From d9481586433e998c7c05669d626c1c5c23c83e0d Mon Sep 17 00:00:00 2001
From: Michal Novotny <michal.novotny@gmail.com>
Date: Tue, 27 Nov 2012 12:48:15 +0100
Subject: [PATCH 001/160] Bug 725993 - Remove usage of STORE_ON_DISK flag in
 XHR code, r=jonas

---
 content/base/public/nsDOMFile.h       | 24 ++++------
 content/base/src/nsXMLHttpRequest.cpp | 63 ++++++---------------------
 content/base/src/nsXMLHttpRequest.h   |  3 +-
 dom/devicestorage/nsDeviceStorage.cpp |  3 +-
 4 files changed, 25 insertions(+), 68 deletions(-)

diff --git a/content/base/public/nsDOMFile.h b/content/base/public/nsDOMFile.h
index 2458371ddcd6..b6feedb290c9 100644
--- a/content/base/public/nsDOMFile.h
+++ b/content/base/public/nsDOMFile.h
@@ -246,24 +246,17 @@ public:
     NS_ASSERTION(mFile, "must have file");
   }
 
-  // Create as a blob
-  nsDOMFileFile(nsIFile *aFile, const nsAString& aContentType,
-                nsISupports *aCacheToken)
-    : nsDOMFile(aContentType, UINT64_MAX),
-      mFile(aFile), mWholeFile(true), mStoredFile(false),
-      mCacheToken(aCacheToken)
-  {
-    NS_ASSERTION(mFile, "must have file");
-  }
-
   // Create as a file with custom name
-  nsDOMFileFile(nsIFile *aFile, const nsAString& aName)
-    : nsDOMFile(aName, EmptyString(), UINT64_MAX, UINT64_MAX),
+  nsDOMFileFile(nsIFile *aFile, const nsAString& aName,
+                const nsAString& aContentType)
+    : nsDOMFile(aName, aContentType, UINT64_MAX, UINT64_MAX),
       mFile(aFile), mWholeFile(true), mStoredFile(false)
   {
     NS_ASSERTION(mFile, "must have file");
-    // Lazily get the content type and size
-    mContentType.SetIsVoid(true);
+    if (aContentType.IsEmpty()) {
+      // Lazily get the content type and size
+      mContentType.SetIsVoid(true);
+    }
   }
 
   // Create as a stored file
@@ -324,7 +317,7 @@ protected:
                 const nsAString& aContentType)
     : nsDOMFile(aContentType, aOther->mStart + aStart, aLength),
       mFile(aOther->mFile), mWholeFile(false),
-      mStoredFile(aOther->mStoredFile), mCacheToken(aOther->mCacheToken)
+      mStoredFile(aOther->mStoredFile)
   {
     NS_ASSERTION(mFile, "must have file");
     mImmutable = aOther->mImmutable;
@@ -363,7 +356,6 @@ protected:
   nsCOMPtr<nsIFile> mFile;
   bool mWholeFile;
   bool mStoredFile;
-  nsCOMPtr<nsISupports> mCacheToken;
 };
 
 class nsDOMMemoryFile : public nsDOMFile
diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp
index 533c5dc1ff2c..50adbb844beb 100644
--- a/content/base/src/nsXMLHttpRequest.cpp
+++ b/content/base/src/nsXMLHttpRequest.cpp
@@ -1077,18 +1077,6 @@ nsXMLHttpRequest::SetResponseType(nsXMLHttpRequest::ResponseTypeEnum aResponseTy
   // Set the responseType attribute's value to the given value.
   mResponseType = aResponseType;
 
-  // If the state is OPENED, SetCacheAsFile would have no effect here
-  // because the channel hasn't initialized the cache entry yet.
-  // SetCacheAsFile will be called from OnStartRequest.
-  // If the state is HEADERS_RECEIVED, however, we need to call
-  // it immediately because OnStartRequest is already dispatched.
-  if (mState & XML_HTTP_REQUEST_HEADERS_RECEIVED) {
-    nsCOMPtr<nsICachingChannel> cc(do_QueryInterface(mChannel));
-    if (cc) {
-      cc->SetCacheAsFile(mResponseType == XML_HTTP_RESPONSE_TYPE_BLOB ||
-                         mResponseType == XML_HTTP_RESPONSE_TYPE_MOZ_BLOB);
-    }
-  }
 }
 
 /* readonly attribute jsval response; */
@@ -1965,37 +1953,22 @@ nsXMLHttpRequest::StreamReaderFunc(nsIInputStream* in,
 bool nsXMLHttpRequest::CreateDOMFile(nsIRequest *request)
 {
   nsCOMPtr<nsIFile> file;
-  nsCOMPtr<nsICachingChannel> cc(do_QueryInterface(request));
-  if (cc) {
-    cc->GetCacheFile(getter_AddRefs(file));
-  } else {
-    nsCOMPtr<nsIFileChannel> fc = do_QueryInterface(request);
-    if (fc) {
-      fc->GetFile(getter_AddRefs(file));
-    }
+  nsCOMPtr<nsIFileChannel> fc = do_QueryInterface(request);
+  if (fc) {
+    fc->GetFile(getter_AddRefs(file));
   }
-  bool fromFile = false;
-  if (file) {
-    nsAutoCString contentType;
-    mChannel->GetContentType(contentType);
-    nsCOMPtr<nsISupports> cacheToken;
-    if (cc) {
-      cc->GetCacheToken(getter_AddRefs(cacheToken));
-      // We need to call IsFromCache to determine whether the response is
-      // fully cached (i.e. whether we can skip reading the response).
-      cc->IsFromCache(&fromFile);
-    } else {
-      // If the response is coming from the local resource, we can skip
-      // reading the response unconditionally.
-      fromFile = true;
-    }
 
-    mDOMFile =
-      new nsDOMFileFile(file, NS_ConvertASCIItoUTF16(contentType), cacheToken);
-    mBlobSet = nullptr;
-    NS_ASSERTION(mResponseBody.IsEmpty(), "mResponseBody should be empty");
-  }
-  return fromFile;
+  if (!file)
+    return false;
+
+  nsAutoCString contentType;
+  mChannel->GetContentType(contentType);
+
+  mDOMFile =
+    new nsDOMFileFile(file, EmptyString(), NS_ConvertASCIItoUTF16(contentType));
+  mBlobSet = nullptr;
+  NS_ASSERTION(mResponseBody.IsEmpty(), "mResponseBody should be empty");
+  return true;
 }
 
 NS_IMETHODIMP
@@ -2127,14 +2100,6 @@ nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
   mState &= ~XML_HTTP_REQUEST_MPART_HEADERS;
   ChangeState(XML_HTTP_REQUEST_HEADERS_RECEIVED);
 
-  if (mResponseType == XML_HTTP_RESPONSE_TYPE_BLOB ||
-      mResponseType == XML_HTTP_RESPONSE_TYPE_MOZ_BLOB) {
-    nsCOMPtr<nsICachingChannel> cc(do_QueryInterface(mChannel));
-    if (cc) {
-      cc->SetCacheAsFile(true);
-    }
-  }
-
   ResetResponse();
 
   if (!mOverrideMimeType.IsEmpty()) {
diff --git a/content/base/src/nsXMLHttpRequest.h b/content/base/src/nsXMLHttpRequest.h
index a4c9fc7237e3..429d086a6ecc 100644
--- a/content/base/src/nsXMLHttpRequest.h
+++ b/content/base/src/nsXMLHttpRequest.h
@@ -596,8 +596,7 @@ protected:
   // but is also explicitly set in OnStopRequest.
   nsCOMPtr<nsIDOMBlob> mResponseBlob;
   // Non-null only when we are able to get a os-file representation of the
-  // response, i.e. when loading from a file, or when the http-stream
-  // caches into a file or is reading from a cached file.
+  // response, i.e. when loading from a file.
   nsRefPtr<nsDOMFile> mDOMFile;
   // We stream data to mBlobSet when response type is "blob" or "moz-blob"
   // and mDOMFile is null.
diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp
index 70459d5dc4d1..1cf20b1ef2f6 100644
--- a/dom/devicestorage/nsDeviceStorage.cpp
+++ b/dom/devicestorage/nsDeviceStorage.cpp
@@ -778,7 +778,8 @@ jsval nsIFileToJsval(nsPIDOMWindow* aWindow, DeviceStorageFile* aFile)
     return JSVAL_NULL;
   }
 
-  nsCOMPtr<nsIDOMBlob> blob = new nsDOMFileFile(aFile->mFile, aFile->mPath);
+  nsCOMPtr<nsIDOMBlob> blob = new nsDOMFileFile(aFile->mFile, aFile->mPath,
+                                                EmptyString());
   return InterfaceToJsval(aWindow, blob, &NS_GET_IID(nsIDOMBlob));
  }
 

From 22979fc6000dbbac10f64a0da5692f03e1d36fdd Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Tue, 27 Nov 2012 22:16:12 +0900
Subject: [PATCH 002/160] Bug 767756 - try implementing ISimpleDOMNode with a
 tear off, r=tbsaunde, f=marcoz

--HG--
rename : accessible/src/msaa/nsAccessNodeWrap.cpp => accessible/src/windows/sdn/sdnAccessible.cpp
rename : accessible/src/msaa/nsAccessNodeWrap.h => accessible/src/windows/sdn/sdnAccessible.h
---
 accessible/build/Makefile.in                  |   1 +
 accessible/src/msaa/AccessibleWrap.cpp        |   9 +-
 accessible/src/msaa/Makefile.in               |   1 +
 accessible/src/msaa/nsAccessNodeWrap.cpp      | 400 +------------
 accessible/src/msaa/nsAccessNodeWrap.h        |  63 --
 accessible/src/windows/Makefile.in            |   1 +
 accessible/src/windows/sdn/Makefile.in        |  35 ++
 .../src/windows/sdn/sdnAccessible-inl.h       |  36 ++
 accessible/src/windows/sdn/sdnAccessible.cpp  | 537 ++++++++++++++++++
 accessible/src/windows/sdn/sdnAccessible.h    | 113 ++++
 10 files changed, 737 insertions(+), 459 deletions(-)
 create mode 100644 accessible/src/windows/sdn/Makefile.in
 create mode 100644 accessible/src/windows/sdn/sdnAccessible-inl.h
 create mode 100644 accessible/src/windows/sdn/sdnAccessible.cpp
 create mode 100644 accessible/src/windows/sdn/sdnAccessible.h

diff --git a/accessible/build/Makefile.in b/accessible/build/Makefile.in
index 69e9dd27bd8d..7529748691d7 100644
--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@@ -34,6 +34,7 @@ SHARED_LIBRARY_LIBS = \
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 SHARED_LIBRARY_LIBS += \
   ../src/windows/ia2/$(LIB_PREFIX)accessibility_toolkit_ia2_s.$(LIB_SUFFIX) \
+  ../src/windows/sdn/$(LIB_PREFIX)accessibility_toolkit_sdn_s.$(LIB_SUFFIX) \
   ../src/windows/uia/$(LIB_PREFIX)accessibility_toolkit_uia_s.$(LIB_SUFFIX) \
   $(NULL)
 endif
diff --git a/accessible/src/msaa/AccessibleWrap.cpp b/accessible/src/msaa/AccessibleWrap.cpp
index ec5cee2c8eaf..66295b71ab55 100644
--- a/accessible/src/msaa/AccessibleWrap.cpp
+++ b/accessible/src/msaa/AccessibleWrap.cpp
@@ -17,6 +17,7 @@
 #include "Relation.h"
 #include "Role.h"
 #include "RootAccessible.h"
+#include "sdnAccessible.h"
 #include "States.h"
 #include "uiaRawElmProvider.h"
 
@@ -93,6 +94,12 @@ __try {
     *ppv = static_cast<IServiceProvider*>(this);
   else if (IID_IAccessible2 == iid && !Compatibility::IsIA2Off())
     *ppv = static_cast<IAccessible2*>(this);
+  else if (IID_ISimpleDOMNode == iid) {
+    if (IsDefunct() || !HasOwnContent() && !IsDoc())
+      return E_NOINTERFACE;
+
+    *ppv = new sdnAccessible(GetNode());
+  }
 
   if (NULL == *ppv) {
     HRESULT hr = ia2AccessibleComponent::QueryInterface(iid, ppv);
@@ -113,7 +120,7 @@ __try {
   }
 
   if (NULL == *ppv)
-    return nsAccessNodeWrap::QueryInterface(iid, ppv);
+    return E_NOINTERFACE;
 
   (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
 } __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
diff --git a/accessible/src/msaa/Makefile.in b/accessible/src/msaa/Makefile.in
index 21031ac707b5..c302cbf1312e 100644
--- a/accessible/src/msaa/Makefile.in
+++ b/accessible/src/msaa/Makefile.in
@@ -67,6 +67,7 @@ LOCAL_INCLUDES += \
   -I$(srcdir)/../xpcom \
   -I$(srcdir)/../xul \
   -I$(srcdir)/../windows/ia2 \
+  -I$(srcdir)/../windows/sdn \
   -I$(srcdir)/../windows/uia \
   -I$(srcdir)/../../../content/base/src \
   -I$(srcdir)/../../../content/events/src \
diff --git a/accessible/src/msaa/nsAccessNodeWrap.cpp b/accessible/src/msaa/nsAccessNodeWrap.cpp
index 5353a68def69..b29799a779ae 100644
--- a/accessible/src/msaa/nsAccessNodeWrap.cpp
+++ b/accessible/src/msaa/nsAccessNodeWrap.cpp
@@ -7,7 +7,7 @@
 
 #include "AccessibleApplication.h"
 #include "ApplicationAccessibleWrap.h"
-#include "ISimpleDOMNode_i.c"
+#include "sdnAccessible.h"
 
 #include "Compatibility.h"
 #include "nsAccessibilityService.h"
@@ -60,24 +60,17 @@ nsAccessNodeWrap::QueryNativeInterface(REFIID aIID, void** aInstancePtr)
   return static_cast<nsresult>(QueryInterface(aIID, aInstancePtr));
 }
 
-//-----------------------------------------------------
-// IUnknown interface methods - see iunknown.h for documentation
-//-----------------------------------------------------
-
 STDMETHODIMP nsAccessNodeWrap::QueryInterface(REFIID iid, void** ppv)
 {
   *ppv = nullptr;
 
   if (IID_IUnknown == iid) {
-    *ppv = static_cast<ISimpleDOMNode*>(this);
-  } else if (IID_ISimpleDOMNode == iid) {
-    statistics::ISimpleDOMUsed();
-    *ppv = static_cast<ISimpleDOMNode*>(this);
+    *ppv = static_cast<IUnknown*>(this);
   } else {
-    return E_NOINTERFACE;      //iid not supported.
+    return E_NOINTERFACE; //iid not supported.
   }
-   
-  (reinterpret_cast<IUnknown*>(*ppv))->AddRef(); 
+
+  (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
   return S_OK;
 }
 
@@ -161,389 +154,6 @@ nsAccessNodeWrap::QueryService(REFGUID guidService, REFIID iid, void** ppv)
 
   return E_INVALIDARG;
 }
-
-//-----------------------------------------------------
-// ISimpleDOMNode methods
-//-----------------------------------------------------
-
-STDMETHODIMP nsAccessNodeWrap::get_nodeInfo( 
-    /* [out] */ BSTR __RPC_FAR *aNodeName,
-    /* [out] */ short __RPC_FAR *aNameSpaceID,
-    /* [out] */ BSTR __RPC_FAR *aNodeValue,
-    /* [out] */ unsigned int __RPC_FAR *aNumChildren,
-    /* [out] */ unsigned int __RPC_FAR *aUniqueID,
-    /* [out] */ unsigned short __RPC_FAR *aNodeType)
-{
-__try{
-  *aNodeName = nullptr;
-  *aNodeValue = nullptr;
-
-  nsINode* node = GetNode();
-  if (!node)
-    return E_FAIL;
-
-  nsCOMPtr<nsIDOMNode> DOMNode(do_QueryInterface(node));
-
-  uint16_t nodeType = 0;
-  DOMNode->GetNodeType(&nodeType);
-  *aNodeType=static_cast<unsigned short>(nodeType);
-
-  if (*aNodeType !=  NODETYPE_TEXT) {
-    nsAutoString nodeName;
-    DOMNode->GetNodeName(nodeName);
-    *aNodeName =   ::SysAllocString(nodeName.get());
-  }
-
-  nsAutoString nodeValue;
-
-  DOMNode->GetNodeValue(nodeValue);
-  *aNodeValue = ::SysAllocString(nodeValue.get());
-
-  *aNameSpaceID = IsContent() ?
-    static_cast<short>(mContent->GetNameSpaceID()) : 0;
-
-  // This is a unique ID for every content node.  The 3rd party
-  // accessibility application can compare this to the childID we
-  // return for events such as focus events, to correlate back to
-  // data nodes in their internal object model.
-  *aUniqueID = - NS_PTR_TO_INT32(UniqueID());
-
-  *aNumChildren = node->GetChildCount();
-
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-  return S_OK;
-}
-
-
-       
-STDMETHODIMP nsAccessNodeWrap::get_attributes( 
-    /* [in] */ unsigned short aMaxAttribs,
-    /* [length_is][size_is][out] */ BSTR __RPC_FAR *aAttribNames,
-    /* [length_is][size_is][out] */ short __RPC_FAR *aNameSpaceIDs,
-    /* [length_is][size_is][out] */ BSTR __RPC_FAR *aAttribValues,
-    /* [out] */ unsigned short __RPC_FAR *aNumAttribs)
-{
-__try{
-  *aNumAttribs = 0;
-
-  if (!mContent || IsDocumentNode())
-    return E_FAIL;
-
-  uint32_t numAttribs = mContent->GetAttrCount();
-  if (numAttribs > aMaxAttribs)
-    numAttribs = aMaxAttribs;
-  *aNumAttribs = static_cast<unsigned short>(numAttribs);
-
-  for (uint32_t index = 0; index < numAttribs; index++) {
-    aNameSpaceIDs[index] = 0; aAttribValues[index] = aAttribNames[index] = nullptr;
-    nsAutoString attributeValue;
-
-    const nsAttrName* name = mContent->GetAttrNameAt(index);
-    aNameSpaceIDs[index] = static_cast<short>(name->NamespaceID());
-    aAttribNames[index] = ::SysAllocString(name->LocalName()->GetUTF16String());
-    mContent->GetAttr(name->NamespaceID(), name->LocalName(), attributeValue);
-    aAttribValues[index] = ::SysAllocString(attributeValue.get());
-  }
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return S_OK; 
-}
-        
-
-STDMETHODIMP nsAccessNodeWrap::get_attributesForNames( 
-    /* [in] */ unsigned short aNumAttribs,
-    /* [length_is][size_is][in] */ BSTR __RPC_FAR *aAttribNames,
-    /* [length_is][size_is][in] */ short __RPC_FAR *aNameSpaceID,
-    /* [length_is][size_is][retval] */ BSTR __RPC_FAR *aAttribValues)
-{
-__try {
-  if (!mContent || !IsElement())
-    return E_FAIL;
-
-  nsCOMPtr<nsIDOMElement> domElement(do_QueryInterface(mContent));
-  nsCOMPtr<nsINameSpaceManager> nameSpaceManager =
-    do_GetService(NS_NAMESPACEMANAGER_CONTRACTID);
-
-  int32_t index;
-
-  for (index = 0; index < aNumAttribs; index++) {
-    aAttribValues[index] = nullptr;
-    if (aAttribNames[index]) {
-      nsAutoString attributeValue, nameSpaceURI;
-      nsAutoString attributeName(nsDependentString(static_cast<PRUnichar*>(aAttribNames[index])));
-      nsresult rv;
-
-      if (aNameSpaceID[index]>0 && 
-        NS_SUCCEEDED(nameSpaceManager->GetNameSpaceURI(aNameSpaceID[index], nameSpaceURI)))
-          rv = domElement->GetAttributeNS(nameSpaceURI, attributeName, attributeValue);
-      else 
-        rv = domElement->GetAttribute(attributeName, attributeValue);
-
-      if (NS_SUCCEEDED(rv))
-        aAttribValues[index] = ::SysAllocString(attributeValue.get());
-    }
-  }
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return S_OK; 
-}
-
-/* To do: use media type if not null */
-STDMETHODIMP nsAccessNodeWrap::get_computedStyle( 
-    /* [in] */ unsigned short aMaxStyleProperties,
-    /* [in] */ boolean aUseAlternateView,
-    /* [length_is][size_is][out] */ BSTR __RPC_FAR *aStyleProperties,
-    /* [length_is][size_is][out] */ BSTR __RPC_FAR *aStyleValues,
-    /* [out] */ unsigned short __RPC_FAR *aNumStyleProperties)
-{
-__try{
-  *aNumStyleProperties = 0;
-
-  if (!mContent || IsDocumentNode())
-    return E_FAIL;
-
-  nsCOMPtr<nsIDOMCSSStyleDeclaration> cssDecl =
-    nsWinUtils::GetComputedStyleDeclaration(mContent);
-  NS_ENSURE_TRUE(cssDecl, E_FAIL);
-
-  uint32_t length;
-  cssDecl->GetLength(&length);
-
-  uint32_t index, realIndex;
-  for (index = realIndex = 0; index < length && realIndex < aMaxStyleProperties; index ++) {
-    nsAutoString property, value;
-    if (NS_SUCCEEDED(cssDecl->Item(index, property)) && property.CharAt(0) != '-')  // Ignore -moz-* properties
-      cssDecl->GetPropertyValue(property, value);  // Get property value
-    if (!value.IsEmpty()) {
-      aStyleProperties[realIndex] =   ::SysAllocString(property.get());
-      aStyleValues[realIndex]     =   ::SysAllocString(value.get());
-      ++realIndex;
-    }
-  }
-  *aNumStyleProperties = static_cast<unsigned short>(realIndex);
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return S_OK;
-}
-
-
-STDMETHODIMP nsAccessNodeWrap::get_computedStyleForProperties( 
-    /* [in] */ unsigned short aNumStyleProperties,
-    /* [in] */ boolean aUseAlternateView,
-    /* [length_is][size_is][in] */ BSTR __RPC_FAR *aStyleProperties,
-    /* [length_is][size_is][out] */ BSTR __RPC_FAR *aStyleValues)
-{
-__try {
-  if (!mContent || IsDocumentNode())
-    return E_FAIL;
- 
-  nsCOMPtr<nsIDOMCSSStyleDeclaration> cssDecl =
-    nsWinUtils::GetComputedStyleDeclaration(mContent);
-  NS_ENSURE_TRUE(cssDecl, E_FAIL);
-
-  uint32_t index;
-  for (index = 0; index < aNumStyleProperties; index ++) {
-    nsAutoString value;
-    if (aStyleProperties[index])
-      cssDecl->GetPropertyValue(nsDependentString(static_cast<PRUnichar*>(aStyleProperties[index])), value);  // Get property value
-    aStyleValues[index] = ::SysAllocString(value.get());
-  }
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return S_OK;
-}
-
-STDMETHODIMP nsAccessNodeWrap::scrollTo(/* [in] */ boolean aScrollTopLeft)
-{
-__try {
-  uint32_t scrollType =
-    aScrollTopLeft ? nsIAccessibleScrollType::SCROLL_TYPE_TOP_LEFT :
-                     nsIAccessibleScrollType::SCROLL_TYPE_BOTTOM_RIGHT;
-
-  nsCoreUtils::ScrollTo(mDoc->PresShell(), mContent, scrollType);
-  return S_OK;
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return E_FAIL;
-}
-
-ISimpleDOMNode*
-nsAccessNodeWrap::MakeAccessNode(nsINode *aNode)
-{
-  if (!aNode)
-    return NULL;
-
-  nsAccessNodeWrap *newNode = NULL;
-
-  ISimpleDOMNode *iNode = NULL;
-  Accessible* acc = mDoc->GetAccessible(aNode);
-  if (acc) {
-    IAccessible *msaaAccessible = nullptr;
-    acc->GetNativeInterface((void**)&msaaAccessible); // addrefs
-    msaaAccessible->QueryInterface(IID_ISimpleDOMNode, (void**)&iNode); // addrefs
-    msaaAccessible->Release(); // Release IAccessible
-  }
-  else {
-    nsCOMPtr<nsIContent> content(do_QueryInterface(aNode));
-    if (!content) {
-      NS_NOTREACHED("The node is a document which is not accessible!");
-      return NULL;
-    }
-
-    newNode = new nsAccessNodeWrap(content, mDoc);
-    if (!newNode)
-      return NULL;
-
-    iNode = static_cast<ISimpleDOMNode*>(newNode);
-    iNode->AddRef();
-  }
-
-  return iNode;
-}
-
-
-STDMETHODIMP nsAccessNodeWrap::get_parentNode(ISimpleDOMNode __RPC_FAR *__RPC_FAR *aNode)
-{
-__try {
-  nsINode* node = GetNode();
-  if (!node)
-    return E_FAIL;
-
-  *aNode = MakeAccessNode(node->GetParentNode());
-
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return S_OK;
-}
-
-STDMETHODIMP nsAccessNodeWrap::get_firstChild(ISimpleDOMNode __RPC_FAR *__RPC_FAR *aNode)
-{
-__try {
-  nsINode* node = GetNode();
-  if (!node)
-    return E_FAIL;
-
-  *aNode = MakeAccessNode(node->GetFirstChild());
-
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return S_OK;
-}
-
-STDMETHODIMP nsAccessNodeWrap::get_lastChild(ISimpleDOMNode __RPC_FAR *__RPC_FAR *aNode)
-{
-__try {
-  nsINode* node = GetNode();
-  if (!node)
-    return E_FAIL;
-
-  *aNode = MakeAccessNode(node->GetLastChild());
-
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return S_OK;
-}
-
-STDMETHODIMP nsAccessNodeWrap::get_previousSibling(ISimpleDOMNode __RPC_FAR *__RPC_FAR *aNode)
-{
-__try {
-  nsINode* node = GetNode();
-  if (!node)
-    return E_FAIL;
-
-  *aNode = MakeAccessNode(node->GetPreviousSibling());
-
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return S_OK;
-}
-
-STDMETHODIMP nsAccessNodeWrap::get_nextSibling(ISimpleDOMNode __RPC_FAR *__RPC_FAR *aNode)
-{
-__try {
-  nsINode* node = GetNode();
-  if (!node)
-    return E_FAIL;
-
-  *aNode = MakeAccessNode(node->GetNextSibling());
-
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return S_OK;
-}
-
-STDMETHODIMP 
-nsAccessNodeWrap::get_childAt(unsigned aChildIndex,
-                              ISimpleDOMNode __RPC_FAR *__RPC_FAR *aNode)
-{
-__try {
-  *aNode = nullptr;
-
-  nsINode* node = GetNode();
-  if (!node)
-    return E_FAIL;
-
-  *aNode = MakeAccessNode(node->GetChildAt(aChildIndex));
-
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return S_OK;
-}
-
-STDMETHODIMP 
-nsAccessNodeWrap::get_innerHTML(BSTR __RPC_FAR *aInnerHTML)
-{
-__try {
-  *aInnerHTML = nullptr;
-
-  nsCOMPtr<nsIDOMHTMLElement> htmlElement = do_QueryInterface(GetNode());
-  if (!htmlElement)
-    return E_FAIL; // Node already shut down
-
-  nsAutoString innerHTML;
-  htmlElement->GetInnerHTML(innerHTML);
-  if (innerHTML.IsEmpty())
-    return S_FALSE;
-
-  *aInnerHTML = ::SysAllocStringLen(innerHTML.get(), innerHTML.Length());
-  if (!*aInnerHTML)
-    return E_OUTOFMEMORY;
-
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return S_OK;
-}
-
-STDMETHODIMP 
-nsAccessNodeWrap::get_language(BSTR __RPC_FAR *aLanguage)
-{
-__try {
-  *aLanguage = NULL;
-
-  nsAutoString language;
-  Language(language);
-  if (language.IsEmpty())
-    return S_FALSE;
-
-  *aLanguage = ::SysAllocStringLen(language.get(), language.Length());
-  if (!*aLanguage)
-    return E_OUTOFMEMORY;
-
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-
-  return S_OK;
-}
-
-STDMETHODIMP 
-nsAccessNodeWrap::get_localInterface( 
-    /* [out] */ void __RPC_FAR *__RPC_FAR *localInterface)
-{
-__try {
-  *localInterface = static_cast<nsAccessNode*>(this);
-  NS_ADDREF_THIS();
-} __except(FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
-  return S_OK;
-}
  
 void nsAccessNodeWrap::InitAccessibility()
 {
diff --git a/accessible/src/msaa/nsAccessNodeWrap.h b/accessible/src/msaa/nsAccessNodeWrap.h
index 2f870b1f9fdd..f84930198d1e 100644
--- a/accessible/src/msaa/nsAccessNodeWrap.h
+++ b/accessible/src/msaa/nsAccessNodeWrap.h
@@ -21,7 +21,6 @@
 #include "nsIAccessible.h"
 #include "nsIAccessibleEvent.h"
 #include "nsIWinAccessNode.h"
-#include "ISimpleDOMNode.h"
 #include "nsIDOMElement.h"
 #include "nsIContent.h"
 #include "nsAccessNode.h"
@@ -50,7 +49,6 @@ class AccTextChangeEvent;
 
 class nsAccessNodeWrap : public nsAccessNode,
                          public nsIWinAccessNode,
-                         public ISimpleDOMNode,
                          public IServiceProvider
 {
   public:
@@ -70,59 +68,6 @@ public: // construction, destruction
                                                  REFIID aIID,
                                                  void** aInstancePtr);
 
-  // ISimpleDOMNode
-    virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_nodeInfo( 
-        /* [out] */ BSTR __RPC_FAR *tagName,
-        /* [out] */ short __RPC_FAR *nameSpaceID,
-        /* [out] */ BSTR __RPC_FAR *nodeValue,
-        /* [out] */ unsigned int __RPC_FAR *numChildren,
-        /* [out] */ unsigned int __RPC_FAR *aUniqueID,
-        /* [out][retval] */ unsigned short __RPC_FAR *nodeType);
-  
-    virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_attributes( 
-        /* [in] */ unsigned short maxAttribs,
-        /* [length_is][size_is][out] */ BSTR __RPC_FAR *attribNames,
-        /* [length_is][size_is][out] */ short __RPC_FAR *nameSpaceID,
-        /* [length_is][size_is][out] */ BSTR __RPC_FAR *attribValues,
-        /* [out][retval] */ unsigned short __RPC_FAR *numAttribs);
-  
-    virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_attributesForNames( 
-        /* [in] */ unsigned short maxAttribs,
-        /* [length_is][size_is][in] */ BSTR __RPC_FAR *attribNames,
-        /* [length_is][size_is][in] */ short __RPC_FAR *nameSpaceID,
-        /* [length_is][size_is][retval] */ BSTR __RPC_FAR *attribValues);
-  
-    virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_computedStyle( 
-        /* [in] */ unsigned short maxStyleProperties,
-        /* [in] */ boolean useAlternateView,
-        /* [length_is][size_is][out] */ BSTR __RPC_FAR *styleProperties,
-        /* [length_is][size_is][out] */ BSTR __RPC_FAR *styleValues,
-        /* [out][retval] */ unsigned short __RPC_FAR *numStyleProperties);
-  
-    virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_computedStyleForProperties( 
-        /* [in] */ unsigned short numStyleProperties,
-        /* [in] */ boolean useAlternateView,
-        /* [length_is][size_is][in] */ BSTR __RPC_FAR *styleProperties,
-        /* [length_is][size_is][out][retval] */ BSTR __RPC_FAR *styleValues);
-        
-    virtual HRESULT STDMETHODCALLTYPE scrollTo(/* [in] */ boolean scrollTopLeft);
-
-    virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_parentNode(ISimpleDOMNode __RPC_FAR *__RPC_FAR *node);
-    virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_firstChild(ISimpleDOMNode __RPC_FAR *__RPC_FAR *node);
-    virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_lastChild(ISimpleDOMNode __RPC_FAR *__RPC_FAR *node);
-    virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_previousSibling(ISimpleDOMNode __RPC_FAR *__RPC_FAR *node);
-    virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_nextSibling(ISimpleDOMNode __RPC_FAR *__RPC_FAR *node);
-    virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_childAt(unsigned childIndex,
-                                                                  ISimpleDOMNode __RPC_FAR *__RPC_FAR *node);
-
-    virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_innerHTML(
-        /* [out][retval] */ BSTR __RPC_FAR *innerHTML);
-
-    virtual /* [local][propget] */ HRESULT STDMETHODCALLTYPE get_localInterface( 
-        /* [retval][out] */ void __RPC_FAR *__RPC_FAR *localInterface);
-        
-    virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_language(
-        /* [out][retval] */ BSTR __RPC_FAR *language);
 
     static void InitAccessibility();
     static void ShutdownAccessibility();
@@ -136,14 +81,6 @@ public: // construction, destruction
 
 protected:
 
-  /**
-   * Return ISimpleDOMNode instance for existing accessible object or
-   * creates new nsAccessNode instance if the accessible doesn't exist.
-   *
-   * @note ISimpleDOMNode is returned addrefed
-   */
-  ISimpleDOMNode *MakeAccessNode(nsINode *aNode);
-
     /**
      * It is used in HyperTextAccessibleWrap for IA2::newText/oldText
      * implementation.
diff --git a/accessible/src/windows/Makefile.in b/accessible/src/windows/Makefile.in
index 52e95578f38a..db4e18099bfd 100644
--- a/accessible/src/windows/Makefile.in
+++ b/accessible/src/windows/Makefile.in
@@ -12,6 +12,7 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS += \
   ia2 \
+  sdn \
   uia \
   $(null)
 
diff --git a/accessible/src/windows/sdn/Makefile.in b/accessible/src/windows/sdn/Makefile.in
new file mode 100644
index 000000000000..1a6116d00b1f
--- /dev/null
+++ b/accessible/src/windows/sdn/Makefile.in
@@ -0,0 +1,35 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEPTH = @DEPTH@
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = accessibility
+LIBRARY_NAME = accessibility_toolkit_sdn_s
+EXPORT_LIBRARY = 1
+LIBXUL_LIBRARY = 1
+
+CPPSRCS += \
+  sdnAccessible.cpp \
+  $(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
+
+LOCAL_INCLUDES += \
+  -I$(srcdir) \
+  -I$(srcdir)/../../base \
+  -I$(srcdir)/../../generic \
+  -I$(srcdir)/../../html \
+  -I$(srcdir)/../../msaa \
+  -I$(srcdir)/../../xpcom \
+  -I$(srcdir)/../../xul \
+  $(NULL)
diff --git a/accessible/src/windows/sdn/sdnAccessible-inl.h b/accessible/src/windows/sdn/sdnAccessible-inl.h
new file mode 100644
index 000000000000..a2401a81cdda
--- /dev/null
+++ b/accessible/src/windows/sdn/sdnAccessible-inl.h
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_a11y_sdnAccessible_inl_h_
+#define mozilla_a11y_sdnAccessible_inl_h_
+
+#include "sdnAccessible.h"
+
+#include "DocAccessible.h"
+#include "nsAccessibilityService.h"
+
+namespace mozilla {
+namespace a11y {
+
+inline DocAccessible*
+sdnAccessible::GetDocument() const
+{
+  DocManager* docMgr = GetAccService();
+  return docMgr ?
+    docMgr->GetDocAccessibleFromCache(mNode->OwnerDoc()) : nullptr;
+}
+
+inline Accessible*
+sdnAccessible::GetAccessible() const
+{
+  DocAccessible* document = GetDocument();
+  return document ? document->GetAccessible(mNode) : nullptr;
+}
+
+} // namespace a11y
+} // namespace mozilla
+
+#endif // mozilla_a11y_sdnAccessible_inl_h_
diff --git a/accessible/src/windows/sdn/sdnAccessible.cpp b/accessible/src/windows/sdn/sdnAccessible.cpp
new file mode 100644
index 000000000000..19abbe9c4e72
--- /dev/null
+++ b/accessible/src/windows/sdn/sdnAccessible.cpp
@@ -0,0 +1,537 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "sdnAccessible-inl.h"
+#include "ISimpleDOMNode_i.c"
+
+#include "nsAccessNodeWrap.h"
+#include "DocAccessibleWrap.h"
+
+#include "nsAttrName.h"
+#include "nsCoreUtils.h"
+#include "nsIDOMHTMLElement.h"
+#include "nsIDOMCSSStyleDeclaration.h"
+#include "nsServiceManagerUtils.h"
+#include "nsWinUtils.h"
+
+#include "nsAutoPtr.h"
+
+#include "mozilla/dom/Element.h"
+
+using namespace mozilla;
+using namespace mozilla::a11y;
+
+STDMETHODIMP
+sdnAccessible::QueryInterface(REFIID aREFIID, void** aInstancePtr)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aInstancePtr)
+    return E_FAIL;
+  *aInstancePtr = NULL;
+
+  if (aREFIID == IID_ISimpleDOMNode) {
+    *aInstancePtr = this;
+    AddRef();
+    return S_OK;
+  }
+
+  AccessibleWrap* accessible = static_cast<AccessibleWrap*>(GetAccessible());
+  if (accessible)
+    return accessible->QueryInterface(aREFIID, aInstancePtr);
+
+  // IUnknown* is the canonical one if and only if this accessible doesn't have
+  // an accessible.
+  if (aREFIID == IID_IUnknown) {
+    *aInstancePtr = this;
+    AddRef();
+    return S_OK;
+  }
+
+  return E_NOINTERFACE;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_nodeInfo(BSTR __RPC_FAR* aNodeName,
+                            short __RPC_FAR* aNameSpaceID,
+                            BSTR __RPC_FAR* aNodeValue,
+                            unsigned int __RPC_FAR* aNumChildren,
+                            unsigned int __RPC_FAR* aUniqueID,
+                            unsigned short __RPC_FAR* aNodeType)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aNodeName || !aNameSpaceID || !aNodeValue || !aNumChildren ||
+      !aUniqueID || !aNodeType)
+    return E_INVALIDARG;
+
+  *aNodeName = NULL;
+  *aNameSpaceID = 0;
+  *aNodeValue = NULL;
+  *aNumChildren = 0;
+  *aUniqueID = 0;
+  *aNodeType = 0;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  nsCOMPtr<nsIDOMNode> DOMNode(do_QueryInterface(mNode));
+
+  uint16_t nodeType = 0;
+  DOMNode->GetNodeType(&nodeType);
+  *aNodeType = static_cast<unsigned short>(nodeType);
+
+  if (*aNodeType !=  NODETYPE_TEXT) {
+    nsAutoString nodeName;
+    DOMNode->GetNodeName(nodeName);
+    *aNodeName = ::SysAllocString(nodeName.get());
+  }
+
+  nsAutoString nodeValue;
+  DOMNode->GetNodeValue(nodeValue);
+  *aNodeValue = ::SysAllocString(nodeValue.get());
+
+  *aNameSpaceID = mNode->IsNodeOfType(nsINode::eCONTENT) ?
+    static_cast<short>(mNode->AsContent()->GetNameSpaceID()) : 0;
+
+  // This is a unique ID for every content node. The 3rd party accessibility
+  // application can compare this to the childID we return for events such as
+  // focus events, to correlate back to data nodes in their internal object
+  // model.
+  Accessible* accessible = GetAccessible();
+  *aUniqueID = - NS_PTR_TO_INT32(accessible ? accessible->UniqueID() :
+                                              static_cast<void*>(this));
+
+  *aNumChildren = mNode->GetChildCount();
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_attributes(unsigned  short aMaxAttribs,
+                              BSTR __RPC_FAR* aAttribNames,
+                              short __RPC_FAR* aNameSpaceIDs,
+                              BSTR __RPC_FAR* aAttribValues,
+                              unsigned short __RPC_FAR* aNumAttribs)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aAttribNames || !aNameSpaceIDs || !aAttribValues || !aNumAttribs)
+    return E_INVALIDARG;
+
+  *aNumAttribs = 0;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  if (!mNode->IsElement())
+    return S_FALSE;
+
+  dom::Element* elm = mNode->AsElement();
+  uint32_t numAttribs = elm->GetAttrCount();
+  if (numAttribs > aMaxAttribs)
+    numAttribs = aMaxAttribs;
+
+  *aNumAttribs = static_cast<unsigned short>(numAttribs);
+
+  for (uint32_t index = 0; index < numAttribs; index++) {
+    aNameSpaceIDs[index] = 0;
+    aAttribValues[index] = aAttribNames[index] = NULL;
+    nsAutoString attributeValue;
+
+    const nsAttrName* name = elm->GetAttrNameAt(index);
+    aNameSpaceIDs[index] = static_cast<short>(name->NamespaceID());
+    aAttribNames[index] = ::SysAllocString(name->LocalName()->GetUTF16String());
+    elm->GetAttr(name->NamespaceID(), name->LocalName(), attributeValue);
+    aAttribValues[index] = ::SysAllocString(attributeValue.get());
+  }
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_attributesForNames(unsigned short aMaxAttribs,
+                                      BSTR __RPC_FAR* aAttribNames,
+                                      short __RPC_FAR* aNameSpaceID,
+                                      BSTR __RPC_FAR* aAttribValues)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aAttribNames || !aNameSpaceID || !aAttribValues)
+    return E_INVALIDARG;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  if (!mNode->IsElement())
+    return S_FALSE;
+
+  nsCOMPtr<nsIDOMElement> domElement(do_QueryInterface(mNode));
+  nsCOMPtr<nsINameSpaceManager> nameSpaceManager =
+    do_GetService(NS_NAMESPACEMANAGER_CONTRACTID);
+
+  int32_t index = 0;
+  for (index = 0; index < aMaxAttribs; index++) {
+    aAttribValues[index] = NULL;
+    if (aAttribNames[index]) {
+      nsAutoString attributeValue, nameSpaceURI;
+      nsAutoString attributeName(nsDependentString(
+        static_cast<PRUnichar*>(aAttribNames[index])));
+
+      nsresult rv = NS_OK;
+      if (aNameSpaceID[index]>0 &&
+        NS_SUCCEEDED(nameSpaceManager->GetNameSpaceURI(aNameSpaceID[index],
+                                                       nameSpaceURI))) {
+          rv = domElement->GetAttributeNS(nameSpaceURI, attributeName,
+                                          attributeValue);
+      } else {
+        rv = domElement->GetAttribute(attributeName, attributeValue);
+      }
+
+      if (NS_SUCCEEDED(rv))
+        aAttribValues[index] = ::SysAllocString(attributeValue.get());
+    }
+  }
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_computedStyle(unsigned short aMaxStyleProperties,
+                                 boolean aUseAlternateView,
+                                 BSTR __RPC_FAR* aStyleProperties,
+                                 BSTR __RPC_FAR* aStyleValues,
+                                 unsigned short __RPC_FAR* aNumStyleProperties)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aStyleProperties || aStyleValues || !aNumStyleProperties)
+    return E_INVALIDARG;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  *aNumStyleProperties = 0;
+
+  if (mNode->IsNodeOfType(nsINode::eDOCUMENT))
+    return S_FALSE;
+
+  nsCOMPtr<nsIDOMCSSStyleDeclaration> cssDecl =
+    nsWinUtils::GetComputedStyleDeclaration(mNode->AsContent());
+  NS_ENSURE_TRUE(cssDecl, E_FAIL);
+
+  uint32_t length = 0;
+  cssDecl->GetLength(&length);
+
+  uint32_t index = 0, realIndex = 0;
+  for (index = realIndex = 0; index < length && realIndex < aMaxStyleProperties;
+       index ++) {
+    nsAutoString property, value;
+
+    // Ignore -moz-* properties.
+    if (NS_SUCCEEDED(cssDecl->Item(index, property)) && property.CharAt(0) != '-')
+      cssDecl->GetPropertyValue(property, value);  // Get property value
+
+    if (!value.IsEmpty()) {
+      aStyleProperties[realIndex] = ::SysAllocString(property.get());
+      aStyleValues[realIndex] = ::SysAllocString(value.get());
+      ++realIndex;
+    }
+  }
+
+  *aNumStyleProperties = static_cast<unsigned short>(realIndex);
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_computedStyleForProperties(unsigned short aNumStyleProperties,
+                                              boolean aUseAlternateView,
+                                              BSTR __RPC_FAR* aStyleProperties,
+                                              BSTR __RPC_FAR* aStyleValues)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aStyleProperties || !aStyleValues)
+    return E_INVALIDARG;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  if (mNode->IsNodeOfType(nsINode::eDOCUMENT))
+    return S_FALSE;
+
+  nsCOMPtr<nsIDOMCSSStyleDeclaration> cssDecl =
+    nsWinUtils::GetComputedStyleDeclaration(mNode->AsContent());
+  NS_ENSURE_TRUE(cssDecl, E_FAIL);
+
+  uint32_t index = 0;
+  for (index = 0; index < aNumStyleProperties; index++) {
+    nsAutoString value;
+    if (aStyleProperties[index])
+      cssDecl->GetPropertyValue(nsDependentString(static_cast<PRUnichar*>(
+        aStyleProperties[index])), value);  // Get property value
+    aStyleValues[index] = ::SysAllocString(value.get());
+  }
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::scrollTo(boolean aScrollTopLeft)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  DocAccessible* document = GetDocument();
+  if (!document) // that's IsDefunct check
+    return CO_E_OBJNOTCONNECTED;
+
+  if (!mNode->IsContent())
+    return S_FALSE;
+
+  uint32_t scrollType =
+    aScrollTopLeft ? nsIAccessibleScrollType::SCROLL_TYPE_TOP_LEFT :
+                     nsIAccessibleScrollType::SCROLL_TYPE_BOTTOM_RIGHT;
+
+  nsCoreUtils::ScrollTo(document->PresShell(), mNode->AsContent(), scrollType);
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_parentNode(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aNode)
+    return E_INVALIDARG;
+  *aNode = NULL;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  nsINode* resultNode = mNode->GetParentNode();
+  if (resultNode) {
+    *aNode = new sdnAccessible(resultNode);
+    (*aNode)->AddRef();
+  }
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_firstChild(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aNode)
+    return E_INVALIDARG;
+  *aNode = NULL;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  nsINode* resultNode = mNode->GetFirstChild();
+  if (resultNode) {
+    *aNode = new sdnAccessible(resultNode);
+    (*aNode)->AddRef();
+  }
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_lastChild(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aNode)
+    return E_INVALIDARG;
+  *aNode = NULL;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  nsINode* resultNode = mNode->GetLastChild();
+  if (resultNode) {
+    *aNode = new sdnAccessible(resultNode);
+    (*aNode)->AddRef();
+  }
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_previousSibling(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aNode)
+    return E_INVALIDARG;
+  *aNode = NULL;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  nsINode* resultNode = mNode->GetPreviousSibling();
+  if (resultNode) {
+    *aNode = new sdnAccessible(resultNode);
+    (*aNode)->AddRef();
+  }
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_nextSibling(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aNode)
+    return E_INVALIDARG;
+  *aNode = NULL;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  nsINode* resultNode = mNode->GetNextSibling();
+  if (resultNode) {
+    *aNode = new sdnAccessible(resultNode);
+    (*aNode)->AddRef();
+  }
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_childAt(unsigned aChildIndex,
+                           ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aNode)
+    return E_INVALIDARG;
+  *aNode = NULL;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  nsINode* resultNode = mNode->GetChildAt(aChildIndex);
+  if (resultNode) {
+    *aNode = new sdnAccessible(resultNode);
+    (*aNode)->AddRef();
+  }
+
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_innerHTML(BSTR __RPC_FAR* aInnerHTML)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aInnerHTML)
+    return E_INVALIDARG;
+  *aInnerHTML = NULL;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  nsCOMPtr<nsIDOMHTMLElement> htmlElement = do_QueryInterface(mNode);
+  if (!htmlElement)
+    return S_FALSE;
+
+  nsAutoString innerHTML;
+  htmlElement->GetInnerHTML(innerHTML);
+  if (innerHTML.IsEmpty())
+    return S_FALSE;
+
+  *aInnerHTML = ::SysAllocStringLen(innerHTML.get(), innerHTML.Length());
+  if (!*aInnerHTML)
+    return E_OUTOFMEMORY;
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_localInterface(void __RPC_FAR *__RPC_FAR* aLocalInterface)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aLocalInterface)
+    return E_INVALIDARG;
+  *aLocalInterface = NULL;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  *aLocalInterface = this;
+  AddRef();
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
+
+STDMETHODIMP
+sdnAccessible::get_language(BSTR __RPC_FAR* aLanguage)
+{
+  A11Y_TRYBLOCK_BEGIN
+
+  if (!aLanguage)
+    return E_INVALIDARG;
+  *aLanguage = NULL;
+
+  if (IsDefunct())
+    return CO_E_OBJNOTCONNECTED;
+
+  nsAutoString language;
+  if (mNode->IsElement())
+    nsCoreUtils::GetLanguageFor(mNode->AsElement(), nullptr, language);
+  if (language.IsEmpty()) { // Nothing found, so use document's language
+    mNode->OwnerDoc()->GetHeaderData(nsGkAtoms::headerContentLanguage,
+                                     language);
+  }
+
+  if (language.IsEmpty())
+    return S_FALSE;
+
+  *aLanguage = ::SysAllocStringLen(language.get(), language.Length());
+  if (!*aLanguage)
+   return E_OUTOFMEMORY;
+
+  return S_OK;
+
+  A11Y_TRYBLOCK_END
+}
diff --git a/accessible/src/windows/sdn/sdnAccessible.h b/accessible/src/windows/sdn/sdnAccessible.h
new file mode 100644
index 000000000000..84009e44e605
--- /dev/null
+++ b/accessible/src/windows/sdn/sdnAccessible.h
@@ -0,0 +1,113 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_a11y_sdnAccessible_h_
+#define mozilla_a11y_sdnAccessible_h_
+
+#include "ISimpleDOMNode.h"
+#include "AccessibleWrap.h"
+
+#include "mozilla/Attributes.h"
+
+namespace mozilla {
+namespace a11y {
+
+class sdnAccessible : public ISimpleDOMNode
+{
+public:
+  sdnAccessible(nsINode* aNode) : mNode(aNode) { }
+  ~sdnAccessible() { }
+
+  /**
+   * Retrun if the object is defunct.
+   */
+  bool IsDefunct() const { return !GetDocument(); }
+
+  /**
+   * Return a document accessible it belongs to if any.
+   */
+  DocAccessible* GetDocument() const;
+
+  /*
+   * Return associated accessible if any.
+   */
+  Accessible* GetAccessible() const;
+
+  //IUnknown
+  DECL_IUNKNOWN
+
+  virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_nodeInfo(
+    /* [out] */ BSTR __RPC_FAR* aNodeName,
+    /* [out] */ short __RPC_FAR* aNameSpaceID,
+    /* [out] */ BSTR __RPC_FAR* aNodeValue,
+    /* [out] */ unsigned int __RPC_FAR* aNumChildren,
+    /* [out] */ unsigned int __RPC_FAR* aUniqueID,
+    /* [out][retval] */ unsigned short __RPC_FAR* aNodeType);
+
+  virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_attributes(
+    /* [in] */ unsigned short aMaxAttribs,
+    /* [length_is][size_is][out] */ BSTR __RPC_FAR* aAttribNames,
+    /* [length_is][size_is][out] */ short __RPC_FAR* aNameSpaceIDs,
+    /* [length_is][size_is][out] */ BSTR __RPC_FAR* aAttribValues,
+    /* [out][retval] */ unsigned short __RPC_FAR* aNumAttribs);
+
+  virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_attributesForNames(
+    /* [in] */ unsigned short aMaxAttribs,
+    /* [length_is][size_is][in] */ BSTR __RPC_FAR* aAttribNames,
+    /* [length_is][size_is][in] */ short __RPC_FAR* aNameSpaceID,
+    /* [length_is][size_is][retval] */ BSTR __RPC_FAR* aAttribValues);
+
+  virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_computedStyle(
+    /* [in] */ unsigned short aMaxStyleProperties,
+    /* [in] */ boolean aUseAlternateView,
+    /* [length_is][size_is][out] */ BSTR __RPC_FAR* aStyleProperties,
+    /* [length_is][size_is][out] */ BSTR __RPC_FAR* aStyleValues,
+    /* [out][retval] */ unsigned short __RPC_FAR* aNumStyleProperties);
+
+  virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_computedStyleForProperties(
+    /* [in] */ unsigned short aNumStyleProperties,
+    /* [in] */ boolean aUseAlternateView,
+    /* [length_is][size_is][in] */ BSTR __RPC_FAR* aStyleProperties,
+    /* [length_is][size_is][out][retval] */ BSTR __RPC_FAR* aStyleValues);
+
+  virtual HRESULT STDMETHODCALLTYPE scrollTo(/* [in] */ boolean aScrollTopLeft);
+
+  virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_parentNode(
+    /* [out][retval] */ ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode);
+
+  virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_firstChild(
+    /* [out][retval] */ ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode);
+
+  virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_lastChild(
+    /* [out][retval] */ ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode);
+
+  virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_previousSibling(
+    /* [out][retval] */ ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode);
+
+  virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_nextSibling(
+    /* [out][retval] */ ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode);
+
+  virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_childAt(
+    /* [in] */ unsigned aChildIndex,
+    /* [out][retval] */ ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode);
+
+  virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_innerHTML(
+    /* [out][retval] */ BSTR __RPC_FAR* aInnerHTML);
+
+  virtual /* [local][propget] */ HRESULT STDMETHODCALLTYPE get_localInterface(
+    /* [retval][out] */ void __RPC_FAR *__RPC_FAR* aLocalInterface);
+
+  virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_language(
+    /* [out][retval] */ BSTR __RPC_FAR* aLanguage);
+
+private:
+  nsCOMPtr<nsINode> mNode;
+};
+
+} // namespace a11y
+} // namespace mozilla
+
+#endif // mozilla_a11y_sdnAccessible_h_

From f18d446d45886899845ec68fc1df0184d629d8f2 Mon Sep 17 00:00:00 2001
From: Vicamo Yang <vyang@mozilla.com>
Date: Tue, 27 Nov 2012 21:29:07 +0800
Subject: [PATCH 003/160] Bug 793111 - Part 1 - Add properties in
 nsIDOMMozMobileICCInfo to indicate if PLMN/SPN is required sr=sicking

---
 dom/network/interfaces/nsIDOMMobileConnection.idl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/dom/network/interfaces/nsIDOMMobileConnection.idl b/dom/network/interfaces/nsIDOMMobileConnection.idl
index 79424d84dfe4..ac092b80f958 100644
--- a/dom/network/interfaces/nsIDOMMobileConnection.idl
+++ b/dom/network/interfaces/nsIDOMMobileConnection.idl
@@ -415,7 +415,7 @@ interface nsIDOMMozMobileCellInfo: nsISupports
   readonly attribute unsigned long gsmCellId;
 };
 
-[scriptable, uuid(a71c66ed-dfb0-4c33-9942-049e6f03dbed)]
+[scriptable, uuid(352e7f1a-c09f-44ed-8fde-a138b09a0ea9)]
 interface nsIDOMMozMobileICCInfo : nsISupports
 {
    /**
@@ -438,6 +438,16 @@ interface nsIDOMMozMobileICCInfo : nsISupports
    */
   readonly attribute DOMString spn;
 
+  /**
+   * Network name must be a part of displayed carrier name.
+   */
+  readonly attribute boolean isDisplayNetworkNameRequired;
+
+  /**
+   * Service provider name must be a part of displayed carrier name.
+   */
+  readonly attribute boolean isDisplaySpnRequired;
+
   /**
    * Mobile Station ISDN Number (MSISDN) of the subscriber's, aka
    * his phone number.

From f9a4e3cb6596c1221214073c650fcc0f323ad471 Mon Sep 17 00:00:00 2001
From: Vicamo Yang <vyang@mozilla.com>
Date: Tue, 27 Nov 2012 21:29:10 +0800
Subject: [PATCH 004/160] Bug 793111 - Part 2 - getting PLMN list and deciding
 required carrier name component r=vicamo

---
 dom/system/gonk/RadioInterfaceLayer.js |   2 +
 dom/system/gonk/ril_consts.js          |  11 +-
 dom/system/gonk/ril_worker.js          | 287 ++++++++++++++++++++++++-
 3 files changed, 295 insertions(+), 5 deletions(-)

diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index 2c1032336351..50714e4a0a36 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -1497,6 +1497,8 @@ RadioInterfaceLayer.prototype = {
                          oldIcc.mcc != message.mcc || 
                          oldIcc.mnc != message.mnc ||
                          oldIcc.spn != message.spn ||
+                         oldIcc.isDisplayNetworkNameRequired != message.isDisplayNetworkNameRequired ||
+                         oldIcc.isDisplaySpnRequired != message.isDisplaySpnRequired ||
                          oldIcc.msisdn != message.msisdn;
     if (!iccInfoChanged) {
       return;
diff --git a/dom/system/gonk/ril_consts.js b/dom/system/gonk/ril_consts.js
index 63e9f2d46b48..d29a0e47250d 100644
--- a/dom/system/gonk/ril_consts.js
+++ b/dom/system/gonk/ril_consts.js
@@ -405,6 +405,7 @@ this.ICC_COMMAND_UPDATE_RECORD = 0xdc;
 this.ICC_EF_ICCID  = 0x2fe2;
 this.ICC_EF_IMG    = 0x4f20;
 this.ICC_EF_PBR    = 0x4f30;
+this.ICC_EF_PLMNsel = 0x6f30; // PLMN for SIM
 this.ICC_EF_SST    = 0x6f38;
 this.ICC_EF_UST    = 0x6f38; // For USIM
 this.ICC_EF_ADN    = 0x6f3a;
@@ -563,6 +564,10 @@ this.COMPREHENSIONTLV_TAG_ICON_ID_LIST = 0x1f;
 this.COMPREHENSIONTLV_TAG_IMMEDIATE_RESPONSE = 0x2b;
 this.COMPREHENSIONTLV_TAG_URL = 0x31;
 
+// Tags for Service Provider Display Information TLV
+this.SPDI_TAG_SPDI = 0xa3;
+this.SPDI_TAG_PLMN_LIST = 0x80;
+
 // Device identifiers, see TS 11.14, clause 12.7
 this.STK_DEVICE_ID_KEYPAD = 0x01;
 this.STK_DEVICE_ID_DISPLAY = 0x02;
@@ -906,6 +911,8 @@ this.GECKO_ICC_SERVICES = {
   sim: {
     ADN: 2,
     FDN: 3,
+    PLMNSEL: 7,
+    SPN: 17,
     SDN: 18,
     DATA_DOWNLOAD_SMS_PP: 26,
     BDN: 31
@@ -914,7 +921,9 @@ this.GECKO_ICC_SERVICES = {
     FDN: 2,
     SDN: 4,
     BDN: 6,
-    DATA_DOWNLOAD_SMS_PP: 28
+    SPN: 19,
+    DATA_DOWNLOAD_SMS_PP: 28,
+    SPDI: 51
   }
 };
 
diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js
index f14099baba2e..6300c8856f98 100644
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -703,6 +703,11 @@ let RIL = {
     this.IMEISV = null;
     this.SMSC = null;
 
+    /**
+     * ICC information that is not exposed to Gaia.
+     */
+    this.iccInfoPrivate = {};
+
     /**
      * ICC information, such as MSISDN, IMSI, ...etc.
      */
@@ -1171,7 +1176,6 @@ let RIL = {
     this.getIMSI();
     this.getMSISDN();
     this.getAD();
-    this.getSPN();
     this.getSST();
     this.getMBDN();
   },
@@ -1184,6 +1188,86 @@ let RIL = {
     this.sendDOMMessage(this.iccInfo);
   },
 
+  /**
+   * This will compute the spnDisplay field of the network.
+   * See TS 22.101 Annex A and TS 51.011 10.3.11 for details.
+   *
+   * @return True if some of iccInfo is changed in by this function.
+   */
+  updateDisplayCondition: function updateDisplayCondition() {
+    // If EFspn isn't existed in SIM or it haven't been read yet, we should
+    // just set isDisplayNetworkNameRequired = true and
+    // isDisplaySpnRequired = false
+    let iccInfo = this.iccInfo;
+    let iccInfoPriv = this.iccInfoPrivate;
+    let iccSpn = iccInfoPriv.SPN;
+    let origIsDisplayNetworkNameRequired = iccInfo.isDisplayNetworkNameRequired;
+    let origIsDisplaySPNRequired = iccInfo.isDisplaySpnRequired;
+
+    if (!iccSpn) {
+      iccInfo.isDisplayNetworkNameRequired = true;
+      iccInfo.isDisplaySpnRequired = false;
+    } else {
+      let operatorMnc = this.operator.mnc;
+      let operatorMcc = this.operator.mcc;
+
+      // First detect if we are on HPLMN or one of the PLMN
+      // specified by the SIM card.
+      let isOnMatchingPlmn = false;
+
+      // If the current network is the one defined as mcc/mnc
+      // in SIM card, it's okay.
+      if (iccInfo.mcc == operatorMcc && iccInfo.mnc == operatorMnc) {
+        isOnMatchingPlmn = true;
+      }
+
+      // Test to see if operator's mcc/mnc match mcc/mnc of PLMN.
+      if (!isOnMatchingPlmn && iccInfoPriv.PLMN) {
+        let iccPlmn = iccInfoPriv.PLMN; // PLMN list
+        for (let plmn in iccPlmn) {
+          let plmnMcc = iccPlmn[plmn].mcc;
+          let plmnMnc = iccPlmn[plmn].mnc;
+          isOnMatchingPlmn = (plmnMcc == operatorMcc) && (plmnMnc == operatorMnc);
+          if (isOnMatchingPlmn) {
+            break;
+          }
+        }
+      }
+
+      if (isOnMatchingPlmn) {
+        // The first bit of display condition tells us if we should display
+        // registered PLMN.
+        if (DEBUG) debug("updateDisplayCondition: PLMN is HPLMN or PLMN is in PLMN list");
+        if (iccSpn.spnDisplayCondition & 0x01) {
+          iccInfo.isDisplayNetworkNameRequired = true;
+          iccInfo.isDisplaySpnRequired = false;
+        } else {
+          iccInfo.isDisplayNetworkNameRequired = false;
+          iccInfo.isDisplaySpnRequired = false;
+        }
+      } else {
+        // The second bit of display condition tells us if we should display
+        // registered PLMN.
+        if (DEBUG) debug("updateICCDisplayName: PLMN isn't HPLMN and PLMN isn't in PLMN list");
+        if (iccSpn.spnDisplayCondition & 0x02) {
+          iccInfo.isDisplayNetworkNameRequired = false;
+          iccInfo.isDisplaySpnRequired = false;
+        } else {
+          iccInfo.isDisplayNetworkNameRequired = false;
+          iccInfo.isDisplaySpnRequired = true;
+        }
+      }
+    }
+
+    if (DEBUG) {
+      debug("updateDisplayCondition: isDisplayNetworkNameRequired = " + iccInfo.isDisplayNetworkNameRequired);
+      debug("updateDisplayCondition: isDisplaySpnRequired = " + iccInfo.isDisplaySpnRequired);
+    }
+
+    return ((origIsDisplayNetworkNameRequired !== iccInfo.isDisplayNetworkNameRequired) ||
+            (origIsDisplaySPNRequired !== iccInfo.isDisplaySpnRequired));
+  },
+
   /**
    * Get EF_phase.
    * This EF is only available in SIM.
@@ -1345,12 +1429,20 @@ let RIL = {
       // Minus 1 because first is used to store display condition
       let len = (length / 2) - 1;
       let spnDisplayCondition = GsmPDUHelper.readHexOctet();
-      this.iccInfo.spn = GsmPDUHelper.readAlphaIdentifier(len);
+      let spn = GsmPDUHelper.readAlphaIdentifier(len);
       Buf.readStringDelimiter(length);
 
       if (DEBUG) {
-        debug("SPN: spn=" + this.iccInfo.spn + ", spnDisplayCondition=" + spnDisplayCondition);
+        debug("SPN: spn = " + spn +
+              ", spnDisplayCondition = " + spnDisplayCondition);
       }
+
+      this.iccInfoPrivate.SPN = {
+        spn : spn,
+        spnDisplayCondition : spnDisplayCondition,
+      };
+      this.iccInfo.spn = spn;
+      this.updateDisplayCondition();
       this._handleICCInfoChange();
     }
 
@@ -1368,6 +1460,104 @@ let RIL = {
     });
   },
 
+  /**
+   * Read the PLMNsel (Public Land Mobile Network) from the ICC.
+   *
+   * See ETSI TS 100.977 section 10.3.4 EF_PLMNsel
+   */
+  getPLMNSelector: function getPLMNSelector() {
+    function callback() {
+      if (DEBUG) debug("PLMN: [PLMN Selector] Process PLMN Selector");
+
+      let length = Buf.readUint32();
+      this.iccInfoPrivate.PLMN = this.readPLMNEntries(length/6);
+      Buf.readStringDelimiter(length);
+
+      if (DEBUG) debug("PLMN: [PLMN Selector] " + JSON.stringify(this.iccInfoPrivate.PLMN));
+
+      if (this.updateDisplayCondition()) {
+        this._handleICCInfoChange();
+      }
+    }
+
+    // PLMN List is Service 7 in SIM, EF_PLMNsel
+    this.iccIO({
+      command:   ICC_COMMAND_GET_RESPONSE,
+      fileId:    ICC_EF_PLMNsel,
+      pathId:    this._getPathIdForICCRecord(ICC_EF_PLMNsel),
+      p1:        0, // For GET_RESPONSE, p1 = 0
+      p2:        0, // For GET_RESPONSE, p2 = 0
+      p3:        GET_RESPONSE_EF_SIZE_BYTES,
+      data:      null,
+      pin2:      null,
+      type:      EF_TYPE_TRANSPARENT,
+      callback:  callback,
+    });
+  },
+
+  /**
+   * Read the SPDI (Service Provider Display Information) from the ICC.
+   *
+   * See TS 131.102 section 4.2.66
+   */
+  getSPDI: function getSPDI() {
+    function callback() {
+      if (DEBUG) debug("PLMN: [SPDI] Process SPDI callback");
+      let length = Buf.readUint32();
+      let tlvTag;
+      let tlvLen;
+      let readLen = 0;
+      let endLoop = false;
+      this.iccInfoPrivate.PLMN = null;
+      while ((readLen < length) && !endLoop) {
+        tlvTag = GsmPDUHelper.readHexOctet();
+        tlvLen = GsmPDUHelper.readHexOctet();
+        readLen += 2; // For tag and length.
+        switch (tlvTag) {
+        case SPDI_TAG_SPDI:
+          // The value part itself is a TLV.
+          continue;
+        case SPDI_TAG_PLMN_LIST:
+          // This PLMN list is what we want.
+          this.iccInfoPrivate.PLMN = readPLMNEntries(tlvLen/6);
+          readLen += tlvLen;
+          endLoop = true;
+          break;
+        default:
+          // We don't care about its content if its tag is not SPDI nor
+          // PLMN_LIST.
+          GsmPDUHelper.readHexOctetArray(tlvLen);
+          readLen += tlvLen;
+        }
+      }
+
+      // Consume unread octets.
+      if (length - readLen > 0) {
+        GsmPDUHelper.readHexOctetArray(length - readLen);
+      }
+      Buf.readStringDelimiter(length);
+
+      if (DEBUG) debug("PLMN: [SPDI] " + JSON.stringify(this.iccInfoPrivate.PLMN));
+      if (this.updateDisplayCondition()) {
+        this._handleICCInfoChange();
+      }
+    }
+
+    // PLMN List is Servive 51 in USIM, EF_SPDI
+    this.iccIO({
+      command:   ICC_COMMAND_GET_RESPONSE,
+      fileId:    ICC_EF_SPDI,
+      pathId:    this._getPathIdForICCRecord(ICC_EF_SPDI),
+      p1:        0, // For GET_RESPONSE, p1 = 0
+      p2:        0, // For GET_RESPONSE, p2 = 0
+      p3:        GET_RESPONSE_EF_SIZE_BYTES,
+      data:      null,
+      pin2:      null,
+      type:      EF_TYPE_TRANSPARENT,
+      callback:  callback,
+    });
+  },
+
   /**
    * Get whether specificed (U)SIM service is available.
    *
@@ -1448,6 +1638,24 @@ let RIL = {
         }
         debug("SST: " + str);
       }
+
+      // Fetch SPN and PLMN list, if some of them are available.
+      if (this.isICCServiceAvailable("SPN")) {
+        if (DEBUG) debug("SPN: SPN is available");
+        this.getSPN();
+      } else {
+        if (DEBUG) debug("SPN: SPN service is not available");
+      }
+
+      if (this.isICCServiceAvailable("PLMNSEL")) {
+        if (DEBUG) debug("PLMN: PLMNSEL available.");
+        this.getPLMNSelector();
+      } else if (this.isICCServiceAvailable("SPDI")) {
+        if (DEBUG) debug("PLMN: SPDI available.");
+        this.getSPDI();
+      } else {
+        if (DEBUG) debug("PLMN: Both PLMNSEL/SPDI not available");
+      }
     }
 
     // ICC_EF_UST has the same value with ICC_EF_SST.
@@ -1685,6 +1893,73 @@ let RIL = {
     return null;
   },
 
+  /**
+   *  Read the list of PLMN (Public Land Mobile Network) entries
+   *  We cannot directly rely on readSwappedNibbleBcdToString(),
+   *  since it will no correctly handle some corner-cases that are
+   *  not a problem in our case (0xFF 0xFF 0xFF).
+   *
+   *  @param length The number of PLMN records.
+   *  @return An array of string corresponding to the PLMNs.
+   */
+  readPLMNEntries: function readPLMNEntries(length) {
+    let plmnList = [];
+    // each PLMN entry has 3 byte
+    debug("readPLMNEntries: PLMN entries length = " + length);
+    let index = 0;
+    while (index < length) {
+      // Unused entries will be 0xFFFFFF, according to EF_SPDI
+      // specs (TS 131 102, section 4.2.66)
+      try {
+        let plmn = [GsmPDUHelper.readHexOctet(),
+                    GsmPDUHelper.readHexOctet(),
+                    GsmPDUHelper.readHexOctet()];
+        if (DEBUG) debug("readPLMNEntries: Reading PLMN entry: [" + index +
+                         "]: '" + plmn + "'");
+        if (plmn[0] != 0xFF &&
+            plmn[1] != 0xFF &&
+            plmn[2] != 0xFF) {
+          let semiOctets = [];
+          for (let i = 0; i < plmn.length; i++) {
+            semiOctets.push((plmn[idx] & 0xF0) >> 4);
+            semiOctets.push(plmn[idx] & 0x0F);
+          }
+
+          // According to TS 24.301, 9.9.3.12, the semi octets is arranged
+          // in format:
+          // Byte 1: MCC[2] | MCC[1]
+          // Byte 2: MNC[3] | MCC[3]
+          // Byte 3: MNC[2] | MNC[1]
+          // Therefore, we need to rearrage them.
+          let reformat = [semiOctets[1], semiOctets[0], semiOctets[3],
+                          semiOctets[5], semiOctets[4], semiOctets[2]];
+          let buf = "";
+          let plmnEntry = {};
+          for (let i = 0; i < reformat.length; i++) {
+            if (reformat[i] != 0xF) {
+              buf += GsmPDUHelper.semiOctetToBcdChar(reformat[i]);
+            }
+            if (i === 2) {
+              // 0-2: MCC
+              plmnEntry.mcc = parseInt(buf);
+              buf = "";
+            } else if (i === 5) {
+              // 3-5: MNC
+              plmnEntry.mnc = parseInt(buf);
+            }
+          }
+          if (DEBUG) debug("readPLMNEntries: PLMN = " + plmnEntry.mcc + ", " + plmnEntry.mnc);
+          plmnList.push(plmnEntry);
+        }
+      } catch (e) {
+        if (DEBUG) debug("readPLMNEntries: PLMN entry " + index + " is invalid.");
+        break;
+      }
+      index ++;
+    }
+    return plmnList;
+  },
+
   /**
    * Get UICC Phonebook.
    *
@@ -3082,6 +3357,7 @@ let RIL = {
 
           case ICC_EF_AD:
           case ICC_EF_MBDN:
+          case ICC_EF_PLMNsel:
           case ICC_EF_SPN:
           case ICC_EF_SST:
             return EF_PATH_MF_SIM + EF_PATH_DF_GSM;
@@ -3094,6 +3370,7 @@ let RIL = {
           case ICC_EF_UST:
           case ICC_EF_MSISDN:
           case ICC_EF_SPN:
+          case ICC_EF_SPDI:
             return EF_PATH_MF_SIM + EF_PATH_ADF_USIM;
 
           default:
@@ -3438,7 +3715,9 @@ let RIL = {
           debug("Error processing operator tuple: " + e);
         }
       }
-
+      if (this.updateDisplayCondition()) {
+        this._handleICCInfoChange();
+      }
       this._sendNetworkInfoMessage(NETWORK_INFO_OPERATOR, this.operator);
     }
   },

From 6874786b5de68d3d8b98979d9a9892d313227dfe Mon Sep 17 00:00:00 2001
From: Vicamo Yang <vyang@mozilla.com>
Date: Tue, 27 Nov 2012 21:29:13 +0800
Subject: [PATCH 005/160] Bug 793111 - Part 3 - Test case r=vicamo

---
 .../tests/marionette/test_mobile_iccinfo.js   | 60 ++++++++++++++++++-
 dom/system/gonk/tests/test_ril_worker_icc.js  | 55 +++++++++++++++++
 2 files changed, 113 insertions(+), 2 deletions(-)

diff --git a/dom/network/tests/marionette/test_mobile_iccinfo.js b/dom/network/tests/marionette/test_mobile_iccinfo.js
index 6e027af133c3..f9897f4a45eb 100644
--- a/dom/network/tests/marionette/test_mobile_iccinfo.js
+++ b/dom/network/tests/marionette/test_mobile_iccinfo.js
@@ -9,6 +9,39 @@ let connection = navigator.mozMobileConnection;
 ok(connection instanceof MozMobileConnection,
    "connection is instanceof " + connection.constructor);
 
+let emulatorCmdPendingCount = 0;
+function sendEmulatorCommand(cmd, callback) {
+  emulatorCmdPendingCount++;
+  runEmulatorCmd(cmd, function (result) {
+    emulatorCmdPendingCount--;
+    is(result[result.length - 1], "OK");
+    callback(result);
+  });
+}
+
+function setEmulatorMccMnc(mcc, mnc, callback) {
+  let cmd = "operator set 0 Android,Android," + mcc + mnc;
+  sendEmulatorCommand(cmd, function (result) {
+    let re = new RegExp("" + mcc + mnc + "$");
+    ok(result[0].match(re), "MCC/MNC should be changed.");
+    if (callback) {
+      callback();
+    }
+  });
+}
+
+function waitForIccInfoChange(callback) {
+  connection.addEventListener("iccinfochange", function handler() {
+    connection.removeEventListener("iccinfochange", handler);
+    callback();
+  });
+}
+
+function finalize() {
+  SpecialPowers.removePermission("mobileconnection", document);
+  finish();
+}
+
 // The emulator's hard coded iccid value.
 // See it here {B2G_HOME}/external/qemu/telephony/sim_card.c#L299.
 is(connection.iccInfo.iccid, 89014103211118510720);
@@ -22,5 +55,28 @@ is(connection.iccInfo.spn, "Android");
 // See {B2G_HOME}/external/qemu/telephony/sim_card.c, in asimcard_io()
 is(connection.iccInfo.msisdn, "15555215554");
 
-SpecialPowers.removePermission("mobileconnection", document);
-finish();
+// Test display condition change.
+function testDisplayConditionChange(func, caseArray, oncomplete) {
+  (function do_call(index) {
+    let next = index < (caseArray.length - 1) ? do_call.bind(null, index + 1) : oncomplete;
+    caseArray[index].push(next);
+    func.apply(null, caseArray[index]);
+  })(0);
+}
+
+function testSPN(mcc, mnc, expectedIsDisplayNetworkNameRequired,
+                  expectedIsDisplaySpnRequired, callback) {
+  waitForIccInfoChange(function() {
+    is(connection.iccInfo.isDisplayNetworkNameRequired,
+       expectedIsDisplayNetworkNameRequired);
+    is(connection.iccInfo.isDisplaySpnRequired,
+       expectedIsDisplaySpnRequired);
+    window.setTimeout(callback, 0);
+  });
+  setEmulatorMccMnc(mcc, mnc);
+}
+
+testDisplayConditionChange(testSPN, [
+  [123, 456, false, true], // Not in HPLMN.
+  [310, 260, true, false], // inside HPLMN.
+], finalize);
diff --git a/dom/system/gonk/tests/test_ril_worker_icc.js b/dom/system/gonk/tests/test_ril_worker_icc.js
index 8bc3298394ef..b33708d27b51 100644
--- a/dom/system/gonk/tests/test_ril_worker_icc.js
+++ b/dom/system/gonk/tests/test_ril_worker_icc.js
@@ -468,3 +468,58 @@ add_test(function test_stk_proactive_command_event_list() {
 
   run_next_test();
 });
+
+add_test(function test_spn_display_condition() {
+  let RIL = newWorker({
+    postRILMessage: function fakePostRILMessage(data) {
+      // Do nothing
+    },
+    postMessage: function fakePostMessage(message) {
+      // Do nothing
+    }
+  }).RIL;
+
+  // Test updateDisplayCondition runs before any of SIM file is ready.
+  do_check_eq(RIL.updateDisplayCondition(), true);
+  do_check_eq(RIL.iccInfo.isDisplayNetworkNameRequired, true);
+  do_check_eq(RIL.iccInfo.isDisplaySpnRequired, false);
+
+  // Test with value.
+  function testDisplayCondition(iccDisplayCondition,
+                                iccMcc, iccMnc, plmnMcc, plmnMnc,
+                                expectedIsDisplayNetworkNameRequired,
+                                expectedIsDisplaySPNRequired,
+                                callback) {
+    RIL.iccInfoPrivate.SPN = {
+      spnDisplayCondition: iccDisplayCondition
+    };
+    RIL.iccInfo = {
+      mcc: iccMcc,
+      mnc: iccMnc
+    };
+    RIL.operator = {
+      mcc: plmnMcc,
+      mnc: plmnMnc
+    };
+
+    do_check_eq(RIL.updateDisplayCondition(), true);
+    do_check_eq(RIL.iccInfo.isDisplayNetworkNameRequired, expectedIsDisplayNetworkNameRequired);
+    do_check_eq(RIL.iccInfo.isDisplaySpnRequired, expectedIsDisplaySPNRequired);
+    do_timeout(0, callback);
+  };
+
+  function testDisplayConditions(func, caseArray, oncomplete) {
+    (function do_call(index) {
+      let next = index < (caseArray.length - 1) ? do_call.bind(null, index + 1) : oncomplete;
+      caseArray[index].push(next);
+      func.apply(null, caseArray[index]);
+    })(0);
+  }
+
+  testDisplayConditions(testDisplayCondition, [
+    [1, 123, 456, 123, 456, true, false],
+    [0, 123, 456, 123, 456, false, false],
+    [2, 123, 456, 123, 457, false, false],
+    [0, 123, 456, 123, 457, false, true],
+  ], run_next_test);
+});
\ No newline at end of file

From 4649ad08c10b33827deb75534a908309fd00ce9d Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 23 Nov 2012 18:33:41 -0500
Subject: [PATCH 006/160] Bug 814789 - Tie the life-time of the AudioContext to
 the life-time of the document owning it; r=bzbarsky

---
 content/media/webaudio/AudioContext.cpp |  3 ++-
 content/media/webaudio/AudioContext.h   |  2 ++
 content/media/webaudio/Makefile.in      |  1 +
 dom/base/nsGlobalWindow.cpp             | 12 ++++++++++++
 dom/base/nsPIDOMWindow.h                | 17 +++++++++++++++--
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/content/media/webaudio/AudioContext.cpp b/content/media/webaudio/AudioContext.cpp
index ce589933c691..b3e1ba972cd5 100644
--- a/content/media/webaudio/AudioContext.cpp
+++ b/content/media/webaudio/AudioContext.cpp
@@ -60,7 +60,7 @@ AudioContext::WrapObject(JSContext* aCx, JSObject* aScope,
 /* static */ already_AddRefed<AudioContext>
 AudioContext::Constructor(nsISupports* aGlobal, ErrorResult& aRv)
 {
-  nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(aGlobal);
+  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobal);
   if (!window) {
     aRv.Throw(NS_ERROR_FAILURE);
     return nullptr;
@@ -68,6 +68,7 @@ AudioContext::Constructor(nsISupports* aGlobal, ErrorResult& aRv)
 
   AudioContext* object = new AudioContext(window);
   NS_ADDREF(object);
+  window->AddAudioContext(object);
   return object;
 }
 
diff --git a/content/media/webaudio/AudioContext.h b/content/media/webaudio/AudioContext.h
index 293d99f4798b..5918c46ee2bc 100644
--- a/content/media/webaudio/AudioContext.h
+++ b/content/media/webaudio/AudioContext.h
@@ -49,6 +49,8 @@ public:
     return mWindow;
   }
 
+  void Shutdown() {}
+
   virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope,
                                bool* aTriedToWrap);
 
diff --git a/content/media/webaudio/Makefile.in b/content/media/webaudio/Makefile.in
index 9d55a682b2ba..9997769a32f5 100644
--- a/content/media/webaudio/Makefile.in
+++ b/content/media/webaudio/Makefile.in
@@ -35,6 +35,7 @@ EXPORTS_NAMESPACES := mozilla/dom
 EXPORTS_mozilla/dom := \
   AudioBuffer.h \
   AudioBufferSourceNode.h \
+  AudioContext.h \
   AudioDestinationNode.h \
   AudioListener.h \
   AudioNode.h \
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 0c2533ae640b..556dac6140ac 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -224,6 +224,7 @@
 #include "nsSandboxFlags.h"
 #include "TimeChangeObserver.h"
 #include "nsPISocketTransportService.h"
+#include "mozilla/dom/AudioContext.h"
 
 #ifdef ANDROID
 #include <android/log.h>
@@ -1121,6 +1122,11 @@ nsGlobalWindow::FreeInnerObjects()
 
   CleanupCachedXBLHandlers(this);
 
+  for (uint32_t i = 0; i < mAudioContexts.Length(); ++i) {
+    mAudioContexts[i]->Shutdown();
+  }
+  mAudioContexts.Clear();
+
 #ifdef DEBUG
   nsCycleCollector_DEBUG_shouldBeFreed(static_cast<nsIScriptGlobalObject*>(this));
 #endif
@@ -2800,6 +2806,12 @@ nsPIDOMWindow::MaybeCreateDoc()
   }
 }
 
+void
+nsPIDOMWindow::AddAudioContext(AudioContext* aAudioContext)
+{
+  mAudioContexts.AppendElement(aAudioContext);
+}
+
 NS_IMETHODIMP
 nsGlobalWindow::GetDocument(nsIDOMDocument** aDocument)
 {
diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
index c7ceb553a841..37f73fbb008a 100644
--- a/dom/base/nsPIDOMWindow.h
+++ b/dom/base/nsPIDOMWindow.h
@@ -16,6 +16,8 @@
 #include "nsIDOMEventTarget.h"
 #include "nsIDOMDocument.h"
 #include "nsCOMPtr.h"
+#include "nsAutoPtr.h"
+#include "nsTArray.h"
 #include "nsIURI.h"
 
 #define DOM_WINDOW_DESTROYED_TOPIC "dom-window-destroyed"
@@ -47,9 +49,15 @@ class nsXBLPrototypeHandler;
 class nsIArray;
 class nsPIWindowRoot;
 
+namespace mozilla {
+namespace dom {
+class AudioContext;
+}
+}
+
 #define NS_PIDOMWINDOW_IID \
-{ 0x7b18e421, 0x2179, 0x4e24, \
-  { 0x96, 0x58, 0x26, 0x75, 0xa4, 0x37, 0xf3, 0x8f } }
+{ 0xf5af1c3c, 0xebad, 0x4d00, \
+  { 0xa2, 0xa4, 0x12, 0x2e, 0x27, 0x16, 0x59, 0x01 } }
 
 class nsPIDOMWindow : public nsIDOMWindowInternal
 {
@@ -628,6 +636,8 @@ public:
   OpenNoNavigate(const nsAString& aUrl, const nsAString& aName,
                  const nsAString& aOptions, nsIDOMWindow **_retval) = 0;
 
+  void AddAudioContext(mozilla::dom::AudioContext* aAudioContext);
+
 protected:
   // The nsPIDOMWindow constructor. The aOuterWindow argument should
   // be null if and only if the created window itself is an outer
@@ -693,6 +703,9 @@ protected:
   // window is active
   nsCOMPtr<nsIContent> mFocusedNode;
 
+  // The AudioContexts created for the current document, if any.
+  nsTArray<nsRefPtr<mozilla::dom::AudioContext> > mAudioContexts;
+
   // A unique (as long as our 64-bit counter doesn't roll over) id for
   // this window.
   uint64_t mWindowID;

From 0e8d2faad2d455869c39d544916aefc371efa0ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <respindola@mozilla.org>
Date: Tue, 27 Nov 2012 08:52:25 -0500
Subject: [PATCH 007/160] Bug 814704 - Move the creation of a js object from
 combinedStacks into a static function. r=vladan.

---
 toolkit/components/telemetry/Telemetry.cpp | 130 +++++++++++----------
 1 file changed, 66 insertions(+), 64 deletions(-)

diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
index 6f609360090b..dd276cffae06 100644
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -106,6 +106,9 @@ private:
   std::vector<Stack> mStacks;
 };
 
+static JSObject *
+CreateJSStackObject(JSContext *cx, const CombinedStacks &stacks);
+
 size_t
 CombinedStacks::GetModuleCount() const {
   return mModules.size();
@@ -177,11 +180,8 @@ class HangReports {
 public:
   size_t SizeOfExcludingThis() const;
   void AddHang(const Telemetry::ProcessedStack& aStack, uint32_t aDuration);
-  size_t GetStackCount() const;
-  const CombinedStacks::Stack& GetStack(unsigned aIndex) const;
   uint32_t GetDuration(unsigned aIndex) const;
-  size_t GetModuleCount() const;
-  const Telemetry::ProcessedStack::Module& GetModule(unsigned aIndex) const;
+  const CombinedStacks& GetStacks() const;
 private:
   CombinedStacks mStacks;
   std::vector<uint32_t> mDurations;
@@ -203,14 +203,9 @@ HangReports::SizeOfExcludingThis() const {
   return n;
 }
 
-size_t
-HangReports::GetModuleCount() const {
-  return mStacks.GetModuleCount();
-}
-
-const Telemetry::ProcessedStack::Module&
-HangReports::GetModule(unsigned aIndex) const {
-  return mStacks.GetModule(aIndex);
+const CombinedStacks&
+HangReports::GetStacks() const {
+  return mStacks;
 }
 
 uint32_t
@@ -218,17 +213,6 @@ HangReports::GetDuration(unsigned aIndex) const {
   return mDurations[aIndex];
 }
 
-const CombinedStacks::Stack&
-HangReports::GetStack(unsigned aIndex) const {
-  return mStacks.GetStack(aIndex);
-}
-
-size_t
-HangReports::GetStackCount() const {
-  MOZ_ASSERT(mDurations.size() == mStacks.GetStackCount());
-  return mStacks.GetStackCount();
-}
-
 class TelemetryImpl MOZ_FINAL : public nsITelemetry
 {
   NS_DECL_ISUPPORTS
@@ -1222,37 +1206,67 @@ TelemetryImpl::GetChromeHangs(JSContext *cx, jsval *ret)
 {
   MutexAutoLock hangReportMutex(mHangReportsMutex);
 
-  JSObject *fullReportObj = JS_NewObject(cx, nullptr, nullptr, nullptr);
+  const CombinedStacks& stacks = mHangReports.GetStacks();
+  JSObject *fullReportObj = CreateJSStackObject(cx, stacks);
   if (!fullReportObj) {
     return NS_ERROR_FAILURE;
   }
 
   *ret = OBJECT_TO_JSVAL(fullReportObj);
 
-  JSObject *moduleArray = JS_NewArrayObject(cx, 0, nullptr);
-  if (!moduleArray) {
+  JSObject *durationArray = JS_NewArrayObject(cx, 0, nullptr);
+  if (!durationArray) {
     return NS_ERROR_FAILURE;
   }
-  JSBool ok = JS_DefineProperty(cx, fullReportObj, "memoryMap",
-                                OBJECT_TO_JSVAL(moduleArray),
+  JSBool ok = JS_DefineProperty(cx, fullReportObj, "durations",
+                                OBJECT_TO_JSVAL(durationArray),
                                 NULL, NULL, JSPROP_ENUMERATE);
   if (!ok) {
     return NS_ERROR_FAILURE;
   }
 
-  const uint32_t moduleCount = mHangReports.GetModuleCount();
+  const size_t length = stacks.GetStackCount();
+  for (size_t i = 0; i < length; ++i) {
+    jsval duration = INT_TO_JSVAL(mHangReports.GetDuration(i));
+    if (!JS_SetElement(cx, durationArray, i, &duration)) {
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  return NS_OK;
+}
+
+static JSObject *
+CreateJSStackObject(JSContext *cx, const CombinedStacks &stacks) {
+  JSObject *ret = JS_NewObject(cx, nullptr, nullptr, nullptr);
+  if (!ret) {
+    return nullptr;
+  }
+
+  JSObject *moduleArray = JS_NewArrayObject(cx, 0, nullptr);
+  if (!moduleArray) {
+    return nullptr;
+  }
+  JSBool ok = JS_DefineProperty(cx, ret, "memoryMap",
+                                OBJECT_TO_JSVAL(moduleArray),
+                                NULL, NULL, JSPROP_ENUMERATE);
+  if (!ok) {
+    return nullptr;
+  }
+
+  const size_t moduleCount = stacks.GetModuleCount();
   for (size_t moduleIndex = 0; moduleIndex < moduleCount; ++moduleIndex) {
     // Current module
     const Telemetry::ProcessedStack::Module& module =
-      mHangReports.GetModule(moduleIndex);
+      stacks.GetModule(moduleIndex);
 
     JSObject *moduleInfoArray = JS_NewArrayObject(cx, 0, nullptr);
     if (!moduleInfoArray) {
-      return NS_ERROR_FAILURE;
+      return nullptr;
     }
     jsval val = OBJECT_TO_JSVAL(moduleInfoArray);
     if (!JS_SetElement(cx, moduleArray, moduleIndex, &val)) {
-      return NS_ERROR_FAILURE;
+      return nullptr;
     }
 
     unsigned index = 0;
@@ -1260,102 +1274,90 @@ TelemetryImpl::GetChromeHangs(JSContext *cx, jsval *ret)
     // Module name
     JSString *str = JS_NewStringCopyZ(cx, module.mName.c_str());
     if (!str) {
-      return NS_ERROR_FAILURE;
+      return nullptr;
     }
     val = STRING_TO_JSVAL(str);
     if (!JS_SetElement(cx, moduleInfoArray, index++, &val)) {
-      return NS_ERROR_FAILURE;
+      return nullptr;
     }
 
     // "PDB Age" identifier
     val = INT_TO_JSVAL(module.mPdbAge);
     if (!JS_SetElement(cx, moduleInfoArray, index++, &val)) {
-      return NS_ERROR_FAILURE;
+      return nullptr;
     }
 
     // "PDB Signature" GUID
     str = JS_NewStringCopyZ(cx, module.mPdbSignature.c_str());
     if (!str) {
-      return NS_ERROR_FAILURE;
+      return nullptr;
     }
     val = STRING_TO_JSVAL(str);
     if (!JS_SetElement(cx, moduleInfoArray, index++, &val)) {
-      return NS_ERROR_FAILURE;
+      return nullptr;
     }
 
     // Name of associated PDB file
     str = JS_NewStringCopyZ(cx, module.mPdbName.c_str());
     if (!str) {
-      return NS_ERROR_FAILURE;
+      return nullptr;
     }
     val = STRING_TO_JSVAL(str);
     if (!JS_SetElement(cx, moduleInfoArray, index++, &val)) {
-      return NS_ERROR_FAILURE;
+      return nullptr;
     }
   }
 
   JSObject *reportArray = JS_NewArrayObject(cx, 0, nullptr);
   if (!reportArray) {
-    return NS_ERROR_FAILURE;
+    return nullptr;
   }
-  ok = JS_DefineProperty(cx, fullReportObj, "stacks",
+  ok = JS_DefineProperty(cx, ret, "stacks",
                          OBJECT_TO_JSVAL(reportArray),
                          NULL, NULL, JSPROP_ENUMERATE);
   if (!ok) {
-    return NS_ERROR_FAILURE;
+    return nullptr;
   }
 
-  JSObject *durationArray = JS_NewArrayObject(cx, 0, nullptr);
-  ok = JS_DefineProperty(cx, fullReportObj, "durations",
-                         OBJECT_TO_JSVAL(durationArray),
-                         NULL, NULL, JSPROP_ENUMERATE);
-  if (!ok) {
-    return NS_ERROR_FAILURE;
-  }
-
-  for (size_t i = 0, n = mHangReports.GetStackCount(); i < n; ++i) {
-    jsval duration = INT_TO_JSVAL(mHangReports.GetDuration(i));
-    if (!JS_SetElement(cx, durationArray, i, &duration)) {
-      return NS_ERROR_FAILURE;
-    }
-
+  const size_t length = stacks.GetStackCount();
+  for (size_t i = 0; i < length; ++i) {
     // Represent call stack PCs as (module index, offset) pairs.
     JSObject *pcArray = JS_NewArrayObject(cx, 0, nullptr);
     if (!pcArray) {
-      return NS_ERROR_FAILURE;
+      return nullptr;
     }
 
     jsval pcArrayVal = OBJECT_TO_JSVAL(pcArray);
     if (!JS_SetElement(cx, reportArray, i, &pcArrayVal)) {
-      return NS_ERROR_FAILURE;
+      return nullptr;
     }
 
-    const CombinedStacks::Stack& stack = mHangReports.GetStack(i);
+    const CombinedStacks::Stack& stack = stacks.GetStack(i);
     const uint32_t pcCount = stack.size();
     for (size_t pcIndex = 0; pcIndex < pcCount; ++pcIndex) {
       const Telemetry::ProcessedStack::Frame& frame = stack[pcIndex];
       JSObject *framePair = JS_NewArrayObject(cx, 0, nullptr);
       if (!framePair) {
-        return NS_ERROR_FAILURE;
+        return nullptr;
       }
       int modIndex = (std::numeric_limits<uint16_t>::max() == frame.mModIndex) ?
         -1 : frame.mModIndex;
       jsval modIndexVal = INT_TO_JSVAL(modIndex);
       if (!JS_SetElement(cx, framePair, 0, &modIndexVal)) {
-        return NS_ERROR_FAILURE;
+        return nullptr;
       }
       jsval mOffsetVal = INT_TO_JSVAL(frame.mOffset);
       if (!JS_SetElement(cx, framePair, 1, &mOffsetVal)) {
-        return NS_ERROR_FAILURE;
+        return nullptr;
       }
       jsval framePairVal = OBJECT_TO_JSVAL(framePair);
       if (!JS_SetElement(cx, pcArray, pcIndex, &framePairVal)) {
-        return NS_ERROR_FAILURE;
+        return nullptr;
       }
     }
   }
 
-  return NS_OK;
+  return ret;
 }
 
 NS_IMETHODIMP

From 11592816224f0afaf20919583fafdad5a79ed99e Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Fri, 12 Oct 2012 10:45:29 +0100
Subject: [PATCH 008/160] Bug 790338 - Implement Tarjan's algorithm to find the
 stongly connected components of the compartment graph r=billm

--HG--
rename : accessible/src/windows/sdn/sdnAccessible.cpp => accessible/src/msaa/nsAccessNodeWrap.cpp
rename : accessible/src/windows/sdn/sdnAccessible.h => accessible/src/msaa/nsAccessNodeWrap.h
extra : rebase_source : f529480202322726c55c23e40529c81092c5b6c3
---
 js/src/Makefile.in                  |   1 +
 js/src/gc/FindSCCs.cpp              | 176 +++++++++++++++++++
 js/src/gc/FindSCCs.h                | 131 ++++++++++++++
 js/src/jsapi-tests/Makefile.in      |   1 +
 js/src/jsapi-tests/testFindSCCs.cpp | 263 ++++++++++++++++++++++++++++
 5 files changed, 572 insertions(+)
 create mode 100644 js/src/gc/FindSCCs.cpp
 create mode 100644 js/src/gc/FindSCCs.h
 create mode 100644 js/src/jsapi-tests/testFindSCCs.cpp

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 0fa1cd658c6b..cbca4656273c 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -146,6 +146,7 @@ CPPSRCS		= \
 		Memory.cpp \
 		Statistics.cpp \
 		StoreBuffer.cpp \
+		FindSCCs.cpp \
 		StringBuffer.cpp \
 		Unicode.cpp \
 		Xdr.cpp \
diff --git a/js/src/gc/FindSCCs.cpp b/js/src/gc/FindSCCs.cpp
new file mode 100644
index 000000000000..505279fe2edf
--- /dev/null
+++ b/js/src/gc/FindSCCs.cpp
@@ -0,0 +1,176 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "FindSCCs.h"
+
+#include "jsfriendapi.h"
+
+namespace js {
+namespace gc {
+
+ComponentFinder::ComponentFinder(uintptr_t sl)
+  : clock(1),
+    stack(NULL),
+    firstComponent(NULL),
+    cur(NULL),
+    stackLimit(sl),
+    stackFull(false)
+{
+}
+
+ComponentFinder::~ComponentFinder()
+{
+    JS_ASSERT(!stack);
+    JS_ASSERT(!firstComponent);
+}
+
+void
+ComponentFinder::addNode(GraphNodeBase *v)
+{
+    if (v->gcDiscoveryTime == Undefined) {
+        JS_ASSERT(v->gcLowLink == Undefined);
+        JS_ASSERT(!v->gcNextGraphNode);
+        processNode(v);
+    }
+}
+
+void
+ComponentFinder::checkStackFull()
+{
+    /*
+     * Check for exceeding the size of the C stack.
+     *
+     * If this happens we give up and return all vertices in one group, by
+     * pushing them onto the output list with lowLink set to 1.
+     */
+
+    if (!stackFull) {
+        int stackDummy;
+        if (!JS_CHECK_STACK_SIZE(stackLimit, &stackDummy))
+            stackFull = true;
+    }
+
+    if (stackFull) {
+        GraphNodeBase *w;
+        while (stack) {
+            w = stack;
+            stack = w->gcNextGraphNode;
+
+            w->gcLowLink = 1;
+            w->gcNextGraphNode = firstComponent;
+            firstComponent = w;
+        }
+    }
+}
+
+void
+ComponentFinder::processNode(GraphNodeBase *v)
+{
+    v->gcDiscoveryTime = clock;
+    v->gcLowLink = clock;
+    ++clock;
+
+    JS_ASSERT(!v->gcNextGraphNode);
+    v->gcNextGraphNode = stack;
+    stack = v;
+
+    checkStackFull();
+    if (stackFull)
+        return;
+
+    GraphNodeBase *old = cur;
+    cur = v;
+    cur->findOutgoingEdges(*this);
+    cur = old;
+
+    if (stackFull) {
+        JS_ASSERT(!stack);
+        return;
+    }
+
+    if (v->gcLowLink == v->gcDiscoveryTime) {
+        GraphNodeBase *w;
+        do {
+            JS_ASSERT(stack);
+            w = stack;
+            stack = w->gcNextGraphNode;
+
+            /*
+             * Record the elements of a component by setting all their gcLowLink
+             * fields to the same value.
+             */
+            w->gcLowLink = v->gcDiscoveryTime;
+
+            /*
+             * Record that the element is no longer on the stack by setting the
+             * discovery time to a special value that's not Undefined.
+             */
+            w->gcDiscoveryTime = Finished;
+
+            /*
+             * Prepend the component to the beginning of the output list to
+             * reverse the list and achieve the desired order.
+             */
+            w->gcNextGraphNode = firstComponent;
+            firstComponent = w;
+        } while (w != v);
+    }
+}
+
+void
+ComponentFinder::addEdgeTo(GraphNodeBase *w)
+{
+    if (w->gcDiscoveryTime == Undefined) {
+        processNode(w);
+        cur->gcLowLink = Min(cur->gcLowLink, w->gcLowLink);
+    } else if (w->gcDiscoveryTime != Finished) {
+        cur->gcLowLink = Min(cur->gcLowLink, w->gcDiscoveryTime);
+    }
+}
+
+GraphNodeBase *
+ComponentFinder::getResultsList()
+{
+    JS_ASSERT(!stack);
+    GraphNodeBase *result = firstComponent;
+    firstComponent = NULL;
+    return result;
+}
+
+GraphNodeBase *
+ComponentFinder::removeFirstGroup(GraphNodeBase *resultsList)
+{
+    /* Remove the first group from resultsList and return the new list head. */
+
+    JS_ASSERT(resultsList);
+
+    GraphNodeBase *v = resultsList;
+    unsigned lowLink = v->gcLowLink;
+
+    GraphNodeBase *last;
+    do {
+        v->gcDiscoveryTime = Undefined;
+        v->gcLowLink = Undefined;
+        last = v;
+        v = v->gcNextGraphNode;
+    }
+    while (v && v->gcLowLink == lowLink);
+
+    last->gcNextGraphNode = NULL;
+    return v;
+}
+
+void
+ComponentFinder::removeAllRemaining(GraphNodeBase *resultsList)
+{
+    for (GraphNodeBase *v = resultsList; v; v = v->gcNextGraphNode) {
+        v->gcDiscoveryTime = Undefined;
+        v->gcLowLink = Undefined;
+    }
+}
+
+} /* namespace gc */
+} /* namespace js */
diff --git a/js/src/gc/FindSCCs.h b/js/src/gc/FindSCCs.h
new file mode 100644
index 000000000000..571f77b737d6
--- /dev/null
+++ b/js/src/gc/FindSCCs.h
@@ -0,0 +1,131 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef gc_findsccs_h___
+#define gc_findsccs_h___
+
+#include "jsutil.h"
+
+namespace js {
+namespace gc {
+
+class ComponentFinder;
+
+struct GraphNodeBase {
+    GraphNodeBase  *gcNextGraphNode;
+    unsigned       gcDiscoveryTime;
+    unsigned       gcLowLink;
+
+    GraphNodeBase()
+      : gcNextGraphNode(NULL),
+        gcDiscoveryTime(0),
+        gcLowLink(0) {}
+
+    virtual ~GraphNodeBase() {}
+    virtual void findOutgoingEdges(ComponentFinder& finder) = 0;
+};
+
+template <class T> static T *
+NextGraphNode(const T *current)
+{
+    const GraphNodeBase *node = current;
+    return static_cast<T *>(node->gcNextGraphNode);
+}
+
+template <class T> void
+AddGraphNode(T *&listHead, T *newFirstNode)
+{
+    GraphNodeBase *node = newFirstNode;
+    JS_ASSERT(!node->gcNextGraphNode);
+    node->gcNextGraphNode = listHead;
+    listHead = newFirstNode;
+}
+
+template <class T> static T *
+RemoveGraphNode(T *&listHead)
+{
+    GraphNodeBase *node = listHead;
+    if (!node)
+        return NULL;
+
+    T *result = listHead;
+    listHead = static_cast<T *>(node->gcNextGraphNode);
+    node->gcNextGraphNode = NULL;
+    return result;
+}
+
+/*
+ * Find the strongly connected components of a graph using Tarjan's algorithm,
+ * and return them in topological order.
+ *
+ * Nodes derive from GraphNodeBase and implement findGraphEdges, which calls
+ * finder.addEdgeTo to describe the outgoing edges from that node:
+ *
+ * struct MyGraphNode : public GraphNodeBase
+ * {
+ *     void findOutgoingEdges(ComponentFinder& finder)
+ *     {
+ *         for edge in my_outgoing_edges:
+ *             if is_relevant(edge):
+ *                 finder.addEdgeTo(edge.destination)
+ *     }
+ * }
+ */
+class ComponentFinder
+{
+  public:
+    ComponentFinder(uintptr_t stackLimit);
+    ~ComponentFinder();
+    void addNode(GraphNodeBase *v);
+    GraphNodeBase *getResultsList();
+
+    template <class T> static T *
+    getNextGroup(T *&resultsList) {
+        T *group = resultsList;
+        if (resultsList)
+            resultsList = static_cast<T *>(removeFirstGroup(resultsList));
+        return group;
+    }
+
+    template <class T> static T *
+    getAllRemaining(T *&resultsList) {
+        T *all = resultsList;
+        removeAllRemaining(resultsList);
+        resultsList = NULL;
+        return all;
+    }
+
+  private:
+    static GraphNodeBase *removeFirstGroup(GraphNodeBase *resultsList);
+    static void removeAllRemaining(GraphNodeBase *resultsList);
+
+  public:
+    /* Call from implementation of GraphNodeBase::findOutgoingEdges(). */
+    void addEdgeTo(GraphNodeBase *w);
+
+  private:
+    /* Constant used to indicate an unprocessed vertex. */
+    static const unsigned Undefined = 0;
+
+    /* Constant used to indicate an processed vertex that is no longer on the stack. */
+    static const unsigned Finished = (unsigned)-1;
+
+    void processNode(GraphNodeBase *v);
+    void checkStackFull();
+
+  private:
+    unsigned       clock;
+    GraphNodeBase  *stack;
+    GraphNodeBase  *firstComponent;
+    GraphNodeBase  *cur;
+    uintptr_t      stackLimit;
+    bool           stackFull;
+};
+
+} /* namespace gc */
+} /* namespace js */
+
+#endif /* gc_findsccs_h___ */
diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
index 51f3260f2be0..3c0a6b5c98be 100644
--- a/js/src/jsapi-tests/Makefile.in
+++ b/js/src/jsapi-tests/Makefile.in
@@ -67,6 +67,7 @@ CPPSRCS = \
   testJSEvaluateScript.cpp \
   testErrorCopying.cpp \
   testEnclosingFunction.cpp \
+  testFindSCCs.cpp \
   $(NULL)
 
 # Disabled: an entirely unrelated test seems to cause this to fail.  Moreover,
diff --git a/js/src/jsapi-tests/testFindSCCs.cpp b/js/src/jsapi-tests/testFindSCCs.cpp
new file mode 100644
index 000000000000..9df1e781ec6d
--- /dev/null
+++ b/js/src/jsapi-tests/testFindSCCs.cpp
@@ -0,0 +1,263 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=99:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+#include "tests.h"
+#include <string.h>
+#include <stdarg.h>
+
+#include "../gc/FindSCCs.h"
+#include "jscntxt.h"
+#include "jsgc.h"
+
+static const unsigned MaxVertices = 10;
+
+using js::gc::GraphNodeBase;
+using js::gc::ComponentFinder;
+
+struct TestNode : public GraphNodeBase
+{
+    unsigned   index;
+    bool       hasEdge[MaxVertices];
+
+    void findOutgoingEdges(ComponentFinder& finder);
+};
+
+static TestNode Vertex[MaxVertices];
+
+void
+TestNode::findOutgoingEdges(ComponentFinder& finder)
+{
+    for (unsigned i = 0; i < MaxVertices; ++i) {
+        if (hasEdge[i])
+            finder.addEdgeTo(&Vertex[i]);
+    }
+}
+
+BEGIN_TEST(testFindSCCs)
+{
+    // no vertices
+
+    setup(0);
+    run();
+    CHECK(end());
+
+    // no edges
+
+    setup(1);
+    run();
+    CHECK(group(0, -1));
+    CHECK(end());
+
+    setup(3);
+    run();
+    CHECK(group(2, -1));
+    CHECK(group(1, -1));
+    CHECK(group(0, -1));
+    CHECK(end());
+
+    // linear
+
+    setup(3);
+    edge(0, 1);
+    edge(1, 2);
+    run();
+    CHECK(group(0, -1));
+    CHECK(group(1, -1));
+    CHECK(group(2, -1));
+    CHECK(end());
+
+    // tree
+
+    setup(3);
+    edge(0, 1);
+    edge(0, 2);
+    run();
+    CHECK(group(0, -1));
+    CHECK(group(2, -1));
+    CHECK(group(1, -1));
+    CHECK(end());
+
+    // cycles
+
+    setup(3);
+    edge(0, 1);
+    edge(1, 2);
+    edge(2, 0);
+    run();
+    CHECK(group(0, 1, 2, -1));
+    CHECK(end());
+
+    setup(4);
+    edge(0, 1);
+    edge(1, 2);
+    edge(2, 1);
+    edge(2, 3);
+    run();
+    CHECK(group(0, -1));
+    CHECK(group(1, 2, -1));
+    CHECK(group(3, -1));
+    CHECK(end());
+
+    // remaining
+
+    setup(2);
+    edge(0, 1);
+    run();
+    CHECK(remaining(0, 1, -1));
+    CHECK(end());
+
+    setup(2);
+    edge(0, 1);
+    run();
+    CHECK(group(0, -1));
+    CHECK(remaining(1, -1));
+    CHECK(end());
+
+    setup(2);
+    edge(0, 1);
+    run();
+    CHECK(group(0, -1));
+    CHECK(group(1, -1));
+    CHECK(remaining(-1));
+    CHECK(end());
+
+    return true;
+}
+
+unsigned vertex_count;
+ComponentFinder *finder;
+GraphNodeBase *resultsList;
+
+void setup(unsigned count)
+{
+    vertex_count = count;
+    for (unsigned i = 0; i < MaxVertices; ++i) {
+        TestNode &v = Vertex[i];
+        v.gcNextGraphNode = NULL;
+        v.index = i;
+        memset(&v.hasEdge, 0, sizeof(v.hasEdge));
+    }
+}
+
+void edge(unsigned src_index, unsigned dest_index)
+{
+    Vertex[src_index].hasEdge[dest_index] = true;
+}
+
+void run()
+{
+    finder = new ComponentFinder(rt->nativeStackLimit);
+    for (unsigned i = 0; i < vertex_count; ++i)
+        finder->addNode(&Vertex[i]);
+    resultsList = finder->getResultsList();
+}
+
+bool group(int vertex, ...)
+{
+    TestNode *v = (TestNode *)ComponentFinder::getNextGroup(resultsList);
+
+    va_list ap;
+    va_start(ap, vertex);
+    while (vertex != -1) {
+        CHECK(v != NULL);
+        CHECK(v->index == vertex);
+        v = (TestNode *)v->gcNextGraphNode;
+        vertex = va_arg(ap, int);
+    }
+    va_end(ap);
+
+    CHECK(v == NULL);
+    return true;
+}
+
+bool remaining(int vertex, ...)
+{
+    TestNode *v = (TestNode *)ComponentFinder::getAllRemaining(resultsList);
+
+    va_list ap;
+    va_start(ap, vertex);
+    while (vertex != -1) {
+        CHECK(v != NULL);
+        CHECK(v->index == vertex);
+        v = (TestNode *)v->gcNextGraphNode;
+        vertex = va_arg(ap, int);
+    }
+    va_end(ap);
+
+    CHECK(v == NULL);
+    return true;
+}
+
+bool end()
+{
+    CHECK(resultsList == NULL);
+
+    delete finder;
+    finder = NULL;
+    return true;
+}
+END_TEST(testFindSCCs)
+
+struct TestNode2 : public GraphNodeBase
+{
+    TestNode2 *edge;
+
+    TestNode2() :
+        edge(NULL)
+    {
+    }
+
+    void
+    findOutgoingEdges(ComponentFinder& finder)
+    {
+        if (edge)
+            finder.addEdgeTo(edge);
+    }
+};
+
+BEGIN_TEST(testFindSCCsStackLimit)
+{
+    /*
+     * Test what happens if recusion causes the stack to become full while
+     * traversing the graph.
+     *
+     * The test case is a large number of vertices, almost all of which are
+     * arranged in a linear chain.  The last few are left unlinked to exercise
+     * adding vertices after the stack full condition has already been detected.
+     *
+     * Such an arrangement with no cycles would normally result in one group for
+     * each vertex, but since the stack is exhasted in processing a single group
+     * is returned containing all the vertices.
+     */
+    const unsigned max = 1000000;
+
+    TestNode2 *vertices = new TestNode2[max]();
+    for (unsigned i = 0; i < (max - 10); ++i)
+        vertices[i].edge = &vertices[i + 1];
+
+    ComponentFinder finder(rt->nativeStackLimit);
+    for (unsigned i = 0; i < max; ++i)
+        finder.addNode(&vertices[i]);
+
+    GraphNodeBase *r = finder.getResultsList();
+    CHECK(r);
+    GraphNodeBase *v = finder.getNextGroup(r);
+    CHECK(v);
+
+    unsigned count = 0;
+    while (v) {
+        ++count;
+        v = v->gcNextGraphNode;
+    }
+    CHECK(count == max);
+    CHECK(finder.getNextGroup(r) == NULL);
+
+    delete [] vertices;
+    return true;
+}
+END_TEST(testFindSCCsStackLimit)

From d881fbff055e2303cd5105907a9c070b333da107 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Fri, 12 Oct 2012 10:45:30 +0100
Subject: [PATCH 009/160] Bug 790338 - Add Is*AboutToBeFinalized functions
 r=billm

--HG--
extra : rebase_source : 629c81772d673eb4f4c7ce45db57f6111468689c
---
 js/src/gc/Marking.cpp     | 44 +++++++++++++++++++++++++++++++++++
 js/src/gc/Marking.h       | 48 ++++++++++++++++++++++++++++++++++++---
 js/src/jsapi.cpp          |  4 ++--
 js/src/jscompartment.cpp  | 17 +++++++-------
 js/src/jscompartment.h    |  2 +-
 js/src/jsscope.cpp        |  6 ++---
 js/src/jswatchpoint.cpp   |  2 +-
 js/src/jsweakcache.h      |  8 +++----
 js/src/jsweakmap.h        |  6 ++---
 js/src/vm/Debugger.cpp    |  4 ++--
 js/src/vm/ScopeObject.cpp |  6 ++---
 11 files changed, 116 insertions(+), 31 deletions(-)

diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp
index 884a3cbef89d..a66728db652a 100644
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -221,6 +221,17 @@ IsMarked(T **thingp)
     return (*thingp)->isMarked();
 }
 
+template <typename T>
+static bool
+IsAboutToBeFinalized(T **thingp)
+{
+    JS_ASSERT(thingp);
+    JS_ASSERT(*thingp);
+    if (!(*thingp)->compartment()->isGCSweeping())
+        return false;
+    return !(*thingp)->isMarked();
+}
+
 #define DeclMarkerImpl(base, type)                                                                \
 void                                                                                              \
 Mark##base(JSTracer *trc, EncapsulatedPtr<type> *thing, const char *name)                         \
@@ -262,6 +273,16 @@ bool
 Is##base##Marked(EncapsulatedPtr<type> *thingp)                                                   \
 {                                                                                                 \
     return IsMarked<type>(thingp->unsafeGet());                                                   \
+}                                                                                                 \
+                                                                                                  \
+bool Is##base##AboutToBeFinalized(type **thingp)                                                  \
+{                                                                                                 \
+    return IsAboutToBeFinalized<type>(thingp);                                                    \
+}                                                                                                 \
+                                                                                                  \
+bool Is##base##AboutToBeFinalized(EncapsulatedPtr<type> *thingp)                                  \
+{                                                                                                 \
+    return IsAboutToBeFinalized<type>(thingp->unsafeGet());                                       \
 }
 
 DeclMarkerImpl(BaseShape, BaseShape)
@@ -498,6 +519,23 @@ gc::IsValueMarked(Value *v)
     return rv;
 }
 
+bool
+gc::IsValueAboutToBeFinalized(Value *v)
+{
+    JS_ASSERT(v->isMarkable());
+    bool rv;
+    if (v->isString()) {
+        JSString *str = (JSString *)v->toGCThing();
+        rv = IsAboutToBeFinalized<JSString>(&str);
+        v->setString(str);
+    } else {
+        JSObject *obj = (JSObject *)v->toGCThing();
+        rv = IsAboutToBeFinalized<JSObject>(&obj);
+        v->setObject(*obj);
+    }
+    return rv;
+}
+
 /*** Slot Marking ***/
 
 void
@@ -578,6 +616,12 @@ gc::IsCellMarked(Cell **thingp)
     return IsMarked<Cell>(thingp);
 }
 
+bool
+gc::IsCellAboutToBeFinalized(Cell **thingp)
+{
+    return IsAboutToBeFinalized<Cell>(thingp);
+}
+
 /*** Push Mark Stack ***/
 
 #define JS_COMPARTMENT_ASSERT(rt, thing)                                \
diff --git a/js/src/gc/Marking.h b/js/src/gc/Marking.h
index e0719d8b12ec..1a01f77580f5 100644
--- a/js/src/gc/Marking.h
+++ b/js/src/gc/Marking.h
@@ -63,6 +63,20 @@ namespace gc {
  *
  * Additionally, the functions MarkObjectRange and MarkObjectRootRange are
  * defined for marking arrays of object pointers.
+ *
+ * The following functions are provided to test whether a GC thing is marked
+ * under different circumstances:
+ *
+ * IsObjectAboutToBeFinalized(JSObject **thing);
+ *     This function is indended to be used in code used to sweep GC things.  It
+ *     indicates whether the object will will be finialized in the current group
+ *     of compartments being swept.  Note that this will return false for any
+ *     object not in the group of compartments currently being swept, as even if
+ *     it is unmarked it may still become marked before it is swept.
+ *
+ * IsObjectMarked(JSObject **thing);
+ *     This function is indended to be used in rare cases in code used to mark
+ *     GC things.  It indicates whether the object is currently marked.
  */
 #define DeclMarker(base, type)                                                                    \
 void Mark##base(JSTracer *trc, EncapsulatedPtr<type> *thing, const char *name);                   \
@@ -71,7 +85,9 @@ void Mark##base##Unbarriered(JSTracer *trc, type **thingp, const char *name);
 void Mark##base##Range(JSTracer *trc, size_t len, HeapPtr<type> *thing, const char *name);        \
 void Mark##base##RootRange(JSTracer *trc, size_t len, type **thing, const char *name);            \
 bool Is##base##Marked(type **thingp);                                                             \
-bool Is##base##Marked(EncapsulatedPtr<type> *thingp);
+bool Is##base##Marked(EncapsulatedPtr<type> *thingp);                                             \
+bool Is##base##AboutToBeFinalized(type **thingp);                                                 \
+bool Is##base##AboutToBeFinalized(EncapsulatedPtr<type> *thingp);
 
 DeclMarker(BaseShape, BaseShape)
 DeclMarker(BaseShape, UnownedBaseShape)
@@ -164,6 +180,9 @@ MarkTypeRoot(JSTracer *trc, types::Type *v, const char *name);
 bool
 IsValueMarked(Value *v);
 
+bool
+IsValueAboutToBeFinalized(Value *v);
+
 /*** Slot Marking ***/
 
 void
@@ -262,6 +281,9 @@ Mark(JSTracer *trc, HeapPtr<ion::IonCode> *code, const char *name)
 bool
 IsCellMarked(Cell **thingp);
 
+bool
+IsCellAboutToBeFinalized(Cell **thing);
+
 inline bool
 IsMarked(EncapsulatedValue *v)
 {
@@ -282,11 +304,31 @@ IsMarked(EncapsulatedPtrScript *scriptp)
     return IsScriptMarked(scriptp);
 }
 
+inline bool
+IsAboutToBeFinalized(EncapsulatedValue *v)
+{
+    if (!v->isMarkable())
+        return false;
+    return IsValueAboutToBeFinalized(v->unsafeGet());
+}
+
+inline bool
+IsAboutToBeFinalized(EncapsulatedPtrObject *objp)
+{
+    return IsObjectAboutToBeFinalized(objp);
+}
+
+inline bool
+IsAboutToBeFinalized(EncapsulatedPtrScript *scriptp)
+{
+    return IsScriptAboutToBeFinalized(scriptp);
+}
+
 #ifdef JS_ION
 /* Nonsense to get WeakCache to work with new Marking semantics. */
 
 inline bool
-IsMarked(const js::ion::VMFunction **vmfunc)
+IsAboutToBeFinalized(const js::ion::VMFunction **vmfunc)
 {
     /*
      * Preserves entries in the WeakCache<VMFunction, IonCode>
@@ -296,7 +338,7 @@ IsMarked(const js::ion::VMFunction **vmfunc)
 }
 
 inline bool
-IsMarked(ReadBarriered<js::ion::IonCode> code)
+IsAboutToBeFinalized(ReadBarriered<js::ion::IonCode> code)
 {
     return IsIonCodeMarked(code.unsafeGet());
 }
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 8b1ba9a63b32..d62595ca28db 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -2949,9 +2949,9 @@ JS_PUBLIC_API(JSBool)
 JS_IsAboutToBeFinalized(void *thing)
 {
     gc::Cell *t = static_cast<gc::Cell *>(thing);
-    bool isMarked = IsCellMarked(&t);
+    bool isDying = IsCellAboutToBeFinalized(&t);
     JS_ASSERT(t == thing);
-    return !isMarked;
+    return isDying;
 }
 
 JS_PUBLIC_API(void)
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index df6bde2423fa..0eef94f4acad 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -598,10 +598,9 @@ JSCompartment::sweep(FreeOp *fop, bool releaseTypes)
         sweepInitialShapeTable();
         sweepNewTypeObjectTable(newTypeObjects);
         sweepNewTypeObjectTable(lazyTypeObjects);
-
         sweepBreakpoints(fop);
 
-        if (global_ && !IsObjectMarked(&global_))
+        if (global_ && IsObjectAboutToBeFinalized(&global_))
             global_ = NULL;
 
 #ifdef JS_ION
@@ -693,11 +692,11 @@ JSCompartment::sweepCrossCompartmentWrappers()
     /* Remove dead wrappers from the table. */
     for (WrapperMap::Enum e(crossCompartmentWrappers); !e.empty(); e.popFront()) {
         CrossCompartmentKey key = e.front().key;
-        bool keyMarked = IsCellMarked(&key.wrapped);
-        bool valMarked = IsValueMarked(e.front().value.unsafeGet());
-        bool dbgMarked = !key.debugger || IsObjectMarked(&key.debugger);
-        JS_ASSERT_IF(!keyMarked && valMarked, key.kind == CrossCompartmentKey::StringWrapper);
-        if (!keyMarked || !valMarked || !dbgMarked)
+        bool keyDying = IsCellAboutToBeFinalized(&key.wrapped);
+        bool valDying = IsValueAboutToBeFinalized(e.front().value.unsafeGet());
+        bool dbgDying = key.debugger && IsObjectAboutToBeFinalized(&key.debugger);
+        JS_ASSERT_IF(keyDying && !valDying, key.kind == CrossCompartmentKey::StringWrapper);
+        if (keyDying || valDying || dbgDying)
             e.removeFront();
         else if (key.wrapped != e.front().key.wrapped || key.debugger != e.front().key.debugger)
             e.rekeyFront(key);
@@ -895,7 +894,7 @@ JSCompartment::sweepBreakpoints(FreeOp *fop)
         JSScript *script = i.get<JSScript>();
         if (!script->hasAnyBreakpointsOrStepMode())
             continue;
-        bool scriptGone = !IsScriptMarked(&script);
+        bool scriptGone = IsScriptAboutToBeFinalized(&script);
         JS_ASSERT(script == i.get<JSScript>());
         for (unsigned i = 0; i < script->length; i++) {
             BreakpointSite *site = script->getBreakpointSite(script->code + i);
@@ -906,7 +905,7 @@ JSCompartment::sweepBreakpoints(FreeOp *fop)
             Breakpoint *nextbp;
             for (Breakpoint *bp = site->firstBreakpoint(); bp; bp = nextbp) {
                 nextbp = bp->nextInSite();
-                if (scriptGone || !IsObjectMarked(&bp->debugger->toJSObjectRef()))
+                if (scriptGone || IsObjectAboutToBeFinalized(&bp->debugger->toJSObjectRef()))
                     bp->destroy(fop);
             }
         }
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index 0fec7d8664bb..a01f3fa80e32 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -452,7 +452,7 @@ struct JSCompartment
     js::ScriptCountsMap *scriptCountsMap;
 
     js::DebugScriptMap *debugScriptMap;
-	
+
 #ifdef JS_ION
   private:
     js::ion::IonCompartment *ionCompartment_;
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index ef07b6f0c6d8..34c6788cd203 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -1149,7 +1149,7 @@ JSCompartment::sweepBaseShapeTable()
     if (baseShapes.initialized()) {
         for (BaseShapeSet::Enum e(baseShapes); !e.empty(); e.popFront()) {
             UnownedBaseShape *base = e.front();
-            if (!base->isMarked())
+            if (IsBaseShapeAboutToBeFinalized(&base))
                 e.removeFront();
         }
     }
@@ -1306,12 +1306,12 @@ JSCompartment::sweepInitialShapeTable()
             const InitialShapeEntry &entry = e.front();
             Shape *shape = entry.shape;
             JSObject *proto = entry.proto.raw();
-            if (!IsShapeMarked(&shape) || (entry.proto.isObject() && !IsObjectMarked(&proto))) {
+            if (IsShapeAboutToBeFinalized(&shape) || (entry.proto.isObject() && IsObjectAboutToBeFinalized(&proto))) {
                 e.removeFront();
             } else {
 #ifdef DEBUG
                 DebugOnly<JSObject *> parent = shape->getObjectParent();
-                JS_ASSERT(!parent || IsObjectMarked(&parent));
+                JS_ASSERT(!parent || !IsObjectAboutToBeFinalized(&parent));
                 JS_ASSERT(parent == shape->getObjectParent());
 #endif
                 if (shape != entry.shape || proto != entry.proto.raw()) {
diff --git a/js/src/jswatchpoint.cpp b/js/src/jswatchpoint.cpp
index 526e058b3c89..2ed581f0ad15 100644
--- a/js/src/jswatchpoint.cpp
+++ b/js/src/jswatchpoint.cpp
@@ -220,7 +220,7 @@ WatchpointMap::sweep()
     for (Map::Enum e(map); !e.empty(); e.popFront()) {
         Map::Entry &entry = e.front();
         RelocatablePtrObject obj(entry.key.object);
-        if (!IsObjectMarked(&obj)) {
+        if (IsObjectAboutToBeFinalized(&obj)) {
             JS_ASSERT(!entry.value.held);
             e.removeFront();
         } else if (obj != entry.key.object) {
diff --git a/js/src/jsweakcache.h b/js/src/jsweakcache.h
index 1fc34ddd1346..409d2f4acdc9 100644
--- a/js/src/jsweakcache.h
+++ b/js/src/jsweakcache.h
@@ -42,9 +42,9 @@ class WeakCache : public HashMap<Key, Value, HashPolicy, AllocPolicy> {
             // Checking IsMarked() may update the location of the Key (or Value).
             // Pass in a stack local, then manually update the backing heap store.
             Key k(e.front().key);
-            bool isKeyMarked = gc::IsMarked(&k);
+            bool isKeyDying = gc::IsAboutToBeFinalized(&k);
 
-            if (!isKeyMarked || !gc::IsMarked(e.front().value)) {
+            if (isKeyDying || gc::IsAboutToBeFinalized(e.front().value)) {
                 e.removeFront();
             } else {
                 // Potentially update the location of the Key.
@@ -60,8 +60,8 @@ class WeakCache : public HashMap<Key, Value, HashPolicy, AllocPolicy> {
         for (Range r = Base::all(); !r.empty(); r.popFront()) {
             Key k(r.front().key);
 
-            JS_ASSERT(gc::IsMarked(&k));
-            JS_ASSERT(gc::IsMarked(r.front().value));
+            JS_ASSERT(!gc::IsAboutToBeFinalized(&k));
+            JS_ASSERT(!gc::IsAboutToBeFinalized(r.front().value));
 
             // Assert that IsMarked() did not perform relocation.
             JS_ASSERT(k == r.front().key);
diff --git a/js/src/jsweakmap.h b/js/src/jsweakmap.h
index 121f556950b5..4273ebc562da 100644
--- a/js/src/jsweakmap.h
+++ b/js/src/jsweakmap.h
@@ -180,7 +180,7 @@ class WeakMap : public HashMap<Key, Value, HashPolicy, RuntimeAllocPolicy>, publ
         /* Remove all entries whose keys remain unmarked. */
         for (Enum e(*this); !e.empty(); e.popFront()) {
             Key k(e.front().key);
-            if (!gc::IsMarked(&k))
+            if (gc::IsAboutToBeFinalized(&k))
                 e.removeFront();
         }
 
@@ -192,8 +192,8 @@ class WeakMap : public HashMap<Key, Value, HashPolicy, RuntimeAllocPolicy>, publ
         for (Range r = Base::all(); !r.empty(); r.popFront()) {
             Key k(r.front().key);
             Value v(r.front().value);
-            JS_ASSERT(gc::IsMarked(&k));
-            JS_ASSERT(gc::IsMarked(&v));
+            JS_ASSERT(!gc::IsAboutToBeFinalized(&k));
+            JS_ASSERT(!gc::IsAboutToBeFinalized(&v));
             JS_ASSERT(k == r.front().key);
             JS_ASSERT(v == r.front().value);
         }
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index cfd98a291a52..a5ce9496b37a 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1528,7 +1528,7 @@ Debugger::sweepAll(FreeOp *fop)
     for (JSCList *p = &rt->debuggerList; (p = JS_NEXT_LINK(p)) != &rt->debuggerList;) {
         Debugger *dbg = Debugger::fromLinks(p);
 
-        if (!IsObjectMarked(&dbg->object)) {
+        if (IsObjectAboutToBeFinalized(&dbg->object)) {
             /*
              * dbg is being GC'd. Detach it from its debuggees. The debuggee
              * might be GC'd too. Since detaching requires access to both
@@ -1544,7 +1544,7 @@ Debugger::sweepAll(FreeOp *fop)
         GlobalObjectSet &debuggees = (*c)->getDebuggees();
         for (GlobalObjectSet::Enum e(debuggees); !e.empty(); e.popFront()) {
             GlobalObject *global = e.front();
-            if (!IsObjectMarked(&global))
+            if (IsObjectAboutToBeFinalized(&global))
                 detachAllDebuggersFromGlobal(fop, global, &e);
             else if (global != e.front())
                 e.rekeyFront(global);
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index 3a7ec7b3de61..7e08228fa0c7 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -1559,7 +1559,7 @@ DebugScopes::sweep()
      * creating an uncollectable cycle with suspended generator frames.
      */
     for (MissingScopeMap::Enum e(missingScopes); !e.empty(); e.popFront()) {
-        if (!IsObjectMarked(e.front().value.unsafeGet()))
+        if (IsObjectAboutToBeFinalized(e.front().value.unsafeGet()))
             e.removeFront();
     }
 
@@ -1571,7 +1571,7 @@ DebugScopes::sweep()
          * Scopes can be finalized when a debugger-synthesized ScopeObject is
          * no longer reachable via its DebugScopeObject.
          */
-        if (!IsObjectMarked(&scope)) {
+        if (IsObjectAboutToBeFinalized(&scope)) {
             e.removeFront();
             continue;
         }
@@ -1583,7 +1583,7 @@ DebugScopes::sweep()
          */
         if (JSGenerator *gen = fp->maybeSuspendedGenerator(rt)) {
             JS_ASSERT(gen->state == JSGEN_NEWBORN || gen->state == JSGEN_OPEN);
-            if (!IsObjectMarked(&gen->obj)) {
+            if (IsObjectAboutToBeFinalized(&gen->obj)) {
                 e.removeFront();
                 continue;
             }

From bfe6c130fb31a8a158172c81e1d5e1d05cf89630 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Fri, 12 Oct 2012 10:45:30 +0100
Subject: [PATCH 010/160] Bug 790338 - Split up xpconnect finalization callback
 r=billm

--HG--
extra : rebase_source : 2b70376622af8104d829c23b0014cbd7d8d73a87
---
 js/src/jsapi-tests/testIntern.cpp |  2 +-
 js/src/jsapi.h                    | 21 +++++++++++++++++++--
 js/src/jsgc.cpp                   | 10 ++++++++--
 js/xpconnect/src/XPCJSRuntime.cpp | 31 +++++++++++++++++++++++++------
 4 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/js/src/jsapi-tests/testIntern.cpp b/js/src/jsapi-tests/testIntern.cpp
index ba1b4c58808e..d8177767669c 100644
--- a/js/src/jsapi-tests/testIntern.cpp
+++ b/js/src/jsapi-tests/testIntern.cpp
@@ -30,7 +30,7 @@ struct StringWrapper
 void
 FinalizeCallback(JSFreeOp *fop, JSFinalizeStatus status, JSBool isCompartmentGC)
 {
-    if (status == JSFINALIZE_START)
+    if (status == JSFINALIZE_GROUP_START)
         sw.strOk = !JS_IsAboutToBeFinalized(sw.str);
 }
 
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 5a2a97946df7..fc61b92fc1d0 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1862,8 +1862,25 @@ typedef void
 (* JSGCCallback)(JSRuntime *rt, JSGCStatus status);
 
 typedef enum JSFinalizeStatus {
-    JSFINALIZE_START,
-    JSFINALIZE_END
+    /*
+     * Called when preparing to sweep a group of compartments, before anything
+     * has been swept.  The collector will not yield to the mutator before
+     * calling the callback with JSFINALIZE_GROUP_END status.
+     */
+    JSFINALIZE_GROUP_START,
+
+    /*
+     * Called when preparing to sweep a group of compartments. Weak references
+     * to unmarked things have been removed and things that are not swept
+     * incrementally have been finalized at this point.  The collector may yield
+     * to the mutator after this point.
+     */
+    JSFINALIZE_GROUP_END,
+
+    /*
+     * Called at the end of collection when everything has been swept.
+     */
+    JSFINALIZE_COLLECTION_END
 } JSFinalizeStatus;
 
 typedef void
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index d26e6e3b7185..5197a0cc4471 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3830,7 +3830,7 @@ BeginSweepPhase(JSRuntime *rt)
     {
         gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_FINALIZE_START);
         if (rt->gcFinalizeCallback)
-            rt->gcFinalizeCallback(&fop, JSFINALIZE_START, !isFull);
+            rt->gcFinalizeCallback(&fop, JSFINALIZE_GROUP_START, !isFull);
     }
 
     /* Finalize unreachable (key,value) pairs in all weak maps. */
@@ -3910,7 +3910,7 @@ BeginSweepPhase(JSRuntime *rt)
     {
         gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_FINALIZE_END);
         if (rt->gcFinalizeCallback)
-            rt->gcFinalizeCallback(&fop, JSFINALIZE_END, !isFull);
+            rt->gcFinalizeCallback(&fop, JSFINALIZE_GROUP_END, !isFull);
     }
 }
 
@@ -4026,6 +4026,12 @@ EndSweepPhase(JSRuntime *rt, JSGCInvocationKind gckind, bool lastGC)
         }
     }
 
+    {
+        gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_FINALIZE_END);
+        if (rt->gcFinalizeCallback)
+            rt->gcFinalizeCallback(&fop, JSFINALIZE_COLLECTION_END, !rt->gcIsFull);
+    }
+
     /*
      * Reset the list of arenas marked as being allocated during sweep phase.
      */
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index 9a0fd2ccc610..1bb006b091af 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -732,7 +732,7 @@ XPCJSRuntime::FinalizeCallback(JSFreeOp *fop, JSFinalizeStatus status, JSBool is
         return;
 
     switch (status) {
-        case JSFINALIZE_START:
+        case JSFINALIZE_GROUP_START:
         {
             NS_ASSERTION(!self->mDoingFinalization, "bad state");
 
@@ -760,7 +760,7 @@ XPCJSRuntime::FinalizeCallback(JSFreeOp *fop, JSFinalizeStatus status, JSBool is
             self->mDoingFinalization = true;
             break;
         }
-        case JSFINALIZE_END:
+        case JSFINALIZE_GROUP_END:
         {
             NS_ASSERTION(self->mDoingFinalization, "bad state");
             self->mDoingFinalization = false;
@@ -769,6 +769,29 @@ XPCJSRuntime::FinalizeCallback(JSFreeOp *fop, JSFinalizeStatus status, JSBool is
             // to be dead.
             DoDeferredRelease(self->mWrappedJSToReleaseArray);
 
+            // Sweep scopes needing cleanup
+            XPCWrappedNativeScope::FinishedFinalizationPhaseOfGC();
+
+            // mThreadRunningGC indicates that GC is running.
+            // Clear it and notify waiters.
+            { // scoped lock
+                XPCAutoLock lock(self->GetMapLock());
+                NS_ASSERTION(self->mThreadRunningGC == PR_GetCurrentThread(), "bad state");
+                self->mThreadRunningGC = nullptr;
+                xpc_NotifyAll(self->GetMapLock());
+            }
+
+            break;
+        }
+        case JSFINALIZE_COLLECTION_END:
+        {
+            // mThreadRunningGC indicates that GC is running
+            { // scoped lock
+                XPCAutoLock lock(self->GetMapLock());
+                NS_ASSERTION(!self->mThreadRunningGC, "bad state");
+                self->mThreadRunningGC = PR_GetCurrentThread();
+            }
+
 #ifdef XPC_REPORT_NATIVE_INTERFACE_AND_SET_FLUSHING
             printf("--------------------------------------------------------------\n");
             int setsBefore = (int) self->mNativeSetMap->Count();
@@ -869,9 +892,6 @@ XPCJSRuntime::FinalizeCallback(JSFreeOp *fop, JSFinalizeStatus status, JSBool is
             printf("--------------------------------------------------------------\n");
 #endif
 
-            // Sweep scopes needing cleanup
-            XPCWrappedNativeScope::FinishedFinalizationPhaseOfGC();
-
             // Now we are going to recycle any unused WrappedNativeTearoffs.
             // We do this by iterating all the live callcontexts
             // and marking the tearoffs in use. And then we
@@ -925,7 +945,6 @@ XPCJSRuntime::FinalizeCallback(JSFreeOp *fop, JSFinalizeStatus status, JSBool is
             self->mDyingWrappedNativeProtoMap->
                 Enumerate(DyingProtoKiller, nullptr);
 
-
             // mThreadRunningGC indicates that GC is running.
             // Clear it and notify waiters.
             { // scoped lock

From 2b8001276607d35c7467954316e7adee9b2528ee Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Fri, 16 Nov 2012 15:34:22 +0000
Subject: [PATCH 011/160] Bug 790338 - Sweep compartments in groups r=billm

--HG--
extra : rebase_source : 7831452ee66ae9e10d83e77279e68b463748691c
---
 js/src/gc/Marking.cpp     |  15 +-
 js/src/jsapi.cpp          |   6 +-
 js/src/jsatom.cpp         |   6 +-
 js/src/jscntxt.h          |  12 +-
 js/src/jscompartment.cpp  |   8 +-
 js/src/jscompartment.h    |  21 +-
 js/src/jsgc.cpp           | 605 +++++++++++++++++---------------------
 js/src/jsgc.h             |  14 +-
 js/src/jsgcinlines.h      |  33 ++-
 js/src/jsinfer.cpp        |  56 +++-
 js/src/jspropertytree.cpp |  25 +-
 js/src/jstypedarray.cpp   |  50 +++-
 js/src/jstypedarray.h     |   2 +
 js/src/jswatchpoint.cpp   |   2 +-
 js/src/vm/Debugger.cpp    |   4 +-
 15 files changed, 466 insertions(+), 393 deletions(-)

diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp
index a66728db652a..1b9a559c09d1 100644
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -133,7 +133,7 @@ MarkInternal(JSTracer *trc, T **thingp)
      * GC.
      */
     if (!trc->callback) {
-        if (thing->compartment()->isCollecting()) {
+        if (thing->compartment()->isGCMarking()) {
             PushMarkStack(static_cast<GCMarker *>(trc), thing);
             thing->compartment()->maybeAlive = true;
         }
@@ -216,7 +216,8 @@ IsMarked(T **thingp)
 {
     JS_ASSERT(thingp);
     JS_ASSERT(*thingp);
-    if (!(*thingp)->compartment()->isCollecting())
+    JSCompartment *c = (*thingp)->compartment();
+    if (!c->isGCMarking() && !c->isGCSweeping())
         return true;
     return (*thingp)->isMarked();
 }
@@ -567,7 +568,7 @@ gc::MarkObjectSlots(JSTracer *trc, JSObject *obj, uint32_t start, uint32_t nslot
 void
 gc::MarkCrossCompartmentObjectUnbarriered(JSTracer *trc, JSObject **obj, const char *name)
 {
-    if (IS_GC_MARKING_TRACER(trc) && !(*obj)->compartment()->isCollecting())
+    if (IS_GC_MARKING_TRACER(trc) && !(*obj)->compartment()->isGCMarking())
         return;
 
     MarkObjectUnbarriered(trc, obj, name);
@@ -576,7 +577,7 @@ gc::MarkCrossCompartmentObjectUnbarriered(JSTracer *trc, JSObject **obj, const c
 void
 gc::MarkCrossCompartmentScriptUnbarriered(JSTracer *trc, JSScript **script, const char *name)
 {
-    if (IS_GC_MARKING_TRACER(trc) && !(*script)->compartment()->isCollecting())
+    if (IS_GC_MARKING_TRACER(trc) && !(*script)->compartment()->isGCMarking())
         return;
 
     MarkScriptUnbarriered(trc, script, name);
@@ -587,7 +588,7 @@ gc::MarkCrossCompartmentSlot(JSTracer *trc, HeapSlot *s, const char *name)
 {
     if (s->isMarkable()) {
         Cell *cell = (Cell *)s->toGCThing();
-        if (IS_GC_MARKING_TRACER(trc) && !cell->compartment()->isCollecting())
+        if (IS_GC_MARKING_TRACER(trc) && !cell->compartment()->isGCMarking())
             return;
 
         MarkSlot(trc, s, name);
@@ -625,10 +626,10 @@ gc::IsCellAboutToBeFinalized(Cell **thingp)
 /*** Push Mark Stack ***/
 
 #define JS_COMPARTMENT_ASSERT(rt, thing)                                \
-    JS_ASSERT((thing)->compartment()->isCollecting())
+    JS_ASSERT((thing)->compartment()->isGCMarking())
 
 #define JS_COMPARTMENT_ASSERT_STR(rt, thing)                            \
-    JS_ASSERT((thing)->compartment()->isCollecting() ||                 \
+    JS_ASSERT((thing)->compartment()->isGCMarking() ||                  \
               (thing)->compartment() == (rt)->atomsCompartment);
 
 #if JS_HAS_XML_SUPPORT
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index d62595ca28db..48c484463619 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -798,9 +798,13 @@ JSRuntime::JSRuntime(JSUseHelperThreads useHelperThreads)
     gcIncrementalState(gc::NO_INCREMENTAL),
     gcLastMarkSlice(false),
     gcSweepOnBackgroundThread(false),
+    gcFoundBlackGrayEdges(false),
     gcSweepingCompartments(NULL),
+    gcCompartmentGroupIndex(0),
+    gcRemainingCompartmentGroups(NULL),
+    gcCompartmentGroup(NULL),
     gcSweepPhase(0),
-    gcSweepCompartmentIndex(0),
+    gcSweepCompartment(NULL),
     gcSweepKindIndex(0),
     gcArenasAllocatedDuringSweep(NULL),
     gcInterFrameGC(0),
diff --git a/js/src/jsatom.cpp b/js/src/jsatom.cpp
index d12c3b8016b5..d83588cae437 100644
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -205,12 +205,12 @@ js::SweepAtoms(JSRuntime *rt)
     for (AtomSet::Enum e(rt->atoms); !e.empty(); e.popFront()) {
         AtomStateEntry entry = e.front();
         JSAtom *atom = entry.asPtr();
-        bool isMarked = IsStringMarked(&atom);
+        bool isDying = IsStringAboutToBeFinalized(&atom);
 
         /* Pinned or interned key cannot be finalized. */
-        JS_ASSERT_IF(entry.isTagged(), isMarked);
+        JS_ASSERT_IF(entry.isTagged(), !isDying);
 
-        if (!isMarked)
+        if (isDying)
             e.removeFront();
     }
 }
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 603b9d3b7bf9..e70b2d82399a 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -701,14 +701,22 @@ struct JSRuntime : js::RuntimeFriendFields
     /* Whether any sweeping will take place in the separate GC helper thread. */
     bool                gcSweepOnBackgroundThread;
 
-    /* List head of compartments being swept. */
+    /* Whether any black->gray edges were found during marking. */
+    bool                gcFoundBlackGrayEdges;
+
+    /* List head of compartments to be swept in the background. */
     JSCompartment       *gcSweepingCompartments;
 
+    /* Index of current compartment group (for stats). */
+    unsigned            gcCompartmentGroupIndex;
+
     /*
      * Incremental sweep state.
      */
+    JSCompartment       *gcRemainingCompartmentGroups;
+    JSCompartment       *gcCompartmentGroup;
     int                 gcSweepPhase;
-    ptrdiff_t           gcSweepCompartmentIndex;
+    JSCompartment       *gcSweepCompartment;
     int                 gcSweepKindIndex;
 
     /*
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 0eef94f4acad..55f054facc54 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -58,7 +58,6 @@ JSCompartment::JSCompartment(JSRuntime *rt)
     gcBytes(0),
     gcTriggerBytes(0),
     gcHeapGrowthFactor(3.0),
-    gcNextCompartment(NULL),
     hold(false),
     isSystemCompartment(false),
     lastCodeRelease(0),
@@ -695,11 +694,12 @@ JSCompartment::sweepCrossCompartmentWrappers()
         bool keyDying = IsCellAboutToBeFinalized(&key.wrapped);
         bool valDying = IsValueAboutToBeFinalized(e.front().value.unsafeGet());
         bool dbgDying = key.debugger && IsObjectAboutToBeFinalized(&key.debugger);
-        JS_ASSERT_IF(keyDying && !valDying, key.kind == CrossCompartmentKey::StringWrapper);
-        if (keyDying || valDying || dbgDying)
+        if (keyDying || valDying || dbgDying) {
+            JS_ASSERT(key.kind != CrossCompartmentKey::StringWrapper);
             e.removeFront();
-        else if (key.wrapped != e.front().key.wrapped || key.debugger != e.front().key.debugger)
+        } else if (key.wrapped != e.front().key.wrapped || key.debugger != e.front().key.debugger) {
             e.rekeyFront(key);
+        }
     }
 }
 
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index a01f3fa80e32..559483e81d88 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -18,6 +18,7 @@
 #include "jsscope.h"
 
 #include "gc/StoreBuffer.h"
+#include "gc/FindSCCs.h"
 #include "vm/GlobalObject.h"
 #include "vm/RegExpObject.h"
 
@@ -116,7 +117,7 @@ namespace js {
 class AutoDebugModeGC;
 }
 
-struct JSCompartment
+struct JSCompartment : public js::gc::GraphNodeBase
 {
     JSRuntime                    *rt;
     JSPrincipals                 *principals;
@@ -192,7 +193,8 @@ struct JSCompartment
     enum CompartmentGCState {
         NoGC,
         Mark,
-        Sweep
+        Sweep,
+        Finished
     };
 
   private:
@@ -202,11 +204,10 @@ struct JSCompartment
 
   public:
     bool isCollecting() const {
-        if (rt->isHeapCollecting()) {
+        if (rt->isHeapCollecting())
             return gcState != NoGC;
-        } else {
+        else
             return needsBarrier();
-        }
     }
 
     bool isPreservingCode() const {
@@ -248,7 +249,10 @@ struct JSCompartment
     }
 
     bool isGCMarking() {
-        return gcState == Mark;
+        if (rt->isHeapCollecting())
+            return gcState == Mark;
+        else
+            return needsBarrier();
     }
 
     bool isGCSweeping() {
@@ -259,7 +263,6 @@ struct JSCompartment
     size_t                       gcTriggerBytes;
     size_t                       gcMaxMallocBytes;
     double                       gcHeapGrowthFactor;
-    JSCompartment                *gcNextCompartment;
 
     bool                         hold;
     bool                         isSystemCompartment;
@@ -335,7 +338,7 @@ struct JSCompartment
     size_t                       gcTriggerMallocAndFreeBytes;
 
     /* During GC, stores the index of this compartment in rt->compartments. */
-    unsigned                     index;
+    unsigned                     gcIndex;
 
   private:
     /*
@@ -376,6 +379,8 @@ struct JSCompartment
     void sweepCrossCompartmentWrappers();
     void purge();
 
+    virtual void findOutgoingEdges(js::gc::ComponentFinder& finder);
+
     void setGCLastBytes(size_t lastBytes, size_t lastMallocBytes, js::JSGCInvocationKind gckind);
     void reduceGCTriggerBytes(size_t amount);
 
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 5197a0cc4471..e0b9cd4cb114 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -92,6 +92,8 @@
 #include "vm/ScopeObject-inl.h"
 #include "vm/String-inl.h"
 
+#include "gc/FindSCCs.h"
+
 #ifdef MOZ_VALGRIND
 # define JS_VALGRIND
 #endif
@@ -1346,7 +1348,7 @@ js_AddRootRT(JSRuntime *rt, jsval *vp, const char *name)
      * or ModifyBusyCount in workers). We need a read barrier to cover these
      * cases.
      */
-    if (rt->gcIncrementalState == MARK)
+    if (rt->gcIncrementalState != NO_INCREMENTAL)
         IncrementalValueBarrier(*vp);
 
     return !!rt->gcRootsHash.put((void *)vp,
@@ -1362,7 +1364,7 @@ js_AddGCThingRootRT(JSRuntime *rt, void **rp, const char *name)
      * or ModifyBusyCount in workers). We need a read barrier to cover these
      * cases.
      */
-    if (rt->gcIncrementalState == MARK)
+    if (rt->gcIncrementalState != NO_INCREMENTAL)
         IncrementalReferenceBarrier(*rp);
 
     return !!rt->gcRootsHash.put((void *)rp,
@@ -1814,7 +1816,7 @@ js_LockGCThingRT(JSRuntime *rt, void *thing)
      * or ModifyBusyCount in workers). We need a read barrier to cover these
      * cases.
      */
-    if (rt->gcIncrementalState == MARK)
+    if (rt->gcIncrementalState != NO_INCREMENTAL)
         IncrementalReferenceBarrier(thing);
 
     if (GCLocks::Ptr p = rt->gcLocksHash.lookupWithDefault(thing, 0)) {
@@ -2817,7 +2819,7 @@ SweepBackgroundThings(JSRuntime* rt, bool onBackgroundThread)
      */
     FreeOp fop(rt, false);
     for (int phase = 0 ; phase < BackgroundPhaseCount ; ++phase) {
-        for (JSCompartment *c = rt->gcSweepingCompartments; c; c = c->gcNextCompartment) {
+        for (JSCompartment *c = rt->gcSweepingCompartments; c; c = NextGraphNode(c)) {
             for (int index = 0 ; index < BackgroundPhaseLength[phase] ; ++index) {
                 AllocKind kind = BackgroundPhases[phase][index];
                 ArenaHeader *arenas = c->arenas.arenaListsToSweep[kind];
@@ -2828,10 +2830,8 @@ SweepBackgroundThings(JSRuntime* rt, bool onBackgroundThread)
         }
     }
 
-    while (JSCompartment *c = rt->gcSweepingCompartments) {
-        rt->gcSweepingCompartments = c->gcNextCompartment;
-        c->gcNextCompartment = NULL;
-    }
+    while (rt->gcSweepingCompartments)
+        RemoveGraphNode(rt->gcSweepingCompartments);
 }
 
 #ifdef JS_THREADSAFE
@@ -2839,8 +2839,9 @@ static void
 AssertBackgroundSweepingFinished(JSRuntime *rt)
 {
     for (CompartmentsIter c(rt); !c.done(); c.next()) {
-        JS_ASSERT(!c->gcNextCompartment);
+        JS_ASSERT(!c->gcNextGraphNode);
         for (unsigned i = 0 ; i < FINALIZE_LIMIT ; ++i) {
+            JS_ASSERT(!c->gcNextGraphNode);
             JS_ASSERT(!c->arenas.arenaListsToSweep[i]);
             JS_ASSERT(c->arenas.doneBackgroundFinalize(AllocKind(i)));
         }
@@ -3368,6 +3369,8 @@ BeginMarkPhase(JSRuntime *rt)
     /* Reset weak map list. */
     WeakMapBase::resetWeakMapList(rt);
 
+    ArrayBufferObject::resetArrayBufferList(rt);
+
     /*
      * We must purge the runtime at the beginning of an incremental GC. The
      * danger if we purge later is that the snapshot invariant of incremental
@@ -3445,6 +3448,7 @@ BeginMarkPhase(JSRuntime *rt)
         if (!c->maybeAlive)
             c->scheduledForDestruction = true;
     }
+    rt->gcFoundBlackGrayEdges = false;
 }
 
 void
@@ -3491,6 +3495,8 @@ MarkGrayAndWeak(JSRuntime *rt)
     }
 
     JS_ASSERT(gcmarker->isDrained());
+
+    gcmarker->setMarkColorBlack();
 }
 
 #ifdef DEBUG
@@ -3498,56 +3504,6 @@ static void
 ValidateIncrementalMarking(JSRuntime *rt);
 #endif
 
-static void
-EndMarkPhase(JSRuntime *rt)
-{
-    {
-        gcstats::AutoPhase ap1(rt->gcStats, gcstats::PHASE_MARK);
-        MarkGrayAndWeak(rt);
-    }
-
-    JS_ASSERT(rt->gcMarker.isDrained());
-
-#ifdef DEBUG
-    if (rt->gcIsIncremental && rt->gcValidate)
-        ValidateIncrementalMarking(rt);
-#endif
-
-    /*
-     * Having black->gray edges violates our promise to the cycle
-     * collector. This can happen if we're collecting a compartment and it has
-     * an edge to an uncollected compartment: it's possible that the source and
-     * destination of the cross-compartment edge should be gray, but the source
-     * was marked black by the conservative scanner.
-     */
-    bool foundBlackGray = false;
-    for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
-        for (WrapperMap::Enum e(c->crossCompartmentWrappers); !e.empty(); e.popFront()) {
-            Cell *dst = e.front().key.wrapped;
-            Cell *src = ToMarkable(e.front().value);
-            JS_ASSERT(src->compartment() == c.get());
-            if (IsCellMarked(&src) && !src->isMarked(GRAY) && dst->isMarked(GRAY)) {
-                JS_ASSERT(!dst->compartment()->isCollecting());
-                foundBlackGray = true;
-            }
-        }
-    }
-
-    /*
-     * To avoid the black->gray edge, we completely clear the mark bits of all
-     * uncollected compartments. This is safe, although it may prevent the
-     * cycle collector from collecting some dead objects.
-     */
-    if (foundBlackGray) {
-        for (CompartmentsIter c(rt); !c.done(); c.next()) {
-            if (!c->isCollecting())
-                c->arenas.unmarkAll();
-        }
-    }
-
-    /* We do not discard JIT here code as the following sweeping does that. */
-}
-
 #ifdef DEBUG
 static void
 ValidateIncrementalMarking(JSRuntime *rt)
@@ -3641,9 +3597,28 @@ ValidateIncrementalMarking(JSRuntime *rt)
 
     rt->gcIncrementalState = state;
 }
+
 #endif
 
+static void
+DropStringWrappers(JSRuntime *rt)
+{
+    /*
+     * String "wrappers" are dropped on GC because their presence would require
+     * us to sweep the wrappers in all compartments every time we sweep a
+     * compartment group.
+     */
+    for (CompartmentsIter c(rt); !c.done(); c.next()) {
+        for (WrapperMap::Enum e(c->crossCompartmentWrappers); !e.empty(); e.popFront()) {
+            if (e.front().key.kind == CrossCompartmentKey::StringWrapper)
+                e.removeFront();
+        }
+    }
+}
+
 /*
+ * Group compartments that must be swept at the same time.
+ *
  * If compartment A has an edge to an unmarked object in compartment B, then we
  * must not sweep A in a later slice than we sweep B. That's because a write
  * barrier in A that could lead to the unmarked object in B becoming
@@ -3651,178 +3626,122 @@ ValidateIncrementalMarking(JSRuntime *rt)
  *
  * If we consider these dependencies as a graph, then all the compartments in
  * any strongly-connected component of this graph must be swept in the same
- * slice. This class is used to compute these strongly connected components via
- * Tarjan's algorithm.
+ * slice.
+ *
+ * Tarjan's algorithm is used to calculate the components.
  */
-class PartitionCompartments
-{
-    typedef unsigned Node;
-    typedef Vector<Node, 0, SystemAllocPolicy> NodeVector;
-    typedef Vector<bool, 0, SystemAllocPolicy> BoolVector;
 
-    static const Node Undefined = Node(-1);
-
-    JSRuntime *runtime;
-
-    /*
-     * The value of clock ticks monotonically upward as each new compartment is
-     * discovered by the algorithm. When a new SCC is found, it is assigned a
-     * number from nextSCC.
-     */
-    Node clock, nextSCC;
-
-    /*
-     * Compartments have an index based on their order in rt->compartments. The
-     * index is used as a subscript into the arrays below.
-     *
-     * discoveryTime[comp]: The |clock| value when comp was first explored.
-     * lowLink[comp]: The minimal discovery time of any compartment reachable
-     *                from |comp|.
-     * stack: List of explored compartments that haven't been assigned to an SCC.
-     * scc[comp]: SCC number that |comp| is in.
-     * onStack[comp]: Whether |comp| in in |stack|.
-     */
-    NodeVector discoveryTime, lowLink, stack, scc;
-    BoolVector onStack;
-
-    bool fail_;
-
-    void processNode(Node v);
-    void fail() { fail_ = true; }
-    bool failed() { return fail_; }
-
-  public:
-    PartitionCompartments(JSRuntime *rt);
-    void partition();
-    unsigned getSCC(JSCompartment *comp) { return failed() ? 0 : scc[comp->index]; }
-};
-
-const PartitionCompartments::Node PartitionCompartments::Undefined;
-
-PartitionCompartments::PartitionCompartments(JSRuntime *rt)
-  : runtime(rt), clock(0), nextSCC(0), fail_(false)
-{
-    size_t n = runtime->compartments.length();
-    if (!discoveryTime.reserve(n) ||
-        !lowLink.reserve(n) ||
-        !scc.reserve(n) ||
-        !onStack.reserve(n) ||
-        !stack.reserve(n))
-    {
-        fail();
-        return;
-    }
-
-    for (Node v = 0; v < runtime->compartments.length(); v++) {
-        runtime->compartments[v]->index = v;
-        discoveryTime.infallibleAppend(Undefined);
-        lowLink.infallibleAppend(Undefined);
-        scc.infallibleAppend(Undefined);
-        onStack.infallibleAppend(false);
-    }
-}
-
-/* See the Wikipedia article "Tarjan's strongly connected components algorithm". */
 void
-PartitionCompartments::processNode(Node v)
+JSCompartment::findOutgoingEdges(ComponentFinder& finder)
 {
-    int stackDummy;
-    if (failed() || !JS_CHECK_STACK_SIZE(js::GetNativeStackLimit(runtime), &stackDummy)) {
-        fail();
-        return;
-    }
-
-    discoveryTime[v] = clock;
-    lowLink[v] = clock;
-    clock++;
-    stack.infallibleAppend(v);
-    onStack[v] = true;
-
-    JSCompartment *comp = runtime->compartments[v];
-
-    for (WrapperMap::Enum e(comp->crossCompartmentWrappers); !e.empty(); e.popFront()) {
-        if (e.front().key.kind == CrossCompartmentKey::StringWrapper)
-            continue;
+    /*
+     * Any compartment may have a pointer to an atom in the atoms
+     * compartment, and these aren't in the cross compartment map.
+     */
+    if (rt->atomsCompartment->isGCMarking())
+        finder.addEdgeTo(rt->atomsCompartment);
 
+    for (js::WrapperMap::Enum e(crossCompartmentWrappers); !e.empty(); e.popFront()) {
+        JS_ASSERT(e.front().key.kind != CrossCompartmentKey::StringWrapper);
         Cell *other = e.front().key.wrapped;
-        if (other->isMarked(BLACK) && !other->isMarked(GRAY))
-            continue;
-
-        Node w = other->compartment()->index;
-
-        if (discoveryTime[w] == Undefined) {
-            processNode(w);
-            lowLink[v] = Min(lowLink[v], lowLink[w]);
-        } else if (onStack[w]) {
-            lowLink[v] = Min(lowLink[v], discoveryTime[w]);
+        if (!other->isMarked(BLACK) || other->isMarked(GRAY)) {
+            JSCompartment *w = other->compartment();
+            if (w->isGCMarking())
+                finder.addEdgeTo(w);
         }
-    }
 
-    if (lowLink[v] == discoveryTime[v]) {
-        Node w;
-        do {
-            w = stack.popCopy();
-            onStack[w] = false;
-            scc[w] = nextSCC;
-        } while (w != v);
-        nextSCC++;
-    }
-}
-
-void
-PartitionCompartments::partition()
-{
-    if (failed())
-        return;
-
-    for (Node n = 0; n < runtime->compartments.length(); n++) {
-        if (discoveryTime[n] == Undefined)
-            processNode(n);
+#ifdef DEBUG
+        JSObject *wrapper = &e.front().value.toObject();
+        JS_ASSERT_IF(IsFunctionProxy(wrapper), &GetProxyCall(wrapper).toObject() == other);
+#endif
     }
 }
 
 static void
-BeginSweepPhase(JSRuntime *rt)
+FindCompartmentGroups(JSRuntime *rt)
 {
-    /*
-     * Sweep phase.
-     *
-     * Finalize as we sweep, outside of rt->gcLock but with rt->isHeapBusy()
-     * true so that any attempt to allocate a GC-thing from a finalizer will
-     * fail, rather than nest badly and leave the unmarked newborn to be swept.
-     *
-     * We first sweep atom state so we can use IsAboutToBeFinalized on
-     * JSString held in a hashtable to check if the hashtable entry can be
-     * freed. Note that even after the entry is freed, JSObject finalizers can
-     * continue to access the corresponding JSString* assuming that they are
-     * unique. This works since the atomization API must not be called during
-     * the GC.
-     */
-    gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_SWEEP);
-
-    /*
-     * Although there is a runtime-wide gcIsFull flag, it is set in
-     * BeginMarkPhase. More compartments may have been created since then.
-     */
-    bool isFull = true;
-    for (CompartmentsIter c(rt); !c.done(); c.next()) {
-        if (c->isCollecting()) {
-            if (c != rt->atomsCompartment)
-                c->setGCState(JSCompartment::Sweep);
-        } else {
-            isFull = false;
+    JS_ASSERT(!rt->gcRemainingCompartmentGroups);
+    if (rt->gcIsIncremental) {
+        ComponentFinder finder(rt->nativeStackLimit);
+        for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
+            JS_ASSERT(c->isGCMarking());
+            finder.addNode(c);
         }
+        rt->gcRemainingCompartmentGroups = static_cast<JSCompartment *>(finder.getResultsList());
+    } else {
+        for (GCCompartmentsIter c(rt); !c.done(); c.next())
+            AddGraphNode(rt->gcRemainingCompartmentGroups, c.get());
     }
-    JS_ASSERT_IF(isFull, rt->gcIsFull);
+    rt->gcCompartmentGroupIndex = 0;
+}
 
-#ifdef JS_THREADSAFE
-    rt->gcSweepOnBackgroundThread = rt->hasContexts() && rt->useHelperThreads();
+static void
+GetNextCompartmentGroup(JSRuntime *rt)
+{
+    JS_ASSERT(!rt->gcCompartmentGroup);
+    if (rt->gcIsIncremental)
+        rt->gcCompartmentGroup =
+            ComponentFinder::getNextGroup(rt->gcRemainingCompartmentGroups);
+    else
+        rt->gcCompartmentGroup =
+            ComponentFinder::getAllRemaining(rt->gcRemainingCompartmentGroups);
+    ++rt->gcCompartmentGroupIndex;
+}
+
+static void
+EndMarkingCompartmentGroup(JSRuntime *rt)
+{
+    {
+        gcstats::AutoPhase ap1(rt->gcStats, gcstats::PHASE_MARK);
+        MarkGrayAndWeak(rt);
+    }
+
+#ifdef DEBUG
+    if (rt->gcIsIncremental && rt->gcValidate && rt->gcCompartmentGroupIndex == 0)
+        ValidateIncrementalMarking(rt);
 #endif
 
-    /* Purge the ArenaLists before sweeping. */
-    for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
-        if (c->isGCSweeping())
-            c->arenas.purge();
+    JS_ASSERT(rt->gcMarker.isDrained());
+
+    /*
+     * Having black->gray edges violates our promise to the cycle
+     * collector. This can happen if we're collecting a compartment and it has
+     * an edge to an uncollected compartment: it's possible that the source and
+     * destination of the cross-compartment edge should be gray, but the source
+     * was marked black by the conservative scanner.
+     */
+    for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+        for (WrapperMap::Enum e(c->crossCompartmentWrappers); !e.empty(); e.popFront()) {
+            Cell *dst = e.front().key.wrapped;
+            Cell *src = ToMarkable(e.front().value);
+            JS_ASSERT(src->compartment() == c);
+            if (IsCellMarked(&src) && !src->isMarked(GRAY) && dst->isMarked(GRAY)) {
+                //JS_ASSERT(!dst->compartment()->isCollecting());
+                rt->gcFoundBlackGrayEdges = true;
+            }
+        }
+    }
+}
+
+static void
+BeginSweepingCompartmentGroup(JSRuntime *rt)
+{
+    /*
+     * Begin sweeping the group of compartments in gcCompartmentGroup,
+     * performing actions that must be done before yielding to caller.
+     */
+
+    bool sweepingAtoms = false;
+    for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+        /* Set the GC state to sweeping. */
+        JS_ASSERT(c->isGCMarking());
+        c->setGCState(JSCompartment::Sweep);
+
+        /* Purge the ArenaLists before sweeping. */
+        c->arenas.purge();
+
+        if (c == rt->atomsCompartment)
+            sweepingAtoms = true;
     }
 
     FreeOp fop(rt, rt->gcSweepOnBackgroundThread);
@@ -3830,7 +3749,12 @@ BeginSweepPhase(JSRuntime *rt)
     {
         gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_FINALIZE_START);
         if (rt->gcFinalizeCallback)
-            rt->gcFinalizeCallback(&fop, JSFINALIZE_GROUP_START, !isFull);
+            rt->gcFinalizeCallback(&fop, JSFINALIZE_GROUP_START, !rt->gcIsFull /* unused */);
+    }
+
+    if (sweepingAtoms) {
+        gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_SWEEP_ATOMS);
+        SweepAtoms(rt);
     }
 
     /* Finalize unreachable (key,value) pairs in all weak maps. */
@@ -3846,19 +3770,13 @@ BeginSweepPhase(JSRuntime *rt)
     /* Detach unreachable debuggers and global objects from each other. */
     Debugger::sweepAll(&fop);
 
-    PartitionCompartments partition(rt);
-    partition.partition();
-
     {
         gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_SWEEP_COMPARTMENTS);
 
         bool releaseTypes = ReleaseObservedTypes(rt);
-        for (CompartmentsIter c(rt); !c.done(); c.next()) {
-            gcstats::AutoSCC scc(rt->gcStats, partition.getSCC(c));
-            if (c->isCollecting())
-                c->sweep(&fop, releaseTypes);
-            else
-                c->sweepCrossCompartmentWrappers();
+        for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+            gcstats::AutoSCC scc(rt->gcStats, rt->gcCompartmentGroupIndex);
+            c->sweep(&fop, releaseTypes);
         }
     }
 
@@ -3870,50 +3788,75 @@ BeginSweepPhase(JSRuntime *rt)
      *
      * Objects are finalized immediately but this may change in the future.
      */
-    for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
-        if (c->isGCSweeping()) {
-            gcstats::AutoSCC scc(rt->gcStats, partition.getSCC(c));
-            c->arenas.queueObjectsForSweep(&fop);
-        }
+    for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+        gcstats::AutoSCC scc(rt->gcStats, rt->gcCompartmentGroupIndex);
+        c->arenas.queueObjectsForSweep(&fop);
     }
-    for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
-        if (c->isGCSweeping()) {
-            gcstats::AutoSCC scc(rt->gcStats, partition.getSCC(c));
-            c->arenas.queueStringsForSweep(&fop);
-        }
+    for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+        gcstats::AutoSCC scc(rt->gcStats, rt->gcCompartmentGroupIndex);
+        c->arenas.queueStringsForSweep(&fop);
     }
-    for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
-        if (c->isGCSweeping()) {
-            gcstats::AutoSCC scc(rt->gcStats, partition.getSCC(c));
-            c->arenas.queueScriptsForSweep(&fop);
-        }
+    for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+    	gcstats::AutoSCC scc(rt->gcStats, rt->gcCompartmentGroupIndex);
+        c->arenas.queueScriptsForSweep(&fop);
     }
-    for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
-        if (c->isGCSweeping()) {
-            gcstats::AutoSCC scc(rt->gcStats, partition.getSCC(c));
-            c->arenas.queueShapesForSweep(&fop);
-        }
+    for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+        gcstats::AutoSCC scc(rt->gcStats, rt->gcCompartmentGroupIndex);
+        c->arenas.queueShapesForSweep(&fop);
     }
 #ifdef JS_ION
-    for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
-        if (c->isGCSweeping()) {
-            gcstats::AutoSCC scc(rt->gcStats, partition.getSCC(c));
-            c->arenas.queueIonCodeForSweep(&fop);
-        }
+    for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+        gcstats::AutoSCC scc(rt->gcStats, rt->gcCompartmentGroupIndex);
+        c->arenas.queueIonCodeForSweep(&fop);
     }
 #endif
 
     rt->gcSweepPhase = 0;
-    rt->gcSweepCompartmentIndex = 0;
+    rt->gcSweepCompartment = rt->gcCompartmentGroup;
     rt->gcSweepKindIndex = 0;
 
     {
         gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_FINALIZE_END);
         if (rt->gcFinalizeCallback)
-            rt->gcFinalizeCallback(&fop, JSFINALIZE_GROUP_END, !isFull);
+            rt->gcFinalizeCallback(&fop, JSFINALIZE_GROUP_END, !rt->gcIsFull /* unused */);
     }
 }
 
+static void
+EndSweepingCompartmentGroup(JSRuntime *rt)
+{
+    /* Update the GC state for compartments we have swept and unlink the list. */
+    while (JSCompartment *c = RemoveGraphNode(rt->gcCompartmentGroup)) {
+        JS_ASSERT(c->isGCSweeping());
+        c->setGCState(JSCompartment::Finished);
+    }
+}
+
+static void
+BeginSweepPhase(JSRuntime *rt)
+{
+    /*
+     * Sweep phase.
+     *
+     * Finalize as we sweep, outside of rt->gcLock but with rt->isHeapBusy()
+     * true so that any attempt to allocate a GC-thing from a finalizer will
+     * fail, rather than nest badly and leave the unmarked newborn to be swept.
+     */
+    gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_SWEEP);
+
+#ifdef JS_THREADSAFE
+    rt->gcSweepOnBackgroundThread = rt->hasContexts() && rt->useHelperThreads();
+#endif
+
+    JS_ASSERT(!rt->gcCompartmentGroup);
+
+    DropStringWrappers(rt);
+    FindCompartmentGroups(rt);
+    GetNextCompartmentGroup(rt);
+    EndMarkingCompartmentGroup(rt);
+    BeginSweepingCompartmentGroup(rt);
+}
+
 bool
 ArenaLists::foregroundFinalize(FreeOp *fop, AllocKind thingKind, SliceBudget &sliceBudget)
 {
@@ -3930,50 +3873,35 @@ SweepPhase(JSRuntime *rt, SliceBudget &sliceBudget)
     gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_SWEEP);
     FreeOp fop(rt, rt->gcSweepOnBackgroundThread);
 
-    for (; rt->gcSweepPhase < FinalizePhaseCount ; ++rt->gcSweepPhase) {
-        gcstats::AutoPhase ap(rt->gcStats, FinalizePhaseStatsPhase[rt->gcSweepPhase]);
+    for (;;) {
+        for (; rt->gcSweepPhase < FinalizePhaseCount ; ++rt->gcSweepPhase) {
+            gcstats::AutoPhase ap(rt->gcStats, FinalizePhaseStatsPhase[rt->gcSweepPhase]);
 
-        ptrdiff_t len = rt->compartments.end() - rt->compartments.begin();
-        for (; rt->gcSweepCompartmentIndex < len ; ++rt->gcSweepCompartmentIndex) {
-            JSCompartment *c = rt->compartments.begin()[rt->gcSweepCompartmentIndex];
+            for (; rt->gcSweepCompartment;
+                 rt->gcSweepCompartment = NextGraphNode(rt->gcSweepCompartment))
+                {
+                    JSCompartment *c = rt->gcSweepCompartment;
 
-            if (c->wasGCStarted()) {
-                while (rt->gcSweepKindIndex < FinalizePhaseLength[rt->gcSweepPhase]) {
-                    AllocKind kind = FinalizePhases[rt->gcSweepPhase][rt->gcSweepKindIndex];
+                    while (rt->gcSweepKindIndex < FinalizePhaseLength[rt->gcSweepPhase]) {
+                        AllocKind kind = FinalizePhases[rt->gcSweepPhase][rt->gcSweepKindIndex];
 
-                    if (!c->arenas.foregroundFinalize(&fop, kind, sliceBudget))
-                        return false;
-                    ++rt->gcSweepKindIndex;
+                        if (!c->arenas.foregroundFinalize(&fop, kind, sliceBudget))
+                            return false;  /* Yield to the mutator. */
+
+                        ++rt->gcSweepKindIndex;
+                    }
+                    rt->gcSweepKindIndex = 0;
                 }
-            }
-            rt->gcSweepKindIndex = 0;
+            rt->gcSweepCompartment = rt->gcCompartmentGroup;
         }
-        rt->gcSweepCompartmentIndex = 0;
+
+        EndSweepingCompartmentGroup(rt);
+        GetNextCompartmentGroup(rt);
+        if (!rt->gcCompartmentGroup)
+            return true;  /* We're finished. */
+        EndMarkingCompartmentGroup(rt);
+        BeginSweepingCompartmentGroup(rt);
     }
-
-    return true;
-}
-
-static void
-SweepAtomsCompartment(JSRuntime *rt)
-{
-    JSCompartment *c = rt->atomsCompartment;
-
-    JS_ASSERT(rt->gcMarker.isDrained());
-
-    JS_ASSERT(c->isGCMarking());
-    c->setGCState(JSCompartment::Sweep);
-
-    c->arenas.purge();
-
-    {
-        gcstats::AutoPhase ap2(rt->gcStats, gcstats::PHASE_SWEEP_ATOMS);
-        SweepAtoms(rt);
-    }
-
-    FreeOp fop(rt, rt->gcSweepOnBackgroundThread);
-
-    c->arenas.queueStringsForSweep(&fop);
 }
 
 static void
@@ -3987,6 +3915,18 @@ EndSweepPhase(JSRuntime *rt, JSGCInvocationKind gckind, bool lastGC)
     JS_ASSERT(rt->gcMarker.isDrained());
     rt->gcMarker.stop();
 
+    /*
+     * If we found any black->gray edges during marking, we completely clear the
+     * mark bits of all uncollected compartments. This is safe, although it may
+     * prevent the cycle collector from collecting some dead objects.
+     */
+    if (rt->gcFoundBlackGrayEdges) {
+        for (CompartmentsIter c(rt); !c.done(); c.next()) {
+            if (!c->isCollecting())
+                c->arenas.unmarkAll();
+        }
+    }
+
 #ifdef DEBUG
     PropertyTree::dumpShapes(rt);
 #endif
@@ -4028,8 +3968,16 @@ EndSweepPhase(JSRuntime *rt, JSGCInvocationKind gckind, bool lastGC)
 
     {
         gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_FINALIZE_END);
+
+        bool isFull = true;
+        for (CompartmentsIter c(rt); !c.done(); c.next()) {
+            if (!c->isCollecting()) {
+                rt->gcIsFull = false;
+                break;
+            }
+        }
         if (rt->gcFinalizeCallback)
-            rt->gcFinalizeCallback(&fop, JSFINALIZE_COLLECTION_END, !rt->gcIsFull);
+            rt->gcFinalizeCallback(&fop, JSFINALIZE_COLLECTION_END, !isFull);
     }
 
     /*
@@ -4042,10 +3990,8 @@ EndSweepPhase(JSRuntime *rt, JSGCInvocationKind gckind, bool lastGC)
 
     /* Set up list of compartments for sweeping of background things. */
     JS_ASSERT(!rt->gcSweepingCompartments);
-    for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
-        c->gcNextCompartment = rt->gcSweepingCompartments;
-        rt->gcSweepingCompartments = c;
-    }
+    for (GCCompartmentsIter c(rt); !c.done(); c.next())
+        AddGraphNode(rt->gcSweepingCompartments, c.get());
 
     /* If not sweeping on background thread then we must do it here. */
     if (!rt->gcSweepOnBackgroundThread) {
@@ -4062,8 +4008,10 @@ EndSweepPhase(JSRuntime *rt, JSGCInvocationKind gckind, bool lastGC)
 
     for (CompartmentsIter c(rt); !c.done(); c.next()) {
         c->setGCLastBytes(c->gcBytes, c->gcMallocAndFreeBytes, gckind);
-        if (c->wasGCStarted())
+        if (c->isCollecting()) {
+            JS_ASSERT(!c->isGCMarking() && !c->isGCSweeping());
             c->setGCState(JSCompartment::NoGC);
+        }
 
         JS_ASSERT(!c->isCollecting());
         JS_ASSERT(!c->wasGCStarted());
@@ -4176,46 +4124,54 @@ IncrementalCollectSlice(JSRuntime *rt,
 static void
 ResetIncrementalGC(JSRuntime *rt, const char *reason)
 {
-    if (rt->gcIncrementalState == NO_INCREMENTAL)
+    switch (rt->gcIncrementalState) {
+      case NO_INCREMENTAL:
         return;
 
-    /* Cancel and ongoing marking. */
-    bool wasMarking = false;
-    {
+      case MARK: {
+        /* Cancel any ongoing marking. */
         AutoCopyFreeListToArenas copy(rt);
         for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
             if (c->isGCMarking()) {
                 c->setNeedsBarrier(false, JSCompartment::UpdateIon);
                 c->setGCState(JSCompartment::NoGC);
-                wasMarking = true;
             }
         }
-    }
 
-    if (wasMarking)
         rt->gcMarker.reset();
-
-    if (rt->gcIncrementalState >= SWEEP) {
-        /* If we had started sweeping then sweep to completion here. */
-        IncrementalCollectSlice(rt, SliceBudget::Unlimited, gcreason::RESET, GC_NORMAL);
-        gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_WAIT_BACKGROUND_THREAD);
-        rt->gcHelperThread.waitBackgroundSweepOrAllocEnd();
-    } else {
-        JS_ASSERT(rt->gcIncrementalState == MARK);
-        rt->gcIncrementalState = NO_INCREMENTAL;
-
         rt->gcMarker.stop();
 
+        rt->gcIncrementalState = NO_INCREMENTAL;
+
         JS_ASSERT(!rt->gcStrictCompartmentChecking);
 
-        rt->gcStats.reset(reason);
+        break;
+      }
+
+      case SWEEP:
+        for (CompartmentsIter c(rt); !c.done(); c.next())
+            c->scheduledForDestruction = false;
+
+        /* If we had started sweeping then sweep to completion here. */
+        IncrementalCollectSlice(rt, SliceBudget::Unlimited, gcreason::RESET, GC_NORMAL);
+
+        {
+            gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_WAIT_BACKGROUND_THREAD);
+            rt->gcHelperThread.waitBackgroundSweepOrAllocEnd();
+        }
+        break;
+
+      default:
+        JS_NOT_REACHED("Invalid incremental GC state");
     }
 
+    rt->gcStats.reset(reason);
+
 #ifdef DEBUG
     for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
         JS_ASSERT(c->isCollecting());
         JS_ASSERT(!c->needsBarrier());
-        JS_ASSERT(!c->gcNextCompartment);
+        JS_ASSERT(!NextGraphNode(c.get()));
         for (unsigned i = 0 ; i < FINALIZE_LIMIT ; ++i)
             JS_ASSERT(!c->arenas.arenaListsToSweep[i]);
     }
@@ -4316,6 +4272,7 @@ IncrementalCollectSlice(JSRuntime *rt,
     }
 #endif
 
+    JS_ASSERT_IF(rt->gcIncrementalState != NO_INCREMENTAL, rt->gcIsIncremental);
     rt->gcIsIncremental = budget != SliceBudget::Unlimited;
 
     if (zeal == ZealIncrementalRootsThenFinish || zeal == ZealIncrementalMarkAllThenFinish) {
@@ -4349,7 +4306,6 @@ IncrementalCollectSlice(JSRuntime *rt,
         /* fall through */
 
       case MARK: {
-
         /* If we needed delayed marking for gray roots, then collect until done. */
         if (!rt->gcMarker.hasBufferedGrayRoots())
             sliceBudget.reset();
@@ -4373,8 +4329,6 @@ IncrementalCollectSlice(JSRuntime *rt,
             break;
         }
 
-        EndMarkPhase(rt);
-
         rt->gcIncrementalState = SWEEP;
 
         /*
@@ -4396,25 +4350,13 @@ IncrementalCollectSlice(JSRuntime *rt,
       }
 
       case SWEEP: {
-        bool finished = SweepPhase(rt, sliceBudget);
+        bool finished = DrainMarkStack(rt, sliceBudget);
         if (!finished)
             break;
-        rt->gcIncrementalState = SWEEP_END;
 
-        if (rt->gcIsIncremental)
+        finished = SweepPhase(rt, sliceBudget);
+        if (!finished)
             break;
-      }
-
-      case SWEEP_END:
-        if (rt->atomsCompartment->isGCMarking()) {
-            bool finished = DrainMarkStack(rt, sliceBudget);
-            if (!finished)
-                break;
-
-            SweepAtomsCompartment(rt);
-            if (rt->gcIsIncremental)
-                break;
-        }
 
         EndSweepPhase(rt, gckind, reason == gcreason::LAST_CONTEXT);
 
@@ -4423,6 +4365,7 @@ IncrementalCollectSlice(JSRuntime *rt,
 
         rt->gcIncrementalState = NO_INCREMENTAL;
         break;
+      }
 
       default:
         JS_ASSERT(false);
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index ac698afbf57b..c78d1c293f08 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -48,7 +48,6 @@ enum State {
     MARK_ROOTS,
     MARK,
     SWEEP,
-    SWEEP_END,
     INVALID
 };
 
@@ -942,10 +941,9 @@ struct GCMarker : public JSTracer {
     }
 
     /*
-     * The only valid color transition during a GC is from black to gray. It is
-     * wrong to switch the mark color from gray to black. The reason is that the
-     * cycle collector depends on the invariant that there are no black to gray
-     * edges in the GC heap. This invariant lets the CC not trace through black
+     * Care must be taken changing the mark color from gray to black. The cycle
+     * collector depends on the invariant that there are no black to gray edges
+     * in the GC heap. This invariant lets the CC not trace through black
      * objects. If this invariant is violated, the cycle collector may free
      * objects that are still reachable.
      */
@@ -955,6 +953,12 @@ struct GCMarker : public JSTracer {
         color = gc::GRAY;
     }
 
+    void setMarkColorBlack() {
+        JS_ASSERT(isDrained());
+        JS_ASSERT(color == gc::GRAY);
+        color = gc::BLACK;
+    }
+
     inline void delayMarkingArena(gc::ArenaHeader *aheader);
     void delayMarkingChildren(const void *thing);
     void markDelayedChildren(gc::ArenaHeader *aheader);
diff --git a/js/src/jsgcinlines.h b/js/src/jsgcinlines.h
index 8c6e66ce691a..5a09b74cbccc 100644
--- a/js/src/jsgcinlines.h
+++ b/js/src/jsgcinlines.h
@@ -451,6 +451,32 @@ class GCCompartmentsIter {
     JSCompartment *operator->() const { return get(); }
 };
 
+class GCCompartmentGroupIter {
+  private:
+    JSCompartment *current;
+
+  public:
+    GCCompartmentGroupIter(JSRuntime *rt) {
+        JS_ASSERT(rt->isHeapBusy());
+        current = rt->gcCompartmentGroup;
+    }
+
+    bool done() const { return current == NULL; }
+
+    void next() {
+        JS_ASSERT(!done());
+        current = NextGraphNode(current);
+    }
+
+    JSCompartment *get() const {
+        JS_ASSERT(!done());
+        return current;
+    }
+
+    operator JSCompartment *() const { return get(); }
+    JSCompartment *operator->() const { return get(); }
+};
+
 /*
  * Allocates a new GC thing. After a successful allocation the caller must
  * fully initialize the thing before calling any function that can potentially
@@ -486,7 +512,7 @@ NewGCThing(JSContext *cx, js::gc::AllocKind kind, size_t thingSize)
     if (!t)
         t = js::gc::ArenaLists::refillFreeList(cx, kind);
 
-    JS_ASSERT_IF(t && comp->wasGCStarted() && comp->needsBarrier(),
+    JS_ASSERT_IF(t && comp->wasGCStarted() && (comp->isGCMarking() || comp->isGCSweeping()),
                  static_cast<T *>(t)->arenaHeader()->allocatedDuringIncremental);
 
 #if defined(JSGC_GENERATIONAL) && defined(JS_GC_ZEAL)
@@ -513,8 +539,9 @@ TryNewGCThing(JSContext *cx, js::gc::AllocKind kind, size_t thingSize)
         return NULL;
 #endif
 
-    void *t = cx->compartment->arenas.allocateFromFreeList(kind, thingSize);
-    JS_ASSERT_IF(t && cx->compartment->wasGCStarted() && cx->compartment->needsBarrier(),
+    JSCompartment *comp = cx->compartment;
+    void *t = comp->arenas.allocateFromFreeList(kind, thingSize);
+    JS_ASSERT_IF(t && comp->wasGCStarted() && (comp->isGCMarking() || comp->isGCSweeping()),
                  static_cast<T *>(t)->arenaHeader()->allocatedDuringIncremental);
 
 #if defined(JSGC_GENERATIONAL) && defined(JS_GC_ZEAL)
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index 0e37966abdf4..0e6c51e797f9 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -5257,9 +5257,9 @@ IsAboutToBeFinalized(TypeObjectKey *key)
 {
     /* Mask out the low bit indicating whether this is a type or JS object. */
     gc::Cell *tmp = reinterpret_cast<gc::Cell *>(uintptr_t(key) & ~1);
-    bool isMarked = IsCellMarked(&tmp);
+    bool isAboutToBeFinalized = IsCellAboutToBeFinalized(&tmp);
     JS_ASSERT(tmp == reinterpret_cast<gc::Cell *>(uintptr_t(key) & ~1));
-    return !isMarked;
+    return isAboutToBeFinalized;
 }
 
 void
@@ -5955,6 +5955,7 @@ void
 TypeSet::sweep(JSCompartment *compartment)
 {
     JS_ASSERT(!purged());
+    JS_ASSERT(compartment->isGCSweeping());
 
     /*
      * Purge references to type objects that are no longer live. Type sets hold
@@ -6033,14 +6034,15 @@ TypeObject::sweep(FreeOp *fop)
         return;
     }
 
+    JSCompartment *compartment = this->compartment();
+    JS_ASSERT(compartment->isGCSweeping());
+
     if (!isMarked()) {
         if (newScript)
             fop->free_(newScript);
         return;
     }
 
-    JSCompartment *compartment = this->compartment();
-
     /*
      * Properties were allocated from the old arena, and need to be copied over
      * to the new one. Don't hang onto properties without the OWN_PROPERTY
@@ -6117,6 +6119,7 @@ struct SweepTypeObjectOp
 void
 SweepTypeObjects(FreeOp *fop, JSCompartment *compartment)
 {
+    JS_ASSERT(compartment->isGCSweeping());
     SweepTypeObjectOp op(fop);
     gc::ForEachArenaAndCell(compartment, gc::FINALIZE_TYPE_OBJECT, gc::EmptyArenaOp, op);
 }
@@ -6125,6 +6128,7 @@ void
 TypeCompartment::sweep(FreeOp *fop)
 {
     JSCompartment *compartment = this->compartment();
+    JS_ASSERT(compartment->isGCSweeping());
 
     SweepTypeObjects(fop, compartment);
 
@@ -6141,13 +6145,23 @@ TypeCompartment::sweep(FreeOp *fop)
             JS_ASSERT(!key.type.isSingleObject());
 
             bool remove = false;
-            if (key.type.isTypeObject() && !key.type.typeObject()->isMarked())
-                remove = true;
-            if (!obj->isMarked())
+            TypeObject *typeObject = NULL;
+            if (key.type.isTypeObject()) {
+                typeObject = key.type.typeObject();
+                if (IsTypeObjectAboutToBeFinalized(&typeObject))
+                    remove = true;
+            }
+            if (IsTypeObjectAboutToBeFinalized(e.front().value.unsafeGet()))
                 remove = true;
 
-            if (remove)
+            if (remove) {
                 e.removeFront();
+            } else if (typeObject && typeObject != key.type.typeObject()) {
+                ArrayTableKey newKey;
+                newKey.type = Type::ObjectType(typeObject);
+                newKey.proto = key.proto;
+                e.rekeyFront(newKey);
+            }
         }
     }
 
@@ -6158,18 +6172,24 @@ TypeCompartment::sweep(FreeOp *fop)
             JS_ASSERT(uintptr_t(entry.object->proto.get()) == key.proto.toWord());
 
             bool remove = false;
-            if (!IsTypeObjectMarked(entry.object.unsafeGet()))
+            if (IsTypeObjectAboutToBeFinalized(entry.object.unsafeGet()))
                 remove = true;
             for (unsigned i = 0; !remove && i < key.nslots; i++) {
                 if (JSID_IS_STRING(key.ids[i])) {
                     JSString *str = JSID_TO_STRING(key.ids[i]);
-                    if (!IsStringMarked(&str))
+                    if (IsStringAboutToBeFinalized(&str))
                         remove = true;
                     JS_ASSERT(AtomToId((JSAtom *)str) == key.ids[i]);
                 }
                 JS_ASSERT(!entry.types[i].isSingleObject());
-                if (entry.types[i].isTypeObject() && !entry.types[i].typeObject()->isMarked())
-                    remove = true;
+                TypeObject *typeObject = NULL;
+                if (entry.types[i].isTypeObject()) {
+                    typeObject = entry.types[i].typeObject();
+                    if (IsTypeObjectAboutToBeFinalized(&typeObject))
+                        remove = true;
+                    else if (typeObject != entry.types[i].typeObject())
+                        entry.types[i] = Type::ObjectType(typeObject);
+                }
             }
 
             if (remove) {
@@ -6183,9 +6203,9 @@ TypeCompartment::sweep(FreeOp *fop)
     if (allocationSiteTable) {
         for (AllocationSiteTable::Enum e(*allocationSiteTable); !e.empty(); e.popFront()) {
             AllocationSiteKey key = e.front().key;
-            bool keyMarked = IsScriptMarked(&key.script);
-            bool valMarked = IsTypeObjectMarked(e.front().value.unsafeGet());
-            if (!keyMarked || !valMarked)
+            bool keyDying = IsScriptAboutToBeFinalized(&key.script);
+            bool valDying = IsTypeObjectAboutToBeFinalized(e.front().value.unsafeGet());
+            if (keyDying || valDying)
                 e.removeFront();
             else if (key.script != e.front().key.script)
                 e.rekeyFront(key);
@@ -6244,11 +6264,14 @@ TypeCompartment::sweepCompilerOutputs(FreeOp *fop, bool discardConstraints)
 void
 JSCompartment::sweepNewTypeObjectTable(TypeObjectSet &table)
 {
+    JS_ASSERT(isGCSweeping());
     if (table.initialized()) {
         for (TypeObjectSet::Enum e(table); !e.empty(); e.popFront()) {
             TypeObject *type = e.front();
-            if (!type->isMarked())
+            if (IsTypeObjectAboutToBeFinalized(&type))
                 e.removeFront();
+            else if (type != e.front())
+                e.rekeyFront(TaggedProto(type->proto), type);
         }
     }
 }
@@ -6272,6 +6295,7 @@ TypeCompartment::~TypeCompartment()
 TypeScript::Sweep(FreeOp *fop, RawScript script)
 {
     JSCompartment *compartment = script->compartment();
+    JS_ASSERT(compartment->isGCSweeping());
     JS_ASSERT(compartment->types.inferenceEnabled);
 
     unsigned num = NumTypeSets(script);
diff --git a/js/src/jspropertytree.cpp b/js/src/jspropertytree.cpp
index d0391a729fcd..73c50326e8f6 100644
--- a/js/src/jspropertytree.cpp
+++ b/js/src/jspropertytree.cpp
@@ -202,11 +202,28 @@ Shape::finalize(FreeOp *fop)
 {
     if (!inDictionary()) {
         /*
-         * Note that due to incremental sweeping, if !parent->isMarked() then
-         * the parent may point to a new shape allocated in the same cell that
-         * use to hold our parent.
+         * We detach the child from the parent if the parent is reachable.
+         *
+         * Note that due to incremental sweeping, the parent pointer may point
+         * to the original reachable parent, or it may point to a new live
+         * object allocated in the same cell that used to hold the parent.
+         *
+         * There are three cases:
+         *
+         * Case 1: parent is not marked - parent is unreachable, may have been
+         *         finalized, and the cell may subsequently have been
+         *         reallocated to a compartment that is not being marked (cells
+         *         are marked when allocated in a compartment that is currenly
+         *         being marked by the collector).
+         *
+         * Case 2: parent is marked and is in a different compartment - parent
+         *         has been freed and reallocated to compartment that was being
+         *         marked.
+         *
+         * Case 3: parent is marked and is in the same compartment - parent is
+         *         stil reachable and we need to detach from it.
          */
-        if (parent && parent->isMarked())
+        if (parent && parent->isMarked() && parent->compartment() == compartment())
             parent->removeChild(this);
 
         if (kids.isHash())
diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index 39ddba59e9bc..8333ec7c4fd2 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -549,17 +549,24 @@ void
 ArrayBufferObject::sweepAll(JSRuntime *rt)
 {
     JSObject *buffer = rt->liveArrayBuffers;
+    JS_ASSERT(buffer != UNSET_BUFFER_LINK);
+
+    JSObject *lastBufferViews = NULL;
+
     while (buffer) {
         JSObject **views = GetViewList(&buffer->asArrayBuffer());
         JS_ASSERT(*views);
-        JSObject *nextBuffer = BufferLink(*views);
 
-        // Rebuild the list of views of the ArrayBuffer, discarding dead views
+        JSObject *nextBuffer = BufferLink(*views);
+        JS_ASSERT(nextBuffer != UNSET_BUFFER_LINK);
+
+        // Rebuild the list of views of the ArrayBuffer, discarding dead views.
+        // If there is only one view, it will have already been marked.
         JSObject *prevLiveView = NULL;
         JSObject *view = *views;
         while (view) {
-            JSObject *nextView =
-                static_cast<JSObject*>(view->getFixedSlot(BufferView::NEXT_VIEW_SLOT).toPrivate());
+            JS_ASSERT(buffer->compartment() == view->compartment());
+            JSObject *nextView = NextView(view);
             if (!JS_IsAboutToBeFinalized(view)) {
                 view->setFixedSlot(BufferView::NEXT_VIEW_SLOT, PrivateValue(prevLiveView));
                 prevLiveView = view;
@@ -567,12 +574,43 @@ ArrayBufferObject::sweepAll(JSRuntime *rt)
             view = nextView;
         }
         *views = prevLiveView;
-        if (*views)
-            SetBufferLink(*views, UNSET_BUFFER_LINK);
+
+        // Add the buffer to the end of the list if it has any views left.
+        // Buffers without views are dropped from the list.
+        if (*views) {
+            if (lastBufferViews)
+                SetBufferLink(lastBufferViews, buffer);
+            else
+                rt->liveArrayBuffers = buffer;
+            lastBufferViews = *views;
+        }
 
         buffer = nextBuffer;
     }
 
+    // Terminate the buffer list.
+    if (lastBufferViews)
+        SetBufferLink(lastBufferViews, NULL);
+    else
+        rt->liveArrayBuffers = NULL;
+}
+
+void
+ArrayBufferObject::resetArrayBufferList(JSRuntime *rt)
+{
+    JSObject *buffer = rt->liveArrayBuffers;
+    JS_ASSERT(buffer != UNSET_BUFFER_LINK);
+
+    while (buffer) {
+        JSObject *view = *GetViewList(&buffer->asArrayBuffer());
+        JS_ASSERT(view);
+
+        JSObject *nextBuffer = BufferLink(view);
+        JS_ASSERT(nextBuffer != UNSET_BUFFER_LINK);
+
+        SetBufferLink(view, UNSET_BUFFER_LINK);
+        buffer = nextBuffer;
+    }
     rt->liveArrayBuffers = NULL;
 }
 
diff --git a/js/src/jstypedarray.h b/js/src/jstypedarray.h
index 081776f54e14..7c70837e27b3 100644
--- a/js/src/jstypedarray.h
+++ b/js/src/jstypedarray.h
@@ -132,6 +132,8 @@ class ArrayBufferObject : public JSObject
 
     static void sweepAll(JSRuntime *rt);
 
+    static void resetArrayBufferList(JSRuntime *rt);
+
     static bool stealContents(JSContext *cx, JSObject *obj, void **contents,
                               uint8_t **data);
 
diff --git a/js/src/jswatchpoint.cpp b/js/src/jswatchpoint.cpp
index 2ed581f0ad15..d927aa96cc63 100644
--- a/js/src/jswatchpoint.cpp
+++ b/js/src/jswatchpoint.cpp
@@ -148,7 +148,7 @@ WatchpointMap::markAllIteratively(JSTracer *trc)
     JSRuntime *rt = trc->runtime;
     bool mutated = false;
     for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
-        if (c->watchpointMap)
+        if (c->isGCMarking() && c->watchpointMap)
             mutated |= c->watchpointMap->markIteratively(trc);
     }
     return mutated;
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index a5ce9496b37a..bf9cd7d6b304 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1443,12 +1443,12 @@ Debugger::markAllIteratively(GCMarker *trc)
 
                 /*
                  * dbg is a Debugger with at least one debuggee. Check three things:
-                 *   - dbg is actually in a compartment being GC'd
+                 *   - dbg is actually in a compartment that is being marked
                  *   - it isn't already marked
                  *   - it actually has hooks that might be called
                  */
                 HeapPtrObject &dbgobj = dbg->toJSObjectRef();
-                if (!dbgobj->compartment()->isCollecting())
+                if (!dbgobj->compartment()->isGCMarking())
                     continue;
 
                 bool dbgMarked = IsObjectMarked(&dbgobj);

From 51eedf0d1fcc6e5340ee2a811976094dcfda5c1e Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Fri, 12 Oct 2012 15:26:07 +0100
Subject: [PATCH 012/160] Bug 790338 - Fix issues with gray marking r=billm

--HG--
extra : rebase_source : 3bf292670ecc2f314404d02d25c2357dadd682e4
---
 js/src/gc/Marking.cpp     |  82 ++++++++-----
 js/src/gc/Marking.h       |   8 +-
 js/src/jscompartment.cpp  |   1 +
 js/src/jscompartment.h    |  25 +++-
 js/src/jsgc.cpp           | 238 ++++++++++++++++++++++++++++++++------
 js/src/jsgc.h             |   3 +
 js/src/jsproxy.cpp        |  20 +++-
 js/src/jsweakmap.h        |   1 +
 js/src/jswrapper.cpp      |   2 +-
 js/src/vm/Debugger.cpp    |  20 +++-
 js/src/vm/Debugger.h      |   1 +
 js/src/vm/ScopeObject.cpp |   1 +
 12 files changed, 330 insertions(+), 72 deletions(-)

diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp
index 1b9a559c09d1..3a05d5619fa8 100644
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -117,6 +117,17 @@ CheckMarkedThing(JSTracer *trc, T *thing)
     JS_ASSERT_IF(rt->gcStrictCompartmentChecking,
                  thing->compartment()->isCollecting() ||
                  thing->compartment() == rt->atomsCompartment);
+
+    JS_ASSERT_IF(IS_GC_MARKING_TRACER(trc) && ((GCMarker *)trc)->getMarkColor() == GRAY,
+                 thing->compartment()->isGCMarkingGray() ||
+                 thing->compartment() == rt->atomsCompartment);
+}
+
+static GCMarker *
+AsGCMarker(JSTracer *trc)
+{
+    JS_ASSERT(IS_GC_MARKING_TRACER(trc));
+    return static_cast<GCMarker *>(trc);
 }
 
 template<typename T>
@@ -134,7 +145,7 @@ MarkInternal(JSTracer *trc, T **thingp)
      */
     if (!trc->callback) {
         if (thing->compartment()->isGCMarking()) {
-            PushMarkStack(static_cast<GCMarker *>(trc), thing);
+            PushMarkStack(AsGCMarker(trc), thing);
             thing->compartment()->maybeAlive = true;
         }
     } else {
@@ -217,7 +228,7 @@ IsMarked(T **thingp)
     JS_ASSERT(thingp);
     JS_ASSERT(*thingp);
     JSCompartment *c = (*thingp)->compartment();
-    if (!c->isGCMarking() && !c->isGCSweeping())
+    if (!c->isCollecting() || c->isGCFinished())
         return true;
     return (*thingp)->isMarked();
 }
@@ -565,36 +576,55 @@ gc::MarkObjectSlots(JSTracer *trc, JSObject *obj, uint32_t start, uint32_t nslot
     }
 }
 
-void
-gc::MarkCrossCompartmentObjectUnbarriered(JSTracer *trc, JSObject **obj, const char *name)
+static bool
+ShouldMarkCrossCompartment(JSTracer *trc, RawObject src, Cell *cell)
 {
-    if (IS_GC_MARKING_TRACER(trc) && !(*obj)->compartment()->isGCMarking())
-        return;
+    if (!IS_GC_MARKING_TRACER(trc))
+        return true;
 
-    MarkObjectUnbarriered(trc, obj, name);
-}
+    JSCompartment *c = cell->compartment();
+    uint32_t color = AsGCMarker(trc)->getMarkColor();
 
-void
-gc::MarkCrossCompartmentScriptUnbarriered(JSTracer *trc, JSScript **script, const char *name)
-{
-    if (IS_GC_MARKING_TRACER(trc) && !(*script)->compartment()->isGCMarking())
-        return;
-
-    MarkScriptUnbarriered(trc, script, name);
-}
-
-void
-gc::MarkCrossCompartmentSlot(JSTracer *trc, HeapSlot *s, const char *name)
-{
-    if (s->isMarkable()) {
-        Cell *cell = (Cell *)s->toGCThing();
-        if (IS_GC_MARKING_TRACER(trc) && !cell->compartment()->isGCMarking())
-            return;
-
-        MarkSlot(trc, s, name);
+    JS_ASSERT(color == BLACK || color == GRAY);
+    if (color == BLACK) {
+        return c->isGCMarking();
+    } else {
+        if (c->isGCMarkingBlack()) {
+            /*
+             * The destination compartment is being not being marked gray now,
+             * but it will be later, so record the cell so it can be marked gray
+             * at the appropriate time.
+             */
+            if (!cell->isMarked())
+                DelayCrossCompartmentGrayMarking(src, cell);
+            return false;
+        }
+        return c->isGCMarkingGray();
     }
 }
 
+void
+gc::MarkCrossCompartmentObjectUnbarriered(JSTracer *trc, RawObject src, JSObject **dst, const char *name)
+{
+    if (ShouldMarkCrossCompartment(trc, src, *dst))
+        MarkObjectUnbarriered(trc, dst, name);
+}
+
+void
+gc::MarkCrossCompartmentScriptUnbarriered(JSTracer *trc, RawObject src, JSScript **dst,
+                                      const char *name)
+{
+    if (ShouldMarkCrossCompartment(trc, src, *dst))
+        MarkScriptUnbarriered(trc, dst, name);
+}
+
+void
+gc::MarkCrossCompartmentSlot(JSTracer *trc, RawObject src, HeapSlot *dst, const char *name)
+{
+    if (dst->isMarkable() && ShouldMarkCrossCompartment(trc, src, (Cell *)dst->toGCThing()))
+        MarkSlot(trc, dst, name);
+}
+
 /*** Special Marking ***/
 
 void
diff --git a/js/src/gc/Marking.h b/js/src/gc/Marking.h
index 1a01f77580f5..544cef77d528 100644
--- a/js/src/gc/Marking.h
+++ b/js/src/gc/Marking.h
@@ -195,17 +195,19 @@ void
 MarkObjectSlots(JSTracer *trc, JSObject *obj, uint32_t start, uint32_t nslots);
 
 void
-MarkCrossCompartmentObjectUnbarriered(JSTracer *trc, JSObject **obj, const char *name);
+MarkCrossCompartmentObjectUnbarriered(JSTracer *trc, RawObject src, JSObject **dst_obj,
+                                      const char *name);
 
 void
-MarkCrossCompartmentScriptUnbarriered(JSTracer *trc, JSScript **script, const char *name);
+MarkCrossCompartmentScriptUnbarriered(JSTracer *trc, RawObject src, JSScript **dst_script,
+                                      const char *name);
 
 /*
  * Mark a value that may be in a different compartment from the compartment
  * being GC'd. (Although it won't be marked if it's in the wrong compartment.)
  */
 void
-MarkCrossCompartmentSlot(JSTracer *trc, HeapSlot *s, const char *name);
+MarkCrossCompartmentSlot(JSTracer *trc, RawObject src, HeapSlot *dst_slot, const char *name);
 
 
 /*** Special Cases ***/
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 55f054facc54..d66eadd6557f 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -72,6 +72,7 @@ JSCompartment::JSCompartment(JSRuntime *rt)
     propertyTree(thisForCtor()),
     gcMallocAndFreeBytes(0),
     gcTriggerMallocAndFreeBytes(0),
+    gcIncomingGrayPointers(NULL),
     gcMallocBytes(0),
     debugModeBits(rt->debugMode ? DebugFromC : 0),
     watchpointMap(NULL),
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index 559483e81d88..59fdb20b7d83 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -193,6 +193,7 @@ struct JSCompartment : public js::gc::GraphNodeBase
     enum CompartmentGCState {
         NoGC,
         Mark,
+        MarkGray,
         Sweep,
         Finished
     };
@@ -250,15 +251,28 @@ struct JSCompartment : public js::gc::GraphNodeBase
 
     bool isGCMarking() {
         if (rt->isHeapCollecting())
-            return gcState == Mark;
+            return gcState == Mark || gcState == MarkGray;
         else
             return needsBarrier();
     }
 
+    bool isGCMarkingBlack() {
+        return gcState == Mark;
+    }
+
+    bool isGCMarkingGray() {
+        return gcState == MarkGray;
+    }
+
     bool isGCSweeping() {
         return gcState == Sweep;
     }
 
+    bool isGCFinished() {
+        return gcState == Finished;
+    }
+
+
     size_t                       gcBytes;
     size_t                       gcTriggerBytes;
     size_t                       gcMaxMallocBytes;
@@ -340,6 +354,15 @@ struct JSCompartment : public js::gc::GraphNodeBase
     /* During GC, stores the index of this compartment in rt->compartments. */
     unsigned                     gcIndex;
 
+    /*
+     * During GC, stores the head of a list of incoming pointers from gray cells.
+     *
+     * The objects in the list are either cross-compartment wrappers, or
+     * debugger wrapper objects.  The list link is either in the second extra
+     * slot for the former, or a special slot for the latter.
+     */
+    js::RawObject                gcIncomingGrayPointers;
+
   private:
     /*
      * Malloc counter to measure memory pressure for GC scheduling. It runs from
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index e0b9cd4cb114..637cd53992c4 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -1944,12 +1944,11 @@ GCMarker::stop()
     JS_ASSERT(!unmarkedArenaStackTop);
     JS_ASSERT(markLaterArenas == 0);
 
-    JS_ASSERT(grayRoots.empty());
+    grayRoots.clearAndFree();
     grayFailed = false;
 
     /* Free non-ballast stack memory. */
     stack.reset();
-    grayRoots.clearAndFree();
 }
 
 void
@@ -2102,19 +2101,30 @@ GCMarker::markBufferedGrayRoots()
 {
     JS_ASSERT(!grayFailed);
 
-    for (GrayRoot *elem = grayRoots.begin(); elem != grayRoots.end(); elem++) {
+    unsigned markCount = 0;
+
+    GrayRoot *elem = grayRoots.begin();
+    GrayRoot *write = elem;
+    for (; elem != grayRoots.end(); elem++) {
 #ifdef DEBUG
         debugPrinter = elem->debugPrinter;
         debugPrintArg = elem->debugPrintArg;
         debugPrintIndex = elem->debugPrintIndex;
 #endif
-        JS_SET_TRACING_LOCATION(this, (void *)&elem->thing);
         void *tmp = elem->thing;
-        MarkKind(this, &tmp, elem->kind);
-        JS_ASSERT(tmp == elem->thing);
+        if (static_cast<Cell *>(tmp)->compartment()->isGCMarkingGray()) {
+            JS_SET_TRACING_LOCATION(this, (void *)&elem->thing);
+            MarkKind(this, &tmp, elem->kind);
+            JS_ASSERT(tmp == elem->thing);
+            ++markCount;
+        } else {
+            if (write != elem)
+                *write = *elem;
+            ++write;
+        }
     }
-
-    grayRoots.clearAndFree();
+    JS_ASSERT(markCount == elem - write);
+    grayRoots.shrinkBy(elem - write);
 }
 
 void
@@ -3335,8 +3345,11 @@ BeginMarkPhase(JSRuntime *rt)
      * atoms. Otherwise, the non-collected compartments could contain pointers
      * to atoms that we would miss.
      */
-    if (rt->atomsCompartment->isGCScheduled() && rt->gcIsFull && !rt->gcKeepAtoms)
-        rt->atomsCompartment->setGCState(JSCompartment::Mark);
+    JSCompartment *atomsComp = rt->atomsCompartment;
+    if (atomsComp->isGCScheduled() && rt->gcIsFull && !rt->gcKeepAtoms) {
+        JS_ASSERT(!atomsComp->isCollecting());
+        atomsComp->setGCState(JSCompartment::Mark);
+    }
 
     /*
      * At the end of each incremental slice, we call prepareForIncrementalGC,
@@ -3452,9 +3465,13 @@ BeginMarkPhase(JSRuntime *rt)
 }
 
 void
-MarkWeakReferences(GCMarker *gcmarker)
+MarkWeakReferences(JSRuntime *rt, gcstats::Phase phase = gcstats::PHASE_MARK_WEAK)
 {
+    GCMarker *gcmarker = &rt->gcMarker;
     JS_ASSERT(gcmarker->isDrained());
+
+    gcstats::AutoPhase ap(rt->gcStats, phase);
+
     while (WatchpointMap::markAllIteratively(gcmarker) ||
            WeakMapBase::markAllIteratively(gcmarker) ||
            Debugger::markAllIteratively(gcmarker))
@@ -3466,16 +3483,10 @@ MarkWeakReferences(GCMarker *gcmarker)
 }
 
 static void
-MarkGrayAndWeak(JSRuntime *rt)
+MarkGrayReferences(JSRuntime *rt)
 {
     GCMarker *gcmarker = &rt->gcMarker;
 
-    {
-        gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_MARK_WEAK);
-        JS_ASSERT(gcmarker->isDrained());
-        MarkWeakReferences(gcmarker);
-    }
-
     {
         gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_MARK_GRAY);
         gcmarker->setMarkColorGray();
@@ -3489,10 +3500,7 @@ MarkGrayAndWeak(JSRuntime *rt)
         gcmarker->drainMarkStack(budget);
     }
 
-    {
-        gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_MARK_GRAY_WEAK);
-        MarkWeakReferences(gcmarker);
-    }
+    MarkWeakReferences(rt, gcstats::PHASE_MARK_GRAY_WEAK);
 
     JS_ASSERT(gcmarker->isDrained());
 
@@ -3555,7 +3563,8 @@ ValidateIncrementalMarking(JSRuntime *rt)
     SliceBudget budget;
     rt->gcIncrementalState = MARK;
     rt->gcMarker.drainMarkStack(budget);
-    MarkGrayAndWeak(rt);
+    MarkWeakReferences(rt);
+    MarkGrayReferences(rt);
 
     /* Now verify that we have the same mark bits as before. */
     for (GCChunkSet::Range r(rt->gcChunkSet.all()); !r.empty(); r.popFront()) {
@@ -3583,7 +3592,20 @@ ValidateIncrementalMarking(JSRuntime *rt)
             uintptr_t end = arena->thingsEnd();
             while (thing < end) {
                 Cell *cell = (Cell *)thing;
+
+                /*
+                 * If a non-incremental GC wouldn't have collected a cell, then
+                 * an incremental GC won't collect it.
+                 */
                 JS_ASSERT_IF(bitmap->isMarked(cell, BLACK), incBitmap.isMarked(cell, BLACK));
+
+                /*
+                 * If the cycle collector isn't allowed to collect an object
+                 * after a non-incremental GC has run, then it isn't allowed to
+                 * collected it after an incremental GC.
+                 */
+                JS_ASSERT_IF(!bitmap->isMarked(cell, GRAY), !incBitmap.isMarked(cell, GRAY));
+
                 thing += Arena::thingSize(kind);
             }
         }
@@ -3688,12 +3710,156 @@ GetNextCompartmentGroup(JSRuntime *rt)
     ++rt->gcCompartmentGroupIndex;
 }
 
+/*
+ * Gray marking:
+ *
+ * At the end of collection, anything reachable from a gray root that has not
+ * otherwise been marked black must be marked gray.
+ *
+ * This means that when marking things gray we must not allow marking to leave
+ * the current compartment group, as that could result in things being marked
+ * grey when they might subsequently be marked black.  To acheive this, when we
+ * find a cross compartment pointer we don't mark the referent but add it to a
+ * singly-linked list of incoming gray pointers that is stored with each
+ * compartment.
+ *
+ * The list head is stored in JSCompartment::gcIncomingGrayPointers and can
+ * contain both cross compartment wrapper objects and debugger env, object or
+ * script wrappers. The next pointer is stored in a slot on the on the object,
+ * either the second extra slot for cross compartment wrappers, or a dedicated
+ * slot for debugger objects.
+ *
+ * The list is created during gray marking when one of the
+ * MarkCrossCompartmentXXX functions is called for a pointer that leaves the
+ * current compartent group.  This calls DelayCrossCompartmentGrayMarking to
+ * push the referring object onto the list.
+ *
+ * The list is traversed and then unlinked in
+ * MarkIncomingCrossCompartmentPointers.
+ */
+
+static unsigned
+GrayLinkSlot(RawObject o)
+{
+    return IsCrossCompartmentWrapper(o) ? JSSLOT_PROXY_EXTRA + 1 : Debugger::gcGrayLinkSlot();
+}
+
+static Cell *
+CrossCompartmentPointerReferent(RawObject o)
+{
+    return (Cell*)(IsCrossCompartmentWrapper(o) ? GetProxyPrivate(o).toGCThing() : o->getPrivate());
+}
+
+static RawObject
+NextIncomingCrossCompartmentPointer(RawObject prev, bool unlink)
+{
+    unsigned slot = GrayLinkSlot(prev);
+    RawObject next = prev->getReservedSlot(slot).toObjectOrNull();
+
+    if (unlink)
+        prev->setSlot(slot, UndefinedValue());
+
+    return next;
+}
+
+void
+js::DelayCrossCompartmentGrayMarking(RawObject src, Cell *cell)
+{
+    /* Called from MarkCrossCompartmentXXX functions. */
+    unsigned slot = GrayLinkSlot(src);
+    JSCompartment *c = cell->compartment();
+
+    if (src->getReservedSlot(slot).isUndefined()) {
+        src->setCrossCompartmentSlot(slot, ObjectOrNullValue(c->gcIncomingGrayPointers));
+        c->gcIncomingGrayPointers = src;
+    } else {
+#ifdef DEBUG
+        /* Assert that if the slot is in use, the object is in our list. */
+        JS_ASSERT(src->getReservedSlot(slot).isObjectOrNull());
+        RawObject o = c->gcIncomingGrayPointers;
+        while (o && o != src)
+            o = NextIncomingCrossCompartmentPointer(o, false);
+        JS_ASSERT(o);
+#endif
+    }
+}
+
+static void
+MarkIncomingCrossCompartmentPointers(JSRuntime *rt, const uint32_t color)
+{
+    JS_ASSERT(color == BLACK || color == GRAY);
+
+    bool unlinkList = color == GRAY;
+
+    for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+        JS_ASSERT_IF(color == GRAY, c->isGCMarkingGray());
+        JS_ASSERT_IF(color == BLACK, c->isGCMarkingBlack());
+
+        for (RawObject src = c->gcIncomingGrayPointers;
+             src;
+             src = NextIncomingCrossCompartmentPointer(src, unlinkList)) {
+
+            Cell *dst = CrossCompartmentPointerReferent(src);
+            JS_ASSERT(dst->compartment() == c);
+
+            if (color == GRAY) {
+                if (IsObjectMarked(&src) && src->isMarked(GRAY))
+                    MarkGCThingUnbarriered(&rt->gcMarker, (void**)&dst,
+                                           "cross-compartment gray pointer");
+            } else {
+                if (IsObjectMarked(&src) && !src->isMarked(GRAY))
+                    MarkGCThingUnbarriered(&rt->gcMarker, (void**)&dst,
+                                           "cross-compartment black pointer");
+            }
+        }
+
+        if (unlinkList)
+            c->gcIncomingGrayPointers = NULL;
+    }
+
+    SliceBudget budget;
+    rt->gcMarker.drainMarkStack(budget);
+}
+
 static void
 EndMarkingCompartmentGroup(JSRuntime *rt)
 {
     {
         gcstats::AutoPhase ap1(rt->gcStats, gcstats::PHASE_MARK);
-        MarkGrayAndWeak(rt);
+
+        /*
+         * Mark any incoming black pointers from previously swept compartments
+         * whose referents are not marked. This can occur when gray cells become
+         * black by the action of UnmarkGray.
+         */
+        MarkIncomingCrossCompartmentPointers(rt, BLACK);
+
+        MarkWeakReferences(rt);
+
+        /*
+         * Change state of current group to MarkGray to restrict marking to this
+         * group.  Note that there may be pointers to the atoms compartment, and
+         * these will be marked through, as they are not marked with
+         * MarkCrossCompartmentXXX.
+         */
+        for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+            JS_ASSERT(c->isGCMarkingBlack());
+            c->setGCState(JSCompartment::MarkGray);
+        }
+
+        /* Mark incoming gray pointers from previously swept compartments. */
+        rt->gcMarker.setMarkColorGray();
+        MarkIncomingCrossCompartmentPointers(rt, GRAY);
+        rt->gcMarker.setMarkColorBlack();
+
+        /* Mark gray roots and mark transitively inside the current compartment group. */
+        MarkGrayReferences(rt);
+
+        /* Restore marking state. */
+        for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+            JS_ASSERT(c->isGCMarkingGray());
+            c->setGCState(JSCompartment::Mark);
+        }
     }
 
 #ifdef DEBUG
@@ -3716,7 +3882,7 @@ EndMarkingCompartmentGroup(JSRuntime *rt)
             Cell *src = ToMarkable(e.front().value);
             JS_ASSERT(src->compartment() == c);
             if (IsCellMarked(&src) && !src->isMarked(GRAY) && dst->isMarked(GRAY)) {
-                //JS_ASSERT(!dst->compartment()->isCollecting());
+                JS_ASSERT(!dst->compartment()->isCollecting());
                 rt->gcFoundBlackGrayEdges = true;
             }
         }
@@ -3830,6 +3996,12 @@ EndSweepingCompartmentGroup(JSRuntime *rt)
         JS_ASSERT(c->isGCSweeping());
         c->setGCState(JSCompartment::Finished);
     }
+
+    /* Reset the list of arenas marked as being allocated during sweep phase. */
+    while (ArenaHeader *arena = rt->gcArenasAllocatedDuringSweep) {
+        rt->gcArenasAllocatedDuringSweep = arena->getNextAllocDuringSweep();
+        arena->unsetAllocDuringSweep();
+    }
 }
 
 static void
@@ -3848,7 +4020,11 @@ BeginSweepPhase(JSRuntime *rt)
     rt->gcSweepOnBackgroundThread = rt->hasContexts() && rt->useHelperThreads();
 #endif
 
+#ifdef DEBUG
     JS_ASSERT(!rt->gcCompartmentGroup);
+    for (GCCompartmentsIter c(rt); !c.done(); c.next())
+        JS_ASSERT(!c->gcIncomingGrayPointers);
+#endif
 
     DropStringWrappers(rt);
     FindCompartmentGroups(rt);
@@ -3980,14 +4156,6 @@ EndSweepPhase(JSRuntime *rt, JSGCInvocationKind gckind, bool lastGC)
             rt->gcFinalizeCallback(&fop, JSFINALIZE_COLLECTION_END, !isFull);
     }
 
-    /*
-     * Reset the list of arenas marked as being allocated during sweep phase.
-     */
-    while (ArenaHeader *arena = rt->gcArenasAllocatedDuringSweep) {
-        rt->gcArenasAllocatedDuringSweep = arena->getNextAllocDuringSweep();
-        arena->unsetAllocDuringSweep();
-    }
-
     /* Set up list of compartments for sweeping of background things. */
     JS_ASSERT(!rt->gcSweepingCompartments);
     for (GCCompartmentsIter c(rt); !c.done(); c.next())
@@ -4009,12 +4177,14 @@ EndSweepPhase(JSRuntime *rt, JSGCInvocationKind gckind, bool lastGC)
     for (CompartmentsIter c(rt); !c.done(); c.next()) {
         c->setGCLastBytes(c->gcBytes, c->gcMallocAndFreeBytes, gckind);
         if (c->isCollecting()) {
-            JS_ASSERT(!c->isGCMarking() && !c->isGCSweeping());
+            JS_ASSERT(c->isGCFinished());
             c->setGCState(JSCompartment::NoGC);
         }
 
         JS_ASSERT(!c->isCollecting());
         JS_ASSERT(!c->wasGCStarted());
+        JS_ASSERT(!c->gcIncomingGrayPointers);
+
         for (unsigned i = 0 ; i < FINALIZE_LIMIT ; ++i) {
             JS_ASSERT_IF(!IsBackgroundFinalized(AllocKind(i)) ||
                          !rt->gcSweepOnBackgroundThread,
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index c78d1c293f08..18f6479100a5 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -544,6 +544,9 @@ GCDebugSlice(JSRuntime *rt, bool limit, int64_t objCount);
 extern void
 PrepareForDebugGC(JSRuntime *rt);
 
+extern void
+DelayCrossCompartmentGrayMarking(RawObject src, gc::Cell *cell);
+
 void
 InitTracer(JSTracer *trc, JSRuntime *rt, JSTraceCallback callback);
 
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index 3fdc57ca6a7b..cbad716c8544 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -2842,9 +2842,15 @@ proxy_TraceObject(JSTracer *trc, RawObject obj)
 
     // NB: If you add new slots here, make sure to change
     // js::NukeChromeCrossCompartmentWrappers to cope.
-    MarkCrossCompartmentSlot(trc, &obj->getReservedSlotRef(JSSLOT_PROXY_PRIVATE), "private");
+    MarkCrossCompartmentSlot(trc, obj, &obj->getReservedSlotRef(JSSLOT_PROXY_PRIVATE), "private");
     MarkSlot(trc, &obj->getReservedSlotRef(JSSLOT_PROXY_EXTRA + 0), "extra0");
-    MarkSlot(trc, &obj->getReservedSlotRef(JSSLOT_PROXY_EXTRA + 1), "extra1");
+
+    /*
+     * The GC can use the second reserved slot to link the cross compartment
+     * wrappers into a linked list, in which case we don't want to trace it.
+     */
+    if (!IsCrossCompartmentWrapper(obj))
+        MarkSlot(trc, &obj->getReservedSlotRef(JSSLOT_PROXY_EXTRA + 1), "extra1");
 }
 
 static void
@@ -2852,7 +2858,7 @@ proxy_TraceFunction(JSTracer *trc, RawObject obj)
 {
     // NB: If you add new slots here, make sure to change
     // js::NukeChromeCrossCompartmentWrappers to cope.
-    MarkCrossCompartmentSlot(trc, &GetCall(obj), "call");
+    MarkCrossCompartmentSlot(trc, obj, &GetCall(obj), "call");
     MarkSlot(trc, &GetFunctionProxyConstruct(obj), "construct");
     proxy_TraceObject(trc, obj);
 }
@@ -3155,7 +3161,13 @@ js::RenewProxyObject(JSContext *cx, JSObject *obj,
     obj->setSlot(JSSLOT_PROXY_HANDLER, PrivateValue(handler));
     obj->setCrossCompartmentSlot(JSSLOT_PROXY_PRIVATE, priv);
     obj->setSlot(JSSLOT_PROXY_EXTRA + 0, UndefinedValue());
-    obj->setSlot(JSSLOT_PROXY_EXTRA + 1, UndefinedValue());
+
+    /*
+     * The GC can use the second reserved slot to link the cross compartment
+     * wrappers into a linked list, in which case we don't want to reset it.
+     */
+    if (!IsCrossCompartmentWrapper(obj))
+        obj->setSlot(JSSLOT_PROXY_EXTRA + 1, UndefinedValue());
 
     return obj;
 }
diff --git a/js/src/jsweakmap.h b/js/src/jsweakmap.h
index 4273ebc562da..36bf60125344 100644
--- a/js/src/jsweakmap.h
+++ b/js/src/jsweakmap.h
@@ -130,6 +130,7 @@ class WeakMap : public HashMap<Key, Value, HashPolicy, RuntimeAllocPolicy>, publ
         if (gc::IsMarked(x))
             return false;
         gc::Mark(trc, x, "WeakMap entry");
+        JS_ASSERT(gc::IsMarked(x));
         return true;
     }
 
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 14bc2d3b33f8..dc77fd2a93a7 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -1017,7 +1017,7 @@ js::NukeCrossCompartmentWrapper(JSContext *cx, JSObject *wrapper)
  * option of how to handle the global object.
  */
 JS_FRIEND_API(JSBool)
-js::NukeCrossCompartmentWrappers(JSContext* cx, 
+js::NukeCrossCompartmentWrappers(JSContext* cx,
                                  const CompartmentFilter& sourceFilter,
                                  const CompartmentFilter& targetFilter,
                                  js::NukeReferencesToWindow nukeReferencesToWindow)
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index bf9cd7d6b304..549e1c500926 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -55,6 +55,7 @@ extern Class DebuggerEnv_class;
 
 enum {
     JSSLOT_DEBUGENV_OWNER,
+    JSSLOT_DEBUGENV_GC_GRAY_LINK,
     JSSLOT_DEBUGENV_COUNT
 };
 
@@ -62,6 +63,7 @@ extern Class DebuggerObject_class;
 
 enum {
     JSSLOT_DEBUGOBJECT_OWNER,
+    JSSLOT_DEBUGOBJECT_GC_GRAY_LINK,
     JSSLOT_DEBUGOBJECT_COUNT
 };
 
@@ -69,6 +71,7 @@ extern Class DebuggerScript_class;
 
 enum {
     JSSLOT_DEBUGSCRIPT_OWNER,
+    JSSLOT_DEBUGSCRIPT_GC_GRAY_LINK,
     JSSLOT_DEBUGSCRIPT_COUNT
 };
 
@@ -1333,6 +1336,17 @@ Debugger::slowPathOnNewGlobalObject(JSContext *cx, Handle<GlobalObject *> global
 
 /*** Debugger JSObjects **************************************************************************/
 
+JS_STATIC_ASSERT(unsigned(JSSLOT_DEBUGENV_GC_GRAY_LINK) ==
+                 unsigned(JSSLOT_DEBUGOBJECT_GC_GRAY_LINK));
+JS_STATIC_ASSERT(unsigned(JSSLOT_DEBUGENV_GC_GRAY_LINK) ==
+                 unsigned(JSSLOT_DEBUGSCRIPT_GC_GRAY_LINK));
+
+unsigned
+Debugger::gcGrayLinkSlot()
+{
+    return JSSLOT_DEBUGOBJECT_GC_GRAY_LINK;
+}
+
 void
 Debugger::markKeysInCompartment(JSTracer *tracer)
 {
@@ -2542,7 +2556,7 @@ DebuggerScript_trace(JSTracer *trc, RawObject obj)
 {
     /* This comes from a private pointer, so no barrier needed. */
     if (JSScript *script = GetScriptReferent(obj)) {
-        MarkCrossCompartmentScriptUnbarriered(trc, &script, "Debugger.Script referent");
+        MarkCrossCompartmentScriptUnbarriered(trc, obj, &script, "Debugger.Script referent");
         obj->setPrivateUnbarriered(script);
     }
 }
@@ -3752,7 +3766,7 @@ DebuggerObject_trace(JSTracer *trc, RawObject obj)
      * is okay.
      */
     if (JSObject *referent = (JSObject *) obj->getPrivate()) {
-        MarkCrossCompartmentObjectUnbarriered(trc, &referent, "Debugger.Object referent");
+        MarkCrossCompartmentObjectUnbarriered(trc, obj, &referent, "Debugger.Object referent");
         obj->setPrivateUnbarriered(referent);
     }
 }
@@ -4524,7 +4538,7 @@ DebuggerEnv_trace(JSTracer *trc, RawObject obj)
      * is okay.
      */
     if (Env *referent = (JSObject *) obj->getPrivate()) {
-        MarkCrossCompartmentObjectUnbarriered(trc, &referent, "Debugger.Environment referent");
+        MarkCrossCompartmentObjectUnbarriered(trc, obj, &referent, "Debugger.Environment referent");
         obj->setPrivateUnbarriered(referent);
     }
 }
diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
index dd5684bd3356..4f9546795834 100644
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -252,6 +252,7 @@ class Debugger {
     static void sweepAll(FreeOp *fop);
     static void detachAllDebuggersFromGlobal(FreeOp *fop, GlobalObject *global,
                                              GlobalObjectSet::Enum *compartmentEnum);
+    static unsigned gcGrayLinkSlot();
 
     static inline JSTrapStatus onEnterFrame(JSContext *cx, Value *vp);
     static inline bool onLeaveFrame(JSContext *cx, bool ok);
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index 7e08228fa0c7..c3629c10cded 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -1465,6 +1465,7 @@ DebugScopeProxy DebugScopeProxy::singleton;
 /* static */ DebugScopeObject *
 DebugScopeObject::create(JSContext *cx, ScopeObject &scope, HandleObject enclosing)
 {
+    JS_ASSERT(scope.compartment() == cx->compartment);
     JSObject *obj = NewProxyObject(cx, &DebugScopeProxy::singleton, ObjectValue(scope),
                                    NULL /* proto */, &scope.global(),
                                    NULL /* call */, NULL /* construct */);

From d3eea7074af82480247f6fa2655ee7117607f29f Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Tue, 16 Oct 2012 12:28:32 +0100
Subject: [PATCH 013/160] Bug 790338 - Sweep debugger objects in the same group
 as their debugees r=billm

--HG--
extra : rebase_source : a97bb6aefa4291496a40b643887b4f712bc18119
---
 js/src/jsgc.cpp        |   2 +
 js/src/jsweakmap.cpp   |   2 +
 js/src/jsweakmap.h     |  26 ++++----
 js/src/vm/Debugger.cpp |  44 +++++++------
 js/src/vm/Debugger.h   | 139 ++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 177 insertions(+), 36 deletions(-)

diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 637cd53992c4..45036b3d087d 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3677,6 +3677,8 @@ JSCompartment::findOutgoingEdges(ComponentFinder& finder)
         JS_ASSERT_IF(IsFunctionProxy(wrapper), &GetProxyCall(wrapper).toObject() == other);
 #endif
     }
+
+    Debugger::findCompartmentEdges(this, finder);
 }
 
 static void
diff --git a/js/src/jsweakmap.cpp b/js/src/jsweakmap.cpp
index 7f38aeefb2d3..d60bb5add1d1 100644
--- a/js/src/jsweakmap.cpp
+++ b/js/src/jsweakmap.cpp
@@ -247,6 +247,8 @@ WeakMap_set_impl(JSContext *cx, CallArgs args)
         }
     }
 
+    JS_ASSERT(key->compartment() == thisObj->compartment());
+    JS_ASSERT_IF(value.isObject(), value.toObject().compartment() == thisObj->compartment());
     if (!map->put(key, value)) {
         JS_ReportOutOfMemory(cx);
         return false;
diff --git a/js/src/jsweakmap.h b/js/src/jsweakmap.h
index 36bf60125344..80d63aaef4c9 100644
--- a/js/src/jsweakmap.h
+++ b/js/src/jsweakmap.h
@@ -184,21 +184,11 @@ class WeakMap : public HashMap<Key, Value, HashPolicy, RuntimeAllocPolicy>, publ
             if (gc::IsAboutToBeFinalized(&k))
                 e.removeFront();
         }
-
-#if DEBUG
         /*
          * Once we've swept, all remaining edges should stay within the
          * known-live part of the graph.
          */
-        for (Range r = Base::all(); !r.empty(); r.popFront()) {
-            Key k(r.front().key);
-            Value v(r.front().value);
-            JS_ASSERT(!gc::IsAboutToBeFinalized(&k));
-            JS_ASSERT(!gc::IsAboutToBeFinalized(&v));
-            JS_ASSERT(k == r.front().key);
-            JS_ASSERT(v == r.front().value);
-        }
-#endif
+        assertEntriesNotAboutToBeFinalized();
     }
 
     /* memberOf can be NULL, which means that the map is not part of a JSObject. */
@@ -213,6 +203,20 @@ class WeakMap : public HashMap<Key, Value, HashPolicy, RuntimeAllocPolicy>, publ
             }
         }
     }
+
+protected:
+    void assertEntriesNotAboutToBeFinalized() {
+#if DEBUG
+        for (Range r = Base::all(); !r.empty(); r.popFront()) {
+            Key k(r.front().key);
+            Value v(r.front().value);
+            JS_ASSERT(!gc::IsAboutToBeFinalized(&k));
+            JS_ASSERT(!gc::IsAboutToBeFinalized(&v));
+            JS_ASSERT(k == r.front().key);
+            JS_ASSERT(v == r.front().value);
+        }
+#endif
+    }
 };
 
 } /* namespace js */
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index 549e1c500926..3bf265e675a3 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1355,29 +1355,9 @@ Debugger::markKeysInCompartment(JSTracer *tracer)
      * enumerating WeakMap keys. However in this case we need access, so we
      * make a base-class reference. Range is public in HashMap.
      */
-    ObjectWeakMap::Base &objStorage = objects;
-    for (ObjectWeakMap::Base::Range r = objStorage.all(); !r.empty(); r.popFront()) {
-        const EncapsulatedPtrObject key = r.front().key;
-        HeapPtrObject tmp(key);
-        gc::MarkObject(tracer, &tmp, "cross-compartment WeakMap key");
-        JS_ASSERT(tmp == key);
-    }
-
-    ObjectWeakMap::Base &envStorage = environments;
-    for (ObjectWeakMap::Base::Range r = envStorage.all(); !r.empty(); r.popFront()) {
-        const EncapsulatedPtrObject &key = r.front().key;
-        HeapPtrObject tmp(key);
-        js::gc::MarkObject(tracer, &tmp, "cross-compartment WeakMap key");
-        JS_ASSERT(tmp == key);
-    }
-
-    const ScriptWeakMap::Base &scriptStorage = scripts;
-    for (ScriptWeakMap::Base::Range r = scriptStorage.all(); !r.empty(); r.popFront()) {
-        const EncapsulatedPtrScript &key = r.front().key;
-        HeapPtrScript tmp(key);
-        gc::MarkScript(tracer, &tmp, "cross-compartment WeakMap key");
-        JS_ASSERT(tmp == key);
-    }
+    objects.markKeys(tracer);
+    environments.markKeys(tracer);
+    scripts.markKeys(tracer);
 }
 
 /*
@@ -1576,6 +1556,24 @@ Debugger::detachAllDebuggersFromGlobal(FreeOp *fop, GlobalObject *global,
         debuggers->back()->removeDebuggeeGlobal(fop, global, compartmentEnum, NULL);
 }
 
+/* static */ void
+Debugger::findCompartmentEdges(JSCompartment *comp, js::gc::ComponentFinder &finder)
+{
+    /*
+     * For debugger cross compartment wrappers, add edges in the opposite
+     * direction to those already added by JSCompartment::findOutgoingEdges.
+     * This ensure that debuggers and their debuggees are finalized in the same
+     * group.
+     */
+    JSRuntime *rt = comp->rt;
+    for (JSCList *p = &rt->debuggerList; (p = JS_NEXT_LINK(p)) != &rt->debuggerList;) {
+        Debugger *dbg = Debugger::fromLinks(p);
+        dbg->scripts.findCompartmentEdges(comp, finder);
+        dbg->objects.findCompartmentEdges(comp, finder);
+        dbg->environments.findCompartmentEdges(comp, finder);
+    }
+}
+
 void
 Debugger::finalize(FreeOp *fop, RawObject obj)
 {
diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
index 4f9546795834..d20942ba00c6 100644
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -19,11 +19,145 @@
 #include "jswrapper.h"
 
 #include "gc/Barrier.h"
+#include "gc/FindSCCs.h"
 #include "js/HashTable.h"
 #include "vm/GlobalObject.h"
 
 namespace js {
 
+/*
+ * A weakmap that supports the keys being in different compartments to the
+ * values, although all values must be in the same compartment.
+ *
+ * The Key and Value classes must support the compartment() method.
+ *
+ * The purpose of this is to allow the garbage collector to easily find edges
+ * from debugee object compartments to debugger compartments when calculating
+ * the compartment groups.  Note that these edges are the inverse of the edges
+ * stored in the cross compartment map.
+ *
+ * The current implementation results in all debuggee object compartments being
+ * swept in the same group as the debugger.  This is a conservative approach,
+ * and compartments may be unnecessarily grouped, however it results in a
+ * simpler and faster implementation.
+ */
+template <class Key, class Value>
+class DebuggerWeakMap : private WeakMap<Key, Value, DefaultHasher<Key> >
+{
+  private:
+    typedef HashMap<JSCompartment *,
+                    uintptr_t,
+                    DefaultHasher<JSCompartment *>,
+                    RuntimeAllocPolicy> CountMap;
+
+    JSCompartment *valueCompartment;
+    CountMap compartmentCounts;
+
+  public:
+    typedef WeakMap<Key, Value, DefaultHasher<Key> > Base;
+    explicit DebuggerWeakMap(JSRuntime *rt)
+        : Base(rt), valueCompartment(NULL), compartmentCounts(rt) { }
+    explicit DebuggerWeakMap(JSContext *cx)
+        : Base(cx), valueCompartment(NULL), compartmentCounts(cx) { }
+
+  public:
+    /* Expose those parts of HashMap public interface that are used by Debugger methods. */
+
+    typedef typename Base::Ptr Ptr;
+    typedef typename Base::AddPtr AddPtr;
+    typedef typename Base::Range Range;
+    typedef typename Base::Enum Enum;
+    typedef typename Base::Lookup Lookup;
+
+    bool init(uint32_t len = 16) {
+        return Base::init(len) && compartmentCounts.init();
+    }
+
+    AddPtr lookupForAdd(const Lookup &l) const {
+        return Base::lookupForAdd(l);
+    }
+
+    template<typename KeyInput, typename ValueInput>
+    bool relookupOrAdd(AddPtr &p, const KeyInput &k, const ValueInput &v) {
+        if (!valueCompartment)
+            valueCompartment = v->compartment();
+        JS_ASSERT(v->compartment() == valueCompartment);
+        if (!incCompartmentCount(k->compartment()))
+            return false;
+        bool ok = Base::relookupOrAdd(p, k, v);
+        if (!ok)
+            decCompartmentCount(k->compartment());
+        return ok;
+    }
+
+    Range all() const {
+        return Base::all();
+    }
+
+    void remove(const Lookup &l) {
+        Base::remove(l);
+        decCompartmentCount(l->compartment());
+        if (Base::count() == 0)
+            valueCompartment = NULL;
+    }
+
+  public:
+    /* Expose WeakMap public interface*/
+    void trace(JSTracer *tracer) {
+        Base::trace(tracer);
+    }
+
+  public:
+    void markKeys(JSTracer *tracer) {
+        for (Range r = all(); !r.empty(); r.popFront()) {
+            Key key = r.front().key;
+            gc::Mark(tracer, &key, "cross-compartment WeakMap key");
+            JS_ASSERT(key == r.front().key);
+        }
+    }
+
+    void findCompartmentEdges(JSCompartment *v, js::gc::ComponentFinder &finder) {
+        if (!valueCompartment || valueCompartment == v || !valueCompartment->isGCMarking())
+            return;
+        CountMap::Ptr p = compartmentCounts.lookup(v);
+        if (!p)
+            return;
+        JS_ASSERT(p->value > 0);
+        finder.addEdgeTo(valueCompartment);
+    }
+
+  private:
+    /* Override sweep method to also update our edge cache. */
+    void sweep(JSTracer *trc) {
+        for (Enum e(*static_cast<Base *>(this)); !e.empty(); e.popFront()) {
+            Key k(e.front().key);
+            Value v(e.front().value);
+            if (gc::IsAboutToBeFinalized(&k)) {
+                e.removeFront();
+                decCompartmentCount(k->compartment());
+            }
+        }
+        Base::assertEntriesNotAboutToBeFinalized();
+    }
+
+    bool incCompartmentCount(JSCompartment *c) {
+        CountMap::Ptr p = compartmentCounts.lookupWithDefault(c, 0);
+        if (!p)
+            return false;
+        ++p->value;
+        return true;
+    }
+
+    void decCompartmentCount(JSCompartment *c) {
+        CountMap::Ptr p = compartmentCounts.lookup(c);
+        JS_ASSERT(p);
+        JS_ASSERT(p->value > 0);
+        --p->value;
+        if (p->value == 0)
+            compartmentCounts.remove(c);
+    }
+};
+
 class Debugger {
     friend class Breakpoint;
     friend JSBool (::JS_DefineDebuggerObject)(JSContext *cx, JSObject *obj);
@@ -86,11 +220,11 @@ class Debugger {
     FrameMap frames;
 
     /* An ephemeral map from JSScript* to Debugger.Script instances. */
-    typedef WeakMap<EncapsulatedPtrScript, RelocatablePtrObject> ScriptWeakMap;
+    typedef DebuggerWeakMap<EncapsulatedPtrScript, RelocatablePtrObject> ScriptWeakMap;
     ScriptWeakMap scripts;
 
     /* The map from debuggee objects to their Debugger.Object instances. */
-    typedef WeakMap<EncapsulatedPtrObject, RelocatablePtrObject> ObjectWeakMap;
+    typedef DebuggerWeakMap<EncapsulatedPtrObject, RelocatablePtrObject> ObjectWeakMap;
     ObjectWeakMap objects;
 
     /* The map from debuggee Envs to Debugger.Environment instances. */
@@ -253,6 +387,7 @@ class Debugger {
     static void detachAllDebuggersFromGlobal(FreeOp *fop, GlobalObject *global,
                                              GlobalObjectSet::Enum *compartmentEnum);
     static unsigned gcGrayLinkSlot();
+    static void findCompartmentEdges(JSCompartment *v, js::gc::ComponentFinder &finder);
 
     static inline JSTrapStatus onEnterFrame(JSContext *cx, Value *vp);
     static inline bool onLeaveFrame(JSContext *cx, bool ok);

From 8695ebcda902dc03f0a79e9a7892ab24b6659de2 Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Mon, 26 Nov 2012 12:51:57 -0800
Subject: [PATCH 014/160] Bug 811958 - Pull GLContext out of Cocoa stuff -
 r=bgirard

---
 gfx/gl/GLContext.h                           |  19 +---
 gfx/gl/GLContextTypes.h                      |  44 ++++++++
 gfx/gl/Makefile.in                           |   1 +
 gfx/layers/opengl/LayerManagerOGL.cpp        |  89 ++++++++++++++-
 gfx/layers/opengl/LayerManagerOGL.h          |  98 ++++------------
 gfx/layers/opengl/LayerManagerOGLProgram.cpp | 111 +++++++++++++++++++
 gfx/layers/opengl/LayerManagerOGLProgram.h   |  96 +++-------------
 gfx/layers/opengl/ReusableTileStoreOGL.cpp   |   2 +
 widget/cocoa/nsChildView.mm                  |  10 +-
 9 files changed, 287 insertions(+), 183 deletions(-)
 create mode 100644 gfx/gl/GLContextTypes.h

diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index b109b782578c..38b26722f416 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -32,6 +32,7 @@
 #include "nsRegion.h"
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
+#include "GLContextTypes.h"
 
 typedef char realGLboolean;
 
@@ -55,24 +56,6 @@ class GLContext;
 
 typedef uintptr_t SharedTextureHandle;
 
-enum ShaderProgramType {
-    RGBALayerProgramType,
-    RGBALayerExternalProgramType,
-    BGRALayerProgramType,
-    RGBXLayerProgramType,
-    BGRXLayerProgramType,
-    RGBARectLayerProgramType,
-    RGBAExternalLayerProgramType,
-    ColorLayerProgramType,
-    YCbCrLayerProgramType,
-    ComponentAlphaPass1ProgramType,
-    ComponentAlphaPass2ProgramType,
-    Copy2DProgramType,
-    Copy2DRectProgramType,
-    NumProgramTypes
-};
-
-
 /**
  * A TextureImage encapsulates a surface that can be drawn to by a
  * Thebes gfxContext and (hopefully efficiently!) synchronized to a
diff --git a/gfx/gl/GLContextTypes.h b/gfx/gl/GLContextTypes.h
new file mode 100644
index 000000000000..e369b07a6361
--- /dev/null
+++ b/gfx/gl/GLContextTypes.h
@@ -0,0 +1,44 @@
+/*
+ * GLContextStuff.h
+ *
+ *  Created on: Nov 13, 2012
+ *      Author: jgilbert
+ */
+
+#ifndef GLCONTEXTSTUFF_H_
+#define GLCONTEXTSTUFF_H_
+
+/**
+ * We don't include GLDefs.h here since we don't want to drag in all defines
+ * in for all our users.
+ */
+typedef unsigned int GLenum;
+typedef unsigned int GLbitfield;
+typedef unsigned int GLuint;
+typedef int GLint;
+typedef int GLsizei;
+
+namespace mozilla {
+namespace gl {
+
+enum ShaderProgramType {
+    RGBALayerProgramType,
+    RGBALayerExternalProgramType,
+    BGRALayerProgramType,
+    RGBXLayerProgramType,
+    BGRXLayerProgramType,
+    RGBARectLayerProgramType,
+    RGBAExternalLayerProgramType,
+    ColorLayerProgramType,
+    YCbCrLayerProgramType,
+    ComponentAlphaPass1ProgramType,
+    ComponentAlphaPass2ProgramType,
+    Copy2DProgramType,
+    Copy2DRectProgramType,
+    NumProgramTypes
+};
+
+} // namespace gl
+} // namespace mozilla
+
+#endif /* GLCONTEXTSTUFF_H_ */
diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in
index 4d8928ee8f8a..e3729a278007 100644
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -18,6 +18,7 @@ FAIL_ON_WARNINGS = 1
 EXPORTS	= \
 	GLDefs.h \
 	GLContext.h \
+	GLContextTypes.h \
 	GLContextSymbols.h \
 	GLContextProvider.h \
 	GLContextProviderImpl.h \
diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp
index 7f794318f349..932150e4482e 100644
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -3,13 +3,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/. */
 
+#include "LayerManagerOGL.h"
+
 #include "mozilla/layers/PLayers.h"
 
 /* This must occur *after* layers/PLayers.h to avoid typedefs conflicts. */
 #include "mozilla/Util.h"
-
 #include "Composer2D.h"
-#include "LayerManagerOGL.h"
 #include "ThebesLayerOGL.h"
 #include "ContainerLayerOGL.h"
 #include "ImageLayerOGL.h"
@@ -52,6 +52,91 @@ using namespace mozilla::gl;
 int ShaderProgramOGL::sCurrentProgramKey = 0;
 #endif
 
+bool
+LayerManagerOGL::Initialize(bool force)
+{
+  return Initialize(CreateContext(), force);
+}
+
+int32_t
+LayerManagerOGL::GetMaxTextureSize() const
+{
+  return mGLContext->GetMaxTextureSize();
+}
+
+void
+LayerManagerOGL::MakeCurrent(bool aForce)
+{
+  if (mDestroyed) {
+    NS_WARNING("Call on destroyed layer manager");
+    return;
+  }
+  mGLContext->MakeCurrent(aForce);
+}
+
+void*
+LayerManagerOGL::GetNSOpenGLContext() const
+{
+  return gl()->GetNativeData(GLContext::NativeGLContext);
+}
+
+
+void
+LayerManagerOGL::BindQuadVBO() {
+  mGLContext->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, mQuadVBO);
+}
+
+void
+LayerManagerOGL::QuadVBOVerticesAttrib(GLuint aAttribIndex) {
+  mGLContext->fVertexAttribPointer(aAttribIndex, 2,
+                                   LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
+                                   (GLvoid*) QuadVBOVertexOffset());
+}
+
+void
+LayerManagerOGL::QuadVBOTexCoordsAttrib(GLuint aAttribIndex) {
+  mGLContext->fVertexAttribPointer(aAttribIndex, 2,
+                                   LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
+                                   (GLvoid*) QuadVBOTexCoordOffset());
+}
+
+void
+LayerManagerOGL::QuadVBOFlippedTexCoordsAttrib(GLuint aAttribIndex) {
+  mGLContext->fVertexAttribPointer(aAttribIndex, 2,
+                                   LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
+                                   (GLvoid*) QuadVBOFlippedTexCoordOffset());
+}
+
+// Super common
+
+void
+LayerManagerOGL::BindAndDrawQuad(GLuint aVertAttribIndex,
+                     GLuint aTexCoordAttribIndex,
+                     bool aFlipped)
+{
+  BindQuadVBO();
+  QuadVBOVerticesAttrib(aVertAttribIndex);
+
+  if (aTexCoordAttribIndex != GLuint(-1)) {
+    if (aFlipped)
+      QuadVBOFlippedTexCoordsAttrib(aTexCoordAttribIndex);
+    else
+      QuadVBOTexCoordsAttrib(aTexCoordAttribIndex);
+
+    mGLContext->fEnableVertexAttribArray(aTexCoordAttribIndex);
+  }
+
+  mGLContext->fEnableVertexAttribArray(aVertAttribIndex);
+
+  mGLContext->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
+
+  mGLContext->fDisableVertexAttribArray(aVertAttribIndex);
+
+  if (aTexCoordAttribIndex != GLuint(-1)) {
+    mGLContext->fDisableVertexAttribArray(aTexCoordAttribIndex);
+  }
+}
+
 static const double kFpsWindowMs = 250.0;
 static const size_t kNumFrameTimeStamps = 16;
 struct FPSCounter {
diff --git a/gfx/layers/opengl/LayerManagerOGL.h b/gfx/layers/opengl/LayerManagerOGL.h
index 623e009e0e64..78059d36a8c9 100644
--- a/gfx/layers/opengl/LayerManagerOGL.h
+++ b/gfx/layers/opengl/LayerManagerOGL.h
@@ -9,31 +9,23 @@
 #include "LayerManagerOGLProgram.h"
 
 #include "mozilla/layers/ShadowLayers.h"
-
 #include "mozilla/TimeStamp.h"
 
 #ifdef XP_WIN
 #include <windows.h>
 #endif
 
-/**
- * We don't include GLDefs.h here since we don't want to drag in all defines
- * in for all our users.
- */
-typedef unsigned int GLenum;
-typedef unsigned int GLbitfield;
-typedef unsigned int GLuint;
-typedef int GLint;
-typedef int GLsizei;
-
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
 #include "gfxContext.h"
 #include "gfx3DMatrix.h"
 #include "nsIWidget.h"
-#include "GLContext.h"
+#include "GLContextTypes.h"
 
 namespace mozilla {
+namespace gl {
+class GLContext;
+}
 namespace layers {
 
 class Composer2D;
@@ -71,9 +63,7 @@ public:
    *
    * \return True is initialization was succesful, false when it was not.
    */
-  bool Initialize(bool force = false) {
-    return Initialize(CreateContext(), force);
-  }
+  bool Initialize(bool force = false);
 
   bool Initialize(nsRefPtr<GLContext> aContext, bool force = false);
 
@@ -110,18 +100,14 @@ public:
 
   virtual void SetRoot(Layer* aLayer) { mRoot = aLayer; }
 
-  virtual bool CanUseCanvasLayerForSize(const gfxIntSize &aSize)
-  {
-      if (!mGLContext)
-          return false;
-      int32_t maxSize = mGLContext->GetMaxTextureSize();
-      return aSize <= gfxIntSize(maxSize, maxSize);
+  virtual bool CanUseCanvasLayerForSize(const gfxIntSize &aSize) {
+    if (!mGLContext)
+      return false;
+    int32_t maxSize = GetMaxTextureSize();
+    return aSize <= gfxIntSize(maxSize, maxSize);
   }
 
-  virtual int32_t GetMaxTextureSize() const
-  {
-    return mGLContext->GetMaxTextureSize();
-  }
+  virtual int32_t GetMaxTextureSize() const;
 
   virtual already_AddRefed<ThebesLayer> CreateThebesLayer();
 
@@ -151,13 +137,7 @@ public:
   /**
    * Helper methods.
    */
-  void MakeCurrent(bool aForce = false) {
-    if (mDestroyed) {
-      NS_WARNING("Call on destroyed layer manager");
-      return;
-    }
-    mGLContext->MakeCurrent(aForce);
-  }
+  void MakeCurrent(bool aForce = false);
 
   ShaderProgramOGL* GetBasicLayerProgram(bool aOpaque, bool aIsRGB,
                                          MaskType aMask = MaskNone)
@@ -203,6 +183,9 @@ public:
 
   GLContext* gl() const { return mGLContext; }
 
+  // |NSOpenGLContext*|:
+  void* GetNSOpenGLContext() const;
+
   DrawThebesLayerCallback GetThebesLayerCallback() const
   { return mThebesLayerCallback; }
 
@@ -254,56 +237,15 @@ public:
   GLintptr QuadVBOTexCoordOffset() { return sizeof(float)*4*2; }
   GLintptr QuadVBOFlippedTexCoordOffset() { return sizeof(float)*8*2; }
 
-  void BindQuadVBO() {
-    mGLContext->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, mQuadVBO);
-  }
-
-  void QuadVBOVerticesAttrib(GLuint aAttribIndex) {
-    mGLContext->fVertexAttribPointer(aAttribIndex, 2,
-                                     LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
-                                     (GLvoid*) QuadVBOVertexOffset());
-  }
-
-  void QuadVBOTexCoordsAttrib(GLuint aAttribIndex) {
-    mGLContext->fVertexAttribPointer(aAttribIndex, 2,
-                                     LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
-                                     (GLvoid*) QuadVBOTexCoordOffset());
-  }
-
-  void QuadVBOFlippedTexCoordsAttrib(GLuint aAttribIndex) {
-    mGLContext->fVertexAttribPointer(aAttribIndex, 2,
-                                     LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
-                                     (GLvoid*) QuadVBOFlippedTexCoordOffset());
-  }
+  void BindQuadVBO();
+  void QuadVBOVerticesAttrib(GLuint aAttribIndex);
+  void QuadVBOTexCoordsAttrib(GLuint aAttribIndex);
+  void QuadVBOFlippedTexCoordsAttrib(GLuint aAttribIndex);
 
   // Super common
-
   void BindAndDrawQuad(GLuint aVertAttribIndex,
                        GLuint aTexCoordAttribIndex,
-                       bool aFlipped = false)
-  {
-    BindQuadVBO();
-    QuadVBOVerticesAttrib(aVertAttribIndex);
-
-    if (aTexCoordAttribIndex != GLuint(-1)) {
-      if (aFlipped)
-        QuadVBOFlippedTexCoordsAttrib(aTexCoordAttribIndex);
-      else
-        QuadVBOTexCoordsAttrib(aTexCoordAttribIndex);
-
-      mGLContext->fEnableVertexAttribArray(aTexCoordAttribIndex);
-    }
-
-    mGLContext->fEnableVertexAttribArray(aVertAttribIndex);
-
-    mGLContext->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
-
-    mGLContext->fDisableVertexAttribArray(aVertAttribIndex);
-
-    if (aTexCoordAttribIndex != GLuint(-1)) {
-      mGLContext->fDisableVertexAttribArray(aTexCoordAttribIndex);
-    }
-  }
+                       bool aFlipped = false);
 
   void BindAndDrawQuad(ShaderProgramOGL *aProg,
                        bool aFlipped = false)
diff --git a/gfx/layers/opengl/LayerManagerOGLProgram.cpp b/gfx/layers/opengl/LayerManagerOGLProgram.cpp
index 155b28870693..3631e831da50 100644
--- a/gfx/layers/opengl/LayerManagerOGLProgram.cpp
+++ b/gfx/layers/opengl/LayerManagerOGLProgram.cpp
@@ -3,9 +3,16 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "LayerManagerOGLProgram.h"
+
+#ifdef GLCONTEXT_H_
+#error GLContext.h should not have been included here.
+#endif
+
 #include "LayerManagerOGLShaders.h"
 #include "LayerManagerOGL.h"
 
+#include "GLContext.h"
+
 namespace mozilla {
 namespace layers {
 
@@ -227,6 +234,28 @@ ProgramProfileOGL::GetProfileFor(gl::ShaderProgramType aType,
 const char* const ShaderProgramOGL::VertexCoordAttrib = "aVertexCoord";
 const char* const ShaderProgramOGL::TexCoordAttrib = "aTexCoord";
 
+ShaderProgramOGL::ShaderProgramOGL(GLContext* aGL, const ProgramProfileOGL& aProfile)
+  : mIsProjectionMatrixStale(false)
+  , mGL(aGL)
+  , mProgram(0)
+  , mProfile(aProfile)
+  , mProgramState(STATE_NEW)
+{}
+
+ShaderProgramOGL::~ShaderProgramOGL()
+{
+  if (mProgram <= 0) {
+    return;
+  }
+
+  nsRefPtr<GLContext> ctx = mGL->GetSharedContext();
+  if (!ctx) {
+    ctx = mGL;
+  }
+  ctx->MakeCurrent();
+  ctx->fDeleteProgram(mProgram);
+}
+
 bool
 ShaderProgramOGL::Initialize()
 {
@@ -394,5 +423,87 @@ ShaderProgramOGL::LoadMask(Layer* aMaskLayer)
   return true;
 }
 
+void
+ShaderProgramOGL::Activate()
+{
+  if (mProgramState == STATE_NEW) {
+    if (!Initialize()) {
+      NS_WARNING("Shader could not be initialised");
+      return;
+    }
+  }
+  NS_ASSERTION(HasInitialized(), "Attempting to activate a program that's not in use!");
+  mGL->fUseProgram(mProgram);
+#if CHECK_CURRENT_PROGRAM
+  mGL->SetUserData(&sCurrentProgramKey, this);
+#endif
+  // check and set the projection matrix
+  if (mIsProjectionMatrixStale) {
+    SetProjectionMatrix(mProjectionMatrix);
+  }
+}
+
+
+void
+ShaderProgramOGL::SetUniform(GLint aLocation, float aFloatValue)
+{
+  ASSERT_THIS_PROGRAM;
+  NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+  mGL->fUniform1f(aLocation, aFloatValue);
+}
+
+void
+ShaderProgramOGL::SetUniform(GLint aLocation, const gfxRGBA& aColor)
+{
+  ASSERT_THIS_PROGRAM;
+  NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+  mGL->fUniform4f(aLocation, float(aColor.r), float(aColor.g), float(aColor.b), float(aColor.a));
+}
+
+void
+ShaderProgramOGL::SetUniform(GLint aLocation, int aLength, float *aFloatValues)
+{
+  ASSERT_THIS_PROGRAM;
+  NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+  if (aLength == 1) {
+    mGL->fUniform1fv(aLocation, 1, aFloatValues);
+  } else if (aLength == 2) {
+    mGL->fUniform2fv(aLocation, 1, aFloatValues);
+  } else if (aLength == 3) {
+    mGL->fUniform3fv(aLocation, 1, aFloatValues);
+  } else if (aLength == 4) {
+    mGL->fUniform4fv(aLocation, 1, aFloatValues);
+  } else {
+    NS_NOTREACHED("Bogus aLength param");
+  }
+}
+
+void
+ShaderProgramOGL::SetUniform(GLint aLocation, GLint aIntValue)
+{
+  ASSERT_THIS_PROGRAM;
+  NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+  mGL->fUniform1i(aLocation, aIntValue);
+}
+
+void
+ShaderProgramOGL::SetMatrixUniform(GLint aLocation, const gfx3DMatrix& aMatrix)
+{
+  SetMatrixUniform(aLocation, &aMatrix._11);
+}
+
+void
+ShaderProgramOGL::SetMatrixUniform(GLint aLocation, const float *aFloatValues)
+{
+  ASSERT_THIS_PROGRAM;
+  NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+  mGL->fUniformMatrix4fv(aLocation, 1, false, aFloatValues);
+}
+
 } /* layers */
 } /* mozilla */
diff --git a/gfx/layers/opengl/LayerManagerOGLProgram.h b/gfx/layers/opengl/LayerManagerOGLProgram.h
index ac4a2151f9bb..f6ed2b7a64bb 100644
--- a/gfx/layers/opengl/LayerManagerOGLProgram.h
+++ b/gfx/layers/opengl/LayerManagerOGLProgram.h
@@ -10,11 +10,16 @@
 
 #include "prenv.h"
 
+#include "nsAutoPtr.h"
 #include "nsString.h"
-#include "GLContext.h"
+#include "GLContextTypes.h"
 #include "gfx3DMatrix.h"
+#include "gfxColor.h"
 
 namespace mozilla {
+namespace gl {
+class GLContext;
+}
 namespace layers {
 
 class Layer;
@@ -140,45 +145,16 @@ class ShaderProgramOGL
 public:
   typedef mozilla::gl::GLContext GLContext;
 
-  ShaderProgramOGL(GLContext* aGL, const ProgramProfileOGL& aProfile) :
-    mIsProjectionMatrixStale(false), mGL(aGL), mProgram(0),
-    mProfile(aProfile), mProgramState(STATE_NEW) { }
+  ShaderProgramOGL(GLContext* aGL, const ProgramProfileOGL& aProfile);
 
-  ~ShaderProgramOGL() {
-    if (mProgram <= 0) {
-      return;
-    }
-
-    nsRefPtr<GLContext> ctx = mGL->GetSharedContext();
-    if (!ctx) {
-      ctx = mGL;
-    }
-    ctx->MakeCurrent();
-    ctx->fDeleteProgram(mProgram);
-  }
+  ~ShaderProgramOGL();
 
   bool HasInitialized() {
     NS_ASSERTION(mProgramState != STATE_OK || mProgram > 0, "Inconsistent program state");
     return mProgramState == STATE_OK;
   }
 
-  void Activate() {
-    if (mProgramState == STATE_NEW) {
-      if (!Initialize()) {
-        NS_WARNING("Shader could not be initialised");
-        return;
-      }
-    }
-    NS_ASSERTION(HasInitialized(), "Attempting to activate a program that's not in use!");
-    mGL->fUseProgram(mProgram);
-#if CHECK_CURRENT_PROGRAM
-    mGL->SetUserData(&sCurrentProgramKey, this);
-#endif
-    // check and set the projection matrix
-    if (mIsProjectionMatrixStale) {
-      SetProjectionMatrix(mProjectionMatrix);
-    }
-  }
+  void Activate();
 
   bool Initialize();
 
@@ -329,54 +305,12 @@ protected:
   static int sCurrentProgramKey;
 #endif
 
-  void SetUniform(GLint aLocation, float aFloatValue) {
-    ASSERT_THIS_PROGRAM;
-    NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-    mGL->fUniform1f(aLocation, aFloatValue);
-  }
-
-  void SetUniform(GLint aLocation, const gfxRGBA& aColor) {
-    ASSERT_THIS_PROGRAM;
-    NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-    mGL->fUniform4f(aLocation, float(aColor.r), float(aColor.g), float(aColor.b), float(aColor.a));
-  }
-
-  void SetUniform(GLint aLocation, int aLength, float *aFloatValues) {
-    ASSERT_THIS_PROGRAM;
-    NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-    if (aLength == 1) {
-      mGL->fUniform1fv(aLocation, 1, aFloatValues);
-    } else if (aLength == 2) {
-      mGL->fUniform2fv(aLocation, 1, aFloatValues);
-    } else if (aLength == 3) {
-      mGL->fUniform3fv(aLocation, 1, aFloatValues);
-    } else if (aLength == 4) {
-      mGL->fUniform4fv(aLocation, 1, aFloatValues);
-    } else {
-      NS_NOTREACHED("Bogus aLength param");
-    }
-  }
-
-  void SetUniform(GLint aLocation, GLint aIntValue) {
-    ASSERT_THIS_PROGRAM;
-    NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-    mGL->fUniform1i(aLocation, aIntValue);
-  }
-
-  void SetMatrixUniform(GLint aLocation, const gfx3DMatrix& aMatrix) {
-    SetMatrixUniform(aLocation, &aMatrix._11);
-  }
-
-  void SetMatrixUniform(GLint aLocation, const float *aFloatValues) {
-    ASSERT_THIS_PROGRAM;
-    NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-    mGL->fUniformMatrix4fv(aLocation, 1, false, aFloatValues);
-  }
+  void SetUniform(GLint aLocation, float aFloatValue);
+  void SetUniform(GLint aLocation, const gfxRGBA& aColor);
+  void SetUniform(GLint aLocation, int aLength, float *aFloatValues);
+  void SetUniform(GLint aLocation, GLint aIntValue);
+  void SetMatrixUniform(GLint aLocation, const gfx3DMatrix& aMatrix);
+  void SetMatrixUniform(GLint aLocation, const float *aFloatValues);
 };
 
 
diff --git a/gfx/layers/opengl/ReusableTileStoreOGL.cpp b/gfx/layers/opengl/ReusableTileStoreOGL.cpp
index 63e4d531785e..6c52f74c060f 100644
--- a/gfx/layers/opengl/ReusableTileStoreOGL.cpp
+++ b/gfx/layers/opengl/ReusableTileStoreOGL.cpp
@@ -4,6 +4,8 @@
 
 #include "ReusableTileStoreOGL.h"
 
+#include "GLContext.h"
+
 namespace mozilla {
 namespace layers {
 
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index e7ba09c2b627..f8c005534d8d 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -51,7 +51,6 @@
 #include "nsRegion.h"
 #include "Layers.h"
 #include "LayerManagerOGL.h"
-#include "GLContext.h"
 #include "mozilla/layers/CompositorCocoaWidgetHelper.h"
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"
@@ -67,6 +66,10 @@
 
 #include "nsIDOMWheelEvent.h"
 
+#ifdef GLCONTEXT_H_
+#error GLContext.h should not have been included here.
+#endif
+
 using namespace mozilla;
 using namespace mozilla::layers;
 using namespace mozilla::gl;
@@ -1692,8 +1695,7 @@ nsChildView::CreateCompositor()
     LayerManagerOGL *manager =
       static_cast<LayerManagerOGL*>(compositor::GetLayerManager(mCompositorParent));
 
-    NSOpenGLContext *glContext =
-      (NSOpenGLContext *) manager->gl()->GetNativeData(GLContext::NativeGLContext);
+    NSOpenGLContext *glContext = (NSOpenGLContext *)manager->GetNSOpenGLContext();
 
     [(ChildView *)mView setGLContext:glContext];
     [(ChildView *)mView setUsingOMTCompositor:true];
@@ -2457,7 +2459,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
 
     LayerManagerOGL *manager = static_cast<LayerManagerOGL*>(layerManager);
     manager->SetClippingRegion(region);
-    glContext = (NSOpenGLContext *)manager->gl()->GetNativeData(mozilla::gl::GLContext::NativeGLContext);
+    glContext = (NSOpenGLContext *)manager->GetNSOpenGLContext();
 
     if (!mGLContext) {
       [self setGLContext:glContext];

From f8b6d7d46562ad4d6420bdd89ec3ed654856f604 Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Mon, 26 Nov 2012 12:51:57 -0800
Subject: [PATCH 015/160] Bug 811958 - Fix and move ShareType type - r=bgirard

---
 dom/plugins/base/nsNPAPIPluginInstance.cpp |  9 ++-
 dom/plugins/base/nsPluginInstanceOwner.cpp |  8 +-
 gfx/gl/GLContext.h                         | 48 +++++++-----
 gfx/gl/GLContextProviderEGL.cpp            | 89 +++++++++++-----------
 gfx/layers/SharedTextureImage.h            |  4 +-
 gfx/layers/basic/BasicCanvasLayer.cpp      | 15 ++--
 gfx/layers/ipc/LayersSurfaces.ipdlh        |  4 +-
 gfx/layers/ipc/ShadowLayerUtils.h          |  4 +-
 gfx/layers/opengl/CanvasLayerOGL.cpp       |  5 +-
 gfx/layers/opengl/ImageLayerOGL.h          |  2 +-
 10 files changed, 104 insertions(+), 84 deletions(-)

diff --git a/dom/plugins/base/nsNPAPIPluginInstance.cpp b/dom/plugins/base/nsNPAPIPluginInstance.cpp
index cfce39aeb98a..6094d5ed9518 100644
--- a/dom/plugins/base/nsNPAPIPluginInstance.cpp
+++ b/dom/plugins/base/nsNPAPIPluginInstance.cpp
@@ -129,7 +129,10 @@ public:
     if (mTextureInfo.mWidth == 0 || mTextureInfo.mHeight == 0)
       return 0;
 
-    SharedTextureHandle handle = sPluginContext->CreateSharedHandle(TextureImage::ThreadShared, (void*)mTextureInfo.mTexture, GLContext::TextureID);
+    SharedTextureHandle handle =
+      sPluginContext->CreateSharedHandle(GLContext::SameProcess,
+                                         (void*)mTextureInfo.mTexture,
+                                         GLContext::TextureID);
 
     // We want forget about this now, so delete the texture. Assigning it to zero
     // ensures that we create a new one in Lock()
@@ -1000,7 +1003,9 @@ SharedTextureHandle nsNPAPIPluginInstance::CreateSharedHandle()
     return mContentTexture->CreateSharedHandle();
   } else if (mContentSurface) {
     EnsureGLContext();
-    return sPluginContext->CreateSharedHandle(TextureImage::ThreadShared, mContentSurface, GLContext::SurfaceTexture);
+    return sPluginContext->CreateSharedHandle(GLContext::SameProcess,
+                                              mContentSurface,
+                                              GLContext::SurfaceTexture);
   } else return 0;
 }
 
diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp
index bf2d859833ca..55014898a03e 100644
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -186,7 +186,7 @@ nsPluginInstanceOwner::GetImageContainer()
 
   SharedTextureImage::Data data;
   data.mHandle = mInstance->CreateSharedHandle();
-  data.mShareType = mozilla::gl::TextureImage::ThreadShared;
+  data.mShareType = mozilla::gl::GLContext::SameProcess;
   data.mInverted = mInstance->Inverted();
 
   gfxRect r = GetPluginRect();
@@ -1723,8 +1723,10 @@ already_AddRefed<ImageContainer> nsPluginInstanceOwner::GetImageContainerForVide
 
   SharedTextureImage::Data data;
 
-  data.mHandle = mInstance->GLContext()->CreateSharedHandle(gl::TextureImage::ThreadShared, aVideoInfo->mSurfaceTexture, gl::GLContext::SurfaceTexture);
-  data.mShareType = mozilla::gl::TextureImage::ThreadShared;
+  data.mShareType = gl::GLContext::SameProcess;
+  data.mHandle = mInstance->GLContext()->CreateSharedHandle(data.mShareType,
+                                                            aVideoInfo->mSurfaceTexture,
+                                                            gl::GLContext::SurfaceTexture);
 
   // The logic below for Honeycomb is just a guess, but seems to work. We don't have a separate
   // inverted flag for video.
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 38b26722f416..5188d4411157 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -90,11 +90,6 @@ public:
         ForceSingleTile  = 0x4
     };
 
-    enum TextureShareType {
-        ThreadShared     = 0x0,
-        ProcessShared    = 0x1
-    };
-
     typedef gfxASurface::gfxContentType ContentType;
 
     virtual ~TextureImage() {}
@@ -912,6 +907,12 @@ public:
         return IsExtensionSupported(EXT_framebuffer_blit) || IsExtensionSupported(ANGLE_framebuffer_blit);
     }
 
+
+    enum SharedTextureShareType {
+        SameProcess = 0,
+        CrossProcess
+    };
+
     enum SharedTextureBufferType {
         TextureID
 #ifdef MOZ_WIDGET_ANDROID
@@ -922,23 +923,26 @@ public:
     /**
      * Create new shared GLContext content handle, must be released by ReleaseSharedHandle.
      */
-    virtual SharedTextureHandle CreateSharedHandle(TextureImage::TextureShareType aType) { return 0; }
+    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType)
+    { return 0; }
     /*
      * Create a new shared GLContext content handle, using the passed buffer as a source.
      * Must be released by ReleaseSharedHandle. UpdateSharedHandle will have no effect
      * on handles created with this method, as the caller owns the source (the passed buffer)
      * and is responsible for updating it accordingly.
      */
-    virtual SharedTextureHandle CreateSharedHandle(TextureImage::TextureShareType aType,
-                                                   void* aBuffer,
-                                                   SharedTextureBufferType aBufferType) { return 0; }
+    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType,
+                                                   void* buffer,
+                                                   SharedTextureBufferType bufferType)
+    { return 0; }
     /**
      * Publish GLContext content to intermediate buffer attached to shared handle.
      * Shared handle content is ready to be used after call returns, and no need extra Flush/Finish are required.
      * GLContext must be current before this call
      */
-    virtual void UpdateSharedHandle(TextureImage::TextureShareType aType,
-                                    SharedTextureHandle aSharedHandle) { }
+    virtual void UpdateSharedHandle(SharedTextureShareType shareType,
+                                    SharedTextureHandle sharedHandle)
+    { }
     /**
      * - It is better to call ReleaseSharedHandle before original GLContext destroyed,
      *     otherwise warning will be thrown on attempt to destroy Texture associated with SharedHandle, depends on backend implementation.
@@ -952,8 +956,9 @@ public:
      * SharedHandle (currently EGLImage) does not require GLContext because it is EGL call, and can be destroyed
      *   at any time, unless EGLImage have siblings (which are not expected with current API).
      */
-    virtual void ReleaseSharedHandle(TextureImage::TextureShareType aType,
-                                     SharedTextureHandle aSharedHandle) { }
+    virtual void ReleaseSharedHandle(SharedTextureShareType shareType,
+                                     SharedTextureHandle sharedHandle)
+    { }
 
 
     typedef struct {
@@ -966,21 +971,24 @@ public:
      * Returns information necessary for rendering a shared handle.
      * These values change depending on what sharing mechanism is in use
      */
-    virtual bool GetSharedHandleDetails(TextureImage::TextureShareType aType,
-                                        SharedTextureHandle aSharedHandle,
-                                        SharedHandleDetails& aDetails) { return false; }
+    virtual bool GetSharedHandleDetails(SharedTextureShareType shareType,
+                                        SharedTextureHandle sharedHandle,
+                                        SharedHandleDetails& details)
+    { return false; }
     /**
      * Attach Shared GL Handle to GL_TEXTURE_2D target
      * GLContext must be current before this call
      */
-    virtual bool AttachSharedHandle(TextureImage::TextureShareType aType,
-                                    SharedTextureHandle aSharedHandle) { return false; }
+    virtual bool AttachSharedHandle(SharedTextureShareType shareType,
+                                    SharedTextureHandle sharedHandle)
+    { return false; }
 
     /**
      * Detach Shared GL Handle from GL_TEXTURE_2D target
      */
-    virtual void DetachSharedHandle(TextureImage::TextureShareType aType,
-                                    SharedTextureHandle aSharedHandle) { return; }
+    virtual void DetachSharedHandle(SharedTextureShareType shareType,
+                                    SharedTextureHandle sharedHandle)
+    { }
 
 private:
     GLuint mUserBoundDrawFBO;
diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index e080cb10159b..85bb1c6aad10 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -646,19 +646,19 @@ public:
         return sEGLLibrary.HasKHRLockSurface();
     }
 
-    virtual SharedTextureHandle CreateSharedHandle(TextureImage::TextureShareType aType);
-    virtual SharedTextureHandle CreateSharedHandle(TextureImage::TextureShareType aType,
-                                                   void* aBuffer,
-                                                   SharedTextureBufferType aBufferType);
-    virtual void UpdateSharedHandle(TextureImage::TextureShareType aType,
-                                    SharedTextureHandle aSharedHandle);
-    virtual void ReleaseSharedHandle(TextureImage::TextureShareType aType,
-                                     SharedTextureHandle aSharedHandle);
-    virtual bool GetSharedHandleDetails(TextureImage::TextureShareType aType,
-                                        SharedTextureHandle aSharedHandle,
-                                        SharedHandleDetails& aDetails);
-    virtual bool AttachSharedHandle(TextureImage::TextureShareType aType,
-                                    SharedTextureHandle aSharedHandle);
+    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType);
+    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType,
+                                                   void* buffer,
+                                                   SharedTextureBufferType bufferType);
+    virtual void UpdateSharedHandle(SharedTextureShareType shareType,
+                                    SharedTextureHandle sharedHandle);
+    virtual void ReleaseSharedHandle(SharedTextureShareType shareType,
+                                     SharedTextureHandle sharedHandle);
+    virtual bool GetSharedHandleDetails(SharedTextureShareType shareType,
+                                        SharedTextureHandle sharedHandle,
+                                        SharedHandleDetails& details);
+    virtual bool AttachSharedHandle(SharedTextureShareType shareType,
+                                    SharedTextureHandle sharedHandle);
 protected:
     friend class GLContextProviderEGL;
 
@@ -854,15 +854,15 @@ private:
 };
 
 void
-GLContextEGL::UpdateSharedHandle(TextureImage::TextureShareType aType,
-                                 SharedTextureHandle aSharedHandle)
+GLContextEGL::UpdateSharedHandle(SharedTextureShareType shareType,
+                                 SharedTextureHandle sharedHandle)
 {
-    if (aType != TextureImage::ThreadShared) {
+    if (shareType != SameProcess) {
         NS_ERROR("Implementation not available for this sharing type");
         return;
     }
 
-    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(aSharedHandle);
+    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(sharedHandle);
 
     NS_ASSERTION(wrapper->Type() == SharedHandleType::Image, "Expected EGLImage shared handle");
     NS_ASSERTION(mShareWithEGLImage, "EGLImage not supported or disabled in runtime");
@@ -895,9 +895,9 @@ GLContextEGL::UpdateSharedHandle(TextureImage::TextureShareType aType,
 }
 
 SharedTextureHandle
-GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType)
+GLContextEGL::CreateSharedHandle(SharedTextureShareType shareType)
 {
-    if (aType != TextureImage::ThreadShared)
+    if (shareType != SameProcess)
         return 0;
 
     if (!mShareWithEGLImage)
@@ -914,7 +914,7 @@ GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType)
 
     if (!ok) {
         NS_ERROR("EGLImage creation for EGLTextureWrapper failed");
-        ReleaseSharedHandle(aType, (SharedTextureHandle)tex);
+        ReleaseSharedHandle(shareType, (SharedTextureHandle)tex);
         return 0;
     }
 
@@ -923,16 +923,16 @@ GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType)
 }
 
 SharedTextureHandle
-GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType,
-                                 void* aBuffer,
-                                 SharedTextureBufferType aBufferType)
+GLContextEGL::CreateSharedHandle(SharedTextureShareType shareType,
+                                 void* buffer,
+                                 SharedTextureBufferType bufferType)
 {
     // Both EGLImage and SurfaceTexture only support ThreadShared currently, but
     // it's possible to make SurfaceTexture work across processes. We should do that.
-    if (aType != TextureImage::ThreadShared)
+    if (shareType != SameProcess)
         return 0;
 
-    switch (aBufferType) {
+    switch (bufferType) {
 #ifdef MOZ_WIDGET_ANDROID
     case SharedTextureBufferType::SurfaceTexture:
         if (!IsExtensionSupported(GLContext::OES_EGL_image_external)) {
@@ -940,13 +940,13 @@ GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType,
             return 0;
         }
 
-        return (SharedTextureHandle) new SurfaceTextureWrapper(reinterpret_cast<nsSurfaceTexture*>(aBuffer));
+        return (SharedTextureHandle) new SurfaceTextureWrapper(reinterpret_cast<nsSurfaceTexture*>(buffer));
 #endif
     case SharedTextureBufferType::TextureID: {
         if (!mShareWithEGLImage)
             return 0;
 
-        GLuint texture = (uintptr_t)aBuffer;
+        GLuint texture = (uintptr_t)buffer;
         EGLTextureWrapper* tex = new EGLTextureWrapper();
         if (!tex->CreateEGLImage(this, texture)) {
             NS_ERROR("EGLImage creation for EGLTextureWrapper failed");
@@ -962,15 +962,15 @@ GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType,
     }
 }
 
-void GLContextEGL::ReleaseSharedHandle(TextureImage::TextureShareType aType,
-                                       SharedTextureHandle aSharedHandle)
+void GLContextEGL::ReleaseSharedHandle(SharedTextureShareType shareType,
+                                       SharedTextureHandle sharedHandle)
 {
-    if (aType != TextureImage::ThreadShared) {
+    if (shareType != SameProcess) {
         NS_ERROR("Implementation not available for this sharing type");
         return;
     }
 
-    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(aSharedHandle);
+    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(sharedHandle);
 
     switch (wrapper->Type()) {
 #ifdef MOZ_WIDGET_ANDROID
@@ -982,24 +982,25 @@ void GLContextEGL::ReleaseSharedHandle(TextureImage::TextureShareType aType,
     case SharedHandleType::Image: {
         NS_ASSERTION(mShareWithEGLImage, "EGLImage not supported or disabled in runtime");
 
-        EGLTextureWrapper* wrap = (EGLTextureWrapper*)aSharedHandle;
+        EGLTextureWrapper* wrap = (EGLTextureWrapper*)sharedHandle;
         delete wrap;
         break;
     }
 
     default:
         NS_ERROR("Unknown shared handle type");
+        return;
     }
 }
 
-bool GLContextEGL::GetSharedHandleDetails(TextureImage::TextureShareType aType,
-                                          SharedTextureHandle aSharedHandle,
-                                          SharedHandleDetails& aDetails)
+bool GLContextEGL::GetSharedHandleDetails(SharedTextureShareType shareType,
+                                          SharedTextureHandle sharedHandle,
+                                          SharedHandleDetails& details)
 {
-    if (aType != TextureImage::ThreadShared)
+    if (shareType != SameProcess)
         return false;
 
-    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(aSharedHandle);
+    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(sharedHandle);
 
     switch (wrapper->Type()) {
 #ifdef MOZ_WIDGET_ANDROID
@@ -1014,8 +1015,8 @@ bool GLContextEGL::GetSharedHandleDetails(TextureImage::TextureShareType aType,
 #endif
 
     case SharedHandleType::Image:
-        aDetails.mTarget = LOCAL_GL_TEXTURE_2D;
-        aDetails.mProgramType = RGBALayerProgramType;
+        details.mTarget = LOCAL_GL_TEXTURE_2D;
+        details.mProgramType = RGBALayerProgramType;
         break;
 
     default:
@@ -1026,13 +1027,13 @@ bool GLContextEGL::GetSharedHandleDetails(TextureImage::TextureShareType aType,
     return true;
 }
 
-bool GLContextEGL::AttachSharedHandle(TextureImage::TextureShareType aType,
-                                      SharedTextureHandle aSharedHandle)
+bool GLContextEGL::AttachSharedHandle(SharedTextureShareType shareType,
+                                      SharedTextureHandle sharedHandle)
 {
-    if (aType != TextureImage::ThreadShared)
+    if (shareType != SameProcess)
         return false;
 
-    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(aSharedHandle);
+    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(sharedHandle);
 
     switch (wrapper->Type()) {
 #ifdef MOZ_WIDGET_ANDROID
@@ -1057,7 +1058,7 @@ bool GLContextEGL::AttachSharedHandle(TextureImage::TextureShareType aType,
     case SharedHandleType::Image: {
         NS_ASSERTION(mShareWithEGLImage, "EGLImage not supported or disabled in runtime");
 
-        EGLTextureWrapper* wrap = (EGLTextureWrapper*)aSharedHandle;
+        EGLTextureWrapper* wrap = (EGLTextureWrapper*)sharedHandle;
         wrap->WaitSync();
         fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, wrap->GetEGLImage());
         break;
diff --git a/gfx/layers/SharedTextureImage.h b/gfx/layers/SharedTextureImage.h
index 3f0732023954..2a42154cfcf6 100644
--- a/gfx/layers/SharedTextureImage.h
+++ b/gfx/layers/SharedTextureImage.h
@@ -20,7 +20,7 @@ class THEBES_API SharedTextureImage : public Image {
 public:
   struct Data {
     gl::SharedTextureHandle mHandle;
-    gl::TextureImage::TextureShareType mShareType;
+    gl::GLContext::SharedTextureShareType mShareType;
     gfxIntSize mSize;
     bool mInverted;
   };
@@ -41,4 +41,4 @@ private:
 } // layers
 } // mozilla
 
-#endif // GFX_SHAREDTEXTUREIMAGE_H
\ No newline at end of file
+#endif // GFX_SHAREDTEXTUREIMAGE_H
diff --git a/gfx/layers/basic/BasicCanvasLayer.cpp b/gfx/layers/basic/BasicCanvasLayer.cpp
index fdc133d38747..e028468f29b1 100644
--- a/gfx/layers/basic/BasicCanvasLayer.cpp
+++ b/gfx/layers/basic/BasicCanvasLayer.cpp
@@ -387,24 +387,25 @@ BasicShadowableCanvasLayer::Paint(gfxContext* aContext, Layer* aMaskLayer)
 
   if (mGLContext &&
       !mForceReadback &&
-      BasicManager()->GetParentBackendType() == mozilla::layers::LAYERS_OPENGL) {
-    TextureImage::TextureShareType flags;
+      BasicManager()->GetParentBackendType() == mozilla::layers::LAYERS_OPENGL)
+  {
+    GLContext::SharedTextureShareType shareType;
     // if process type is default, then it is single-process (non-e10s)
     if (XRE_GetProcessType() == GeckoProcessType_Default)
-      flags = TextureImage::ThreadShared;
+      shareType = GLContext::SameProcess;
     else
-      flags = TextureImage::ProcessShared;
+      shareType = GLContext::CrossProcess;
 
     SharedTextureHandle handle = GetSharedBackBufferHandle();
     if (!handle) {
-      handle = mGLContext->CreateSharedHandle(flags);
+      handle = mGLContext->CreateSharedHandle(shareType);
       if (handle) {
-        mBackBuffer = SharedTextureDescriptor(flags, handle, mBounds.Size(), false);
+        mBackBuffer = SharedTextureDescriptor(shareType, handle, mBounds.Size(), false);
       }
     }
     if (handle) {
       mGLContext->MakeCurrent();
-      mGLContext->UpdateSharedHandle(flags, handle);
+      mGLContext->UpdateSharedHandle(shareType, handle);
       // call Painted() to reset our dirty 'bit'
       Painted();
       FireDidTransactionCallback();
diff --git a/gfx/layers/ipc/LayersSurfaces.ipdlh b/gfx/layers/ipc/LayersSurfaces.ipdlh
index 39db98123782..2d8e763f05b8 100644
--- a/gfx/layers/ipc/LayersSurfaces.ipdlh
+++ b/gfx/layers/ipc/LayersSurfaces.ipdlh
@@ -22,7 +22,7 @@ using mozilla::layers::SurfaceDescriptorX11;
 using mozilla::null_t;
 using mozilla::WindowsHandle;
 using mozilla::gl::SharedTextureHandle;
-using mozilla::gl::TextureImage::TextureShareType;
+using mozilla::gl::GLContext::SharedTextureShareType;
 
 namespace mozilla {
 namespace layers {
@@ -37,7 +37,7 @@ struct SurfaceDescriptorD3D10 {
 };
 
 struct SharedTextureDescriptor {
-  TextureShareType shareType;
+  SharedTextureShareType shareType;
   SharedTextureHandle handle;
   nsIntSize size;
   bool inverted;
diff --git a/gfx/layers/ipc/ShadowLayerUtils.h b/gfx/layers/ipc/ShadowLayerUtils.h
index 4d66cef624bd..b7eaa1d4d191 100644
--- a/gfx/layers/ipc/ShadowLayerUtils.h
+++ b/gfx/layers/ipc/ShadowLayerUtils.h
@@ -52,9 +52,9 @@ struct ParamTraits<mozilla::layers::SurfaceDescriptorX11> {
 #endif  // !defined(MOZ_HAVE_XSURFACEDESCRIPTORX11)
 
 template<>
-struct ParamTraits<mozilla::gl::TextureImage::TextureShareType>
+struct ParamTraits<mozilla::gl::GLContext::SharedTextureShareType>
 {
-  typedef mozilla::gl::TextureImage::TextureShareType paramType;
+  typedef mozilla::gl::GLContext::SharedTextureShareType paramType;
 
   static void Write(Message* msg, const paramType& param)
   {
diff --git a/gfx/layers/opengl/CanvasLayerOGL.cpp b/gfx/layers/opengl/CanvasLayerOGL.cpp
index 3bd9e578b40e..6616fb9fde05 100644
--- a/gfx/layers/opengl/CanvasLayerOGL.cpp
+++ b/gfx/layers/opengl/CanvasLayerOGL.cpp
@@ -420,7 +420,10 @@ ShadowCanvasLayerOGL::Swap(const CanvasSurface& aNewFront,
   } else if (IsValidSharedTexDescriptor(aNewFront)) {
     MakeTextureIfNeeded(gl(), mTexture);
     if (!IsValidSharedTexDescriptor(mFrontBufferDescriptor)) {
-      mFrontBufferDescriptor = SharedTextureDescriptor(TextureImage::ThreadShared, 0, nsIntSize(0, 0), false);
+      mFrontBufferDescriptor = SharedTextureDescriptor(GLContext::SameProcess,
+                                                       0,
+                                                       nsIntSize(0, 0),
+                                                       false);
     }
     *aNewBack = mFrontBufferDescriptor;
     mFrontBufferDescriptor = aNewFront;
diff --git a/gfx/layers/opengl/ImageLayerOGL.h b/gfx/layers/opengl/ImageLayerOGL.h
index 5db8b6e9c897..5995c12ef7c9 100644
--- a/gfx/layers/opengl/ImageLayerOGL.h
+++ b/gfx/layers/opengl/ImageLayerOGL.h
@@ -194,7 +194,7 @@ private:
 
   // For SharedTextureHandle
   gl::SharedTextureHandle mSharedHandle;
-  gl::TextureImage::TextureShareType mShareType;
+  gl::GLContext::SharedTextureShareType mShareType;
   bool mInverted;
   GLuint mTexture;
 

From e7449034084109f4e2da7deed75b35de50a62ff1 Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Mon, 26 Nov 2012 12:51:58 -0800
Subject: [PATCH 016/160] Bug 811958 - Move TextureImage to its own files -
 r=bgirard

---
 gfx/gl/GLContext.cpp            | 555 +------------------------------
 gfx/gl/GLContext.h              | 370 +--------------------
 gfx/gl/GLContextProviderEGL.cpp |   1 +
 gfx/gl/GLTextureImage.cpp       | 573 ++++++++++++++++++++++++++++++++
 gfx/gl/GLTextureImage.h         | 385 +++++++++++++++++++++
 gfx/gl/Makefile.in              |   2 +
 widget/cocoa/nsChildView.mm     |  10 +-
 7 files changed, 984 insertions(+), 912 deletions(-)
 create mode 100644 gfx/gl/GLTextureImage.cpp
 create mode 100644 gfx/gl/GLTextureImage.h

diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 8f183eae5afb..17197535c857 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -23,6 +23,8 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/Util.h" // for DebugOnly
 
+#include "GLTextureImage.h"
+
 using namespace mozilla::gfx;
 
 namespace mozilla {
@@ -738,6 +740,19 @@ GLContext::CreateTextureImage(const nsIntSize& aSize,
     return CreateBasicTextureImage(texture, aSize, aWrapMode, aContentType, this, aFlags);
 }
 
+already_AddRefed<TextureImage>
+GLContext::CreateBasicTextureImage(GLuint aTexture,
+                        const nsIntSize& aSize,
+                        GLenum aWrapMode,
+                        TextureImage::ContentType aContentType,
+                        GLContext* aContext,
+                        TextureImage::Flags aFlags)
+{
+    nsRefPtr<BasicTextureImage> teximage(
+        new BasicTextureImage(aTexture, aSize, aWrapMode, aContentType, aContext, aFlags));
+    return teximage.forget();
+}
+
 void GLContext::ApplyFilterToBoundTexture(gfxPattern::GraphicsFilter aFilter)
 {
     ApplyFilterToBoundTexture(LOCAL_GL_TEXTURE_2D, aFilter);
@@ -755,546 +770,6 @@ void GLContext::ApplyFilterToBoundTexture(GLuint aTarget,
     }
 }
 
-BasicTextureImage::~BasicTextureImage()
-{
-    GLContext *ctx = mGLContext;
-    if (ctx->IsDestroyed() || !ctx->IsOwningThreadCurrent()) {
-        ctx = ctx->GetSharedContext();
-    }
-
-    // If we have a context, then we need to delete the texture;
-    // if we don't have a context (either real or shared),
-    // then they went away when the contex was deleted, because it
-    // was the only one that had access to it.
-    if (ctx && !ctx->IsDestroyed()) {
-        mGLContext->MakeCurrent();
-        mGLContext->fDeleteTextures(1, &mTexture);
-    }
-}
-
-gfxASurface*
-BasicTextureImage::BeginUpdate(nsIntRegion& aRegion)
-{
-    NS_ASSERTION(!mUpdateSurface, "BeginUpdate() without EndUpdate()?");
-
-    // determine the region the client will need to repaint
-    if (mGLContext->CanUploadSubTextures()) {
-        GetUpdateRegion(aRegion);
-    } else {
-        aRegion = nsIntRect(nsIntPoint(0, 0), mSize);
-    }
-
-    mUpdateRegion = aRegion;
-
-    nsIntRect rgnSize = mUpdateRegion.GetBounds();
-    if (!nsIntRect(nsIntPoint(0, 0), mSize).Contains(rgnSize)) {
-        NS_ERROR("update outside of image");
-        return NULL;
-    }
-
-    ImageFormat format =
-        (GetContentType() == gfxASurface::CONTENT_COLOR) ?
-        gfxASurface::ImageFormatRGB24 : gfxASurface::ImageFormatARGB32;
-    mUpdateSurface =
-        GetSurfaceForUpdate(gfxIntSize(rgnSize.width, rgnSize.height), format);
-
-    if (!mUpdateSurface || mUpdateSurface->CairoStatus()) {
-        mUpdateSurface = NULL;
-        return NULL;
-    }
-
-    mUpdateSurface->SetDeviceOffset(gfxPoint(-rgnSize.x, -rgnSize.y));
-
-    return mUpdateSurface;
-}
-
-void
-BasicTextureImage::GetUpdateRegion(nsIntRegion& aForRegion)
-{
-  // if the texture hasn't been initialized yet, or something important
-  // changed, we need to recreate our backing surface and force the
-  // client to paint everything
-  if (mTextureState != Valid)
-      aForRegion = nsIntRect(nsIntPoint(0, 0), mSize);
-}
-
-void
-BasicTextureImage::EndUpdate()
-{
-    NS_ASSERTION(!!mUpdateSurface, "EndUpdate() without BeginUpdate()?");
-
-    // FIXME: this is the slow boat.  Make me fast (with GLXPixmap?).
-
-    // Undo the device offset that BeginUpdate set; doesn't much matter for us here,
-    // but important if we ever do anything directly with the surface.
-    mUpdateSurface->SetDeviceOffset(gfxPoint(0, 0));
-
-    bool relative = FinishedSurfaceUpdate();
-
-    mShaderType =
-        mGLContext->UploadSurfaceToTexture(mUpdateSurface,
-                                           mUpdateRegion,
-                                           mTexture,
-                                           mTextureState == Created,
-                                           mUpdateOffset,
-                                           relative);
-    FinishedSurfaceUpload();
-
-    mUpdateSurface = nullptr;
-    mTextureState = Valid;
-}
-
-void
-BasicTextureImage::BindTexture(GLenum aTextureUnit)
-{
-    mGLContext->fActiveTexture(aTextureUnit);
-    mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
-    mGLContext->fActiveTexture(LOCAL_GL_TEXTURE0);
-}
-
-void
-BasicTextureImage::ApplyFilter()
-{
-  mGLContext->ApplyFilterToBoundTexture(mFilter);
-}
-
-
-already_AddRefed<gfxASurface>
-BasicTextureImage::GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt)
-{
-    return gfxPlatform::GetPlatform()->
-        CreateOffscreenSurface(aSize, gfxASurface::ContentFromFormat(aFmt));
-}
-
-bool
-BasicTextureImage::FinishedSurfaceUpdate()
-{
-    return false;
-}
-
-void
-BasicTextureImage::FinishedSurfaceUpload()
-{
-}
-
-bool 
-BasicTextureImage::DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom /* = nsIntPoint(0, 0) */)
-{
-    nsIntRect bounds = aRegion.GetBounds();
-    nsIntRegion region;
-    if (mTextureState != Valid) {
-        bounds = nsIntRect(0, 0, mSize.width, mSize.height);
-        region = nsIntRegion(bounds);
-    } else {
-        region = aRegion;
-    }
-
-    mShaderType =
-        mGLContext->UploadSurfaceToTexture(aSurf,
-                                           region,
-                                           mTexture,
-                                           mTextureState == Created,
-                                           bounds.TopLeft() + aFrom,
-                                           false);
-    mTextureState = Valid;
-    return true;
-}
-
-void
-BasicTextureImage::Resize(const nsIntSize& aSize)
-{
-    NS_ASSERTION(!mUpdateSurface, "Resize() while in update?");
-
-    mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
-
-    mGLContext->fTexImage2D(LOCAL_GL_TEXTURE_2D,
-                            0,
-                            LOCAL_GL_RGBA,
-                            aSize.width,
-                            aSize.height,
-                            0,
-                            LOCAL_GL_RGBA,
-                            LOCAL_GL_UNSIGNED_BYTE,
-                            NULL);
-
-    mTextureState = Allocated;
-    mSize = aSize;
-}
-
-TiledTextureImage::TiledTextureImage(GLContext* aGL,
-                                     nsIntSize aSize,
-                                     TextureImage::ContentType aContentType,
-                                     TextureImage::Flags aFlags)
-    : TextureImage(aSize, LOCAL_GL_CLAMP_TO_EDGE, aContentType, aFlags)
-    , mCurrentImage(0)
-    , mIterationCallback(nullptr)
-    , mInUpdate(false)
-    , mRows(0)
-    , mColumns(0)
-    , mGL(aGL)
-    , mTextureState(Created)
-{
-    mTileSize = (!(aFlags & TextureImage::ForceSingleTile) && mGL->WantsSmallTiles())
-        ? 256 : mGL->GetMaxTextureSize();
-    if (aSize != nsIntSize(0,0)) {
-        Resize(aSize);
-    }
-}
-
-TiledTextureImage::~TiledTextureImage()
-{
-}
-
-bool 
-TiledTextureImage::DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom /* = nsIntPoint(0, 0) */)
-{
-    nsIntRegion region;
-
-    if (mTextureState != Valid) {
-        nsIntRect bounds = nsIntRect(0, 0, mSize.width, mSize.height);
-        region = nsIntRegion(bounds);
-    } else {
-        region = aRegion;
-    }
-
-    bool result = true;
-    int oldCurrentImage = mCurrentImage;
-    BeginTileIteration();
-    do {
-        nsIntRect tileRect = GetSrcTileRect();
-        int xPos = tileRect.x;
-        int yPos = tileRect.y;
-
-        nsIntRegion tileRegion;
-        tileRegion.And(region, tileRect); // intersect with tile
-
-        if (tileRegion.IsEmpty())
-            continue;
-
-        if (mGL->CanUploadSubTextures()) {
-          tileRegion.MoveBy(-xPos, -yPos); // translate into tile local space
-        } else {
-          // If sub-textures are unsupported, expand to tile boundaries
-          tileRect.x = tileRect.y = 0;
-          tileRegion = nsIntRegion(tileRect);
-        }
-
-        result &= mImages[mCurrentImage]->
-          DirectUpdate(aSurf, tileRegion, aFrom + nsIntPoint(xPos, yPos));
-
-        if (mCurrentImage == mImages.Length() - 1) {
-            // We know we're done, but we still need to ensure that the callback
-            // gets called (e.g. to update the uploaded region).
-            NextTile();
-            break;
-        }
-        // Override a callback cancelling iteration if the texture wasn't valid.
-        // We need to force the update in that situation, or we may end up
-        // showing invalid/out-of-date texture data.
-    } while (NextTile() || (mTextureState != Valid));
-    mCurrentImage = oldCurrentImage;
-
-    mShaderType = mImages[0]->GetShaderProgramType();
-    mTextureState = Valid;
-    return result;
-}
-
-void
-TiledTextureImage::GetUpdateRegion(nsIntRegion& aForRegion)
-{
-    if (mTextureState != Valid) {
-        // if the texture hasn't been initialized yet, or something important
-        // changed, we need to recreate our backing surface and force the
-        // client to paint everything
-        aForRegion = nsIntRect(nsIntPoint(0, 0), mSize);
-        return;
-    }
-
-    nsIntRegion newRegion;
-
-    // We need to query each texture with the region it will be drawing and
-    // set aForRegion to be the combination of all of these regions
-    for (unsigned i = 0; i < mImages.Length(); i++) {
-        int xPos = (i % mColumns) * mTileSize;
-        int yPos = (i / mColumns) * mTileSize;
-        nsIntRect imageRect = nsIntRect(nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize()));
-
-        if (aForRegion.Intersects(imageRect)) {
-            // Make a copy of the region
-            nsIntRegion subRegion;
-            subRegion.And(aForRegion, imageRect);
-            // Translate it into tile-space
-            subRegion.MoveBy(-xPos, -yPos);
-            // Query region
-            mImages[i]->GetUpdateRegion(subRegion);
-            // Translate back
-            subRegion.MoveBy(xPos, yPos);
-            // Add to the accumulated region
-            newRegion.Or(newRegion, subRegion);
-        }
-    }
-
-    aForRegion = newRegion;
-}
-
-gfxASurface*
-TiledTextureImage::BeginUpdate(nsIntRegion& aRegion)
-{
-    NS_ASSERTION(!mInUpdate, "nested update");
-    mInUpdate = true;
-
-    // Note, we don't call GetUpdateRegion here as if the updated region is
-    // fully contained in a single tile, we get to avoid iterating through
-    // the tiles again (and a little copying).
-    if (mTextureState != Valid)
-    {
-        // if the texture hasn't been initialized yet, or something important
-        // changed, we need to recreate our backing surface and force the
-        // client to paint everything
-        aRegion = nsIntRect(nsIntPoint(0, 0), mSize);
-    }
-
-    nsIntRect bounds = aRegion.GetBounds();
-
-    for (unsigned i = 0; i < mImages.Length(); i++) {
-        int xPos = (i % mColumns) * mTileSize;
-        int yPos = (i / mColumns) * mTileSize;
-        nsIntRegion imageRegion = nsIntRegion(nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize()));
-
-        // a single Image can handle this update request
-        if (imageRegion.Contains(aRegion)) {
-            // adjust for tile offset
-            aRegion.MoveBy(-xPos, -yPos);
-            // forward the actual call
-            nsRefPtr<gfxASurface> surface = mImages[i]->BeginUpdate(aRegion);
-            // caller expects container space
-            aRegion.MoveBy(xPos, yPos);
-            // Correct the device offset
-            gfxPoint offset = surface->GetDeviceOffset();
-            surface->SetDeviceOffset(gfxPoint(offset.x - xPos,
-                                              offset.y - yPos));
-            // we don't have a temp surface
-            mUpdateSurface = nullptr;
-            // remember which image to EndUpdate
-            mCurrentImage = i;
-            return surface.get();
-        }
-    }
-
-    // Get the real updated region, taking into account the capabilities of
-    // each TextureImage tile
-    GetUpdateRegion(aRegion);
-    mUpdateRegion = aRegion;
-    bounds = aRegion.GetBounds();
-
-    // update covers multiple Images - create a temp surface to paint in
-    gfxASurface::gfxImageFormat format =
-        (GetContentType() == gfxASurface::CONTENT_COLOR) ?
-        gfxASurface::ImageFormatRGB24 : gfxASurface::ImageFormatARGB32;
-    mUpdateSurface = gfxPlatform::GetPlatform()->
-        CreateOffscreenSurface(gfxIntSize(bounds.width, bounds.height), gfxASurface::ContentFromFormat(format));
-    mUpdateSurface->SetDeviceOffset(gfxPoint(-bounds.x, -bounds.y));
-
-    return mUpdateSurface;
-}
-
-void
-TiledTextureImage::EndUpdate()
-{
-    NS_ASSERTION(mInUpdate, "EndUpdate not in update");
-    if (!mUpdateSurface) { // update was to a single TextureImage
-        mImages[mCurrentImage]->EndUpdate();
-        mInUpdate = false;
-        mTextureState = Valid;
-        mShaderType = mImages[mCurrentImage]->GetShaderProgramType();
-        return;
-    }
-
-    // upload tiles from temp surface
-    for (unsigned i = 0; i < mImages.Length(); i++) {
-        int xPos = (i % mColumns) * mTileSize;
-        int yPos = (i / mColumns) * mTileSize;
-        nsIntRect imageRect = nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize());
-
-        nsIntRegion subregion;
-        subregion.And(mUpdateRegion, imageRect);
-        if (subregion.IsEmpty())
-            continue;
-        subregion.MoveBy(-xPos, -yPos); // Tile-local space
-        // copy tile from temp surface
-        gfxASurface* surf = mImages[i]->BeginUpdate(subregion);
-        nsRefPtr<gfxContext> ctx = new gfxContext(surf);
-        gfxUtils::ClipToRegion(ctx, subregion);
-        ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
-        ctx->SetSource(mUpdateSurface, gfxPoint(-xPos, -yPos));
-        ctx->Paint();
-        mImages[i]->EndUpdate();
-    }
-
-    mUpdateSurface = nullptr;
-    mInUpdate = false;
-    mShaderType = mImages[0]->GetShaderProgramType();
-    mTextureState = Valid;
-}
-
-void TiledTextureImage::BeginTileIteration()
-{
-    mCurrentImage = 0;
-}
-
-bool TiledTextureImage::NextTile()
-{
-    bool continueIteration = true;
-
-    if (mIterationCallback)
-        continueIteration = mIterationCallback(this, mCurrentImage,
-                                               mIterationCallbackData);
-
-    if (mCurrentImage + 1 < mImages.Length()) {
-        mCurrentImage++;
-        return continueIteration;
-    }
-    return false;
-}
-
-void TiledTextureImage::SetIterationCallback(TileIterationCallback aCallback,
-                                             void* aCallbackData)
-{
-    mIterationCallback = aCallback;
-    mIterationCallbackData = aCallbackData;
-}
-
-nsIntRect TiledTextureImage::GetTileRect()
-{
-    nsIntRect rect = mImages[mCurrentImage]->GetTileRect();
-    unsigned int xPos = (mCurrentImage % mColumns) * mTileSize;
-    unsigned int yPos = (mCurrentImage / mColumns) * mTileSize;
-    rect.MoveBy(xPos, yPos);
-    return rect;
-}
-
-nsIntRect TiledTextureImage::GetSrcTileRect()
-{
-    nsIntRect rect = GetTileRect();
-    unsigned int srcY = mFlags & NeedsYFlip
-                        ? mSize.height - rect.height - rect.y
-                        : rect.y;
-    return nsIntRect(rect.x, srcY, rect.width, rect.height);
-}
-
-void
-TiledTextureImage::BindTexture(GLenum aTextureUnit)
-{
-    mImages[mCurrentImage]->BindTexture(aTextureUnit);
-}
-
-void
-TiledTextureImage::ApplyFilter()
-{
-   mGL->ApplyFilterToBoundTexture(mFilter);
-}
-
-/*
- * Resize, trying to reuse tiles. The reuse strategy is to decide on reuse per
- * column. A tile on a column is reused if it hasn't changed size, otherwise it
- * is discarded/replaced. Extra tiles on a column are pruned after iterating
- * each column, and extra rows are pruned after iteration over the entire image
- * finishes.
- */
-void TiledTextureImage::Resize(const nsIntSize& aSize)
-{
-    if (mSize == aSize && mTextureState != Created) {
-        return;
-    }
-
-    // calculate rows and columns, rounding up
-    unsigned int columns = (aSize.width  + mTileSize - 1) / mTileSize;
-    unsigned int rows = (aSize.height + mTileSize - 1) / mTileSize;
-
-    // Iterate over old tile-store and insert/remove tiles as necessary
-    int row;
-    unsigned int i = 0;
-    for (row = 0; row < (int)rows; row++) {
-        // If we've gone beyond how many rows there were before, set mColumns to
-        // zero so that we only create new tiles.
-        if (row >= (int)mRows)
-            mColumns = 0;
-
-        // Similarly, if we're on the last row of old tiles and the height has
-        // changed, discard all tiles in that row.
-        // This will cause the pruning of columns not to work, but we don't need
-        // to worry about that, as no more tiles will be reused past this point
-        // anyway.
-        if ((row == (int)mRows - 1) && (aSize.height != mSize.height))
-            mColumns = 0;
-
-        int col;
-        for (col = 0; col < (int)columns; col++) {
-            nsIntSize size( // use tilesize first, then the remainder
-                    (col+1) * mTileSize > (unsigned int)aSize.width  ? aSize.width  % mTileSize : mTileSize,
-                    (row+1) * mTileSize > (unsigned int)aSize.height ? aSize.height % mTileSize : mTileSize);
-
-            bool replace = false;
-
-            // Check if we can re-use old tiles.
-            if (col < (int)mColumns) {
-                // Reuse an existing tile. If the tile is an end-tile and the
-                // width differs, replace it instead.
-                if (mSize.width != aSize.width) {
-                    if (col == (int)mColumns - 1) {
-                        // Tile at the end of the old column, replace it with
-                        // a new one.
-                        replace = true;
-                    } else if (col == (int)columns - 1) {
-                        // Tile at the end of the new column, create a new one.
-                    } else {
-                        // Before the last column on both the old and new sizes,
-                        // reuse existing tile.
-                        i++;
-                        continue;
-                    }
-                } else {
-                    // Width hasn't changed, reuse existing tile.
-                    i++;
-                    continue;
-                }
-            }
-
-            // Create a new tile.
-            nsRefPtr<TextureImage> teximg =
-                    mGL->TileGenFunc(size, mContentType, mFlags);
-            if (replace)
-                mImages.ReplaceElementAt(i, teximg.forget());
-            else
-                mImages.InsertElementAt(i, teximg.forget());
-            i++;
-        }
-
-        // Prune any unused tiles on the end of the column.
-        if (row < (int)mRows) {
-            for (col = (int)mColumns - col; col > 0; col--) {
-                mImages.RemoveElementAt(i);
-            }
-        }
-    }
-
-    // Prune any unused tiles at the end of the store.
-    unsigned int length = mImages.Length();
-    for (; i < length; i++)
-      mImages.RemoveElementAt(mImages.Length()-1);
-
-    // Reset tile-store properties.
-    mRows = rows;
-    mColumns = columns;
-    mSize = aSize;
-    mTextureState = Allocated;
-    mCurrentImage = 0;
-}
-
-uint32_t TiledTextureImage::GetTileCount()
-{
-    return mImages.Length();
-}
 
 GLContext::GLFormats
 GLContext::ChooseGLFormats(ContextFormat& aCF, ColorByteOrder aByteOrder)
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 5188d4411157..d8a327b26d41 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -33,6 +33,7 @@
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
 #include "GLContextTypes.h"
+#include "GLTextureImage.h"
 
 typedef char realGLboolean;
 
@@ -56,368 +57,6 @@ class GLContext;
 
 typedef uintptr_t SharedTextureHandle;
 
-/**
- * A TextureImage encapsulates a surface that can be drawn to by a
- * Thebes gfxContext and (hopefully efficiently!) synchronized to a
- * texture in the server.  TextureImages are associated with one and
- * only one GLContext.
- *
- * Implementation note: TextureImages attempt to unify two categories
- * of backends
- *
- *  (1) proxy to server-side object that can be bound to a texture;
- *      e.g. Pixmap on X11.
- *
- *  (2) efficient manager of texture memory; e.g. by having clients draw
- *      into a scratch buffer which is then uploaded with
- *      glTexSubImage2D().
- */
-class TextureImage
-{
-    NS_INLINE_DECL_REFCOUNTING(TextureImage)
-public:
-    enum TextureState
-    {
-      Created, // Texture created, but has not had glTexImage called to initialize it.
-      Allocated,  // Texture memory exists, but contents are invalid.
-      Valid  // Texture fully ready to use.
-    };
-
-    enum Flags {
-        NoFlags          = 0x0,
-        UseNearestFilter = 0x1,
-        NeedsYFlip       = 0x2,
-        ForceSingleTile  = 0x4
-    };
-
-    typedef gfxASurface::gfxContentType ContentType;
-
-    virtual ~TextureImage() {}
-
-    /**
-     * Returns a gfxASurface for updating |aRegion| of the client's
-     * image if successul, NULL if not.  |aRegion|'s bounds must fit
-     * within Size(); its coordinate space (if any) is ignored.  If
-     * the update begins successfully, the returned gfxASurface is
-     * owned by this.  Otherwise, NULL is returned.
-     *
-     * |aRegion| is an inout param: the returned region is what the
-     * client must repaint.  Category (1) regions above can
-     * efficiently handle repaints to "scattered" regions, while (2)
-     * can only efficiently handle repaints to rects.
-     *
-     * Painting the returned surface outside of |aRegion| results 
-     * in undefined behavior.
-     *
-     * BeginUpdate() calls cannot be "nested", and each successful
-     * BeginUpdate() must be followed by exactly one EndUpdate() (see
-     * below).  Failure to do so can leave this in a possibly
-     * inconsistent state.  Unsuccessful BeginUpdate()s must not be
-     * followed by EndUpdate().
-     */
-    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion) = 0;
-    /**
-     * Retrieves the region that will require updating, given a
-     * region that needs to be updated. This can be used for
-     * making decisions about updating before calling BeginUpdate().
-     *
-     * |aRegion| is an inout param.
-     */
-    virtual void GetUpdateRegion(nsIntRegion& aForRegion) {
-    }
-    /**
-     * Finish the active update and synchronize with the server, if
-     * necessary.
-     *
-     * BeginUpdate() must have been called exactly once before
-     * EndUpdate().
-     */
-    virtual void EndUpdate() = 0;
-
-    /**
-     * The Image may contain several textures for different regions (tiles).
-     * These functions iterate over each sub texture image tile.
-     */
-    virtual void BeginTileIteration() {
-    }
-
-    virtual bool NextTile() {
-        return false;
-    }
-
-    // Function prototype for a tile iteration callback. Returning false will
-    // cause iteration to be interrupted (i.e. the corresponding NextTile call
-    // will return false).
-    typedef bool (* TileIterationCallback)(TextureImage* aImage,
-                                           int aTileNumber,
-                                           void* aCallbackData);
-
-    // Sets a callback to be called every time NextTile is called.
-    virtual void SetIterationCallback(TileIterationCallback aCallback,
-                                      void* aCallbackData) {
-    }
-
-    virtual nsIntRect GetTileRect() {
-        return nsIntRect(nsIntPoint(0,0), mSize);
-    }
-
-    virtual GLuint GetTextureID() = 0;
-
-    virtual uint32_t GetTileCount() {
-        return 1;
-    }
-
-    /**
-     * Set this TextureImage's size, and ensure a texture has been
-     * allocated.  Must not be called between BeginUpdate and EndUpdate.
-     * After a resize, the contents are undefined.
-     *
-     * If this isn't implemented by a subclass, it will just perform
-     * a dummy BeginUpdate/EndUpdate pair.
-     */
-    virtual void Resize(const nsIntSize& aSize) {
-        mSize = aSize;
-        nsIntRegion r(nsIntRect(0, 0, aSize.width, aSize.height));
-        BeginUpdate(r);
-        EndUpdate();
-    }
-
-    /**
-     * Mark this texture as having valid contents. Call this after modifying
-     * the texture contents externally.
-     */
-    virtual void MarkValid() {}
-
-    /**
-     * aSurf - the source surface to update from
-     * aRegion - the region in this image to update
-     * aFrom - offset in the source to update from
-     */
-    virtual bool DirectUpdate(gfxASurface *aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0)) = 0;
-
-    virtual void BindTexture(GLenum aTextureUnit) = 0;
-    virtual void ReleaseTexture() {}
-
-    void BindTextureAndApplyFilter(GLenum aTextureUnit) {
-        BindTexture(aTextureUnit);
-        ApplyFilter();
-    }
-
-    class ScopedBindTexture
-    {
-    public:
-        ScopedBindTexture(TextureImage *aTexture, GLenum aTextureUnit) :
-          mTexture(aTexture)
-        {
-            if (mTexture) {
-                mTexture->BindTexture(aTextureUnit);
-            }
-        }
-
-        ~ScopedBindTexture()
-        {
-            if (mTexture) {
-                mTexture->ReleaseTexture();
-            }       
-        }
-
-    protected:
-        TextureImage *mTexture;
-    };
-
-    class ScopedBindTextureAndApplyFilter
-        : public ScopedBindTexture
-    {
-    public:
-        ScopedBindTextureAndApplyFilter(TextureImage *aTexture, GLenum aTextureUnit) :
-          ScopedBindTexture(aTexture, aTextureUnit)
-        {
-            if (mTexture) {
-                mTexture->ApplyFilter();
-            }
-        }
-    };
-
-    /**
-     * Returns the shader program type that should be used to render
-     * this texture. Only valid after a matching BeginUpdate/EndUpdate
-     * pair have been called.
-     */
-    virtual ShaderProgramType GetShaderProgramType()
-    {
-         return mShaderType;
-    }
-
-    /** Can be called safely at any time. */
-
-    /**
-     * If this TextureImage has a permanent gfxASurface backing,
-     * return it.  Otherwise return NULL.
-     */
-    virtual already_AddRefed<gfxASurface> GetBackingSurface()
-    { return NULL; }
-
-    const nsIntSize& GetSize() const { return mSize; }
-    ContentType GetContentType() const { return mContentType; }
-    virtual bool InUpdate() const = 0;
-    GLenum GetWrapMode() const { return mWrapMode; }
-
-    void SetFilter(gfxPattern::GraphicsFilter aFilter) { mFilter = aFilter; }
-
-    /**
-     * Applies this TextureImage's filter, assuming that its texture is
-     * the currently bound texture.
-     */
-    virtual void ApplyFilter() = 0;
-
-protected:
-    friend class GLContext;
-
-    /**
-     * After the ctor, the TextureImage is invalid.  Implementations
-     * must allocate resources successfully before returning the new
-     * TextureImage from GLContext::CreateTextureImage().  That is,
-     * clients must not be given partially-constructed TextureImages.
-     */
-    TextureImage(const nsIntSize& aSize,
-                 GLenum aWrapMode, ContentType aContentType,
-                 Flags aFlags = NoFlags)
-        : mSize(aSize)
-        , mWrapMode(aWrapMode)
-        , mContentType(aContentType)
-        , mFilter(gfxPattern::FILTER_GOOD)
-        , mFlags(aFlags)
-    {}
-
-    virtual nsIntRect GetSrcTileRect() {
-        return nsIntRect(nsIntPoint(0,0), mSize);
-    }
-
-    nsIntSize mSize;
-    GLenum mWrapMode;
-    ContentType mContentType;
-    ShaderProgramType mShaderType;
-    gfxPattern::GraphicsFilter mFilter;
-    Flags mFlags;
-};
-
-/**
- * BasicTextureImage is the baseline TextureImage implementation ---
- * it updates its texture by allocating a scratch buffer for the
- * client to draw into, then using glTexSubImage2D() to upload the new
- * pixels.  Platforms must provide the code to create a new surface
- * into which the updated pixels will be drawn, and the code to
- * convert the update surface's pixels into an image on which we can
- * glTexSubImage2D().
- */
-class BasicTextureImage
-    : public TextureImage
-{
-public:
-    typedef gfxASurface::gfxImageFormat ImageFormat;
-    virtual ~BasicTextureImage();
-
-    BasicTextureImage(GLuint aTexture,
-                      const nsIntSize& aSize,
-                      GLenum aWrapMode,
-                      ContentType aContentType,
-                      GLContext* aContext,
-                      TextureImage::Flags aFlags = TextureImage::NoFlags)
-        : TextureImage(aSize, aWrapMode, aContentType, aFlags)
-        , mTexture(aTexture)
-        , mTextureState(Created)
-        , mGLContext(aContext)
-        , mUpdateOffset(0, 0)
-    {}
-
-    virtual void BindTexture(GLenum aTextureUnit);
-
-    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion);
-    virtual void GetUpdateRegion(nsIntRegion& aForRegion);
-    virtual void EndUpdate();
-    virtual bool DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0));
-    virtual GLuint GetTextureID() { return mTexture; }
-    // Returns a surface to draw into
-    virtual already_AddRefed<gfxASurface>
-      GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt);
-
-    virtual void MarkValid() { mTextureState = Valid; }
-
-    // Call when drawing into the update surface is complete.
-    // Returns true if textures should be upload with a relative 
-    // offset - See UploadSurfaceToTexture.
-    virtual bool FinishedSurfaceUpdate();
-
-    // Call after surface data has been uploaded to a texture.
-    virtual void FinishedSurfaceUpload();
-
-    virtual bool InUpdate() const { return !!mUpdateSurface; }
-
-    virtual void Resize(const nsIntSize& aSize);
-
-    virtual void ApplyFilter();
-protected:
-
-    GLuint mTexture;
-    TextureState mTextureState;
-    GLContext* mGLContext;
-    nsRefPtr<gfxASurface> mUpdateSurface;
-    nsIntRegion mUpdateRegion;
-
-    // The offset into the update surface at which the update rect is located.
-    nsIntPoint mUpdateOffset;
-};
-
-/**
- * A container class that complements many sub TextureImages into a big TextureImage.
- * Aims to behave just like the real thing.
- */
-
-class TiledTextureImage
-    : public TextureImage
-{
-public:
-    TiledTextureImage(GLContext* aGL, nsIntSize aSize,
-        TextureImage::ContentType, TextureImage::Flags aFlags = TextureImage::NoFlags);
-    ~TiledTextureImage();
-    void DumpDiv();
-    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion);
-    virtual void GetUpdateRegion(nsIntRegion& aForRegion);
-    virtual void EndUpdate();
-    virtual void Resize(const nsIntSize& aSize);
-    virtual uint32_t GetTileCount();
-    virtual void BeginTileIteration();
-    virtual bool NextTile();
-    virtual void SetIterationCallback(TileIterationCallback aCallback,
-                                      void* aCallbackData);
-    virtual nsIntRect GetTileRect();
-    virtual GLuint GetTextureID() {
-        return mImages[mCurrentImage]->GetTextureID();
-    }
-    virtual bool DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0));
-    virtual bool InUpdate() const { return mInUpdate; }
-    virtual void BindTexture(GLenum);
-    virtual void ApplyFilter();
-
-protected:
-    virtual nsIntRect GetSrcTileRect();
-
-    unsigned int mCurrentImage;
-    TileIterationCallback mIterationCallback;
-    void* mIterationCallbackData;
-    nsTArray< nsRefPtr<TextureImage> > mImages;
-    bool mInUpdate;
-    nsIntSize mSize;
-    unsigned int mTileSize;
-    unsigned int mRows, mColumns;
-    GLContext* mGL;
-    // A temporary surface to faciliate cross-tile updates.
-    nsRefPtr<gfxASurface> mUpdateSurface;
-    // The region of update requested
-    nsIntRegion mUpdateRegion;
-    TextureState mTextureState;
-};
-
 struct THEBES_API ContextFormat
 {
     static const ContextFormat BasicRGBA32Format;
@@ -1927,12 +1566,7 @@ protected:
                             GLenum aWrapMode,
                             TextureImage::ContentType aContentType,
                             GLContext* aContext,
-                            TextureImage::Flags aFlags = TextureImage::NoFlags)
-    {
-        nsRefPtr<BasicTextureImage> teximage(
-            new BasicTextureImage(aTexture, aSize, aWrapMode, aContentType, aContext, aFlags));
-        return teximage.forget();
-    }
+                            TextureImage::Flags aFlags = TextureImage::NoFlags);
 
     bool IsOffscreenSizeAllowed(const gfxIntSize& aSize) const {
         int32_t biggerDimension = NS_MAX(aSize.width, aSize.height);
diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index 85bb1c6aad10..0f7b7cbc1efd 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -1072,6 +1072,7 @@ bool GLContextEGL::AttachSharedHandle(SharedTextureShareType shareType,
     return true;
 }
 
+
 bool
 GLContextEGL::BindTex2DOffscreen(GLContext *aOffscreen)
 {
diff --git a/gfx/gl/GLTextureImage.cpp b/gfx/gl/GLTextureImage.cpp
new file mode 100644
index 000000000000..fbfef04fa4e6
--- /dev/null
+++ b/gfx/gl/GLTextureImage.cpp
@@ -0,0 +1,573 @@
+/* -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40; -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "GLTextureImage.h"
+#include "GLContext.h"
+#include "gfxContext.h"
+#include "gfxPlatform.h"
+#include "gfxUtils.h"
+
+using namespace mozilla::gl;
+
+already_AddRefed<TextureImage>
+TextureImage::Create(GLContext* gl,
+                     const nsIntSize& size,
+                     TextureImage::ContentType contentType,
+                     GLenum wrapMode,
+                     TextureImage::Flags flags)
+{
+    return gl->CreateTextureImage(size, contentType, wrapMode, flags);
+}
+
+BasicTextureImage::~BasicTextureImage()
+{
+    GLContext *ctx = mGLContext;
+    if (ctx->IsDestroyed() || !ctx->IsOwningThreadCurrent()) {
+        ctx = ctx->GetSharedContext();
+    }
+
+    // If we have a context, then we need to delete the texture;
+    // if we don't have a context (either real or shared),
+    // then they went away when the contex was deleted, because it
+    // was the only one that had access to it.
+    if (ctx && !ctx->IsDestroyed()) {
+        mGLContext->MakeCurrent();
+        mGLContext->fDeleteTextures(1, &mTexture);
+    }
+}
+
+gfxASurface*
+BasicTextureImage::BeginUpdate(nsIntRegion& aRegion)
+{
+    NS_ASSERTION(!mUpdateSurface, "BeginUpdate() without EndUpdate()?");
+
+    // determine the region the client will need to repaint
+    if (mGLContext->CanUploadSubTextures()) {
+        GetUpdateRegion(aRegion);
+    } else {
+        aRegion = nsIntRect(nsIntPoint(0, 0), mSize);
+    }
+
+    mUpdateRegion = aRegion;
+
+    nsIntRect rgnSize = mUpdateRegion.GetBounds();
+    if (!nsIntRect(nsIntPoint(0, 0), mSize).Contains(rgnSize)) {
+        NS_ERROR("update outside of image");
+        return NULL;
+    }
+
+    ImageFormat format =
+        (GetContentType() == gfxASurface::CONTENT_COLOR) ?
+        gfxASurface::ImageFormatRGB24 : gfxASurface::ImageFormatARGB32;
+    mUpdateSurface =
+        GetSurfaceForUpdate(gfxIntSize(rgnSize.width, rgnSize.height), format);
+
+    if (!mUpdateSurface || mUpdateSurface->CairoStatus()) {
+        mUpdateSurface = NULL;
+        return NULL;
+    }
+
+    mUpdateSurface->SetDeviceOffset(gfxPoint(-rgnSize.x, -rgnSize.y));
+
+    return mUpdateSurface;
+}
+
+void
+BasicTextureImage::GetUpdateRegion(nsIntRegion& aForRegion)
+{
+  // if the texture hasn't been initialized yet, or something important
+  // changed, we need to recreate our backing surface and force the
+  // client to paint everything
+  if (mTextureState != Valid)
+      aForRegion = nsIntRect(nsIntPoint(0, 0), mSize);
+}
+
+void
+BasicTextureImage::EndUpdate()
+{
+    NS_ASSERTION(!!mUpdateSurface, "EndUpdate() without BeginUpdate()?");
+
+    // FIXME: this is the slow boat.  Make me fast (with GLXPixmap?).
+
+    // Undo the device offset that BeginUpdate set; doesn't much matter for us here,
+    // but important if we ever do anything directly with the surface.
+    mUpdateSurface->SetDeviceOffset(gfxPoint(0, 0));
+
+    bool relative = FinishedSurfaceUpdate();
+
+    mShaderType =
+        mGLContext->UploadSurfaceToTexture(mUpdateSurface,
+                                           mUpdateRegion,
+                                           mTexture,
+                                           mTextureState == Created,
+                                           mUpdateOffset,
+                                           relative);
+    FinishedSurfaceUpload();
+
+    mUpdateSurface = nullptr;
+    mTextureState = Valid;
+}
+
+void
+BasicTextureImage::BindTexture(GLenum aTextureUnit)
+{
+    mGLContext->fActiveTexture(aTextureUnit);
+    mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
+    mGLContext->fActiveTexture(LOCAL_GL_TEXTURE0);
+}
+
+void
+BasicTextureImage::ApplyFilter()
+{
+  mGLContext->ApplyFilterToBoundTexture(mFilter);
+}
+
+
+already_AddRefed<gfxASurface>
+BasicTextureImage::GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt)
+{
+    return gfxPlatform::GetPlatform()->
+        CreateOffscreenSurface(aSize, gfxASurface::ContentFromFormat(aFmt));
+}
+
+bool
+BasicTextureImage::FinishedSurfaceUpdate()
+{
+    return false;
+}
+
+void
+BasicTextureImage::FinishedSurfaceUpload()
+{
+}
+
+bool
+BasicTextureImage::DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom /* = nsIntPoint(0, 0) */)
+{
+    nsIntRect bounds = aRegion.GetBounds();
+    nsIntRegion region;
+    if (mTextureState != Valid) {
+        bounds = nsIntRect(0, 0, mSize.width, mSize.height);
+        region = nsIntRegion(bounds);
+    } else {
+        region = aRegion;
+    }
+
+    mShaderType =
+        mGLContext->UploadSurfaceToTexture(aSurf,
+                                           region,
+                                           mTexture,
+                                           mTextureState == Created,
+                                           bounds.TopLeft() + aFrom,
+                                           false);
+    mTextureState = Valid;
+    return true;
+}
+
+void
+BasicTextureImage::Resize(const nsIntSize& aSize)
+{
+    NS_ASSERTION(!mUpdateSurface, "Resize() while in update?");
+
+    mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
+
+    mGLContext->fTexImage2D(LOCAL_GL_TEXTURE_2D,
+                            0,
+                            LOCAL_GL_RGBA,
+                            aSize.width,
+                            aSize.height,
+                            0,
+                            LOCAL_GL_RGBA,
+                            LOCAL_GL_UNSIGNED_BYTE,
+                            NULL);
+
+    mTextureState = Allocated;
+    mSize = aSize;
+}
+
+TiledTextureImage::TiledTextureImage(GLContext* aGL,
+                                     nsIntSize aSize,
+                                     TextureImage::ContentType aContentType,
+                                     TextureImage::Flags aFlags)
+    : TextureImage(aSize, LOCAL_GL_CLAMP_TO_EDGE, aContentType, aFlags)
+    , mCurrentImage(0)
+    , mIterationCallback(nullptr)
+    , mInUpdate(false)
+    , mRows(0)
+    , mColumns(0)
+    , mGL(aGL)
+    , mTextureState(Created)
+{
+    mTileSize = (!(aFlags & TextureImage::ForceSingleTile) && mGL->WantsSmallTiles())
+        ? 256 : mGL->GetMaxTextureSize();
+    if (aSize != nsIntSize(0,0)) {
+        Resize(aSize);
+    }
+}
+
+TiledTextureImage::~TiledTextureImage()
+{
+}
+
+bool
+TiledTextureImage::DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom /* = nsIntPoint(0, 0) */)
+{
+    nsIntRegion region;
+
+    if (mTextureState != Valid) {
+        nsIntRect bounds = nsIntRect(0, 0, mSize.width, mSize.height);
+        region = nsIntRegion(bounds);
+    } else {
+        region = aRegion;
+    }
+
+    bool result = true;
+    int oldCurrentImage = mCurrentImage;
+    BeginTileIteration();
+    do {
+        nsIntRect tileRect = GetSrcTileRect();
+        int xPos = tileRect.x;
+        int yPos = tileRect.y;
+
+        nsIntRegion tileRegion;
+        tileRegion.And(region, tileRect); // intersect with tile
+
+        if (tileRegion.IsEmpty())
+            continue;
+
+        if (mGL->CanUploadSubTextures()) {
+          tileRegion.MoveBy(-xPos, -yPos); // translate into tile local space
+        } else {
+          // If sub-textures are unsupported, expand to tile boundaries
+          tileRect.x = tileRect.y = 0;
+          tileRegion = nsIntRegion(tileRect);
+        }
+
+        result &= mImages[mCurrentImage]->
+          DirectUpdate(aSurf, tileRegion, aFrom + nsIntPoint(xPos, yPos));
+
+        if (mCurrentImage == mImages.Length() - 1) {
+            // We know we're done, but we still need to ensure that the callback
+            // gets called (e.g. to update the uploaded region).
+            NextTile();
+            break;
+        }
+        // Override a callback cancelling iteration if the texture wasn't valid.
+        // We need to force the update in that situation, or we may end up
+        // showing invalid/out-of-date texture data.
+    } while (NextTile() || (mTextureState != Valid));
+    mCurrentImage = oldCurrentImage;
+
+    mShaderType = mImages[0]->GetShaderProgramType();
+    mTextureState = Valid;
+    return result;
+}
+
+void
+TiledTextureImage::GetUpdateRegion(nsIntRegion& aForRegion)
+{
+    if (mTextureState != Valid) {
+        // if the texture hasn't been initialized yet, or something important
+        // changed, we need to recreate our backing surface and force the
+        // client to paint everything
+        aForRegion = nsIntRect(nsIntPoint(0, 0), mSize);
+        return;
+    }
+
+    nsIntRegion newRegion;
+
+    // We need to query each texture with the region it will be drawing and
+    // set aForRegion to be the combination of all of these regions
+    for (unsigned i = 0; i < mImages.Length(); i++) {
+        int xPos = (i % mColumns) * mTileSize;
+        int yPos = (i / mColumns) * mTileSize;
+        nsIntRect imageRect = nsIntRect(nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize()));
+
+        if (aForRegion.Intersects(imageRect)) {
+            // Make a copy of the region
+            nsIntRegion subRegion;
+            subRegion.And(aForRegion, imageRect);
+            // Translate it into tile-space
+            subRegion.MoveBy(-xPos, -yPos);
+            // Query region
+            mImages[i]->GetUpdateRegion(subRegion);
+            // Translate back
+            subRegion.MoveBy(xPos, yPos);
+            // Add to the accumulated region
+            newRegion.Or(newRegion, subRegion);
+        }
+    }
+
+    aForRegion = newRegion;
+}
+
+gfxASurface*
+TiledTextureImage::BeginUpdate(nsIntRegion& aRegion)
+{
+    NS_ASSERTION(!mInUpdate, "nested update");
+    mInUpdate = true;
+
+    // Note, we don't call GetUpdateRegion here as if the updated region is
+    // fully contained in a single tile, we get to avoid iterating through
+    // the tiles again (and a little copying).
+    if (mTextureState != Valid)
+    {
+        // if the texture hasn't been initialized yet, or something important
+        // changed, we need to recreate our backing surface and force the
+        // client to paint everything
+        aRegion = nsIntRect(nsIntPoint(0, 0), mSize);
+    }
+
+    nsIntRect bounds = aRegion.GetBounds();
+
+    for (unsigned i = 0; i < mImages.Length(); i++) {
+        int xPos = (i % mColumns) * mTileSize;
+        int yPos = (i / mColumns) * mTileSize;
+        nsIntRegion imageRegion = nsIntRegion(nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize()));
+
+        // a single Image can handle this update request
+        if (imageRegion.Contains(aRegion)) {
+            // adjust for tile offset
+            aRegion.MoveBy(-xPos, -yPos);
+            // forward the actual call
+            nsRefPtr<gfxASurface> surface = mImages[i]->BeginUpdate(aRegion);
+            // caller expects container space
+            aRegion.MoveBy(xPos, yPos);
+            // Correct the device offset
+            gfxPoint offset = surface->GetDeviceOffset();
+            surface->SetDeviceOffset(gfxPoint(offset.x - xPos,
+                                              offset.y - yPos));
+            // we don't have a temp surface
+            mUpdateSurface = nullptr;
+            // remember which image to EndUpdate
+            mCurrentImage = i;
+            return surface.get();
+        }
+    }
+
+    // Get the real updated region, taking into account the capabilities of
+    // each TextureImage tile
+    GetUpdateRegion(aRegion);
+    mUpdateRegion = aRegion;
+    bounds = aRegion.GetBounds();
+
+    // update covers multiple Images - create a temp surface to paint in
+    gfxASurface::gfxImageFormat format =
+        (GetContentType() == gfxASurface::CONTENT_COLOR) ?
+        gfxASurface::ImageFormatRGB24 : gfxASurface::ImageFormatARGB32;
+    mUpdateSurface = gfxPlatform::GetPlatform()->
+        CreateOffscreenSurface(gfxIntSize(bounds.width, bounds.height), gfxASurface::ContentFromFormat(format));
+    mUpdateSurface->SetDeviceOffset(gfxPoint(-bounds.x, -bounds.y));
+
+    return mUpdateSurface;
+}
+
+void
+TiledTextureImage::EndUpdate()
+{
+    NS_ASSERTION(mInUpdate, "EndUpdate not in update");
+    if (!mUpdateSurface) { // update was to a single TextureImage
+        mImages[mCurrentImage]->EndUpdate();
+        mInUpdate = false;
+        mTextureState = Valid;
+        mShaderType = mImages[mCurrentImage]->GetShaderProgramType();
+        return;
+    }
+
+    // upload tiles from temp surface
+    for (unsigned i = 0; i < mImages.Length(); i++) {
+        int xPos = (i % mColumns) * mTileSize;
+        int yPos = (i / mColumns) * mTileSize;
+        nsIntRect imageRect = nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize());
+
+        nsIntRegion subregion;
+        subregion.And(mUpdateRegion, imageRect);
+        if (subregion.IsEmpty())
+            continue;
+        subregion.MoveBy(-xPos, -yPos); // Tile-local space
+        // copy tile from temp surface
+        gfxASurface* surf = mImages[i]->BeginUpdate(subregion);
+        nsRefPtr<gfxContext> ctx = new gfxContext(surf);
+        gfxUtils::ClipToRegion(ctx, subregion);
+        ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
+        ctx->SetSource(mUpdateSurface, gfxPoint(-xPos, -yPos));
+        ctx->Paint();
+        mImages[i]->EndUpdate();
+    }
+
+    mUpdateSurface = nullptr;
+    mInUpdate = false;
+    mShaderType = mImages[0]->GetShaderProgramType();
+    mTextureState = Valid;
+}
+
+void TiledTextureImage::BeginTileIteration()
+{
+    mCurrentImage = 0;
+}
+
+bool TiledTextureImage::NextTile()
+{
+    bool continueIteration = true;
+
+    if (mIterationCallback)
+        continueIteration = mIterationCallback(this, mCurrentImage,
+                                               mIterationCallbackData);
+
+    if (mCurrentImage + 1 < mImages.Length()) {
+        mCurrentImage++;
+        return continueIteration;
+    }
+    return false;
+}
+
+void TiledTextureImage::SetIterationCallback(TileIterationCallback aCallback,
+                                             void* aCallbackData)
+{
+    mIterationCallback = aCallback;
+    mIterationCallbackData = aCallbackData;
+}
+
+nsIntRect TiledTextureImage::GetTileRect()
+{
+    nsIntRect rect = mImages[mCurrentImage]->GetTileRect();
+    unsigned int xPos = (mCurrentImage % mColumns) * mTileSize;
+    unsigned int yPos = (mCurrentImage / mColumns) * mTileSize;
+    rect.MoveBy(xPos, yPos);
+    return rect;
+}
+
+nsIntRect TiledTextureImage::GetSrcTileRect()
+{
+    nsIntRect rect = GetTileRect();
+    unsigned int srcY = mFlags & NeedsYFlip
+                        ? mSize.height - rect.height - rect.y
+                        : rect.y;
+    return nsIntRect(rect.x, srcY, rect.width, rect.height);
+}
+
+void
+TiledTextureImage::BindTexture(GLenum aTextureUnit)
+{
+    mImages[mCurrentImage]->BindTexture(aTextureUnit);
+}
+
+void
+TiledTextureImage::ApplyFilter()
+{
+   mGL->ApplyFilterToBoundTexture(mFilter);
+}
+
+/*
+ * Resize, trying to reuse tiles. The reuse strategy is to decide on reuse per
+ * column. A tile on a column is reused if it hasn't changed size, otherwise it
+ * is discarded/replaced. Extra tiles on a column are pruned after iterating
+ * each column, and extra rows are pruned after iteration over the entire image
+ * finishes.
+ */
+void TiledTextureImage::Resize(const nsIntSize& aSize)
+{
+    if (mSize == aSize && mTextureState != Created) {
+        return;
+    }
+
+    // calculate rows and columns, rounding up
+    unsigned int columns = (aSize.width  + mTileSize - 1) / mTileSize;
+    unsigned int rows = (aSize.height + mTileSize - 1) / mTileSize;
+
+    // Iterate over old tile-store and insert/remove tiles as necessary
+    int row;
+    unsigned int i = 0;
+    for (row = 0; row < (int)rows; row++) {
+        // If we've gone beyond how many rows there were before, set mColumns to
+        // zero so that we only create new tiles.
+        if (row >= (int)mRows)
+            mColumns = 0;
+
+        // Similarly, if we're on the last row of old tiles and the height has
+        // changed, discard all tiles in that row.
+        // This will cause the pruning of columns not to work, but we don't need
+        // to worry about that, as no more tiles will be reused past this point
+        // anyway.
+        if ((row == (int)mRows - 1) && (aSize.height != mSize.height))
+            mColumns = 0;
+
+        int col;
+        for (col = 0; col < (int)columns; col++) {
+            nsIntSize size( // use tilesize first, then the remainder
+                    (col+1) * mTileSize > (unsigned int)aSize.width  ? aSize.width  % mTileSize : mTileSize,
+                    (row+1) * mTileSize > (unsigned int)aSize.height ? aSize.height % mTileSize : mTileSize);
+
+            bool replace = false;
+
+            // Check if we can re-use old tiles.
+            if (col < (int)mColumns) {
+                // Reuse an existing tile. If the tile is an end-tile and the
+                // width differs, replace it instead.
+                if (mSize.width != aSize.width) {
+                    if (col == (int)mColumns - 1) {
+                        // Tile at the end of the old column, replace it with
+                        // a new one.
+                        replace = true;
+                    } else if (col == (int)columns - 1) {
+                        // Tile at the end of the new column, create a new one.
+                    } else {
+                        // Before the last column on both the old and new sizes,
+                        // reuse existing tile.
+                        i++;
+                        continue;
+                    }
+                } else {
+                    // Width hasn't changed, reuse existing tile.
+                    i++;
+                    continue;
+                }
+            }
+
+            // Create a new tile.
+            nsRefPtr<TextureImage> teximg =
+                    mGL->TileGenFunc(size, mContentType, mFlags);
+            if (replace)
+                mImages.ReplaceElementAt(i, teximg.forget());
+            else
+                mImages.InsertElementAt(i, teximg.forget());
+            i++;
+        }
+
+        // Prune any unused tiles on the end of the column.
+        if (row < (int)mRows) {
+            for (col = (int)mColumns - col; col > 0; col--) {
+                mImages.RemoveElementAt(i);
+            }
+        }
+    }
+
+    // Prune any unused tiles at the end of the store.
+    unsigned int length = mImages.Length();
+    for (; i < length; i++)
+      mImages.RemoveElementAt(mImages.Length()-1);
+
+    // Reset tile-store properties.
+    mRows = rows;
+    mColumns = columns;
+    mSize = aSize;
+    mTextureState = Allocated;
+    mCurrentImage = 0;
+}
+
+uint32_t TiledTextureImage::GetTileCount()
+{
+    return mImages.Length();
+}
+
+TextureImage::ScopedBindTexture::ScopedBindTexture(TextureImage* aTexture,
+                                                   GLenum aTextureUnit)
+    : mTexture(aTexture)
+{
+    if (mTexture) {
+        MOZ_ASSERT(aTextureUnit >= LOCAL_GL_TEXTURE0);
+        mTexture->BindTexture(aTextureUnit);
+    }
+}
diff --git a/gfx/gl/GLTextureImage.h b/gfx/gl/GLTextureImage.h
new file mode 100644
index 000000000000..4217778fb0ef
--- /dev/null
+++ b/gfx/gl/GLTextureImage.h
@@ -0,0 +1,385 @@
+/* -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40; -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 GLTEXTUREIMAGE_H_
+#define GLTEXTUREIMAGE_H_
+
+#include "nsAutoPtr.h"
+#include "nsRegion.h"
+#include "gfxASurface.h"
+#include "GLContextTypes.h"
+#include "gfxPattern.h"
+
+namespace mozilla {
+namespace gl {
+class GLContext;
+
+/**
+ * A TextureImage encapsulates a surface that can be drawn to by a
+ * Thebes gfxContext and (hopefully efficiently!) synchronized to a
+ * texture in the server.  TextureImages are associated with one and
+ * only one GLContext.
+ *
+ * Implementation note: TextureImages attempt to unify two categories
+ * of backends
+ *
+ *  (1) proxy to server-side object that can be bound to a texture;
+ *      e.g. Pixmap on X11.
+ *
+ *  (2) efficient manager of texture memory; e.g. by having clients draw
+ *      into a scratch buffer which is then uploaded with
+ *      glTexSubImage2D().
+ */
+class TextureImage
+{
+    NS_INLINE_DECL_REFCOUNTING(TextureImage)
+public:
+    enum TextureState
+    {
+      Created, // Texture created, but has not had glTexImage called to initialize it.
+      Allocated,  // Texture memory exists, but contents are invalid.
+      Valid  // Texture fully ready to use.
+    };
+
+    enum Flags {
+        NoFlags          = 0x0,
+        UseNearestFilter = 0x1,
+        NeedsYFlip       = 0x2,
+        ForceSingleTile  = 0x4
+    };
+
+    typedef gfxASurface::gfxContentType ContentType;
+
+    static already_AddRefed<TextureImage> Create(
+                       GLContext* gl,
+                       const nsIntSize& aSize,
+                       TextureImage::ContentType aContentType,
+                       GLenum aWrapMode,
+                       TextureImage::Flags aFlags = TextureImage::NoFlags);
+
+    virtual ~TextureImage() {}
+
+    /**
+     * Returns a gfxASurface for updating |aRegion| of the client's
+     * image if successul, NULL if not.  |aRegion|'s bounds must fit
+     * within Size(); its coordinate space (if any) is ignored.  If
+     * the update begins successfully, the returned gfxASurface is
+     * owned by this.  Otherwise, NULL is returned.
+     *
+     * |aRegion| is an inout param: the returned region is what the
+     * client must repaint.  Category (1) regions above can
+     * efficiently handle repaints to "scattered" regions, while (2)
+     * can only efficiently handle repaints to rects.
+     *
+     * Painting the returned surface outside of |aRegion| results
+     * in undefined behavior.
+     *
+     * BeginUpdate() calls cannot be "nested", and each successful
+     * BeginUpdate() must be followed by exactly one EndUpdate() (see
+     * below).  Failure to do so can leave this in a possibly
+     * inconsistent state.  Unsuccessful BeginUpdate()s must not be
+     * followed by EndUpdate().
+     */
+    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion) = 0;
+    /**
+     * Retrieves the region that will require updating, given a
+     * region that needs to be updated. This can be used for
+     * making decisions about updating before calling BeginUpdate().
+     *
+     * |aRegion| is an inout param.
+     */
+    virtual void GetUpdateRegion(nsIntRegion& aForRegion) {
+    }
+    /**
+     * Finish the active update and synchronize with the server, if
+     * necessary.
+     *
+     * BeginUpdate() must have been called exactly once before
+     * EndUpdate().
+     */
+    virtual void EndUpdate() = 0;
+
+    /**
+     * The Image may contain several textures for different regions (tiles).
+     * These functions iterate over each sub texture image tile.
+     */
+    virtual void BeginTileIteration() {
+    }
+
+    virtual bool NextTile() {
+        return false;
+    }
+
+    // Function prototype for a tile iteration callback. Returning false will
+    // cause iteration to be interrupted (i.e. the corresponding NextTile call
+    // will return false).
+    typedef bool (* TileIterationCallback)(TextureImage* aImage,
+                                           int aTileNumber,
+                                           void* aCallbackData);
+
+    // Sets a callback to be called every time NextTile is called.
+    virtual void SetIterationCallback(TileIterationCallback aCallback,
+                                      void* aCallbackData) {
+    }
+
+    virtual nsIntRect GetTileRect() {
+        return nsIntRect(nsIntPoint(0,0), mSize);
+    }
+
+    virtual GLuint GetTextureID() = 0;
+
+    virtual uint32_t GetTileCount() {
+        return 1;
+    }
+
+    /**
+     * Set this TextureImage's size, and ensure a texture has been
+     * allocated.  Must not be called between BeginUpdate and EndUpdate.
+     * After a resize, the contents are undefined.
+     *
+     * If this isn't implemented by a subclass, it will just perform
+     * a dummy BeginUpdate/EndUpdate pair.
+     */
+    virtual void Resize(const nsIntSize& aSize) {
+        mSize = aSize;
+        nsIntRegion r(nsIntRect(0, 0, aSize.width, aSize.height));
+        BeginUpdate(r);
+        EndUpdate();
+    }
+
+    /**
+     * Mark this texture as having valid contents. Call this after modifying
+     * the texture contents externally.
+     */
+    virtual void MarkValid() {}
+
+    /**
+     * aSurf - the source surface to update from
+     * aRegion - the region in this image to update
+     * aFrom - offset in the source to update from
+     */
+    virtual bool DirectUpdate(gfxASurface *aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0)) = 0;
+
+    virtual void BindTexture(GLenum aTextureUnit) = 0;
+    virtual void ReleaseTexture() {}
+
+    void BindTextureAndApplyFilter(GLenum aTextureUnit) {
+        BindTexture(aTextureUnit);
+        ApplyFilter();
+    }
+
+    class ScopedBindTexture
+    {
+    public:
+        ScopedBindTexture(TextureImage *aTexture, GLenum aTextureUnit);
+
+        ~ScopedBindTexture()
+        {
+            if (mTexture) {
+                mTexture->ReleaseTexture();
+            }
+        }
+
+    protected:
+        TextureImage *mTexture;
+    };
+
+    class ScopedBindTextureAndApplyFilter
+        : public ScopedBindTexture
+    {
+    public:
+        ScopedBindTextureAndApplyFilter(TextureImage *aTexture, GLenum aTextureUnit) :
+          ScopedBindTexture(aTexture, aTextureUnit)
+        {
+            if (mTexture) {
+                mTexture->ApplyFilter();
+            }
+        }
+    };
+
+    /**
+     * Returns the shader program type that should be used to render
+     * this texture. Only valid after a matching BeginUpdate/EndUpdate
+     * pair have been called.
+     */
+    virtual ShaderProgramType GetShaderProgramType()
+    {
+         return mShaderType;
+    }
+
+    /** Can be called safely at any time. */
+
+    /**
+     * If this TextureImage has a permanent gfxASurface backing,
+     * return it.  Otherwise return NULL.
+     */
+    virtual already_AddRefed<gfxASurface> GetBackingSurface()
+    { return NULL; }
+
+    const nsIntSize& GetSize() const { return mSize; }
+    ContentType GetContentType() const { return mContentType; }
+    virtual bool InUpdate() const = 0;
+    GLenum GetWrapMode() const { return mWrapMode; }
+
+    void SetFilter(gfxPattern::GraphicsFilter aFilter) { mFilter = aFilter; }
+
+    /**
+     * Applies this TextureImage's filter, assuming that its texture is
+     * the currently bound texture.
+     */
+    virtual void ApplyFilter() = 0;
+
+protected:
+    friend class GLContext;
+
+    /**
+     * After the ctor, the TextureImage is invalid.  Implementations
+     * must allocate resources successfully before returning the new
+     * TextureImage from GLContext::CreateTextureImage().  That is,
+     * clients must not be given partially-constructed TextureImages.
+     */
+    TextureImage(const nsIntSize& aSize,
+                 GLenum aWrapMode, ContentType aContentType,
+                 Flags aFlags = NoFlags)
+        : mSize(aSize)
+        , mWrapMode(aWrapMode)
+        , mContentType(aContentType)
+        , mFilter(gfxPattern::FILTER_GOOD)
+        , mFlags(aFlags)
+    {}
+
+    virtual nsIntRect GetSrcTileRect() {
+        return nsIntRect(nsIntPoint(0,0), mSize);
+    }
+
+    nsIntSize mSize;
+    GLenum mWrapMode;
+    ContentType mContentType;
+    ShaderProgramType mShaderType;
+    gfxPattern::GraphicsFilter mFilter;
+    Flags mFlags;
+};
+
+/**
+ * BasicTextureImage is the baseline TextureImage implementation ---
+ * it updates its texture by allocating a scratch buffer for the
+ * client to draw into, then using glTexSubImage2D() to upload the new
+ * pixels.  Platforms must provide the code to create a new surface
+ * into which the updated pixels will be drawn, and the code to
+ * convert the update surface's pixels into an image on which we can
+ * glTexSubImage2D().
+ */
+class BasicTextureImage
+    : public TextureImage
+{
+public:
+    typedef gfxASurface::gfxImageFormat ImageFormat;
+    virtual ~BasicTextureImage();
+
+    BasicTextureImage(GLuint aTexture,
+                      const nsIntSize& aSize,
+                      GLenum aWrapMode,
+                      ContentType aContentType,
+                      GLContext* aContext,
+                      TextureImage::Flags aFlags = TextureImage::NoFlags)
+        : TextureImage(aSize, aWrapMode, aContentType, aFlags)
+        , mTexture(aTexture)
+        , mTextureState(Created)
+        , mGLContext(aContext)
+        , mUpdateOffset(0, 0)
+    {}
+
+    virtual void BindTexture(GLenum aTextureUnit);
+
+    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion);
+    virtual void GetUpdateRegion(nsIntRegion& aForRegion);
+    virtual void EndUpdate();
+    virtual bool DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0));
+    virtual GLuint GetTextureID() { return mTexture; }
+    // Returns a surface to draw into
+    virtual already_AddRefed<gfxASurface>
+      GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt);
+
+    virtual void MarkValid() { mTextureState = Valid; }
+
+    // Call when drawing into the update surface is complete.
+    // Returns true if textures should be upload with a relative
+    // offset - See UploadSurfaceToTexture.
+    virtual bool FinishedSurfaceUpdate();
+
+    // Call after surface data has been uploaded to a texture.
+    virtual void FinishedSurfaceUpload();
+
+    virtual bool InUpdate() const { return !!mUpdateSurface; }
+
+    virtual void Resize(const nsIntSize& aSize);
+
+    virtual void ApplyFilter();
+protected:
+
+    GLuint mTexture;
+    TextureState mTextureState;
+    GLContext* mGLContext;
+    nsRefPtr<gfxASurface> mUpdateSurface;
+    nsIntRegion mUpdateRegion;
+
+    // The offset into the update surface at which the update rect is located.
+    nsIntPoint mUpdateOffset;
+};
+
+/**
+ * A container class that complements many sub TextureImages into a big TextureImage.
+ * Aims to behave just like the real thing.
+ */
+
+class TiledTextureImage
+    : public TextureImage
+{
+public:
+    TiledTextureImage(GLContext* aGL, nsIntSize aSize,
+        TextureImage::ContentType, TextureImage::Flags aFlags = TextureImage::NoFlags);
+    ~TiledTextureImage();
+    void DumpDiv();
+    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion);
+    virtual void GetUpdateRegion(nsIntRegion& aForRegion);
+    virtual void EndUpdate();
+    virtual void Resize(const nsIntSize& aSize);
+    virtual uint32_t GetTileCount();
+    virtual void BeginTileIteration();
+    virtual bool NextTile();
+    virtual void SetIterationCallback(TileIterationCallback aCallback,
+                                      void* aCallbackData);
+    virtual nsIntRect GetTileRect();
+    virtual GLuint GetTextureID() {
+        return mImages[mCurrentImage]->GetTextureID();
+    }
+    virtual bool DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0));
+    virtual bool InUpdate() const { return mInUpdate; }
+    virtual void BindTexture(GLenum);
+    virtual void ApplyFilter();
+
+protected:
+    virtual nsIntRect GetSrcTileRect();
+
+    unsigned int mCurrentImage;
+    TileIterationCallback mIterationCallback;
+    void* mIterationCallbackData;
+    nsTArray< nsRefPtr<TextureImage> > mImages;
+    bool mInUpdate;
+    nsIntSize mSize;
+    unsigned int mTileSize;
+    unsigned int mRows, mColumns;
+    GLContext* mGL;
+    // A temporary surface to faciliate cross-tile updates.
+    nsRefPtr<gfxASurface> mUpdateSurface;
+    // The region of update requested
+    nsIntRegion mUpdateRegion;
+    TextureState mTextureState;
+};
+
+} // namespace gl
+} // namespace mozilla
+
+#endif /* GLTEXTUREIMAGE_H_ */
diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in
index e3729a278007..8f1cde8fe9de 100644
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -24,6 +24,7 @@ EXPORTS	= \
 	GLContextProviderImpl.h \
 	GLLibraryLoader.h \
 	ForceDiscreteGPUHelperCGL.h \
+	GLTextureImage.h \
 	$(NULL)
 
 ifdef MOZ_X11
@@ -48,6 +49,7 @@ CPPSRCS	= \
 	GLContext.cpp \
 	GLContextUtils.cpp \
 	GLLibraryLoader.cpp \
+	GLTextureImage.cpp \
 	$(NULL)
 
 GL_PROVIDER = Null
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index f8c005534d8d..403183554a59 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -51,6 +51,7 @@
 #include "nsRegion.h"
 #include "Layers.h"
 #include "LayerManagerOGL.h"
+#include "GLTextureImage.h"
 #include "mozilla/layers/CompositorCocoaWidgetHelper.h"
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"
@@ -1758,10 +1759,11 @@ nsChildView::DrawWindowOverlay(LayerManager* aManager, nsIntRect aRect)
   }
 
   if (!mResizerImage) {
-    mResizerImage = manager->gl()->CreateTextureImage(nsIntSize(15, 15),
-                                                      gfxASurface::CONTENT_COLOR_ALPHA,
-                                                      LOCAL_GL_CLAMP_TO_EDGE,
-                                                      TextureImage::UseNearestFilter);
+    mResizerImage = TextureImage::Create(manager->gl(),
+                                         nsIntSize(15, 15),
+                                         gfxASurface::CONTENT_COLOR_ALPHA,
+                                         LOCAL_GL_CLAMP_TO_EDGE,
+                                         TextureImage::UseNearestFilter);
 
     // Creation of texture images can fail.
     if (!mResizerImage)

From 5a0f0bbd1ab11d2b3663f5c66128cded22703df3 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 26 Nov 2012 16:20:03 -0500
Subject: [PATCH 017/160] Backed out changeset ac304d3c250e (bug 806742)
 because of test failures

---
 .../places/tests/browser/Makefile.in          |   6 -
 .../places/tests/browser/browser_bug248970.js | 256 ------------------
 2 files changed, 262 deletions(-)
 delete mode 100644 toolkit/components/places/tests/browser/browser_bug248970.js

diff --git a/toolkit/components/places/tests/browser/Makefile.in b/toolkit/components/places/tests/browser/Makefile.in
index 73f8edf55f50..e06863f98c2a 100644
--- a/toolkit/components/places/tests/browser/Makefile.in
+++ b/toolkit/components/places/tests/browser/Makefile.in
@@ -30,12 +30,6 @@ MOCHITEST_BROWSER_FILES = \
 	colorAnalyzer/localeGeneric.png \
 	$(NULL)
 
-ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING
-MOCHITEST_BROWSER_FILES += \
-	browser_bug248970.js \
-	$(NULL)
-endif
-
 # These are files that need to be loaded via the HTTP proxy server
 # Access them through http://example.com/
 MOCHITEST_FILES = \
diff --git a/toolkit/components/places/tests/browser/browser_bug248970.js b/toolkit/components/places/tests/browser/browser_bug248970.js
deleted file mode 100644
index 82e51657e36f..000000000000
--- a/toolkit/components/places/tests/browser/browser_bug248970.js
+++ /dev/null
@@ -1,256 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// This test performs checks on the history testing area as outlined
-// https://wiki.mozilla.org/Firefox3.1/PrivateBrowsing/TestPlan#History
-// http://developer.mozilla.org/en/Using_the_Places_history_service
-
-let visitedURIs = [
-  "http://www.test-link.com/",
-  "http://www.test-typed.com/",
-  "http://www.test-bookmark.com/",
-  "http://www.test-redirect-permanent.com/",
-  "http://www.test-redirect-temporary.com/",
-  "http://www.test-embed.com/",
-  "http://www.test-framed.com/",
-  "http://www.test-download.com/"
-];
-
-function test() {
-  waitForExplicitFinish();
-
-  let windowsToClose = [];
-  let windowCount = 0;
-  let placeItemsCount = getPlacesItemsCount(window);
-
-  registerCleanupFunction(function() {
-    windowsToClose.forEach(function(win) {
-      win.close();
-    });
-  });
-
-  function testOnWindow(aIsPrivate, aCallback) {
-    whenNewWindowLoaded(aIsPrivate, function(win) {
-      windowsToClose.push(win);
-      checkPlaces(win, aIsPrivate, aCallback);
-    });
-  }
-
-  function checkPlaces(aWindow, aIsPrivate, aCallback) {
-    // Updates the place items count
-    placeItemsCount = getPlacesItemsCount(aWindow);
-    // History items should be retrievable by query
-    checkHistoryItems(aWindow);
-
-    // Create Bookmark
-    let bookmarkTitle = "title " + windowCount;
-    let bookmarkKeyword = "keyword " + windowCount;
-    let bookmarkUri = NetUtil.newURI("http://test-a-" + windowCount + ".com/");
-    createBookmark(aWindow, bookmarkUri, bookmarkTitle, bookmarkKeyword);
-    placeItemsCount++;
-    windowCount++;
-    ok(aWindow.PlacesUtils.bookmarks.isBookmarked(bookmarkUri),
-       "Bookmark should be bookmarked, data should be retrievable");
-    is(bookmarkKeyword, aWindow.PlacesUtils.bookmarks.getKeywordForURI(bookmarkUri),
-       "Check bookmark uri keyword");
-    is(getPlacesItemsCount(aWindow), placeItemsCount,
-       "Check the new bookmark items count");
-    is(isBookmarkAltered(aWindow), false, "Check if bookmark has been visited");
-
-    aCallback();
-  }
-
-  clearHistory(function() {
-    // History database should be empty
-    is(PlacesUtils.history.hasHistoryEntries, false,
-       "History database should be empty");
-    // Create a handful of history items with various visit types
-    fillHistoryVisitedURI(window);
-    placeItemsCount += 7;
-    // History database should have entries
-    is(PlacesUtils.history.hasHistoryEntries, true,
-       "History database should have entries");
-    // We added 7 new items to history.
-    is(getPlacesItemsCount(window), placeItemsCount, "Check the total items count");
-    // Test on windows.
-    testOnWindow(false, function() {
-      testOnWindow(true, function() {
-        testOnWindow(false, finish);
-      });
-    });
-  });
-}
-
-function whenNewWindowLoaded(aIsPrivate, aCallback) {
-  let win = OpenBrowserWindow({private: aIsPrivate});
-  win.addEventListener("load", function onLoad() {
-    win.removeEventListener("load", onLoad, false);
-    aCallback(win);
-  }, false);
-}
-
-function clearHistory(aCallback) {
-  Services.obs.addObserver(function observer(aSubject, aTopic, aData) {
-    Services.obs.removeObserver(observer, PlacesUtils.TOPIC_EXPIRATION_FINISHED);
-    aCallback();
-  }, PlacesUtils.TOPIC_EXPIRATION_FINISHED, false);
-  PlacesUtils.bhistory.removeAllPages();
-}
-
-/**
- * Function performs a really simple query on our places entries,
- * and makes sure that the number of entries equal num_places_entries.
- */
-function getPlacesItemsCount(aWin){
-  // Get bookmarks count
-  let options = aWin.PlacesUtils.history.getNewQueryOptions();
-  options.includeHidden = true;
-  options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
-  let root = aWin.PlacesUtils.history.executeQuery(
-    aWin.PlacesUtils.history.getNewQuery(), options).root;
-  root.containerOpen = true;
-  let cc = root.childCount;
-  root.containerOpen = false;
-
-  // Get history item count
-  options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY;
-  let root = aWin.PlacesUtils.history.executeQuery(
-    aWin.PlacesUtils.history.getNewQuery(), options).root;
-  root.containerOpen = true;
-  cc += root.childCount;
-  root.containerOpen = false;
-
-  return cc;
-}
-
-function addVisit(aWin, aURI, aType) {
-  aWin.PlacesUtils.history.addVisit(
-    NetUtil.newURI(aURI), Date.now() * 1000, null, aType, false, 0);
-}
-
-function fillHistoryVisitedURI(aWin) {
-  aWin.PlacesUtils.history.runInBatchMode({
-    runBatched: function (aUserData) {
-      addVisit(aWin, visitedURIs[0], PlacesUtils.history.TRANSITION_LINK);
-      addVisit(aWin, visitedURIs[1], PlacesUtils.history.TRANSITION_TYPED);
-      addVisit(aWin, visitedURIs[2], PlacesUtils.history.TRANSITION_BOOKMARK);
-      addVisit(aWin, visitedURIs[3], PlacesUtils.history.TRANSITION_REDIRECT_PERMANENT);
-      addVisit(aWin, visitedURIs[4], PlacesUtils.history.TRANSITION_REDIRECT_TEMPORARY);
-      addVisit(aWin, visitedURIs[5], PlacesUtils.history.TRANSITION_EMBED);
-      addVisit(aWin, visitedURIs[6], PlacesUtils.history.TRANSITION_FRAMED_LINK);
-      addVisit(aWin, visitedURIs[7], PlacesUtils.history.TRANSITION_DOWNLOAD);
-    }
-  }, null);
-}
-
-function checkHistoryItems(aWin) {
-  visitedURIs.forEach(function (visitedUri) {
-    ok(aWin.PlacesUtils.bhistory.isVisited(NetUtil.newURI(visitedUri)), "");
-    if (/embed/.test(visitedUri)) {
-      is(!!pageInDatabase(visitedUri), false, "Check if URI is in database");
-    } else {
-      ok(!!pageInDatabase(visitedUri), "Check if URI is in database");
-    }
-  });
-}
-
-/**
- * Checks if an address is found in the database.
- * @param aURI
- *        nsIURI or address to look for.
- * @return place id of the page or 0 if not found
- */
-function pageInDatabase(aURI) {
-  let url = (aURI instanceof Ci.nsIURI ? aURI.spec : aURI);
-  let stmt = DBConn().createStatement(
-    "SELECT id FROM moz_places WHERE url = :url"
-  );
-  stmt.params.url = url;
-  try {
-    if (!stmt.executeStep())
-      return 0;
-    return stmt.getInt64(0);
-  } finally {
-    stmt.finalize();
-  }
-}
-
-/**
- * Gets the database connection.  If the Places connection is invalid it will
- * try to create a new connection.
- *
- * @param [optional] aForceNewConnection
- *        Forces creation of a new connection to the database.  When a
- *        connection is asyncClosed it cannot anymore schedule async statements,
- *        though connectionReady will keep returning true (Bug 726990).
- *
- * @return The database connection or null if unable to get one.
- */
-let gDBConn;
-function DBConn(aForceNewConnection) {
-  if (!aForceNewConnection) {
-    let db =
-      PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase).DBConnection;
-    if (db.connectionReady)
-      return db;
-  }
-
-  // If the Places database connection has been closed, create a new connection.
-  if (!gDBConn || aForceNewConnection) {
-    let file = Services.dirsvc.get('ProfD', Ci.nsIFile);
-    file.append("places.sqlite");
-    let dbConn = gDBConn = Services.storage.openDatabase(file);
-
-    // Be sure to cleanly close this connection.
-    Services.obs.addObserver(function DBCloseCallback(aSubject, aTopic, aData) {
-      Services.obs.removeObserver(DBCloseCallback, aTopic);
-      dbConn.asyncClose();
-    }, "profile-before-change", false);
-  }
-
-  return gDBConn.connectionReady ? gDBConn : null;
-};
-
-/**
- * Function creates a bookmark
- * @param aURI
- *        The URI for the bookmark
- * @param aTitle
- *        The title for the bookmark
- * @param aKeyword
- *        The keyword for the bookmark
- * @returns the bookmark
- */
-function createBookmark(aWin, aURI, aTitle, aKeyword) {
-  let bookmarkID = aWin.PlacesUtils.bookmarks.insertBookmark(
-    aWin.PlacesUtils.bookmarksMenuFolderId, aURI,
-    aWin.PlacesUtils.bookmarks.DEFAULT_INDEX, aTitle);
-  aWin.PlacesUtils.bookmarks.setKeywordForBookmark(bookmarkID, aKeyword);
-  return bookmarkID;
-}
-
-/**
- * Function attempts to check if Bookmark-A has been visited
- * during private browsing mode, function should return false
- *
- * @returns false if the accessCount has not changed
- *          true if the accessCount has changed
- */
-function isBookmarkAltered(aWin){
-  let options = aWin.PlacesUtils.history.getNewQueryOptions();
-  options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
-  options.maxResults = 1; // should only expect a new bookmark
-  options.resultType = options.RESULT_TYPE_VISIT;
-
-  let query = aWin.PlacesUtils.history.getNewQuery();
-  query.setFolders([aWin.PlacesUtils.bookmarks.bookmarksMenuFolder], 1);
-
-  let root = aWin.PlacesUtils.history.executeQuery(query, options).root;
-  root.containerOpen = true;
-  is(root.childCount, options.maxResults, "Check new bookmarks results");
-  let node = root.getChild(0);
-  root.containerOpen = false;
-
-  return (node.accessCount != 0);
-}

From efa5ec829c5c396734be9bc278c42fcb1307bd6c Mon Sep 17 00:00:00 2001
From: Andres Hernandez <andres@appcoast.com>
Date: Mon, 26 Nov 2012 14:09:24 -0600
Subject: [PATCH 018/160] Bug 806742 - Port
 toolkit/components/places/tests/unit/test_248970.js to the new per-window PB
 APIs; r=ehsan

--HG--
rename : toolkit/components/places/tests/unit/test_248970.js => toolkit/components/places/tests/browser/browser_bug248970.js
---
 .../places/tests/browser/Makefile.in          |   6 +
 .../places/tests/browser/browser_bug248970.js | 259 ++++++++++++++++++
 2 files changed, 265 insertions(+)
 create mode 100644 toolkit/components/places/tests/browser/browser_bug248970.js

diff --git a/toolkit/components/places/tests/browser/Makefile.in b/toolkit/components/places/tests/browser/Makefile.in
index e06863f98c2a..73f8edf55f50 100644
--- a/toolkit/components/places/tests/browser/Makefile.in
+++ b/toolkit/components/places/tests/browser/Makefile.in
@@ -30,6 +30,12 @@ MOCHITEST_BROWSER_FILES = \
 	colorAnalyzer/localeGeneric.png \
 	$(NULL)
 
+ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING
+MOCHITEST_BROWSER_FILES += \
+	browser_bug248970.js \
+	$(NULL)
+endif
+
 # These are files that need to be loaded via the HTTP proxy server
 # Access them through http://example.com/
 MOCHITEST_FILES = \
diff --git a/toolkit/components/places/tests/browser/browser_bug248970.js b/toolkit/components/places/tests/browser/browser_bug248970.js
new file mode 100644
index 000000000000..f3c3155789fa
--- /dev/null
+++ b/toolkit/components/places/tests/browser/browser_bug248970.js
@@ -0,0 +1,259 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// This test performs checks on the history testing area as outlined
+// https://wiki.mozilla.org/Firefox3.1/PrivateBrowsing/TestPlan#History
+// http://developer.mozilla.org/en/Using_the_Places_history_service
+
+let visitedURIs = [
+  "http://www.test-link.com/",
+  "http://www.test-typed.com/",
+  "http://www.test-bookmark.com/",
+  "http://www.test-redirect-permanent.com/",
+  "http://www.test-redirect-temporary.com/",
+  "http://www.test-embed.com/",
+  "http://www.test-framed.com/",
+  "http://www.test-download.com/"
+];
+
+function test() {
+  waitForExplicitFinish();
+
+  let windowsToClose = [];
+  let windowCount = 0;
+  let placeItemsCount = 0;
+
+  registerCleanupFunction(function() {
+    windowsToClose.forEach(function(win) {
+      win.close();
+    });
+  });
+
+  function testOnWindow(aIsPrivate, aCallback) {
+    whenNewWindowLoaded(aIsPrivate, function(win) {
+      windowsToClose.push(win);
+      checkPlaces(win, aIsPrivate, aCallback);
+    });
+  }
+
+  function checkPlaces(aWindow, aIsPrivate, aCallback) {
+    // Updates the place items count
+    placeItemsCount = getPlacesItemsCount(aWindow);
+    // History items should be retrievable by query
+    checkHistoryItems(aWindow);
+
+    // Create Bookmark
+    let bookmarkTitle = "title " + windowCount;
+    let bookmarkKeyword = "keyword " + windowCount;
+    let bookmarkUri = NetUtil.newURI("http://test-a-" + windowCount + ".com/");
+    createBookmark(aWindow, bookmarkUri, bookmarkTitle, bookmarkKeyword);
+    placeItemsCount++;
+    windowCount++;
+    ok(aWindow.PlacesUtils.bookmarks.isBookmarked(bookmarkUri),
+       "Bookmark should be bookmarked, data should be retrievable");
+    is(bookmarkKeyword, aWindow.PlacesUtils.bookmarks.getKeywordForURI(bookmarkUri),
+       "Check bookmark uri keyword");
+    is(getPlacesItemsCount(aWindow), placeItemsCount,
+       "Check the new bookmark items count");
+    is(isBookmarkAltered(aWindow), false, "Check if bookmark has been visited");
+
+    aCallback();
+  }
+
+  clearHistory(function() {
+    // Updates the place items count
+    placeItemsCount = getPlacesItemsCount(window);
+    // History database should be empty
+    is(PlacesUtils.history.hasHistoryEntries, false,
+       "History database should be empty");
+    // Create a handful of history items with various visit types
+    fillHistoryVisitedURI(window);
+    placeItemsCount += 7;
+    // History database should have entries
+    is(PlacesUtils.history.hasHistoryEntries, true,
+       "History database should have entries");
+    // We added 7 new items to history.
+    is(getPlacesItemsCount(window), placeItemsCount,
+       "Check the total items count");
+    // Test on windows.
+    testOnWindow(false, function() {
+      testOnWindow(true, function() {
+        testOnWindow(false, finish);
+      });
+    });
+  });
+}
+
+function whenNewWindowLoaded(aIsPrivate, aCallback) {
+  let win = OpenBrowserWindow({private: aIsPrivate});
+  win.addEventListener("load", function onLoad() {
+    win.removeEventListener("load", onLoad, false);
+    aCallback(win);
+  }, false);
+}
+
+function clearHistory(aCallback) {
+  Services.obs.addObserver(function observer(aSubject, aTopic, aData) {
+    Services.obs.removeObserver(observer, PlacesUtils.TOPIC_EXPIRATION_FINISHED);
+    aCallback();
+  }, PlacesUtils.TOPIC_EXPIRATION_FINISHED, false);
+  PlacesUtils.bhistory.removeAllPages();
+}
+
+/**
+ * Function performs a really simple query on our places entries,
+ * and makes sure that the number of entries equal num_places_entries.
+ */
+function getPlacesItemsCount(aWin){
+  // Get bookmarks count
+  let options = aWin.PlacesUtils.history.getNewQueryOptions();
+  options.includeHidden = true;
+  options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
+  let root = aWin.PlacesUtils.history.executeQuery(
+    aWin.PlacesUtils.history.getNewQuery(), options).root;
+  root.containerOpen = true;
+  let cc = root.childCount;
+  root.containerOpen = false;
+
+  // Get history item count
+  options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY;
+  let root = aWin.PlacesUtils.history.executeQuery(
+    aWin.PlacesUtils.history.getNewQuery(), options).root;
+  root.containerOpen = true;
+  cc += root.childCount;
+  root.containerOpen = false;
+
+  return cc;
+}
+
+function addVisit(aWin, aURI, aType) {
+  aWin.PlacesUtils.history.addVisit(
+    NetUtil.newURI(aURI), Date.now() * 1000, null, aType, false, 0);
+}
+
+function fillHistoryVisitedURI(aWin) {
+  aWin.PlacesUtils.history.runInBatchMode({
+    runBatched: function (aUserData) {
+      addVisit(aWin, visitedURIs[0], PlacesUtils.history.TRANSITION_LINK);
+      addVisit(aWin, visitedURIs[1], PlacesUtils.history.TRANSITION_TYPED);
+      addVisit(aWin, visitedURIs[2], PlacesUtils.history.TRANSITION_BOOKMARK);
+      addVisit(aWin, visitedURIs[3], PlacesUtils.history.TRANSITION_REDIRECT_PERMANENT);
+      addVisit(aWin, visitedURIs[4], PlacesUtils.history.TRANSITION_REDIRECT_TEMPORARY);
+      addVisit(aWin, visitedURIs[5], PlacesUtils.history.TRANSITION_EMBED);
+      addVisit(aWin, visitedURIs[6], PlacesUtils.history.TRANSITION_FRAMED_LINK);
+      addVisit(aWin, visitedURIs[7], PlacesUtils.history.TRANSITION_DOWNLOAD);
+    }
+  }, null);
+}
+
+function checkHistoryItems(aWin) {
+  visitedURIs.forEach(function (visitedUri) {
+    ok(aWin.PlacesUtils.bhistory.isVisited(NetUtil.newURI(visitedUri)), "");
+    if (/embed/.test(visitedUri)) {
+      is(!!pageInDatabase(visitedUri), false, "Check if URI is in database");
+    } else {
+      ok(!!pageInDatabase(visitedUri), "Check if URI is in database");
+    }
+  });
+}
+
+/**
+ * Checks if an address is found in the database.
+ * @param aURI
+ *        nsIURI or address to look for.
+ * @return place id of the page or 0 if not found
+ */
+function pageInDatabase(aURI) {
+  let url = (aURI instanceof Ci.nsIURI ? aURI.spec : aURI);
+  let stmt = DBConn().createStatement(
+    "SELECT id FROM moz_places WHERE url = :url"
+  );
+  stmt.params.url = url;
+  try {
+    if (!stmt.executeStep())
+      return 0;
+    return stmt.getInt64(0);
+  } finally {
+    stmt.finalize();
+  }
+}
+
+/**
+ * Gets the database connection.  If the Places connection is invalid it will
+ * try to create a new connection.
+ *
+ * @param [optional] aForceNewConnection
+ *        Forces creation of a new connection to the database.  When a
+ *        connection is asyncClosed it cannot anymore schedule async statements,
+ *        though connectionReady will keep returning true (Bug 726990).
+ *
+ * @return The database connection or null if unable to get one.
+ */
+let gDBConn;
+function DBConn(aForceNewConnection) {
+  if (!aForceNewConnection) {
+    let db =
+      PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase).DBConnection;
+    if (db.connectionReady)
+      return db;
+  }
+
+  // If the Places database connection has been closed, create a new connection.
+  if (!gDBConn || aForceNewConnection) {
+    let file = Services.dirsvc.get('ProfD', Ci.nsIFile);
+    file.append("places.sqlite");
+    let dbConn = gDBConn = Services.storage.openDatabase(file);
+
+    // Be sure to cleanly close this connection.
+    Services.obs.addObserver(function DBCloseCallback(aSubject, aTopic, aData) {
+      Services.obs.removeObserver(DBCloseCallback, aTopic);
+      dbConn.asyncClose();
+    }, "profile-before-change", false);
+  }
+
+  return gDBConn.connectionReady ? gDBConn : null;
+};
+
+/**
+ * Function creates a bookmark
+ * @param aURI
+ *        The URI for the bookmark
+ * @param aTitle
+ *        The title for the bookmark
+ * @param aKeyword
+ *        The keyword for the bookmark
+ * @returns the bookmark
+ */
+function createBookmark(aWin, aURI, aTitle, aKeyword) {
+  let bookmarkID = aWin.PlacesUtils.bookmarks.insertBookmark(
+    aWin.PlacesUtils.bookmarksMenuFolderId, aURI,
+    aWin.PlacesUtils.bookmarks.DEFAULT_INDEX, aTitle);
+  aWin.PlacesUtils.bookmarks.setKeywordForBookmark(bookmarkID, aKeyword);
+  return bookmarkID;
+}
+
+/**
+ * Function attempts to check if Bookmark-A has been visited
+ * during private browsing mode, function should return false
+ *
+ * @returns false if the accessCount has not changed
+ *          true if the accessCount has changed
+ */
+function isBookmarkAltered(aWin){
+  let options = aWin.PlacesUtils.history.getNewQueryOptions();
+  options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS;
+  options.maxResults = 1; // should only expect a new bookmark
+  options.resultType = options.RESULT_TYPE_VISIT;
+
+  let query = aWin.PlacesUtils.history.getNewQuery();
+  query.setFolders([aWin.PlacesUtils.bookmarks.bookmarksMenuFolder], 1);
+
+  let root = aWin.PlacesUtils.history.executeQuery(query, options).root;
+  root.containerOpen = true;
+  is(root.childCount, options.maxResults, "Check new bookmarks results");
+  let node = root.getChild(0);
+  root.containerOpen = false;
+
+  return (node.accessCount != 0);
+}

From 43949a522286863aa57cf62fd4adb8a58e8f4378 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Mon, 26 Nov 2012 16:30:37 -0500
Subject: [PATCH 019/160] Add config option for off thread compilation, bug
 815199. r=dvander

---
 dom/base/nsJSEnvironment.cpp    | 4 ++++
 js/src/jsapi.cpp                | 8 ++++++++
 js/src/jsapi.h                  | 3 +++
 modules/libpref/src/init/all.js | 1 +
 4 files changed, 16 insertions(+)

diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 227a96c8b17c..84c98f847390 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -968,6 +968,7 @@ static const char js_memnotify_option_str[]   = JS_OPTIONS_DOT_STR "mem.notify";
 static const char js_disable_explicit_compartment_gc[] =
   JS_OPTIONS_DOT_STR "mem.disable_explicit_compartment_gc";
 static const char js_ion_content_str[]        = JS_OPTIONS_DOT_STR "ion.content";
+static const char js_ion_parallel_compilation_str[] = JS_OPTIONS_DOT_STR "ion.parallel_compilation";
 
 int
 nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
@@ -1010,6 +1011,7 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
                                      "javascript.options.xml.content");
   bool useHardening = Preferences::GetBool(js_jit_hardening_str);
   bool useIon = Preferences::GetBool(js_ion_content_str);
+  bool parallelIonCompilation = Preferences::GetBool(js_ion_parallel_compilation_str);
   nsCOMPtr<nsIXULRuntime> xr = do_GetService(XULRUNTIME_SERVICE_CONTRACTID);
   if (xr) {
     bool safeMode = false;
@@ -1074,6 +1076,8 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
   ::JS_SetOptions(context->mContext,
                   newDefaultJSOptions & (JSRUNOPTION_MASK | JSOPTION_ALLOW_XML));
 
+  ::JS_SetParallelCompilationEnabled(context->mContext, parallelIonCompilation);
+
   // Save the new defaults for the next page load (InitContext).
   context->mDefaultJSOptions = newDefaultJSOptions;
 
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index fc8fdc0bdef2..8b1ba9a63b32 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -7045,6 +7045,14 @@ JS_ScheduleGC(JSContext *cx, uint32_t count)
 }
 #endif
 
+JS_PUBLIC_API(void)
+JS_SetParallelCompilationEnabled(JSContext *cx, bool enabled)
+{
+#ifdef JS_ION
+    ion::js_IonOptions.parallelCompilation = enabled;
+#endif
+}
+
 /************************************************************************/
 
 #if !defined(STATIC_EXPORTABLE_JS_API) && !defined(STATIC_JS_API) && defined(XP_WIN)
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index ba4ed5550f40..ad1909dc15ef 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -5963,6 +5963,9 @@ extern JS_PUBLIC_API(void)
 JS_ScheduleGC(JSContext *cx, uint32_t count);
 #endif
 
+extern JS_PUBLIC_API(void)
+JS_SetParallelCompilationEnabled(JSContext *cx, bool enabled);
+
 /*
  * Convert a uint32_t index into a jsid.
  */
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 1a36f0db8135..484b84b68594 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -712,6 +712,7 @@ pref("javascript.options.strict.debug",     true);
 pref("javascript.options.methodjit.content", true);
 pref("javascript.options.methodjit.chrome",  true);
 pref("javascript.options.ion.content",      true);
+pref("javascript.options.ion.parallel_compilation", false);
 pref("javascript.options.pccounts.content", false);
 pref("javascript.options.pccounts.chrome",  false);
 pref("javascript.options.methodjit_always", false);

From 4a40134208100a3d7b7bad1994a1f129df23f35b Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Mon, 26 Nov 2012 16:32:45 -0500
Subject: [PATCH 020/160] Clone type sets to avoid races when compiling off
 thread, bug 815258. r=dvander

---
 js/src/ion/CodeGenerator.cpp     |  2 +-
 js/src/ion/IonBuilder.cpp        | 28 ++++++++++++++++++++++++----
 js/src/ion/IonBuilder.h          |  2 ++
 js/src/ion/IonMacroAssembler.cpp |  6 +++---
 js/src/ion/IonMacroAssembler.h   |  2 +-
 js/src/ion/MIR.cpp               |  2 +-
 js/src/ion/MIR.h                 | 24 ++++++++++++------------
 js/src/jsinfer.cpp               | 24 ++++++++++++++++++++++++
 js/src/jsinfer.h                 | 16 +++++++++++-----
 js/src/jsinferinlines.h          | 10 +++++-----
 10 files changed, 84 insertions(+), 32 deletions(-)

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index 62071975c3e7..8a9f5fcb36d4 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -1271,7 +1271,7 @@ CodeGenerator::generateArgumentsChecks()
     for (uint32 i = START_SLOT; i < CountArgSlots(info.fun()); i++) {
         // All initial parameters are guaranteed to be MParameters.
         MParameter *param = rp->getOperand(i)->toParameter();
-        types::TypeSet *types = param->typeSet();
+        const types::TypeSet *types = param->typeSet();
         if (!types || types->unknown())
             continue;
 
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index 2ea2d9472198..5ef9ef76c516 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -500,7 +500,14 @@ IonBuilder::rewriteParameters()
 
     for (uint32 i = START_SLOT; i < CountArgSlots(info().fun()); i++) {
         MParameter *param = current->getSlot(i)->toParameter();
-        types::StackTypeSet *types = param->typeSet();
+
+        // Find the original (not cloned) type set for the MParameter, as we
+        // will be adding constraints to it.
+        types::StackTypeSet *types;
+        if (param->index() == MParameter::THIS_SLOT)
+            types = oracle->thisTypeSet(script_);
+        else
+            types = oracle->parameterTypeSet(script_, param->index());
         if (!types)
             continue;
 
@@ -544,7 +551,7 @@ IonBuilder::initParameters()
         return true;
 
     MParameter *param = MParameter::New(MParameter::THIS_SLOT,
-                                        oracle->thisTypeSet(script_));
+                                        cloneTypeSet(oracle->thisTypeSet(script_)));
     current->add(param);
     current->initSlot(info().thisSlot(), param);
 
@@ -4536,7 +4543,7 @@ IonBuilder::pushTypeBarrier(MInstruction *ins, types::StackTypeSet *actual,
       case JSVAL_TYPE_UNKNOWN:
       case JSVAL_TYPE_UNDEFINED:
       case JSVAL_TYPE_NULL:
-        barrier = MTypeBarrier::New(ins, observed);
+        barrier = MTypeBarrier::New(ins, cloneTypeSet(observed));
         current->add(barrier);
 
         if (type == JSVAL_TYPE_UNDEFINED)
@@ -4569,7 +4576,7 @@ IonBuilder::monitorResult(MInstruction *ins, types::TypeSet *barrier, types::Typ
     if (!types || types->unknown())
         return;
 
-    MInstruction *monitor = MMonitorTypes::New(ins, types);
+    MInstruction *monitor = MMonitorTypes::New(ins, cloneTypeSet(types));
     current->add(monitor);
 }
 
@@ -6561,3 +6568,16 @@ IonBuilder::addShapeGuard(MDefinition *obj, const Shape *shape, BailoutKind bail
 
     return guard;
 }
+
+const types::TypeSet *
+IonBuilder::cloneTypeSet(const types::TypeSet *types)
+{
+    if (!js_IonOptions.parallelCompilation)
+        return types;
+
+    // Clone a type set so that it can be stored into the MIR and accessed
+    // during off thread compilation. This is necessary because main thread
+    // updates to type sets can race with reads in the compiler backend, and
+    // after bug 804676 this code can be removed.
+    return types->clone(GetIonContext()->temp->lifoAlloc());
+}
diff --git a/js/src/ion/IonBuilder.h b/js/src/ion/IonBuilder.h
index cda8708eddef..2546e6285297 100644
--- a/js/src/ion/IonBuilder.h
+++ b/js/src/ion/IonBuilder.h
@@ -437,6 +437,8 @@ class IonBuilder : public MIRGenerator
                            MBasicBlock *bottom,
                            Vector<MDefinition *, 8, IonAllocPolicy> &retvalDefns);
 
+    const types::TypeSet *cloneTypeSet(const types::TypeSet *types);
+
     // A builder is inextricably tied to a particular script.
     HeapPtrScript script_;
 
diff --git a/js/src/ion/IonMacroAssembler.cpp b/js/src/ion/IonMacroAssembler.cpp
index 64c1e02ea890..e0964f62a409 100644
--- a/js/src/ion/IonMacroAssembler.cpp
+++ b/js/src/ion/IonMacroAssembler.cpp
@@ -15,7 +15,7 @@ using namespace js;
 using namespace js::ion;
 
 template <typename T> void
-MacroAssembler::guardTypeSet(const T &address, types::TypeSet *types,
+MacroAssembler::guardTypeSet(const T &address, const types::TypeSet *types,
                              Register scratch, Label *mismatched)
 {
     JS_ASSERT(!types->unknown());
@@ -64,9 +64,9 @@ MacroAssembler::guardTypeSet(const T &address, types::TypeSet *types,
     bind(&matched);
 }
 
-template void MacroAssembler::guardTypeSet(const Address &address, types::TypeSet *types,
+template void MacroAssembler::guardTypeSet(const Address &address, const types::TypeSet *types,
                                            Register scratch, Label *mismatched);
-template void MacroAssembler::guardTypeSet(const ValueOperand &value, types::TypeSet *types,
+template void MacroAssembler::guardTypeSet(const ValueOperand &value, const types::TypeSet *types,
                                            Register scratch, Label *mismatched);
 
 void
diff --git a/js/src/ion/IonMacroAssembler.h b/js/src/ion/IonMacroAssembler.h
index 6e4a0ad49068..8ad65e15f1e8 100644
--- a/js/src/ion/IonMacroAssembler.h
+++ b/js/src/ion/IonMacroAssembler.h
@@ -119,7 +119,7 @@ class MacroAssembler : public MacroAssemblerSpecific
     // Emits a test of a value against all types in a TypeSet. A scratch
     // register is required.
     template <typename T>
-    void guardTypeSet(const T &address, types::TypeSet *types, Register scratch,
+    void guardTypeSet(const T &address, const types::TypeSet *types, Register scratch,
                       Label *mismatched);
 
     void loadObjShape(Register objReg, Register dest) {
diff --git a/js/src/ion/MIR.cpp b/js/src/ion/MIR.cpp
index 1b0c0d5af706..2f2c46face83 100644
--- a/js/src/ion/MIR.cpp
+++ b/js/src/ion/MIR.cpp
@@ -347,7 +347,7 @@ MConstantElements::printOpcode(FILE *fp)
 }
 
 MParameter *
-MParameter::New(int32 index, types::StackTypeSet *types)
+MParameter::New(int32 index, const types::TypeSet *types)
 {
     return new MParameter(index, types);
 }
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index 2a0081af31d9..83fc476bb021 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -632,12 +632,12 @@ class MConstant : public MNullaryInstruction
 class MParameter : public MNullaryInstruction
 {
     int32 index_;
-    types::StackTypeSet *typeSet_;
+    const types::TypeSet *typeSet_;
 
   public:
     static const int32 THIS_SLOT = -1;
 
-    MParameter(int32 index, types::StackTypeSet *types)
+    MParameter(int32 index, const types::TypeSet *types)
       : index_(index),
         typeSet_(types)
     {
@@ -646,12 +646,12 @@ class MParameter : public MNullaryInstruction
 
   public:
     INSTRUCTION_HEADER(Parameter);
-    static MParameter *New(int32 index, types::StackTypeSet *types);
+    static MParameter *New(int32 index, const types::TypeSet *types);
 
     int32 index() const {
         return index_;
     }
-    types::StackTypeSet *typeSet() const {
+    const types::TypeSet *typeSet() const {
         return typeSet_;
     }
     void printOpcode(FILE *fp);
@@ -5353,9 +5353,9 @@ class MGetArgument
 class MTypeBarrier : public MUnaryInstruction
 {
     BailoutKind bailoutKind_;
-    types::TypeSet *typeSet_;
+    const types::TypeSet *typeSet_;
 
-    MTypeBarrier(MDefinition *def, types::TypeSet *types)
+    MTypeBarrier(MDefinition *def, const types::TypeSet *types)
       : MUnaryInstruction(def),
         typeSet_(types)
     {
@@ -5370,7 +5370,7 @@ class MTypeBarrier : public MUnaryInstruction
   public:
     INSTRUCTION_HEADER(TypeBarrier);
 
-    static MTypeBarrier *New(MDefinition *def, types::TypeSet *types) {
+    static MTypeBarrier *New(MDefinition *def, const types::TypeSet *types) {
         return new MTypeBarrier(def, types);
     }
     bool congruentTo(MDefinition * const &def) const {
@@ -5382,7 +5382,7 @@ class MTypeBarrier : public MUnaryInstruction
     BailoutKind bailoutKind() const {
         return bailoutKind_;
     }
-    types::TypeSet *typeSet() const {
+    const types::TypeSet *typeSet() const {
         return typeSet_;
     }
     AliasSet getAliasSet() const {
@@ -5395,9 +5395,9 @@ class MTypeBarrier : public MUnaryInstruction
 // TypeScript::Monitor inside these stubs.
 class MMonitorTypes : public MUnaryInstruction
 {
-    types::TypeSet *typeSet_;
+    const types::TypeSet *typeSet_;
 
-    MMonitorTypes(MDefinition *def, types::TypeSet *types)
+    MMonitorTypes(MDefinition *def, const types::TypeSet *types)
       : MUnaryInstruction(def),
         typeSet_(types)
     {
@@ -5409,13 +5409,13 @@ class MMonitorTypes : public MUnaryInstruction
   public:
     INSTRUCTION_HEADER(MonitorTypes);
 
-    static MMonitorTypes *New(MDefinition *def, types::TypeSet *types) {
+    static MMonitorTypes *New(MDefinition *def, const types::TypeSet *types) {
         return new MMonitorTypes(def, types);
     }
     MDefinition *input() const {
         return getOperand(0);
     }
-    types::TypeSet *typeSet() const {
+    const types::TypeSet *typeSet() const {
         return typeSet_;
     }
     AliasSet getAliasSet() const {
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index 941e2b4f24ed..0e37966abdf4 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -456,6 +456,30 @@ StackTypeSet::make(JSContext *cx, const char *name)
     return res;
 }
 
+const TypeSet *
+TypeSet::clone(LifoAlloc *alloc) const
+{
+    unsigned objectCount = baseObjectCount();
+    unsigned capacity = (objectCount >= 2) ? HashSetCapacity(objectCount) : 0;
+
+    TypeSet *res = alloc->new_<TypeSet>();
+    if (!res)
+        return NULL;
+
+    TypeObjectKey **newSet;
+    if (capacity) {
+        newSet = alloc->newArray<TypeObjectKey*>(capacity);
+        if (!newSet)
+            return NULL;
+        PodCopy(newSet, objectSet, capacity);
+    }
+
+    res->flags = this->flags;
+    res->objectSet = capacity ? newSet : this->objectSet;
+
+    return res;
+}
+
 /////////////////////////////////////////////////////////////////////
 // TypeSet constraints
 /////////////////////////////////////////////////////////////////////
diff --git a/js/src/jsinfer.h b/js/src/jsinfer.h
index 6e50a52c48e9..1b3fb4718237 100644
--- a/js/src/jsinfer.h
+++ b/js/src/jsinfer.h
@@ -444,7 +444,7 @@ class TypeSet
     inline void sweep(JSCompartment *compartment);
 
     /* Whether this set contains a specific type. */
-    inline bool hasType(Type type);
+    inline bool hasType(Type type) const;
 
     TypeFlags baseFlags() const { return flags & TYPE_FLAG_BASE_MASK; }
     bool unknown() const { return !!(flags & TYPE_FLAG_UNKNOWN); }
@@ -466,6 +466,12 @@ class TypeSet
         return flags >> TYPE_FLAG_DEFINITE_SHIFT;
     }
 
+    /*
+     * Clone a type set into an arbitrary allocator. The result should not be
+     * modified further.
+     */
+    const TypeSet *clone(LifoAlloc *alloc) const;
+
     /*
      * Add a type to this set, calling any constraint handlers if this is a new
      * possible type.
@@ -480,10 +486,10 @@ class TypeSet
      * in the hash case (see SET_ARRAY_SIZE in jsinferinlines.h), and getObject
      * may return NULL.
      */
-    inline unsigned getObjectCount();
-    inline TypeObjectKey *getObject(unsigned i);
-    inline RawObject getSingleObject(unsigned i);
-    inline TypeObject *getTypeObject(unsigned i);
+    inline unsigned getObjectCount() const;
+    inline TypeObjectKey *getObject(unsigned i) const;
+    inline RawObject getSingleObject(unsigned i) const;
+    inline TypeObject *getTypeObject(unsigned i) const;
 
     void setOwnProperty(bool configurable) {
         flags |= TYPE_FLAG_OWN_PROPERTY;
diff --git a/js/src/jsinferinlines.h b/js/src/jsinferinlines.h
index 5ab7599c8f6b..6365903ec913 100644
--- a/js/src/jsinferinlines.h
+++ b/js/src/jsinferinlines.h
@@ -1294,7 +1294,7 @@ Type::typeObject() const
 }
 
 inline bool
-TypeSet::hasType(Type type)
+TypeSet::hasType(Type type) const
 {
     if (unknown())
         return true;
@@ -1431,7 +1431,7 @@ TypeSet::setOwnProperty(JSContext *cx, bool configured)
 }
 
 inline unsigned
-TypeSet::getObjectCount()
+TypeSet::getObjectCount() const
 {
     JS_ASSERT(!unknownObject());
     uint32_t count = baseObjectCount();
@@ -1441,7 +1441,7 @@ TypeSet::getObjectCount()
 }
 
 inline TypeObjectKey *
-TypeSet::getObject(unsigned i)
+TypeSet::getObject(unsigned i) const
 {
     JS_ASSERT(i < getObjectCount());
     if (baseObjectCount() == 1) {
@@ -1452,14 +1452,14 @@ TypeSet::getObject(unsigned i)
 }
 
 inline RawObject
-TypeSet::getSingleObject(unsigned i)
+TypeSet::getSingleObject(unsigned i) const
 {
     TypeObjectKey *key = getObject(i);
     return (uintptr_t(key) & 1) ? (JSObject *)(uintptr_t(key) ^ 1) : NULL;
 }
 
 inline TypeObject *
-TypeSet::getTypeObject(unsigned i)
+TypeSet::getTypeObject(unsigned i) const
 {
     TypeObjectKey *key = getObject(i);
     return (key && !(uintptr_t(key) & 1)) ? (TypeObject *) key : NULL;

From f4bd2d33b753250efeeba2c405c75083900565f9 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 26 Nov 2012 16:12:24 -0500
Subject: [PATCH 021/160] Bug 815226 - Make the MediaPluginReader not depend on
 the concrete type of the AbstractMediaDecoder passed to it; r=cpearce

---
 content/media/plugins/MediaPluginDecoder.cpp | 2 +-
 content/media/plugins/MediaPluginReader.cpp  | 5 +++--
 content/media/plugins/MediaPluginReader.h    | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/content/media/plugins/MediaPluginDecoder.cpp b/content/media/plugins/MediaPluginDecoder.cpp
index 8751d826446f..df20598c5e34 100644
--- a/content/media/plugins/MediaPluginDecoder.cpp
+++ b/content/media/plugins/MediaPluginDecoder.cpp
@@ -16,7 +16,7 @@ MediaPluginDecoder::MediaPluginDecoder(const nsACString& aType) : mType(aType)
 
 MediaDecoderStateMachine* MediaPluginDecoder::CreateStateMachine()
 {
-  return new MediaDecoderStateMachine(this, new MediaPluginReader(this));
+  return new MediaDecoderStateMachine(this, new MediaPluginReader(this, mType));
 }
 
 } // namespace mozilla
diff --git a/content/media/plugins/MediaPluginReader.cpp b/content/media/plugins/MediaPluginReader.cpp
index aef9e90758de..b8bec26a2507 100644
--- a/content/media/plugins/MediaPluginReader.cpp
+++ b/content/media/plugins/MediaPluginReader.cpp
@@ -15,8 +15,10 @@
 
 namespace mozilla {
 
-MediaPluginReader::MediaPluginReader(AbstractMediaDecoder *aDecoder) :
+MediaPluginReader::MediaPluginReader(AbstractMediaDecoder *aDecoder,
+                                     const nsACString& aContentType) :
   MediaDecoderReader(aDecoder),
+  mType(aContentType),
   mPlugin(NULL),
   mHasAudio(false),
   mHasVideo(false),
@@ -24,7 +26,6 @@ MediaPluginReader::MediaPluginReader(AbstractMediaDecoder *aDecoder) :
   mAudioSeekTimeUs(-1),
   mLastVideoFrame(NULL)
 {
-  static_cast<MediaPluginDecoder *>(aDecoder)->GetContentType(mType);
 }
 
 MediaPluginReader::~MediaPluginReader()
diff --git a/content/media/plugins/MediaPluginReader.h b/content/media/plugins/MediaPluginReader.h
index f86f7f1fef3d..ea44397fc9e6 100644
--- a/content/media/plugins/MediaPluginReader.h
+++ b/content/media/plugins/MediaPluginReader.h
@@ -11,6 +11,8 @@
 
 #include "MPAPI.h"
 
+class nsACString;
+
 namespace mozilla {
 
 class AbstractMediaDecoder;
@@ -27,7 +29,8 @@ class MediaPluginReader : public MediaDecoderReader
   int64_t mAudioSeekTimeUs;
   VideoData *mLastVideoFrame;
 public:
-  MediaPluginReader(AbstractMediaDecoder* aDecoder);
+  MediaPluginReader(AbstractMediaDecoder* aDecoder,
+                    const nsACString& aContentType);
   ~MediaPluginReader();
 
   virtual nsresult Init(MediaDecoderReader* aCloneDonor);

From d90aa800b34b6f92d774e370170fda7a28d34633 Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Thu, 18 Oct 2012 13:56:47 -0400
Subject: [PATCH 022/160] Bug 802400 - Restore pan timer to 60 Hz because of
 trobopan regression. r=kats

---
 mobile/android/base/ui/Axis.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/base/ui/Axis.java b/mobile/android/base/ui/Axis.java
index 57772b221716..06ac81dde85f 100644
--- a/mobile/android/base/ui/Axis.java
+++ b/mobile/android/base/ui/Axis.java
@@ -84,7 +84,7 @@ abstract class Axis {
         });
     }
 
-    static final float MS_PER_FRAME = 4.0f;
+    static final float MS_PER_FRAME = 1000.0f / 60.0f;
     private static final float FRAMERATE_MULTIPLIER = (1000f/60f) / MS_PER_FRAME;
 
     //  The values we use for friction are based on a 16.6ms frame, adjust them to MS_PER_FRAME:

From 1df394a0e3a25c649351f59d147fa46adadf1bef Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Wed, 24 Oct 2012 13:08:09 -0700
Subject: [PATCH 023/160] Bug 790338 - Update GC stats with time spent marking
 in the sweep phase and add more detail to sweep tables phase r=billm

--HG--
extra : rebase_source : 1e05d780ec815320985e031250e378a38ce8ab36
---
 js/src/gc/Statistics.cpp |  18 +++++--
 js/src/gc/Statistics.h   |  15 ++++--
 js/src/jscompartment.cpp |   5 +-
 js/src/jsgc.cpp          | 106 +++++++++++++++++++++------------------
 js/src/jsinfer.cpp       |   2 +
 js/src/jsscope.cpp       |   4 ++
 6 files changed, 91 insertions(+), 59 deletions(-)

diff --git a/js/src/gc/Statistics.cpp b/js/src/gc/Statistics.cpp
index a1dd2797790f..bec743e6d9d1 100644
--- a/js/src/gc/Statistics.cpp
+++ b/js/src/gc/Statistics.cpp
@@ -280,14 +280,22 @@ static PhaseInfo phases[] = {
     { PHASE_MARK_ROOTS, "Mark Roots" },
     { PHASE_MARK_TYPES, "Mark Types" },
     { PHASE_MARK_DELAYED, "Mark Delayed" },
-    { PHASE_MARK_WEAK, "Mark Weak" },
-    { PHASE_MARK_GRAY, "Mark Gray" },
-    { PHASE_MARK_GRAY_WEAK, "Mark Gray and Weak" },
-    { PHASE_FINALIZE_START, "Finalize Start Callback" },
     { PHASE_SWEEP, "Sweep" },
+    { PHASE_SWEEP_MARK_INCOMING_BLACK, "Mark Incoming Black Pointers" },
+    { PHASE_SWEEP_MARK_WEAK, "Mark Weak" },
+    { PHASE_SWEEP_MARK_GRAY, "Mark Gray" },
+    { PHASE_SWEEP_MARK_GRAY_WEAK, "Mark Gray and Weak" },
+    { PHASE_SWEEP_MARK_INCOMING_GRAY, "Mark Incoming Gray Pointers" },
+    { PHASE_FINALIZE_START, "Finalize Start Callback" },
     { PHASE_SWEEP_ATOMS, "Sweep Atoms" },
     { PHASE_SWEEP_COMPARTMENTS, "Sweep Compartments" },
     { PHASE_SWEEP_TABLES, "Sweep Tables" },
+    { PHASE_SWEEP_TABLES_WRAPPER, "Sweep Cross Compartment Wrappers" },
+    { PHASE_SWEEP_TABLES_BASE_SHAPE, "Sweep Base Shapes" },
+    { PHASE_SWEEP_TABLES_INITIAL_SHAPE, "Sweep Intital Shapes" },
+    { PHASE_SWEEP_TABLES_TYPE_OBJECT, "Sweep Type Objects" },
+    { PHASE_SWEEP_TABLES_BREAKPOINT, "Sweep Breakpoints" },
+    { PHASE_SWEEP_TABLES_REGEXP, "Sweep Regexps" },
     { PHASE_SWEEP_OBJECT, "Sweep Object" },
     { PHASE_SWEEP_STRING, "Sweep String" },
     { PHASE_SWEEP_SCRIPT, "Sweep Script" },
@@ -536,7 +544,7 @@ Statistics::endGC()
         (*cb)(JS_TELEMETRY_GC_MARK_MS, t(phaseTimes[PHASE_MARK]));
         (*cb)(JS_TELEMETRY_GC_SWEEP_MS, t(phaseTimes[PHASE_SWEEP]));
         (*cb)(JS_TELEMETRY_GC_MARK_ROOTS_MS, t(phaseTimes[PHASE_MARK_ROOTS]));
-        (*cb)(JS_TELEMETRY_GC_MARK_GRAY_MS, t(phaseTimes[PHASE_MARK_GRAY]));
+        (*cb)(JS_TELEMETRY_GC_MARK_GRAY_MS, t(phaseTimes[PHASE_SWEEP_MARK_GRAY]));
         (*cb)(JS_TELEMETRY_GC_NON_INCREMENTAL, !!nonincrementalReason);
         (*cb)(JS_TELEMETRY_GC_INCREMENTAL_DISABLED, !runtime->gcIncrementalEnabled);
         (*cb)(JS_TELEMETRY_GC_SCC_SWEEP_TOTAL_MS, t(sccTotal));
diff --git a/js/src/gc/Statistics.h b/js/src/gc/Statistics.h
index e0434b4d6162..0665406cd88b 100644
--- a/js/src/gc/Statistics.h
+++ b/js/src/gc/Statistics.h
@@ -28,14 +28,23 @@ enum Phase {
     PHASE_MARK_ROOTS,
     PHASE_MARK_TYPES,
     PHASE_MARK_DELAYED,
-    PHASE_MARK_WEAK,
-    PHASE_MARK_GRAY,
-    PHASE_MARK_GRAY_WEAK,
     PHASE_FINALIZE_START,
     PHASE_SWEEP,
+    PHASE_SWEEP_MARK_INCOMING_BLACK,
+    PHASE_SWEEP_MARK_WEAK,
+    PHASE_SWEEP_MARK_INCOMING_GRAY,
+    PHASE_SWEEP_MARK_GRAY,
+    PHASE_SWEEP_MARK_GRAY_WEAK,
+    PHASE_SWEEP_FIND_BLACK_GRAY,
     PHASE_SWEEP_ATOMS,
     PHASE_SWEEP_COMPARTMENTS,
     PHASE_SWEEP_TABLES,
+    PHASE_SWEEP_TABLES_WRAPPER,
+    PHASE_SWEEP_TABLES_BASE_SHAPE,
+    PHASE_SWEEP_TABLES_INITIAL_SHAPE,
+    PHASE_SWEEP_TABLES_TYPE_OBJECT,
+    PHASE_SWEEP_TABLES_BREAKPOINT,
+    PHASE_SWEEP_TABLES_REGEXP,
     PHASE_SWEEP_OBJECT,
     PHASE_SWEEP_STRING,
     PHASE_SWEEP_SCRIPT,
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index d66eadd6557f..98f5e55c0056 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -687,7 +687,8 @@ JSCompartment::sweep(FreeOp *fop, bool releaseTypes)
 void
 JSCompartment::sweepCrossCompartmentWrappers()
 {
-    gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_SWEEP_TABLES);
+    gcstats::AutoPhase ap1(rt->gcStats, gcstats::PHASE_SWEEP_TABLES);
+    gcstats::AutoPhase ap2(rt->gcStats, gcstats::PHASE_SWEEP_TABLES_WRAPPER);
 
     /* Remove dead wrappers from the table. */
     for (WrapperMap::Enum e(crossCompartmentWrappers); !e.empty(); e.popFront()) {
@@ -888,6 +889,8 @@ JSCompartment::clearTraps(FreeOp *fop)
 void
 JSCompartment::sweepBreakpoints(FreeOp *fop)
 {
+    gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_SWEEP_TABLES_BREAKPOINT);
+
     if (JS_CLIST_IS_EMPTY(&rt->debuggerList))
         return;
 
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 45036b3d087d..ff21db9bbb65 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3465,7 +3465,7 @@ BeginMarkPhase(JSRuntime *rt)
 }
 
 void
-MarkWeakReferences(JSRuntime *rt, gcstats::Phase phase = gcstats::PHASE_MARK_WEAK)
+MarkWeakReferences(JSRuntime *rt, gcstats::Phase phase)
 {
     GCMarker *gcmarker = &rt->gcMarker;
     JS_ASSERT(gcmarker->isDrained());
@@ -3488,7 +3488,7 @@ MarkGrayReferences(JSRuntime *rt)
     GCMarker *gcmarker = &rt->gcMarker;
 
     {
-        gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_MARK_GRAY);
+        gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_SWEEP_MARK_GRAY);
         gcmarker->setMarkColorGray();
         if (gcmarker->hasBufferedGrayRoots()) {
             gcmarker->markBufferedGrayRoots();
@@ -3500,7 +3500,7 @@ MarkGrayReferences(JSRuntime *rt)
         gcmarker->drainMarkStack(budget);
     }
 
-    MarkWeakReferences(rt, gcstats::PHASE_MARK_GRAY_WEAK);
+    MarkWeakReferences(rt, gcstats::PHASE_SWEEP_MARK_GRAY_WEAK);
 
     JS_ASSERT(gcmarker->isDrained());
 
@@ -3563,7 +3563,7 @@ ValidateIncrementalMarking(JSRuntime *rt)
     SliceBudget budget;
     rt->gcIncrementalState = MARK;
     rt->gcMarker.drainMarkStack(budget);
-    MarkWeakReferences(rt);
+    MarkWeakReferences(rt, gcstats::PHASE_SWEEP_MARK_WEAK);
     MarkGrayReferences(rt);
 
     /* Now verify that we have the same mark bits as before. */
@@ -3791,6 +3791,12 @@ MarkIncomingCrossCompartmentPointers(JSRuntime *rt, const uint32_t color)
 {
     JS_ASSERT(color == BLACK || color == GRAY);
 
+    static const gcstats::Phase statsPhases[] = {
+        gcstats::PHASE_SWEEP_MARK_INCOMING_BLACK,
+        gcstats::PHASE_SWEEP_MARK_INCOMING_GRAY
+    };
+    gcstats::AutoPhase ap1(rt->gcStats, statsPhases[color]);
+
     bool unlinkList = color == GRAY;
 
     for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
@@ -3826,42 +3832,38 @@ MarkIncomingCrossCompartmentPointers(JSRuntime *rt, const uint32_t color)
 static void
 EndMarkingCompartmentGroup(JSRuntime *rt)
 {
-    {
-        gcstats::AutoPhase ap1(rt->gcStats, gcstats::PHASE_MARK);
+    /*
+     * Mark any incoming black pointers from previously swept compartments
+     * whose referents are not marked. This can occur when gray cells become
+     * black by the action of UnmarkGray.
+     */
+    MarkIncomingCrossCompartmentPointers(rt, BLACK);
 
-        /*
-         * Mark any incoming black pointers from previously swept compartments
-         * whose referents are not marked. This can occur when gray cells become
-         * black by the action of UnmarkGray.
-         */
-        MarkIncomingCrossCompartmentPointers(rt, BLACK);
+    MarkWeakReferences(rt, gcstats::PHASE_SWEEP_MARK_WEAK);
 
-        MarkWeakReferences(rt);
+    /*
+     * Change state of current group to MarkGray to restrict marking to this
+     * group.  Note that there may be pointers to the atoms compartment, and
+     * these will be marked through, as they are not marked with
+     * MarkCrossCompartmentXXX.
+     */
+    for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+        JS_ASSERT(c->isGCMarkingBlack());
+        c->setGCState(JSCompartment::MarkGray);
+    }
 
-        /*
-         * Change state of current group to MarkGray to restrict marking to this
-         * group.  Note that there may be pointers to the atoms compartment, and
-         * these will be marked through, as they are not marked with
-         * MarkCrossCompartmentXXX.
-         */
-        for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
-            JS_ASSERT(c->isGCMarkingBlack());
-            c->setGCState(JSCompartment::MarkGray);
-        }
+    /* Mark incoming gray pointers from previously swept compartments. */
+    rt->gcMarker.setMarkColorGray();
+    MarkIncomingCrossCompartmentPointers(rt, GRAY);
+    rt->gcMarker.setMarkColorBlack();
 
-        /* Mark incoming gray pointers from previously swept compartments. */
-        rt->gcMarker.setMarkColorGray();
-        MarkIncomingCrossCompartmentPointers(rt, GRAY);
-        rt->gcMarker.setMarkColorBlack();
+    /* Mark gray roots and mark transitively inside the current compartment group. */
+    MarkGrayReferences(rt);
 
-        /* Mark gray roots and mark transitively inside the current compartment group. */
-        MarkGrayReferences(rt);
-
-        /* Restore marking state. */
-        for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
-            JS_ASSERT(c->isGCMarkingGray());
-            c->setGCState(JSCompartment::Mark);
-        }
+    /* Restore marking state. */
+    for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+        JS_ASSERT(c->isGCMarkingGray());
+        c->setGCState(JSCompartment::Mark);
     }
 
 #ifdef DEBUG
@@ -3871,21 +3873,25 @@ EndMarkingCompartmentGroup(JSRuntime *rt)
 
     JS_ASSERT(rt->gcMarker.isDrained());
 
-    /*
-     * Having black->gray edges violates our promise to the cycle
-     * collector. This can happen if we're collecting a compartment and it has
-     * an edge to an uncollected compartment: it's possible that the source and
-     * destination of the cross-compartment edge should be gray, but the source
-     * was marked black by the conservative scanner.
-     */
-    for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
-        for (WrapperMap::Enum e(c->crossCompartmentWrappers); !e.empty(); e.popFront()) {
-            Cell *dst = e.front().key.wrapped;
-            Cell *src = ToMarkable(e.front().value);
-            JS_ASSERT(src->compartment() == c);
-            if (IsCellMarked(&src) && !src->isMarked(GRAY) && dst->isMarked(GRAY)) {
-                JS_ASSERT(!dst->compartment()->isCollecting());
-                rt->gcFoundBlackGrayEdges = true;
+    {
+        gcstats::AutoPhase ap1(rt->gcStats, gcstats::PHASE_SWEEP_FIND_BLACK_GRAY);
+
+        /*
+         * Having black->gray edges violates our promise to the cycle
+         * collector. This can happen if we're collecting a compartment and it has
+         * an edge to an uncollected compartment: it's possible that the source and
+         * destination of the cross-compartment edge should be gray, but the source
+         * was marked black by the conservative scanner.
+         */
+        for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+            for (WrapperMap::Enum e(c->crossCompartmentWrappers); !e.empty(); e.popFront()) {
+                Cell *dst = e.front().key.wrapped;
+                Cell *src = ToMarkable(e.front().value);
+                JS_ASSERT(src->compartment() == c);
+                if (IsCellMarked(&src) && !src->isMarked(GRAY) && dst->isMarked(GRAY)) {
+                    JS_ASSERT(!dst->compartment()->isCollecting());
+                    rt->gcFoundBlackGrayEdges = true;
+                }
             }
         }
     }
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index 0e6c51e797f9..3c79d4ea9a59 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -6264,6 +6264,8 @@ TypeCompartment::sweepCompilerOutputs(FreeOp *fop, bool discardConstraints)
 void
 JSCompartment::sweepNewTypeObjectTable(TypeObjectSet &table)
 {
+    gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_SWEEP_TABLES_TYPE_OBJECT);
+
     JS_ASSERT(isGCSweeping());
     if (table.initialized()) {
         for (TypeObjectSet::Enum e(table); !e.empty(); e.popFront()) {
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 34c6788cd203..cd08ed0df63c 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -1146,6 +1146,8 @@ BaseShape::getUnowned(JSContext *cx, const StackBaseShape &base)
 void
 JSCompartment::sweepBaseShapeTable()
 {
+    gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_SWEEP_TABLES_BASE_SHAPE);
+
     if (baseShapes.initialized()) {
         for (BaseShapeSet::Enum e(baseShapes); !e.empty(); e.popFront()) {
             UnownedBaseShape *base = e.front();
@@ -1301,6 +1303,8 @@ EmptyShape::insertInitialShape(JSContext *cx, Shape *shape, JSObject *proto)
 void
 JSCompartment::sweepInitialShapeTable()
 {
+    gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_SWEEP_TABLES_INITIAL_SHAPE);
+
     if (initialShapes.initialized()) {
         for (InitialShapeSet::Enum e(initialShapes); !e.empty(); e.popFront()) {
             const InitialShapeEntry &entry = e.front();

From 049e9c416c5a6160034412373346039c3ad95c67 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Wed, 31 Oct 2012 17:59:22 +0000
Subject: [PATCH 024/160] Bug 790338 - Store the list of arraybufs per
 compartment rather than on the runtime r=billm

--HG--
extra : rebase_source : 38ba69d144983afbc2dc1e3996c21ca20f7f9c30
---
 js/src/jsapi.cpp         |  1 -
 js/src/jscntxt.h         |  3 ---
 js/src/jscompartment.cpp |  1 +
 js/src/jscompartment.h   |  3 +++
 js/src/jsgc.cpp          |  9 +++++---
 js/src/jstypedarray.cpp  | 45 ++++++++++++++--------------------------
 js/src/jstypedarray.h    |  4 ++--
 7 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 48c484463619..00e9a6d206fe 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -846,7 +846,6 @@ JSRuntime::JSRuntime(JSUseHelperThreads useHelperThreads)
     alwaysPreserveCode(false),
     hadOutOfMemory(false),
     debugScopes(NULL),
-    liveArrayBuffers(NULL),
     data(NULL),
     gcLock(NULL),
     gcHelperThread(thisFromCtor()),
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index e70b2d82399a..04b3182f0d58 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -915,9 +915,6 @@ struct JSRuntime : js::RuntimeFriendFields
     /* Bookkeeping information for debug scope objects. */
     js::DebugScopes     *debugScopes;
 
-    /* Linked list of live array buffers with >1 view */
-    JSObject            *liveArrayBuffers;
-
     /* Client opaque pointers */
     void                *data;
 
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 98f5e55c0056..55805902ec54 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -73,6 +73,7 @@ JSCompartment::JSCompartment(JSRuntime *rt)
     gcMallocAndFreeBytes(0),
     gcTriggerMallocAndFreeBytes(0),
     gcIncomingGrayPointers(NULL),
+    gcLiveArrayBuffers(NULL),
     gcMallocBytes(0),
     debugModeBits(rt->debugMode ? DebugFromC : 0),
     watchpointMap(NULL),
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index 59fdb20b7d83..3222859c8376 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -363,6 +363,9 @@ struct JSCompartment : public js::gc::GraphNodeBase
      */
     js::RawObject                gcIncomingGrayPointers;
 
+    /* Linked list of live array buffers with >1 view. */
+    JSObject                     *gcLiveArrayBuffers;
+
   private:
     /*
      * Malloc counter to measure memory pressure for GC scheduling. It runs from
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index ff21db9bbb65..7dd66cf42341 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3320,6 +3320,7 @@ BeginMarkPhase(JSRuntime *rt)
         JS_ASSERT(!c->isCollecting());
         for (unsigned i = 0; i < FINALIZE_LIMIT; ++i)
             JS_ASSERT(!c->arenas.arenaListsToSweep[i]);
+        JS_ASSERT(!c->gcLiveArrayBuffers);
 
         /* Set up which compartments will be collected. */
         if (c->isGCScheduled()) {
@@ -3382,8 +3383,6 @@ BeginMarkPhase(JSRuntime *rt)
     /* Reset weak map list. */
     WeakMapBase::resetWeakMapList(rt);
 
-    ArrayBufferObject::resetArrayBufferList(rt);
-
     /*
      * We must purge the runtime at the beginning of an incremental GC. The
      * danger if we purge later is that the snapshot invariant of incremental
@@ -3936,7 +3935,8 @@ BeginSweepingCompartmentGroup(JSRuntime *rt)
     rt->debugScopes->sweep();
 
     /* Prune out dead views from ArrayBuffer's view lists. */
-    ArrayBufferObject::sweepAll(rt);
+    for (GCCompartmentGroupIter c(rt); !c.done(); c.next())
+        ArrayBufferObject::sweep(c);
 
     /* Collect watch points associated with unreachable objects. */
     WatchpointMap::sweepAll(rt);
@@ -4192,6 +4192,7 @@ EndSweepPhase(JSRuntime *rt, JSGCInvocationKind gckind, bool lastGC)
         JS_ASSERT(!c->isCollecting());
         JS_ASSERT(!c->wasGCStarted());
         JS_ASSERT(!c->gcIncomingGrayPointers);
+        JS_ASSERT(!c->gcLiveArrayBuffers);
 
         for (unsigned i = 0 ; i < FINALIZE_LIMIT ; ++i) {
             JS_ASSERT_IF(!IsBackgroundFinalized(AllocKind(i)) ||
@@ -4313,6 +4314,7 @@ ResetIncrementalGC(JSRuntime *rt, const char *reason)
             if (c->isGCMarking()) {
                 c->setNeedsBarrier(false, JSCompartment::UpdateIon);
                 c->setGCState(JSCompartment::NoGC);
+                ArrayBufferObject::resetArrayBufferList(c);
             }
         }
 
@@ -4350,6 +4352,7 @@ ResetIncrementalGC(JSRuntime *rt, const char *reason)
         JS_ASSERT(c->isCollecting());
         JS_ASSERT(!c->needsBarrier());
         JS_ASSERT(!NextGraphNode(c.get()));
+        JS_ASSERT(!c->gcLiveArrayBuffers);
         for (unsigned i = 0 ; i < FINALIZE_LIMIT ; ++i)
             JS_ASSERT(!c->arenas.arenaListsToSweep[i]);
     }
diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index 8333ec7c4fd2..92078b032b7b 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -535,23 +535,25 @@ ArrayBufferObject::obj_trace(JSTracer *trc, RawObject obj)
     } else {
         // Multiple views: do not mark, but append buffer to list.
 
-        // obj_trace may be called multiple times before sweepAll(), so avoid
-        // adding this buffer to the list multiple times.
-        if (BufferLink(firstView) == UNSET_BUFFER_LINK)  {
-            JSObject **bufList = &trc->runtime->liveArrayBuffers;
-            SetBufferLink(firstView, *bufList);
-            *bufList = obj;
+        if (IS_GC_MARKING_TRACER(trc)) {
+            // obj_trace may be called multiple times before sweep(), so avoid
+            // adding this buffer to the list multiple times.
+            if (BufferLink(firstView) == UNSET_BUFFER_LINK) {
+                JS_ASSERT(obj->compartment() == firstView->compartment());
+                JSObject **bufList = &obj->compartment()->gcLiveArrayBuffers;
+                SetBufferLink(firstView, *bufList);
+                *bufList = obj;
+            }
         }
     }
 }
 
 void
-ArrayBufferObject::sweepAll(JSRuntime *rt)
+ArrayBufferObject::sweep(JSCompartment *compartment)
 {
-    JSObject *buffer = rt->liveArrayBuffers;
+    JSObject *buffer = compartment->gcLiveArrayBuffers;
     JS_ASSERT(buffer != UNSET_BUFFER_LINK);
-
-    JSObject *lastBufferViews = NULL;
+    compartment->gcLiveArrayBuffers = NULL;
 
     while (buffer) {
         JSObject **views = GetViewList(&buffer->asArrayBuffer());
@@ -559,6 +561,7 @@ ArrayBufferObject::sweepAll(JSRuntime *rt)
 
         JSObject *nextBuffer = BufferLink(*views);
         JS_ASSERT(nextBuffer != UNSET_BUFFER_LINK);
+        SetBufferLink(*views, UNSET_BUFFER_LINK);
 
         // Rebuild the list of views of the ArrayBuffer, discarding dead views.
         // If there is only one view, it will have already been marked.
@@ -575,31 +578,16 @@ ArrayBufferObject::sweepAll(JSRuntime *rt)
         }
         *views = prevLiveView;
 
-        // Add the buffer to the end of the list if it has any views left.
-        // Buffers without views are dropped from the list.
-        if (*views) {
-            if (lastBufferViews)
-                SetBufferLink(lastBufferViews, buffer);
-            else
-                rt->liveArrayBuffers = buffer;
-            lastBufferViews = *views;
-        }
-
         buffer = nextBuffer;
     }
-
-    // Terminate the buffer list.
-    if (lastBufferViews)
-        SetBufferLink(lastBufferViews, NULL);
-    else
-        rt->liveArrayBuffers = NULL;
 }
 
 void
-ArrayBufferObject::resetArrayBufferList(JSRuntime *rt)
+ArrayBufferObject::resetArrayBufferList(JSCompartment *compartment)
 {
-    JSObject *buffer = rt->liveArrayBuffers;
+    JSObject *buffer = compartment->gcLiveArrayBuffers;
     JS_ASSERT(buffer != UNSET_BUFFER_LINK);
+    compartment->gcLiveArrayBuffers = NULL;
 
     while (buffer) {
         JSObject *view = *GetViewList(&buffer->asArrayBuffer());
@@ -611,7 +599,6 @@ ArrayBufferObject::resetArrayBufferList(JSRuntime *rt)
         SetBufferLink(view, UNSET_BUFFER_LINK);
         buffer = nextBuffer;
     }
-    rt->liveArrayBuffers = NULL;
 }
 
 JSBool
diff --git a/js/src/jstypedarray.h b/js/src/jstypedarray.h
index 7c70837e27b3..95d76e63b2ec 100644
--- a/js/src/jstypedarray.h
+++ b/js/src/jstypedarray.h
@@ -130,9 +130,9 @@ class ArrayBufferObject : public JSObject
     static JSBool obj_enumerate(JSContext *cx, HandleObject obj, JSIterateOp enum_op,
                                 MutableHandleValue statep, MutableHandleId idp);
 
-    static void sweepAll(JSRuntime *rt);
+    static void sweep(JSCompartment *rt);
 
-    static void resetArrayBufferList(JSRuntime *rt);
+    static void resetArrayBufferList(JSCompartment *rt);
 
     static bool stealContents(JSContext *cx, JSObject *obj, void **contents,
                               uint8_t **data);

From 31cd034aa10b3aa5c03bc83049b7b5d1163c37b1 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Fri, 2 Nov 2012 18:02:25 +0000
Subject: [PATCH 025/160] Bug 790338 - Make debug scopes object part of
 compartment not runtime r=billm

--HG--
extra : rebase_source : 61e87a7b79541b70cf9d46451b69aef7368436fc
---
 js/src/jsapi.cpp          |   9 --
 js/src/jscntxt.h          |   4 -
 js/src/jscompartment.cpp  |  14 ++-
 js/src/jscompartment.h    |   4 +
 js/src/jsgc.cpp           |   6 +-
 js/src/jsweakmap.cpp      |  12 +++
 js/src/jsweakmap.h        |   3 +
 js/src/vm/ScopeObject.cpp | 189 ++++++++++++++++++++++++++------------
 js/src/vm/ScopeObject.h   |  39 ++++----
 js/src/vm/Stack.cpp       |  10 +-
 10 files changed, 189 insertions(+), 101 deletions(-)

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 00e9a6d206fe..38e6b903d0bc 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -845,7 +845,6 @@ JSRuntime::JSRuntime(JSUseHelperThreads useHelperThreads)
     profilingScripts(false),
     alwaysPreserveCode(false),
     hadOutOfMemory(false),
-    debugScopes(NULL),
     data(NULL),
     gcLock(NULL),
     gcHelperThread(thisFromCtor()),
@@ -960,12 +959,6 @@ JSRuntime::init(uint32_t maxbytes)
     if (!evalCache.init())
         return false;
 
-    debugScopes = this->new_<DebugScopes>(this);
-    if (!debugScopes || !debugScopes->init()) {
-        js_delete(debugScopes);
-        return false;
-    }
-
     nativeStackBase = GetNativeStackBase();
     return true;
 }
@@ -976,8 +969,6 @@ JSRuntime::~JSRuntime()
     clearOwnerThread();
 #endif
 
-    js_delete(debugScopes);
-
     /*
      * Even though all objects in the compartment are dead, we may have keep
      * some filenames around because of gcKeepAtoms.
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 04b3182f0d58..83df659831f3 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -98,7 +98,6 @@ class IonActivation;
 
 class WeakMapBase;
 class InterpreterFrames;
-class DebugScopes;
 class WorkerThreadState;
 
 /*
@@ -912,9 +911,6 @@ struct JSRuntime : js::RuntimeFriendFields
      */
     JSCList             onNewGlobalObjectWatchers;
 
-    /* Bookkeeping information for debug scope objects. */
-    js::DebugScopes     *debugScopes;
-
     /* Client opaque pointers */
     void                *data;
 
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 55805902ec54..b4d85a67a66b 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -78,7 +78,8 @@ JSCompartment::JSCompartment(JSRuntime *rt)
     debugModeBits(rt->debugMode ? DebugFromC : 0),
     watchpointMap(NULL),
     scriptCountsMap(NULL),
-    debugScriptMap(NULL)
+    debugScriptMap(NULL),
+    debugScopes(NULL)
 #ifdef JS_ION
     , ionCompartment_(NULL)
 #endif
@@ -95,6 +96,10 @@ JSCompartment::~JSCompartment()
     js_delete(watchpointMap);
     js_delete(scriptCountsMap);
     js_delete(debugScriptMap);
+    if (debugScopes) {
+        debugScopes->finalize(rt);
+        js_delete(debugScopes);
+    }
 }
 
 bool
@@ -615,6 +620,9 @@ JSCompartment::sweep(FreeOp *fop, bool releaseTypes)
          * sweeping after clearing jit code.
          */
         regExps.sweep(rt);
+
+        if (debugScopes)
+            debugScopes->sweep(rt);
     }
 
     if (!activeAnalysis && !gcPreserveCode) {
@@ -787,7 +795,7 @@ JSCompartment::setDebugModeFromC(JSContext *cx, bool b, AutoDebugModeGC &dmgc)
     if (enabledBefore != enabledAfter) {
         updateForDebugMode(cx->runtime->defaultFreeOp(), dmgc);
         if (!enabledAfter)
-            cx->runtime->debugScopes->onCompartmentLeaveDebugMode(this);
+            DebugScopes::onCompartmentLeaveDebugMode(this);
     }
     return true;
 }
@@ -861,7 +869,7 @@ JSCompartment::removeDebuggee(FreeOp *fop,
         debugModeBits &= ~DebugFromJS;
         if (wasEnabled && !debugMode()) {
             AutoDebugModeGC dmgc(rt);
-            fop->runtime()->debugScopes->onCompartmentLeaveDebugMode(this);
+            DebugScopes::onCompartmentLeaveDebugMode(this);
             updateForDebugMode(fop, dmgc);
         }
     }
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index 3222859c8376..1a3d3bee370a 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -115,6 +115,7 @@ struct TypeInferenceSizes;
 
 namespace js {
 class AutoDebugModeGC;
+struct DebugScopes;
 }
 
 struct JSCompartment : public js::gc::GraphNodeBase
@@ -484,6 +485,9 @@ struct JSCompartment : public js::gc::GraphNodeBase
 
     js::DebugScriptMap *debugScriptMap;
 
+    /* Bookkeeping information for debug scope objects. */
+    js::DebugScopes *debugScopes;
+
 #ifdef JS_ION
   private:
     js::ion::IonCompartment *ionCompartment_;
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 7dd66cf42341..abf72ce5ce0d 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -2554,6 +2554,10 @@ MarkRuntime(JSTracer *trc, bool useSavedRoots = false)
                 }
             }
         }
+
+        /* Mark debug scopes, if present */
+        if (c->debugScopes)
+            c->debugScopes->mark(trc);
     }
 
 #ifdef JS_METHODJIT
@@ -2563,7 +2567,6 @@ MarkRuntime(JSTracer *trc, bool useSavedRoots = false)
 #endif
 
     rt->stackSpace.mark(trc);
-    rt->debugScopes->mark(trc);
 
 #ifdef JS_ION
     ion::MarkIonActivations(rt, trc);
@@ -3932,7 +3935,6 @@ BeginSweepingCompartmentGroup(JSRuntime *rt)
 
     /* Finalize unreachable (key,value) pairs in all weak maps. */
     WeakMapBase::sweepAll(&rt->gcMarker);
-    rt->debugScopes->sweep();
 
     /* Prune out dead views from ArrayBuffer's view lists. */
     for (GCCompartmentGroupIter c(rt); !c.done(); c.next())
diff --git a/js/src/jsweakmap.cpp b/js/src/jsweakmap.cpp
index d60bb5add1d1..f3eb6005299e 100644
--- a/js/src/jsweakmap.cpp
+++ b/js/src/jsweakmap.cpp
@@ -87,6 +87,18 @@ WeakMapBase::restoreWeakMapList(JSRuntime *rt, WeakMapVector &vector)
     }
 }
 
+void
+WeakMapBase::removeWeakMapFromList(JSRuntime *rt, WeakMapBase *weakmap)
+{
+    for (WeakMapBase **p = &rt->gcWeakMapList; *p; p = &(*p)->next) {
+        if (*p == weakmap) {
+            *p = (*p)->next;
+            weakmap->next = WeakMapNotInList;
+            break;
+        }
+    }
+}
+
 typedef WeakMap<EncapsulatedPtrObject, RelocatableValue> ObjectValueMap;
 
 static ObjectValueMap *
diff --git a/js/src/jsweakmap.h b/js/src/jsweakmap.h
index 80d63aaef4c9..adba4ef72a7a 100644
--- a/js/src/jsweakmap.h
+++ b/js/src/jsweakmap.h
@@ -93,6 +93,9 @@ class WeakMapBase {
     static bool saveWeakMapList(JSRuntime *rt, WeakMapVector &vector);
     static void restoreWeakMapList(JSRuntime *rt, WeakMapVector &vector);
 
+    // Remove a weakmap from the live weakmap list
+    static void removeWeakMapFromList(JSRuntime *rt, WeakMapBase *weakmap);
+
   protected:
     // Instance member functions called by the above. Instantiations of WeakMap override
     // these with definitions appropriate for their Key and Value types.
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index c3629c10cded..290506997f53 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -1117,7 +1117,7 @@ class DebugScopeProxy : public BaseProxyHandler
                                jsid id, Action action, Value *vp)
     {
         JS_ASSERT(&debugScope->scope() == scope);
-        StackFrame *maybefp = cx->runtime->debugScopes->hasLiveFrame(*scope);
+        StackFrame *maybefp = DebugScopes::hasLiveFrame(*scope);
 
         /* Handle unaliased formals, vars, and consts at function scope. */
         if (scope->isCall() && !scope->asCall().isForEval()) {
@@ -1268,7 +1268,7 @@ class DebugScopeProxy : public BaseProxyHandler
         if (scope.asCall().callee().nonLazyScript()->needsArgsObj())
             return true;
 
-        StackFrame *maybefp = cx->runtime->debugScopes->hasLiveFrame(scope);
+        StackFrame *maybefp = DebugScopes::hasLiveFrame(scope);
         if (!maybefp) {
             JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_DEBUG_NOT_LIVE,
                                  "Debugger scope");
@@ -1521,11 +1521,10 @@ js_IsDebugScopeSlow(RawObject obj)
 
 /*****************************************************************************/
 
-DebugScopes::DebugScopes(JSRuntime *rt)
- : rt(rt),
-   proxiedScopes(rt),
-   missingScopes(rt),
-   liveScopes(rt)
+DebugScopes::DebugScopes(JSContext *cx)
+ : proxiedScopes(cx),
+   missingScopes(cx),
+   liveScopes(cx)
 {}
 
 DebugScopes::~DebugScopes()
@@ -1545,6 +1544,12 @@ DebugScopes::init()
     return true;
 }
 
+void
+DebugScopes::finalize(JSRuntime *rt)
+{
+    WeakMapBase::removeWeakMapFromList(rt, &proxiedScopes);
+}
+
 void
 DebugScopes::mark(JSTracer *trc)
 {
@@ -1552,7 +1557,7 @@ DebugScopes::mark(JSTracer *trc)
 }
 
 void
-DebugScopes::sweep()
+DebugScopes::sweep(JSRuntime *rt)
 {
     /*
      * Note: missingScopes points to debug scopes weakly not just so that debug
@@ -1605,36 +1610,69 @@ CanUseDebugScopeMaps(JSContext *cx)
     return cx->compartment->debugMode();
 }
 
-DebugScopeObject *
-DebugScopes::hasDebugScope(JSContext *cx, ScopeObject &scope) const
+DebugScopes *
+DebugScopes::ensureCompartmentData(JSContext *cx)
 {
-    if (ObjectWeakMap::Ptr p = proxiedScopes.lookup(&scope)) {
+    JSCompartment *c = cx->compartment;
+    if (c->debugScopes)
+        return c->debugScopes;
+
+    c->debugScopes = c->rt->new_<DebugScopes>(cx);
+    if (c->debugScopes && c->debugScopes->init())
+        return c->debugScopes;
+
+    js_ReportOutOfMemory(cx);
+    return NULL;
+}
+
+DebugScopeObject *
+DebugScopes::hasDebugScope(JSContext *cx, ScopeObject &scope)
+{
+    DebugScopes *scopes = scope.compartment()->debugScopes;
+    if (!scopes)
+        return NULL;
+
+    if (ObjectWeakMap::Ptr p = scopes->proxiedScopes.lookup(&scope)) {
         JS_ASSERT(CanUseDebugScopeMaps(cx));
         return &p->value->asDebugScope();
     }
+
     return NULL;
 }
 
 bool
 DebugScopes::addDebugScope(JSContext *cx, ScopeObject &scope, DebugScopeObject &debugScope)
 {
+    JS_ASSERT(cx->compartment == scope.compartment());
+    JS_ASSERT(cx->compartment == debugScope.compartment());
+
     if (!CanUseDebugScopeMaps(cx))
         return true;
 
-    JS_ASSERT(!proxiedScopes.has(&scope));
-    if (!proxiedScopes.put(&scope, &debugScope)) {
+    DebugScopes *scopes = ensureCompartmentData(cx);
+    if (!scopes)
+        return false;
+
+    JS_ASSERT(!scopes->proxiedScopes.has(&scope));
+    if (!scopes->proxiedScopes.put(&scope, &debugScope)) {
         js_ReportOutOfMemory(cx);
         return false;
     }
-    HashTableWriteBarrierPost(debugScope.compartment(), &proxiedScopes, &scope);
+
+    HashTableWriteBarrierPost(cx->compartment, &scopes->proxiedScopes, &scope);
     return true;
 }
 
 DebugScopeObject *
-DebugScopes::hasDebugScope(JSContext *cx, const ScopeIter &si) const
+DebugScopes::hasDebugScope(JSContext *cx, const ScopeIter &si)
 {
     JS_ASSERT(!si.hasScopeObject());
-    if (MissingScopeMap::Ptr p = missingScopes.lookup(si)) {
+
+    DebugScopes *scopes = cx->compartment->debugScopes;
+    if (!scopes)
+        return NULL;
+
+    if (MissingScopeMap::Ptr p = scopes->missingScopes.lookup(si)) {
         JS_ASSERT(CanUseDebugScopeMaps(cx));
         return p->value;
     }
@@ -1645,20 +1683,27 @@ bool
 DebugScopes::addDebugScope(JSContext *cx, const ScopeIter &si, DebugScopeObject &debugScope)
 {
     JS_ASSERT(!si.hasScopeObject());
+    JS_ASSERT(cx->compartment == debugScope.compartment());
+
     if (!CanUseDebugScopeMaps(cx))
         return true;
 
-    JS_ASSERT(!missingScopes.has(si));
-    if (!missingScopes.put(si, &debugScope)) {
+    DebugScopes *scopes = ensureCompartmentData(cx);
+    if (!scopes)
+        return false;
+
+    JS_ASSERT(!scopes->missingScopes.has(si));
+    if (!scopes->missingScopes.put(si, &debugScope)) {
         js_ReportOutOfMemory(cx);
         return false;
     }
 
-    JS_ASSERT(!liveScopes.has(&debugScope.scope()));
-    if (!liveScopes.put(&debugScope.scope(), si.fp())) {
+    JS_ASSERT(!scopes->liveScopes.has(&debugScope.scope()));
+    if (!scopes->liveScopes.put(&debugScope.scope(), si.fp())) {
         js_ReportOutOfMemory(cx);
         return false;
     }
+
     return true;
 }
 
@@ -1668,6 +1713,10 @@ DebugScopes::onPopCall(StackFrame *fp, JSContext *cx)
     JS_ASSERT(!fp->isYielding());
     assertSameCompartment(cx, fp);
 
+    DebugScopes *scopes = cx->compartment->debugScopes;
+    if (!scopes)
+        return;
+
     DebugScopeObject *debugScope = NULL;
 
     if (fp->fun()->isHeavyweight()) {
@@ -1679,15 +1728,15 @@ DebugScopes::onPopCall(StackFrame *fp, JSContext *cx)
             return;
 
         CallObject &callobj = fp->scopeChain()->asCall();
-        liveScopes.remove(&callobj);
-        if (ObjectWeakMap::Ptr p = proxiedScopes.lookup(&callobj))
+        scopes->liveScopes.remove(&callobj);
+        if (ObjectWeakMap::Ptr p = scopes->proxiedScopes.lookup(&callobj))
             debugScope = &p->value->asDebugScope();
     } else {
         ScopeIter si(fp, cx);
-        if (MissingScopeMap::Ptr p = missingScopes.lookup(si)) {
+        if (MissingScopeMap::Ptr p = scopes->missingScopes.lookup(si)) {
             debugScope = p->value;
-            liveScopes.remove(&debugScope->scope().asCall());
-            missingScopes.remove(p);
+            scopes->liveScopes.remove(&debugScope->scope().asCall());
+            scopes->missingScopes.remove(p);
         }
     }
 
@@ -1742,18 +1791,22 @@ DebugScopes::onPopBlock(JSContext *cx, StackFrame *fp)
 {
     assertSameCompartment(cx, fp);
 
+    DebugScopes *scopes = cx->compartment->debugScopes;
+    if (!scopes)
+        return;
+
     StaticBlockObject &staticBlock = *fp->maybeBlockChain();
     if (staticBlock.needsClone()) {
         ClonedBlockObject &clone = fp->scopeChain()->asClonedBlock();
         clone.copyUnaliasedValues(fp);
-        liveScopes.remove(&clone);
+        scopes->liveScopes.remove(&clone);
     } else {
         ScopeIter si(fp, cx);
-        if (MissingScopeMap::Ptr p = missingScopes.lookup(si)) {
+        if (MissingScopeMap::Ptr p = scopes->missingScopes.lookup(si)) {
             ClonedBlockObject &clone = p->value->scope().asClonedBlock();
             clone.copyUnaliasedValues(fp);
-            liveScopes.remove(&clone);
-            missingScopes.remove(p);
+            scopes->liveScopes.remove(&clone);
+            scopes->missingScopes.remove(p);
         }
     }
 }
@@ -1761,24 +1814,34 @@ DebugScopes::onPopBlock(JSContext *cx, StackFrame *fp)
 void
 DebugScopes::onPopWith(StackFrame *fp)
 {
-    liveScopes.remove(&fp->scopeChain()->asWith());
+    DebugScopes *scopes = fp->compartment()->debugScopes;
+    if (scopes)
+        scopes->liveScopes.remove(&fp->scopeChain()->asWith());
 }
 
 void
 DebugScopes::onPopStrictEvalScope(StackFrame *fp)
 {
+    DebugScopes *scopes = fp->compartment()->debugScopes;
+    if (!scopes)
+        return;
+
     /*
      * The StackFrame may be observed before the prologue has created the
      * CallObject. See ScopeIter::settle.
      */
     if (fp->hasCallObj())
-        liveScopes.remove(&fp->scopeChain()->asCall());
+        scopes->liveScopes.remove(&fp->scopeChain()->asCall());
 }
 
 void
 DebugScopes::onGeneratorFrameChange(StackFrame *from, StackFrame *to, JSContext *cx)
 {
     for (ScopeIter toIter(to, cx); !toIter.done(); ++toIter) {
+        DebugScopes *scopes = ensureCompartmentData(cx);
+        if (!scopes)
+            return;
+
         if (toIter.hasScopeObject()) {
             /*
              * Not only must we correctly replace mappings [scope -> from] with
@@ -1787,18 +1850,20 @@ DebugScopes::onGeneratorFrameChange(StackFrame *from, StackFrame *to, JSContext
              * scope while it is suspended, we can find its frame (which would
              * otherwise not be found by AllFramesIter).
              */
-            LiveScopeMap::AddPtr livePtr = liveScopes.lookupForAdd(&toIter.scope());
+            JS_ASSERT(toIter.scope().compartment() == cx->compartment);
+            LiveScopeMap::AddPtr livePtr = scopes->liveScopes.lookupForAdd(&toIter.scope());
             if (livePtr)
                 livePtr->value = to;
             else
-                liveScopes.add(livePtr, &toIter.scope(), to);
+                scopes->liveScopes.add(livePtr, &toIter.scope(), to);  // OOM here?
         } else {
             ScopeIter si(toIter, from, cx);
-            if (MissingScopeMap::Ptr p = missingScopes.lookup(si)) {
+            JS_ASSERT(si.fp()->compartment() == cx->compartment);
+            if (MissingScopeMap::Ptr p = scopes->missingScopes.lookup(si)) {
                 DebugScopeObject &debugScope = *p->value;
-                liveScopes.lookup(&debugScope.scope())->value = to;
-                missingScopes.remove(p);
-                missingScopes.put(toIter, &debugScope);
+                scopes->liveScopes.lookup(&debugScope.scope())->value = to;
+                scopes->missingScopes.remove(p);
+                scopes->missingScopes.put(toIter, &debugScope);  // OOM here?
             }
         }
     }
@@ -1807,17 +1872,11 @@ DebugScopes::onGeneratorFrameChange(StackFrame *from, StackFrame *to, JSContext
 void
 DebugScopes::onCompartmentLeaveDebugMode(JSCompartment *c)
 {
-    for (ObjectWeakMap::Enum e(proxiedScopes); !e.empty(); e.popFront()) {
-        if (e.front().key->compartment() == c)
-            e.removeFront();
-    }
-    for (MissingScopeMap::Enum e(missingScopes); !e.empty(); e.popFront()) {
-        if (e.front().key.fp()->compartment() == c)
-            e.removeFront();
-    }
-    for (LiveScopeMap::Enum e(liveScopes); !e.empty(); e.popFront()) {
-        if (e.front().key->compartment() == c)
-            e.removeFront();
+    DebugScopes *scopes = c->debugScopes;
+    if (scopes) {
+        scopes->proxiedScopes.clear();
+        scopes->missingScopes.clear();
+        scopes->liveScopes.clear();
     }
 }
 
@@ -1850,8 +1909,14 @@ DebugScopes::updateLiveScopes(JSContext *cx)
             continue;
 
         for (ScopeIter si(fp, cx); !si.done(); ++si) {
-            if (si.hasScopeObject() && !liveScopes.put(&si.scope(), fp))
-                return false;
+            if (si.hasScopeObject()) {
+                JS_ASSERT(si.scope().compartment() == cx->compartment);
+                DebugScopes *scopes = ensureCompartmentData(cx);
+                if (!scopes)
+                    return false;
+                if (!scopes->liveScopes.put(&si.scope(), fp))
+                    return false;
+            }
         }
 
         if (fp->prevUpToDate())
@@ -1866,7 +1931,11 @@ DebugScopes::updateLiveScopes(JSContext *cx)
 StackFrame *
 DebugScopes::hasLiveFrame(ScopeObject &scope)
 {
-    if (LiveScopeMap::Ptr p = liveScopes.lookup(&scope)) {
+    DebugScopes *scopes = scope.compartment()->debugScopes;
+    if (!scopes)
+        return NULL;
+
+    if (LiveScopeMap::Ptr p = scopes->liveScopes.lookup(&scope)) {
         StackFrame *fp = p->value;
 
         /*
@@ -1880,7 +1949,7 @@ DebugScopes::hasLiveFrame(ScopeObject &scope)
          *  4. GC completes, live objects may now point to values that weren't
          *     marked and thus may point to swept GC things
          */
-        if (JSGenerator *gen = fp->maybeSuspendedGenerator(rt))
+        if (JSGenerator *gen = fp->maybeSuspendedGenerator(scope.compartment()->rt))
             JSObject::readBarrier(gen->obj);
 
         return fp;
@@ -1896,8 +1965,7 @@ GetDebugScope(JSContext *cx, const ScopeIter &si);
 static DebugScopeObject *
 GetDebugScopeForScope(JSContext *cx, Handle<ScopeObject*> scope, const ScopeIter &enclosing)
 {
-    DebugScopes &debugScopes = *cx->runtime->debugScopes;
-    if (DebugScopeObject *debugScope = debugScopes.hasDebugScope(cx, *scope))
+    if (DebugScopeObject *debugScope = DebugScopes::hasDebugScope(cx, *scope))
         return debugScope;
 
     RootedObject enclosingDebug(cx, GetDebugScope(cx, enclosing));
@@ -1916,7 +1984,7 @@ GetDebugScopeForScope(JSContext *cx, Handle<ScopeObject*> scope, const ScopeIter
     if (!debugScope)
         return NULL;
 
-    if (!debugScopes.addDebugScope(cx, *scope, *debugScope))
+    if (!DebugScopes::addDebugScope(cx, *scope, *debugScope))
         return NULL;
 
     return debugScope;
@@ -1925,8 +1993,7 @@ GetDebugScopeForScope(JSContext *cx, Handle<ScopeObject*> scope, const ScopeIter
 static DebugScopeObject *
 GetDebugScopeForMissing(JSContext *cx, const ScopeIter &si)
 {
-    DebugScopes &debugScopes = *cx->runtime->debugScopes;
-    if (DebugScopeObject *debugScope = debugScopes.hasDebugScope(cx, si))
+    if (DebugScopeObject *debugScope = DebugScopes::hasDebugScope(cx, si))
         return debugScope;
 
     ScopeIter copy(si, cx);
@@ -1979,7 +2046,7 @@ GetDebugScopeForMissing(JSContext *cx, const ScopeIter &si)
     if (!debugScope)
         return NULL;
 
-    if (!debugScopes.addDebugScope(cx, si, *debugScope))
+    if (!DebugScopes::addDebugScope(cx, si, *debugScope))
         return NULL;
 
     return debugScope;
@@ -2004,7 +2071,7 @@ GetDebugScope(JSContext *cx, JSObject &obj)
     }
 
     Rooted<ScopeObject*> scope(cx, &obj.asScope());
-    if (StackFrame *fp = cx->runtime->debugScopes->hasLiveFrame(*scope)) {
+    if (StackFrame *fp = DebugScopes::hasLiveFrame(*scope)) {
         ScopeIter si(fp, *scope, cx);
         return GetDebugScope(cx, si);
     }
@@ -2034,7 +2101,7 @@ js::GetDebugScopeForFunction(JSContext *cx, JSFunction *fun)
 {
     assertSameCompartment(cx, fun);
     JS_ASSERT(cx->compartment->debugMode());
-    if (!cx->runtime->debugScopes->updateLiveScopes(cx))
+    if (!DebugScopes::updateLiveScopes(cx))
         return NULL;
     return GetDebugScope(cx, *fun->environment());
 }
@@ -2043,7 +2110,7 @@ JSObject *
 js::GetDebugScopeForFrame(JSContext *cx, StackFrame *fp)
 {
     assertSameCompartment(cx, fp);
-    if (CanUseDebugScopeMaps(cx) && !cx->runtime->debugScopes->updateLiveScopes(cx))
+    if (CanUseDebugScopeMaps(cx) && !DebugScopes::updateLiveScopes(cx))
         return NULL;
     ScopeIter si(fp, cx);
     return GetDebugScope(cx, si);
diff --git a/js/src/vm/ScopeObject.h b/js/src/vm/ScopeObject.h
index 628b7bf64a11..d490c73b3f95 100644
--- a/js/src/vm/ScopeObject.h
+++ b/js/src/vm/ScopeObject.h
@@ -534,11 +534,9 @@ class DebugScopeObject : public JSObject
     bool isForDeclarative() const;
 };
 
-/* Maintains runtime-wide debug scope bookkeeping information. */
+/* Maintains per-compartment debug scope bookkeeping information. */
 class DebugScopes
 {
-    JSRuntime *rt;
-
     /* The map from (non-debug) scopes to debug scopes. */
     typedef WeakMap<EncapsulatedPtrObject, RelocatablePtrObject> ObjectWeakMap;
     ObjectWeakMap proxiedScopes;
@@ -567,32 +565,39 @@ class DebugScopes
     LiveScopeMap liveScopes;
 
   public:
-    DebugScopes(JSRuntime *rt);
+    DebugScopes(JSContext *c);
     ~DebugScopes();
+
+    void finalize(JSRuntime *rt);
+
+  private:
     bool init();
 
+    static DebugScopes *ensureCompartmentData(JSContext *cx);
+
+  public:
     void mark(JSTracer *trc);
-    void sweep();
+    void sweep(JSRuntime *rt);
 
-    DebugScopeObject *hasDebugScope(JSContext *cx, ScopeObject &scope) const;
-    bool addDebugScope(JSContext *cx, ScopeObject &scope, DebugScopeObject &debugScope);
+    static DebugScopeObject *hasDebugScope(JSContext *cx, ScopeObject &scope);
+    static bool addDebugScope(JSContext *cx, ScopeObject &scope, DebugScopeObject &debugScope);
 
-    DebugScopeObject *hasDebugScope(JSContext *cx, const ScopeIter &si) const;
-    bool addDebugScope(JSContext *cx, const ScopeIter &si, DebugScopeObject &debugScope);
+    static DebugScopeObject *hasDebugScope(JSContext *cx, const ScopeIter &si);
+    static bool addDebugScope(JSContext *cx, const ScopeIter &si, DebugScopeObject &debugScope);
 
-    bool updateLiveScopes(JSContext *cx);
-    StackFrame *hasLiveFrame(ScopeObject &scope);
+    static bool updateLiveScopes(JSContext *cx);
+    static StackFrame *hasLiveFrame(ScopeObject &scope);
 
     /*
      * In debug-mode, these must be called whenever exiting a call/block or
      * when activating/yielding a generator.
      */
-    void onPopCall(StackFrame *fp, JSContext *cx);
-    void onPopBlock(JSContext *cx, StackFrame *fp);
-    void onPopWith(StackFrame *fp);
-    void onPopStrictEvalScope(StackFrame *fp);
-    void onGeneratorFrameChange(StackFrame *from, StackFrame *to, JSContext *cx);
-    void onCompartmentLeaveDebugMode(JSCompartment *c);
+    static void onPopCall(StackFrame *fp, JSContext *cx);
+    static void onPopBlock(JSContext *cx, StackFrame *fp);
+    static void onPopWith(StackFrame *fp);
+    static void onPopStrictEvalScope(StackFrame *fp);
+    static void onGeneratorFrameChange(StackFrame *from, StackFrame *to, JSContext *cx);
+    static void onCompartmentLeaveDebugMode(JSCompartment *c);
 };
 
 }  /* namespace js */
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index e7a7b96ee755..136a9491328e 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -126,7 +126,7 @@ StackFrame::copyFrameAndValues(JSContext *cx, Value *vp, StackFrame *otherfp,
     }
 
     if (cx->compartment->debugMode())
-        cx->runtime->debugScopes->onGeneratorFrameChange(otherfp, this, cx);
+        DebugScopes::onGeneratorFrameChange(otherfp, this, cx);
 }
 
 /* Note: explicit instantiation for js_NewGenerator located in jsiter.cpp. */
@@ -333,7 +333,7 @@ StackFrame::epilogue(JSContext *cx)
         if (isStrictEvalFrame()) {
             JS_ASSERT_IF(hasCallObj(), scopeChain()->asCall().isForEval());
             if (cx->compartment->debugMode())
-                cx->runtime->debugScopes->onPopStrictEvalScope(this);
+                DebugScopes::onPopStrictEvalScope(this);
         } else if (isDirectEvalFrame()) {
             if (isDebuggerFrame())
                 JS_ASSERT(!scopeChain()->isScope());
@@ -368,7 +368,7 @@ StackFrame::epilogue(JSContext *cx)
         AssertDynamicScopeMatchesStaticScope(script, scopeChain());
 
     if (cx->compartment->debugMode())
-        cx->runtime->debugScopes->onPopCall(this, cx);
+        DebugScopes::onPopCall(this, cx);
 
 
     if (isConstructing() && returnValue().isPrimitive())
@@ -416,7 +416,7 @@ StackFrame::popBlock(JSContext *cx)
     JS_ASSERT(hasBlockChain());
 
     if (cx->compartment->debugMode())
-        cx->runtime->debugScopes->onPopBlock(cx, this);
+        DebugScopes::onPopBlock(cx, this);
 
     if (blockChain_->needsClone()) {
         JS_ASSERT(scopeChain_->asClonedBlock().staticBlock() == *blockChain_);
@@ -430,7 +430,7 @@ void
 StackFrame::popWith(JSContext *cx)
 {
     if (cx->compartment->debugMode())
-        cx->runtime->debugScopes->onPopWith(this);
+        DebugScopes::onPopWith(this);
 
     JS_ASSERT(scopeChain()->isWith());
     popOffScopeChain();

From 897ff0e375c062f4be482c9d3f4aa6167f4749b8 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Fri, 2 Nov 2012 18:03:59 +0000
Subject: [PATCH 026/160] Bug 790338 - Make weakmap list per-compartment rather
 than per-runtime r=billm

--HG--
extra : rebase_source : 3f3ceee949ae9fc2a0ac232038e3858ff838c193
---
 js/src/jsapi.cpp          |  1 -
 js/src/jscntxt.h          |  1 -
 js/src/jscompartment.cpp  |  9 ++++---
 js/src/jscompartment.h    |  3 +++
 js/src/jsgc.cpp           | 46 +++++++++++++++++++-------------
 js/src/jsweakmap.cpp      | 54 +++++++++++++++++++++++--------------
 js/src/jsweakmap.h        | 56 +++++++++++++++++++++------------------
 js/src/vm/Debugger.h      |  4 +--
 js/src/vm/ScopeObject.cpp |  7 +----
 js/src/vm/ScopeObject.h   |  2 --
 10 files changed, 102 insertions(+), 81 deletions(-)

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 38e6b903d0bc..3f4299464a7b 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -787,7 +787,6 @@ JSRuntime::JSRuntime(JSUseHelperThreads useHelperThreads)
     gcDynamicMarkSlice(false),
     gcShouldCleanUpEverything(false),
     gcIsNeeded(0),
-    gcWeakMapList(NULL),
     gcStats(thisFromCtor()),
     gcNumber(0),
     gcStartNumber(0),
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 83df659831f3..acf949e663eb 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -656,7 +656,6 @@ struct JSRuntime : js::RuntimeFriendFields
      */
     volatile uintptr_t  gcIsNeeded;
 
-    js::WeakMapBase     *gcWeakMapList;
     js::gcstats::Statistics gcStats;
 
     /* Incremented on every GC slice. */
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index b4d85a67a66b..72e4c8250a31 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -74,6 +74,7 @@ JSCompartment::JSCompartment(JSRuntime *rt)
     gcTriggerMallocAndFreeBytes(0),
     gcIncomingGrayPointers(NULL),
     gcLiveArrayBuffers(NULL),
+    gcWeakMapList(NULL),
     gcMallocBytes(0),
     debugModeBits(rt->debugMode ? DebugFromC : 0),
     watchpointMap(NULL),
@@ -96,10 +97,7 @@ JSCompartment::~JSCompartment()
     js_delete(watchpointMap);
     js_delete(scriptCountsMap);
     js_delete(debugScriptMap);
-    if (debugScopes) {
-        debugScopes->finalize(rt);
-        js_delete(debugScopes);
-    }
+    js_delete(debugScopes);
 }
 
 bool
@@ -623,6 +621,9 @@ JSCompartment::sweep(FreeOp *fop, bool releaseTypes)
 
         if (debugScopes)
             debugScopes->sweep(rt);
+
+        /* Finalize unreachable (key,value) pairs in all weak maps. */
+        WeakMapBase::sweepCompartment(this);
     }
 
     if (!activeAnalysis && !gcPreserveCode) {
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index 1a3d3bee370a..38b04dc52c2e 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -367,6 +367,9 @@ struct JSCompartment : public js::gc::GraphNodeBase
     /* Linked list of live array buffers with >1 view. */
     JSObject                     *gcLiveArrayBuffers;
 
+    /* Linked list of live weakmaps in this compartment. */
+    js::WeakMapBase              *gcWeakMapList;
+
   private:
     /*
      * Malloc counter to measure memory pressure for GC scheduling. It runs from
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index abf72ce5ce0d..26334379e99c 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3383,9 +3383,6 @@ BeginMarkPhase(JSRuntime *rt)
 
     rt->gcStartNumber = rt->gcNumber;
 
-    /* Reset weak map list. */
-    WeakMapBase::resetWeakMapList(rt);
-
     /*
      * We must purge the runtime at the beginning of an incremental GC. The
      * danger if we purge later is that the snapshot invariant of incremental
@@ -3406,10 +3403,14 @@ BeginMarkPhase(JSRuntime *rt)
     gcstats::AutoPhase ap1(rt->gcStats, gcstats::PHASE_MARK);
     gcstats::AutoPhase ap2(rt->gcStats, gcstats::PHASE_MARK_ROOTS);
 
-    /* Unmark everything in the compartments being collected. */
-    for (GCCompartmentsIter c(rt); !c.done(); c.next())
+    for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
+        /* Unmark everything in the compartments being collected. */
         c->arenas.unmarkAll();
 
+        /* Reset weak map list for the compartments being collected. */
+        WeakMapBase::resetCompartmentWeakMapList(c);
+    }
+
     MarkRuntime(gcmarker);
 
     /*
@@ -3466,6 +3467,16 @@ BeginMarkPhase(JSRuntime *rt)
     rt->gcFoundBlackGrayEdges = false;
 }
 
+bool
+MarkWeakMapsIteratively(JSRuntime *rt)
+{
+    bool markedAny = false;
+    GCMarker *gcmarker = &rt->gcMarker;
+    for (GCCompartmentGroupIter c(rt); !c.done(); c.next())
+        markedAny |= WeakMapBase::markCompartmentIteratively(c, gcmarker);
+    return markedAny;
+}
+
 void
 MarkWeakReferences(JSRuntime *rt, gcstats::Phase phase)
 {
@@ -3475,7 +3486,7 @@ MarkWeakReferences(JSRuntime *rt, gcstats::Phase phase)
     gcstats::AutoPhase ap(rt->gcStats, phase);
 
     while (WatchpointMap::markAllIteratively(gcmarker) ||
-           WeakMapBase::markAllIteratively(gcmarker) ||
+           MarkWeakMapsIteratively(rt) ||
            Debugger::markAllIteratively(gcmarker))
     {
         SliceBudget budget;
@@ -3537,10 +3548,14 @@ ValidateIncrementalMarking(JSRuntime *rt)
             return;
     }
 
-    /* Save the existing weakmaps. */
+    /* Save and reset the lists of live weakmaps for the compartments we are collecting. */
     WeakMapVector weakmaps;
-    if (!WeakMapBase::saveWeakMapList(rt, weakmaps))
-        return;
+    for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
+        if (!WeakMapBase::saveCompartmentWeakMapList(c, weakmaps))
+            return;
+    }
+    for (GCCompartmentsIter c(rt); !c.done(); c.next())
+        WeakMapBase::resetCompartmentWeakMapList(c);
 
     /*
      * After this point, the function should run to completion, so we shouldn't
@@ -3551,9 +3566,6 @@ ValidateIncrementalMarking(JSRuntime *rt)
     js::gc::State state = rt->gcIncrementalState;
     rt->gcIncrementalState = MARK_ROOTS;
 
-    /* As we're re-doing marking, we need to reset the weak map list. */
-    WeakMapBase::resetWeakMapList(rt);
-
     JS_ASSERT(gcmarker->isDrained());
     gcmarker->reset();
 
@@ -3615,9 +3627,10 @@ ValidateIncrementalMarking(JSRuntime *rt)
         memcpy(bitmap->bitmap, incBitmap.bitmap, sizeof(incBitmap.bitmap));
     }
 
-    /* Restore the weak map list. */
-    WeakMapBase::resetWeakMapList(rt);
-    WeakMapBase::restoreWeakMapList(rt, weakmaps);
+    /* Restore the weak map lists. */
+    for (GCCompartmentsIter c(rt); !c.done(); c.next())
+        WeakMapBase::resetCompartmentWeakMapList(c);
+    WeakMapBase::restoreCompartmentWeakMapLists(weakmaps);
 
     rt->gcIncrementalState = state;
 }
@@ -3933,9 +3946,6 @@ BeginSweepingCompartmentGroup(JSRuntime *rt)
         SweepAtoms(rt);
     }
 
-    /* Finalize unreachable (key,value) pairs in all weak maps. */
-    WeakMapBase::sweepAll(&rt->gcMarker);
-
     /* Prune out dead views from ArrayBuffer's view lists. */
     for (GCCompartmentGroupIter c(rt); !c.done(); c.next())
         ArrayBufferObject::sweep(c);
diff --git a/js/src/jsweakmap.cpp b/js/src/jsweakmap.cpp
index f3eb6005299e..fdc7933d43d9 100644
--- a/js/src/jsweakmap.cpp
+++ b/js/src/jsweakmap.cpp
@@ -21,12 +21,24 @@
 
 using namespace js;
 
+WeakMapBase::WeakMapBase(JSObject *memOf, JSCompartment *c)
+  : memberOf(memOf),
+    compartment(c),
+    next(WeakMapNotInList)
+{
+    JS_ASSERT_IF(memberOf, memberOf->compartment() == c);
+}
+
+WeakMapBase::~WeakMapBase()
+{
+    JS_ASSERT(next == WeakMapNotInList);
+}
+
 bool
-WeakMapBase::markAllIteratively(JSTracer *tracer)
+WeakMapBase::markCompartmentIteratively(JSCompartment *c, JSTracer *tracer)
 {
     bool markedAny = false;
-    JSRuntime *rt = tracer->runtime;
-    for (WeakMapBase *m = rt->gcWeakMapList; m; m = m->next) {
+    for (WeakMapBase *m = c->gcWeakMapList; m; m = m->next) {
         if (m->markIteratively(tracer))
             markedAny = true;
     }
@@ -34,28 +46,29 @@ WeakMapBase::markAllIteratively(JSTracer *tracer)
 }
 
 void
-WeakMapBase::sweepAll(JSTracer *tracer)
+WeakMapBase::sweepCompartment(JSCompartment *c)
 {
-    JSRuntime *rt = tracer->runtime;
-    for (WeakMapBase *m = rt->gcWeakMapList; m; m = m->next)
-        m->sweep(tracer);
+    for (WeakMapBase *m = c->gcWeakMapList; m; m = m->next)
+        m->sweep();
 }
 
 void
 WeakMapBase::traceAllMappings(WeakMapTracer *tracer)
 {
     JSRuntime *rt = tracer->runtime;
-    for (WeakMapBase *m = rt->gcWeakMapList; m; m = m->next)
-        m->traceMappings(tracer);
+    for (CompartmentsIter c(rt); !c.done(); c.next()) {
+        for (WeakMapBase *m = c->gcWeakMapList; m; m = m->next)
+            m->traceMappings(tracer);
+    }
 }
 
 void
-WeakMapBase::resetWeakMapList(JSRuntime *rt)
+WeakMapBase::resetCompartmentWeakMapList(JSCompartment *c)
 {
     JS_ASSERT(WeakMapNotInList != NULL);
 
-    WeakMapBase *m = rt->gcWeakMapList;
-    rt->gcWeakMapList = NULL;
+    WeakMapBase *m = c->gcWeakMapList;
+    c->gcWeakMapList = NULL;
     while (m) {
         WeakMapBase *n = m->next;
         m->next = WeakMapNotInList;
@@ -64,9 +77,9 @@ WeakMapBase::resetWeakMapList(JSRuntime *rt)
 }
 
 bool
-WeakMapBase::saveWeakMapList(JSRuntime *rt, WeakMapVector &vector)
+WeakMapBase::saveCompartmentWeakMapList(JSCompartment *c, WeakMapVector &vector)
 {
-    WeakMapBase *m = rt->gcWeakMapList;
+    WeakMapBase *m = c->gcWeakMapList;
     while (m) {
         if (!vector.append(m))
             return false;
@@ -76,21 +89,22 @@ WeakMapBase::saveWeakMapList(JSRuntime *rt, WeakMapVector &vector)
 }
 
 void
-WeakMapBase::restoreWeakMapList(JSRuntime *rt, WeakMapVector &vector)
+WeakMapBase::restoreCompartmentWeakMapLists(WeakMapVector &vector)
 {
-    JS_ASSERT(!rt->gcWeakMapList);
     for (WeakMapBase **p = vector.begin(); p != vector.end(); p++) {
         WeakMapBase *m = *p;
         JS_ASSERT(m->next == WeakMapNotInList);
-        m->next = rt->gcWeakMapList;
-        rt->gcWeakMapList = m;
+        JSCompartment *c = m->compartment;
+        m->next = c->gcWeakMapList;
+        c->gcWeakMapList = m;
     }
 }
 
 void
-WeakMapBase::removeWeakMapFromList(JSRuntime *rt, WeakMapBase *weakmap)
+WeakMapBase::removeWeakMapFromList(WeakMapBase *weakmap)
 {
-    for (WeakMapBase **p = &rt->gcWeakMapList; *p; p = &(*p)->next) {
+    JSCompartment *c = weakmap->compartment;
+    for (WeakMapBase **p = &c->gcWeakMapList; *p; p = &(*p)->next) {
         if (*p == weakmap) {
             *p = (*p)->next;
             weakmap->next = WeakMapNotInList;
diff --git a/js/src/jsweakmap.h b/js/src/jsweakmap.h
index adba4ef72a7a..903e56621892 100644
--- a/js/src/jsweakmap.h
+++ b/js/src/jsweakmap.h
@@ -10,7 +10,7 @@
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
-#include "jscntxt.h"
+#include "jscompartment.h"
 #include "jsobj.h"
 
 #include "gc/Marking.h"
@@ -41,8 +41,8 @@ typedef Vector<WeakMapBase *, 0, SystemAllocPolicy> WeakMapVector;
 // their markIteratively and sweep methods.
 class WeakMapBase {
   public:
-    WeakMapBase(JSObject *memOf) : memberOf(memOf), next(WeakMapNotInList) { }
-    virtual ~WeakMapBase() { }
+    WeakMapBase(JSObject *memOf, JSCompartment *c);
+    virtual ~WeakMapBase();
 
     void trace(JSTracer *tracer) {
         if (IS_GC_MARKING_TRACER(tracer)) {
@@ -55,9 +55,8 @@ class WeakMapBase {
             // Add ourselves to the list if we are not already in the list. We can already
             // be in the list if the weak map is marked more than once due delayed marking.
             if (next == WeakMapNotInList) {
-                JSRuntime *rt = tracer->runtime;
-                next = rt->gcWeakMapList;
-                rt->gcWeakMapList = this;
+                next = compartment->gcWeakMapList;
+                compartment->gcWeakMapList = this;
             }
         } else {
             // If we're not actually doing garbage collection, the keys won't be marked
@@ -71,48 +70,53 @@ class WeakMapBase {
 
     // Garbage collector entry points.
 
-    // Check all weak maps that have been marked as live so far in this garbage
+    // Check all weak maps in a compartment that have been marked as live in this garbage
     // collection, and mark the values of all entries that have become strong references
     // to them. Return true if we marked any new values, indicating that we need to make
     // another pass. In other words, mark my marked maps' marked members' mid-collection.
-    static bool markAllIteratively(JSTracer *tracer);
+    static bool markCompartmentIteratively(JSCompartment *c, JSTracer *tracer);
 
-    // Remove entries whose keys are dead from all weak maps marked as live in this
-    // garbage collection.
-    static void sweepAll(JSTracer *tracer);
+    // Remove entries whose keys are dead from all weak maps in a compartment marked as
+    // live in this garbage collection.
+    static void sweepCompartment(JSCompartment *c);
 
     // Trace all delayed weak map bindings. Used by the cycle collector.
     static void traceAllMappings(WeakMapTracer *tracer);
 
     void check() { JS_ASSERT(next == WeakMapNotInList); }
 
-    // Remove everything from the live weak map list.
-    static void resetWeakMapList(JSRuntime *rt);
+    // Remove everything from the weak map list for a compartment.
+    static void resetCompartmentWeakMapList(JSCompartment *c);
 
-    // Save and restore the live weak map list to a vector.
-    static bool saveWeakMapList(JSRuntime *rt, WeakMapVector &vector);
-    static void restoreWeakMapList(JSRuntime *rt, WeakMapVector &vector);
+    // Save the live weak map list for a compartment, appending the data to a vector.
+    static bool saveCompartmentWeakMapList(JSCompartment *c, WeakMapVector &vector);
 
-    // Remove a weakmap from the live weakmap list
-    static void removeWeakMapFromList(JSRuntime *rt, WeakMapBase *weakmap);
+    // Restore live weak map lists for multiple compartments from a vector.
+    static void restoreCompartmentWeakMapLists(WeakMapVector &vector);
+
+    // Remove a weakmap from the live weakmaps list
+    static void removeWeakMapFromList(WeakMapBase *weakmap);
 
   protected:
     // Instance member functions called by the above. Instantiations of WeakMap override
     // these with definitions appropriate for their Key and Value types.
     virtual void nonMarkingTrace(JSTracer *tracer) = 0;
     virtual bool markIteratively(JSTracer *tracer) = 0;
-    virtual void sweep(JSTracer *tracer) = 0;
+    virtual void sweep() = 0;
     virtual void traceMappings(WeakMapTracer *tracer) = 0;
 
     // Object that this weak map is part of, if any.
     JSObject *memberOf;
 
+    // Compartment that this weak map is part of.
+    JSCompartment *compartment;
+
   private:
     // Link in a list of WeakMaps to mark iteratively and sweep in this garbage
-    // collection, headed by JSRuntime::gcWeakMapList. The last element of the list
-    // has NULL as its next. Maps not in the list have WeakMapNotInList as their
-    // next.  We must distinguish these cases to avoid creating infinite lists
-    // when a weak map gets traced twice due to delayed marking.
+    // collection, headed by JSCompartment::gcWeakMapList. The last element of
+    // the list has NULL as its next. Maps not in the list have WeakMapNotInList
+    // as their next.  We must distinguish these cases to avoid creating
+    // infinite lists when a weak map gets traced twice due to delayed marking.
     WeakMapBase *next;
 };
 
@@ -125,8 +129,8 @@ class WeakMap : public HashMap<Key, Value, HashPolicy, RuntimeAllocPolicy>, publ
     typedef typename Base::Enum Enum;
     typedef typename Base::Range Range;
 
-    explicit WeakMap(JSRuntime *rt, JSObject *memOf=NULL) : Base(rt), WeakMapBase(memOf) { }
-    explicit WeakMap(JSContext *cx, JSObject *memOf=NULL) : Base(cx), WeakMapBase(memOf) { }
+    explicit WeakMap(JSContext *cx, JSObject *memOf=NULL)
+        : Base(cx), WeakMapBase(memOf, cx->compartment) { }
 
   private:
     bool markValue(JSTracer *trc, Value *x) {
@@ -180,7 +184,7 @@ class WeakMap : public HashMap<Key, Value, HashPolicy, RuntimeAllocPolicy>, publ
         return markedAny;
     }
 
-    void sweep(JSTracer *trc) {
+    void sweep() {
         /* Remove all entries whose keys remain unmarked. */
         for (Enum e(*this); !e.empty(); e.popFront()) {
             Key k(e.front().key);
diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
index d20942ba00c6..8f1b7db3f003 100644
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -55,8 +55,6 @@ class DebuggerWeakMap : private WeakMap<Key, Value, DefaultHasher<Key> >
 
   public:
     typedef WeakMap<Key, Value, DefaultHasher<Key> > Base;
-    explicit DebuggerWeakMap(JSRuntime *rt)
-        : Base(rt), valueCompartment(NULL), compartmentCounts(rt) { }
     explicit DebuggerWeakMap(JSContext *cx)
         : Base(cx), valueCompartment(NULL), compartmentCounts(cx) { }
 
@@ -128,7 +126,7 @@ class DebuggerWeakMap : private WeakMap<Key, Value, DefaultHasher<Key> >
 
   private:
     /* Override sweep method to also update our edge cache. */
-    void sweep(JSTracer *trc) {
+    void sweep() {
         for (Enum e(*static_cast<Base *>(this)); !e.empty(); e.popFront()) {
             Key k(e.front().key);
             Value v(e.front().value);
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index 290506997f53..357c70906284 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -1530,6 +1530,7 @@ DebugScopes::DebugScopes(JSContext *cx)
 DebugScopes::~DebugScopes()
 {
     JS_ASSERT(missingScopes.empty());
+    WeakMapBase::removeWeakMapFromList(&proxiedScopes);
 }
 
 bool
@@ -1544,12 +1545,6 @@ DebugScopes::init()
     return true;
 }
 
-void
-DebugScopes::finalize(JSRuntime *rt)
-{
-    WeakMapBase::removeWeakMapFromList(rt, &proxiedScopes);
-}
-
 void
 DebugScopes::mark(JSTracer *trc)
 {
diff --git a/js/src/vm/ScopeObject.h b/js/src/vm/ScopeObject.h
index d490c73b3f95..75bd5d0d7cec 100644
--- a/js/src/vm/ScopeObject.h
+++ b/js/src/vm/ScopeObject.h
@@ -568,8 +568,6 @@ class DebugScopes
     DebugScopes(JSContext *c);
     ~DebugScopes();
 
-    void finalize(JSRuntime *rt);
-
   private:
     bool init();
 

From 627169c8798fdb3280c672e61d6b597c1b0282e4 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Tue, 6 Nov 2012 17:45:58 +0000
Subject: [PATCH 027/160] Bug 790338 - Improve debugger find edges code r=billm

--HG--
extra : rebase_source : 25574a7ca88533ce78ab06e18c4b1625df0fa70d
---
 js/src/vm/Debugger.cpp | 11 ++++++++---
 js/src/vm/Debugger.h   | 21 ++++++---------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index 3bf265e675a3..a46557771a9c 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1568,9 +1568,14 @@ Debugger::findCompartmentEdges(JSCompartment *comp, js::gc::ComponentFinder &fin
     JSRuntime *rt = comp->rt;
     for (JSCList *p = &rt->debuggerList; (p = JS_NEXT_LINK(p)) != &rt->debuggerList;) {
         Debugger *dbg = Debugger::fromLinks(p);
-        dbg->scripts.findCompartmentEdges(comp, finder);
-        dbg->objects.findCompartmentEdges(comp, finder);
-        dbg->environments.findCompartmentEdges(comp, finder);
+        JSCompartment *w = dbg->object->compartment();
+        if (w == comp || !w->isGCMarking())
+            continue;
+        if (dbg->scripts.hasKeyInCompartment(comp) ||
+            dbg->objects.hasKeyInCompartment(comp) ||
+            dbg->environments.hasKeyInCompartment(comp)) {
+            finder.addEdgeTo(w);
+        }
     }
 }
 
diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
index 8f1b7db3f003..2b76a840247e 100644
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -50,13 +50,12 @@ class DebuggerWeakMap : private WeakMap<Key, Value, DefaultHasher<Key> >
                     DefaultHasher<JSCompartment *>,
                     RuntimeAllocPolicy> CountMap;
 
-    JSCompartment *valueCompartment;
     CountMap compartmentCounts;
 
   public:
     typedef WeakMap<Key, Value, DefaultHasher<Key> > Base;
     explicit DebuggerWeakMap(JSContext *cx)
-        : Base(cx), valueCompartment(NULL), compartmentCounts(cx) { }
+        : Base(cx), compartmentCounts(cx) { }
 
   public:
     /* Expose those parts of HashMap public interface that are used by Debugger methods. */
@@ -77,9 +76,7 @@ class DebuggerWeakMap : private WeakMap<Key, Value, DefaultHasher<Key> >
 
     template<typename KeyInput, typename ValueInput>
     bool relookupOrAdd(AddPtr &p, const KeyInput &k, const ValueInput &v) {
-        if (!valueCompartment)
-            valueCompartment = v->compartment();
-        JS_ASSERT(v->compartment() == valueCompartment);
+        JS_ASSERT(v->compartment() == Base::compartment);
         if (!incCompartmentCount(k->compartment()))
             return false;
         bool ok = Base::relookupOrAdd(p, k, v);
@@ -95,8 +92,6 @@ class DebuggerWeakMap : private WeakMap<Key, Value, DefaultHasher<Key> >
     void remove(const Lookup &l) {
         Base::remove(l);
         decCompartmentCount(l->compartment());
-        if (Base::count() == 0)
-            valueCompartment = NULL;
     }
 
   public:
@@ -114,14 +109,10 @@ class DebuggerWeakMap : private WeakMap<Key, Value, DefaultHasher<Key> >
         }
     }
 
-    void findCompartmentEdges(JSCompartment *v, js::gc::ComponentFinder &finder) {
-        if (!valueCompartment || valueCompartment == v || !valueCompartment->isGCMarking())
-            return;
-        CountMap::Ptr p = compartmentCounts.lookup(v);
-        if (!p)
-            return;
-        JS_ASSERT(p->value > 0);
-        finder.addEdgeTo(valueCompartment);
+    bool hasKeyInCompartment(JSCompartment *c) {
+        CountMap::Ptr p = compartmentCounts.lookup(c);
+        JS_ASSERT_IF(p, p->value > 0);
+        return p;
     }
 
   private:

From 134466a3585cc8cb624f775e4ae437b173f56e65 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Tue, 6 Nov 2012 16:01:18 +0000
Subject: [PATCH 028/160] Bug 790338 - Mark weak references in the current
 compartment group only rather than for all collecting compartments r=billm

--HG--
extra : rebase_source : 46d236a1f70a2f8fa80ef7d0b1eb8f73ccdd7c34
---
 js/src/jsgc.cpp         | 25 +++++++++++--------------
 js/src/jswatchpoint.cpp | 12 ++++--------
 js/src/jswatchpoint.h   |  2 +-
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 26334379e99c..1c0be34e0037 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3467,16 +3467,6 @@ BeginMarkPhase(JSRuntime *rt)
     rt->gcFoundBlackGrayEdges = false;
 }
 
-bool
-MarkWeakMapsIteratively(JSRuntime *rt)
-{
-    bool markedAny = false;
-    GCMarker *gcmarker = &rt->gcMarker;
-    for (GCCompartmentGroupIter c(rt); !c.done(); c.next())
-        markedAny |= WeakMapBase::markCompartmentIteratively(c, gcmarker);
-    return markedAny;
-}
-
 void
 MarkWeakReferences(JSRuntime *rt, gcstats::Phase phase)
 {
@@ -3485,10 +3475,17 @@ MarkWeakReferences(JSRuntime *rt, gcstats::Phase phase)
 
     gcstats::AutoPhase ap(rt->gcStats, phase);
 
-    while (WatchpointMap::markAllIteratively(gcmarker) ||
-           MarkWeakMapsIteratively(rt) ||
-           Debugger::markAllIteratively(gcmarker))
-    {
+    for (;;) {
+        bool markedAny = false;
+        for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
+            markedAny |= WatchpointMap::markCompartmentIteratively(c, gcmarker);
+            markedAny |= WeakMapBase::markCompartmentIteratively(c, gcmarker);
+        }
+        markedAny |= Debugger::markAllIteratively(gcmarker);
+
+        if (!markedAny)
+            break;
+
         SliceBudget budget;
         gcmarker->drainMarkStack(budget);
     }
diff --git a/js/src/jswatchpoint.cpp b/js/src/jswatchpoint.cpp
index d927aa96cc63..c7d9ff31666b 100644
--- a/js/src/jswatchpoint.cpp
+++ b/js/src/jswatchpoint.cpp
@@ -143,15 +143,11 @@ WatchpointMap::triggerWatchpoint(JSContext *cx, HandleObject obj, HandleId id, M
 }
 
 bool
-WatchpointMap::markAllIteratively(JSTracer *trc)
+WatchpointMap::markCompartmentIteratively(JSCompartment *c, JSTracer *trc)
 {
-    JSRuntime *rt = trc->runtime;
-    bool mutated = false;
-    for (GCCompartmentsIter c(rt); !c.done(); c.next()) {
-        if (c->isGCMarking() && c->watchpointMap)
-            mutated |= c->watchpointMap->markIteratively(trc);
-    }
-    return mutated;
+    if (!c->watchpointMap)
+        return false;
+    return c->watchpointMap->markIteratively(trc);
 }
 
 bool
diff --git a/js/src/jswatchpoint.h b/js/src/jswatchpoint.h
index 5d97bcf7043e..80eb418e2bd5 100644
--- a/js/src/jswatchpoint.h
+++ b/js/src/jswatchpoint.h
@@ -55,7 +55,7 @@ class WatchpointMap {
 
     bool triggerWatchpoint(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValue vp);
 
-    static bool markAllIteratively(JSTracer *trc);
+    static bool markCompartmentIteratively(JSCompartment *c, JSTracer *trc);
     bool markIteratively(JSTracer *trc);
     void markAll(JSTracer *trc);
     static void sweepAll(JSRuntime *rt);

From 92581e14d8ce18f0aaea91a7927db962601b30c1 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Fri, 16 Nov 2012 15:52:09 +0000
Subject: [PATCH 029/160] Bug 790338 - Handle nuked wrappers in list of
 incoming gray pointers r=billm

--HG--
extra : rebase_source : 869b862af6ce9035f8bd8ccc247d3e4d453a4f9f
---
 js/src/gc/Marking.cpp  |   2 +-
 js/src/jsgc.cpp        | 143 +++++++++++++++++++++++++++++++++++++----
 js/src/jsgc.h          |  13 +++-
 js/src/jsobj.cpp       |   2 +
 js/src/jsproxy.cpp     |   9 +--
 js/src/jswrapper.cpp   |   4 ++
 js/src/vm/Debugger.cpp |  11 +++-
 js/src/vm/Debugger.h   |   1 +
 8 files changed, 163 insertions(+), 22 deletions(-)

diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp
index 3a05d5619fa8..f9d4d16a491e 100644
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -596,7 +596,7 @@ ShouldMarkCrossCompartment(JSTracer *trc, RawObject src, Cell *cell)
              * at the appropriate time.
              */
             if (!cell->isMarked())
-                DelayCrossCompartmentGrayMarking(src, cell);
+                DelayCrossCompartmentGrayMarking(src);
             return false;
         }
         return c->isGCMarkingGray();
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 1c0be34e0037..d06905ffcde2 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3752,16 +3752,37 @@ GetNextCompartmentGroup(JSRuntime *rt)
  * MarkIncomingCrossCompartmentPointers.
  */
 
+static bool
+IsGrayListObject(RawObject o)
+{
+    JS_ASSERT(o);
+    return (IsCrossCompartmentWrapper(o) && !IsDeadProxyObject(o)) ||
+           Debugger::isDebugWrapper(o);
+}
+
+const unsigned JSSLOT_GC_GRAY_LINK = JSSLOT_PROXY_EXTRA + 1;
+
 static unsigned
 GrayLinkSlot(RawObject o)
 {
-    return IsCrossCompartmentWrapper(o) ? JSSLOT_PROXY_EXTRA + 1 : Debugger::gcGrayLinkSlot();
+    JS_ASSERT(IsGrayListObject(o));
+    return IsCrossCompartmentWrapper(o) ? JSSLOT_GC_GRAY_LINK : Debugger::gcGrayLinkSlot();
+}
+
+static void
+AssertNotOnGrayList(RawObject o)
+{
+    JS_ASSERT_IF(IsGrayListObject(o), o->getReservedSlot(GrayLinkSlot(o)).isUndefined());
 }
 
 static Cell *
 CrossCompartmentPointerReferent(RawObject o)
 {
-    return (Cell*)(IsCrossCompartmentWrapper(o) ? GetProxyPrivate(o).toGCThing() : o->getPrivate());
+    JS_ASSERT(IsGrayListObject(o));
+    if (IsCrossCompartmentWrapper(o))
+        return (Cell *)GetProxyPrivate(o).toGCThing();
+    else
+        return (Cell *)o->getPrivate();
 }
 
 static RawObject
@@ -3769,6 +3790,7 @@ NextIncomingCrossCompartmentPointer(RawObject prev, bool unlink)
 {
     unsigned slot = GrayLinkSlot(prev);
     RawObject next = prev->getReservedSlot(slot).toObjectOrNull();
+    JS_ASSERT_IF(next, IsGrayListObject(next));
 
     if (unlink)
         prev->setSlot(slot, UndefinedValue());
@@ -3777,25 +3799,36 @@ NextIncomingCrossCompartmentPointer(RawObject prev, bool unlink)
 }
 
 void
-js::DelayCrossCompartmentGrayMarking(RawObject src, Cell *cell)
+js::DelayCrossCompartmentGrayMarking(RawObject src)
 {
+    JS_ASSERT(IsGrayListObject(src));
+
     /* Called from MarkCrossCompartmentXXX functions. */
     unsigned slot = GrayLinkSlot(src);
-    JSCompartment *c = cell->compartment();
+    Cell *dest = CrossCompartmentPointerReferent(src);
+    JSCompartment *c = dest->compartment();
 
     if (src->getReservedSlot(slot).isUndefined()) {
         src->setCrossCompartmentSlot(slot, ObjectOrNullValue(c->gcIncomingGrayPointers));
         c->gcIncomingGrayPointers = src;
     } else {
-#ifdef DEBUG
-        /* Assert that if the slot is in use, the object is in our list. */
         JS_ASSERT(src->getReservedSlot(slot).isObjectOrNull());
-        RawObject o = c->gcIncomingGrayPointers;
-        while (o && o != src)
-            o = NextIncomingCrossCompartmentPointer(o, false);
-        JS_ASSERT(o);
-#endif
     }
+
+#ifdef DEBUG
+    /*
+     * Assert that the object is in our list, also walking the list to check its
+     * integrity.
+     */
+    RawObject o = c->gcIncomingGrayPointers;
+    bool found = false;
+    while (o) {
+        if (o == src)
+            found = true;
+        o = NextIncomingCrossCompartmentPointer(o, false);
+    }
+    JS_ASSERT(found);
+#endif
 }
 
 static void
@@ -3814,6 +3847,7 @@ MarkIncomingCrossCompartmentPointers(JSRuntime *rt, const uint32_t color)
     for (GCCompartmentGroupIter c(rt); !c.done(); c.next()) {
         JS_ASSERT_IF(color == GRAY, c->isGCMarkingGray());
         JS_ASSERT_IF(color == BLACK, c->isGCMarkingBlack());
+        JS_ASSERT_IF(c->gcIncomingGrayPointers, IsGrayListObject(c->gcIncomingGrayPointers));
 
         for (RawObject src = c->gcIncomingGrayPointers;
              src;
@@ -3841,6 +3875,78 @@ MarkIncomingCrossCompartmentPointers(JSRuntime *rt, const uint32_t color)
     rt->gcMarker.drainMarkStack(budget);
 }
 
+static bool
+RemoveFromGrayList(RawObject wrapper)
+{
+    if (!IsGrayListObject(wrapper))
+        return false;
+
+    unsigned slot = GrayLinkSlot(wrapper);
+    if (wrapper->getReservedSlot(slot).isUndefined())
+        return false;  /* Not on our list. */
+
+    RawObject tail = wrapper->getReservedSlot(slot).toObjectOrNull();
+    wrapper->setReservedSlot(slot, UndefinedValue());
+
+    JSCompartment *c = CrossCompartmentPointerReferent(wrapper)->compartment();
+    RawObject o = c->gcIncomingGrayPointers;
+    if (o == wrapper) {
+        c->gcIncomingGrayPointers = tail;
+        return true;
+    }
+
+    while (o) {
+        unsigned slot = GrayLinkSlot(o);
+        RawObject next = o->getReservedSlot(slot).toObjectOrNull();
+        if (next == wrapper) {
+            o->setCrossCompartmentSlot(slot, ObjectOrNullValue(tail));
+            return true;
+        }
+        o = next;
+    }
+    JS_NOT_REACHED();
+}
+
+void
+js::NotifyGCNukeWrapper(RawObject o)
+{
+    /*
+     * References to target of wrapper are being removed, we no longer have to
+     * remember to mark it.
+     */
+    RemoveFromGrayList(o);
+}
+
+enum {
+    JS_GC_SWAP_OBJECT_A_REMOVED = 1 << 0,
+    JS_GC_SWAP_OBJECT_B_REMOVED = 1 << 1
+};
+
+unsigned
+js::NotifyGCPreSwap(RawObject a, RawObject b)
+{
+    /*
+     * Two objects in the same compartment are about to have had their contents
+     * swapped.  If either of them are in our gray pointer list, then we remove
+     * them from the lists, returning a bitset indicating what happened.
+     */
+    return (RemoveFromGrayList(a) ? JS_GC_SWAP_OBJECT_A_REMOVED : 0) |
+           (RemoveFromGrayList(b) ? JS_GC_SWAP_OBJECT_B_REMOVED : 0);
+}
+
+void
+js::NotifyGCPostSwap(RawObject a, RawObject b, unsigned removedFlags)
+{
+    /*
+     * Two objects in the same compartment have had their contents swapped.  If
+     * either of them were in our gray pointer list, we re-add them again.
+     */
+    if (removedFlags & JS_GC_SWAP_OBJECT_A_REMOVED)
+        DelayCrossCompartmentGrayMarking(b);
+    if (removedFlags & JS_GC_SWAP_OBJECT_B_REMOVED)
+        DelayCrossCompartmentGrayMarking(a);
+}
+
 static void
 EndMarkingCompartmentGroup(JSRuntime *rt)
 {
@@ -4039,8 +4145,13 @@ BeginSweepPhase(JSRuntime *rt)
 
 #ifdef DEBUG
     JS_ASSERT(!rt->gcCompartmentGroup);
-    for (GCCompartmentsIter c(rt); !c.done(); c.next())
+    for (CompartmentsIter c(rt); !c.done(); c.next()) {
         JS_ASSERT(!c->gcIncomingGrayPointers);
+        for (WrapperMap::Enum e(c->crossCompartmentWrappers); !e.empty(); e.popFront()) {
+            if (e.front().key.kind != CrossCompartmentKey::StringWrapper)
+                AssertNotOnGrayList(&e.front().value.get().toObject());
+        }
+    }
 #endif
 
     DropStringWrappers(rt);
@@ -4198,16 +4309,24 @@ EndSweepPhase(JSRuntime *rt, JSGCInvocationKind gckind, bool lastGC)
             c->setGCState(JSCompartment::NoGC);
         }
 
+#ifdef DEBUG
         JS_ASSERT(!c->isCollecting());
         JS_ASSERT(!c->wasGCStarted());
+
         JS_ASSERT(!c->gcIncomingGrayPointers);
         JS_ASSERT(!c->gcLiveArrayBuffers);
 
+        for (WrapperMap::Enum e(c->crossCompartmentWrappers); !e.empty(); e.popFront()) {
+            if (e.front().key.kind != CrossCompartmentKey::StringWrapper)
+                AssertNotOnGrayList(&e.front().value.get().toObject());
+        }
+
         for (unsigned i = 0 ; i < FINALIZE_LIMIT ; ++i) {
             JS_ASSERT_IF(!IsBackgroundFinalized(AllocKind(i)) ||
                          !rt->gcSweepOnBackgroundThread,
                          !c->arenas.arenaListsToSweep[i]);
         }
+#endif
     }
 
     rt->gcLastGCTime = PRMJ_Now();
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 18f6479100a5..6166c5b3854a 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -544,8 +544,19 @@ GCDebugSlice(JSRuntime *rt, bool limit, int64_t objCount);
 extern void
 PrepareForDebugGC(JSRuntime *rt);
 
+/* Functions for managing cross compartment gray pointers. */
+
 extern void
-DelayCrossCompartmentGrayMarking(RawObject src, gc::Cell *cell);
+DelayCrossCompartmentGrayMarking(RawObject src);
+
+extern void
+NotifyGCNukeWrapper(RawObject o);
+
+extern unsigned
+NotifyGCPreSwap(RawObject a, RawObject b);
+
+extern void
+NotifyGCPostSwap(RawObject a, RawObject b, unsigned preResult);
 
 void
 InitTracer(JSTracer *trc, JSRuntime *rt, JSTraceCallback callback);
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 5d875b3bd804..7c2c6a81884e 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -2935,7 +2935,9 @@ JSObject::swap(JSContext *cx, JSObject *other_)
     TradeGutsReserved reserved(cx);
     if (!ReserveForTradeGuts(cx, this, other, reserved))
         return false;
+    unsigned r = NotifyGCPreSwap(this, other);
     TradeGuts(cx, this, other, reserved);
+    NotifyGCPostSwap(this, other, r);
     return true;
 }
 
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index cbad716c8544..6968263544fb 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -3153,6 +3153,7 @@ JSObject *
 js::RenewProxyObject(JSContext *cx, JSObject *obj,
                      BaseProxyHandler *handler, Value priv)
 {
+    JS_ASSERT_IF(IsCrossCompartmentWrapper(obj), IsDeadProxyObject(obj));
     JS_ASSERT(obj->getParent() == cx->global());
     JS_ASSERT(obj->getClass() == &ObjectProxyClass);
     JS_ASSERT(obj->getTaggedProto().isLazy());
@@ -3161,13 +3162,7 @@ js::RenewProxyObject(JSContext *cx, JSObject *obj,
     obj->setSlot(JSSLOT_PROXY_HANDLER, PrivateValue(handler));
     obj->setCrossCompartmentSlot(JSSLOT_PROXY_PRIVATE, priv);
     obj->setSlot(JSSLOT_PROXY_EXTRA + 0, UndefinedValue());
-
-    /*
-     * The GC can use the second reserved slot to link the cross compartment
-     * wrappers into a linked list, in which case we don't want to reset it.
-     */
-    if (!IsCrossCompartmentWrapper(obj))
-        obj->setSlot(JSSLOT_PROXY_EXTRA + 1, UndefinedValue());
+    obj->setSlot(JSSLOT_PROXY_EXTRA + 1, UndefinedValue());
 
     return obj;
 }
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index dc77fd2a93a7..7ca4ae2d89ce 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -996,6 +996,8 @@ js::NukeCrossCompartmentWrapper(JSContext *cx, JSObject *wrapper)
 {
     JS_ASSERT(IsCrossCompartmentWrapper(wrapper));
 
+    NotifyGCNukeWrapper(wrapper);
+
     NukeSlot(wrapper, JSSLOT_PROXY_PRIVATE, NullValue());
     SetProxyHandler(wrapper, &DeadObjectProxy::singleton);
 
@@ -1006,6 +1008,8 @@ js::NukeCrossCompartmentWrapper(JSContext *cx, JSObject *wrapper)
 
     NukeSlot(wrapper, JSSLOT_PROXY_EXTRA + 0, NullValue());
     NukeSlot(wrapper, JSSLOT_PROXY_EXTRA + 1, NullValue());
+
+    JS_ASSERT(IsDeadProxyObject(wrapper));
 }
 
 /*
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index a46557771a9c..2d9ce67b8f2c 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1341,12 +1341,21 @@ JS_STATIC_ASSERT(unsigned(JSSLOT_DEBUGENV_GC_GRAY_LINK) ==
 JS_STATIC_ASSERT(unsigned(JSSLOT_DEBUGENV_GC_GRAY_LINK) ==
                  unsigned(JSSLOT_DEBUGSCRIPT_GC_GRAY_LINK));
 
-unsigned
+/* static */ unsigned
 Debugger::gcGrayLinkSlot()
 {
     return JSSLOT_DEBUGOBJECT_GC_GRAY_LINK;
 }
 
+/* static */ bool
+Debugger::isDebugWrapper(RawObject o)
+{
+    Class *c = o->getClass();
+    return c == &DebuggerObject_class ||
+           c == &DebuggerEnv_class ||
+           c == &DebuggerScript_class;
+}
+
 void
 Debugger::markKeysInCompartment(JSTracer *tracer)
 {
diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
index 2b76a840247e..750da285d5fd 100644
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -376,6 +376,7 @@ class Debugger {
     static void detachAllDebuggersFromGlobal(FreeOp *fop, GlobalObject *global,
                                              GlobalObjectSet::Enum *compartmentEnum);
     static unsigned gcGrayLinkSlot();
+    static bool isDebugWrapper(RawObject o);
     static void findCompartmentEdges(JSCompartment *v, js::gc::ComponentFinder &finder);
 
     static inline JSTrapStatus onEnterFrame(JSContext *cx, Value *vp);

From 57cf75c47a8687dba8cce594a9c4dc4f542836f8 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 26 Nov 2012 11:35:26 +0000
Subject: [PATCH 030/160] Bug 813936 - Update nsHTMLInputElement::GetStepBase()
 to return the default value if there is no min. r=smaug

---
 .../html/content/src/nsHTMLInputElement.cpp   | 13 +++++
 .../test/forms/test_step_attribute.html       | 40 ++++++++++++----
 .../test/forms/test_stepup_stepdown.html      | 48 ++++++++-----------
 3 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index 5fa870ffd92a..85dfbc9149f1 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -1204,6 +1204,19 @@ nsHTMLInputElement::GetStepBase() const
 {
   double stepBase = GetMinAsDouble();
 
+  // If @min is not a double, we should use defaultValue.
+  if (MOZ_DOUBLE_IS_NaN(stepBase)) {
+    nsAutoString stringValue;
+    GetAttr(kNameSpaceID_None, nsGkAtoms::value, stringValue);
+
+    nsresult ec;
+    stepBase = stringValue.ToDouble(&ec);
+
+    if (NS_FAILED(ec)) {
+      stepBase = MOZ_DOUBLE_NaN();
+    }
+  }
+
   return MOZ_DOUBLE_IS_NaN(stepBase) ? kDefaultStepBase : stepBase;
 }
 
diff --git a/content/html/content/test/forms/test_step_attribute.html b/content/html/content/test/forms/test_step_attribute.html
index 5e1ffe663503..c368a71679e6 100644
--- a/content/html/content/test/forms/test_step_attribute.html
+++ b/content/html/content/test/forms/test_step_attribute.html
@@ -45,8 +45,11 @@ var types = [
   [ 'button',         false ],
 ];
 
-var input = document.createElement("input");
-document.getElementById('content').appendChild(input);
+function getFreshElement(type) {
+  var elmt = document.createElement('input');
+  elmt.type = type;
+  return elmt;
+}
 
 function checkValidity(aElement, aValidity, aApply, aData)
 {
@@ -74,7 +77,7 @@ function checkValidity(aElement, aValidity, aApply, aData)
 SimpleTest.waitForExplicitFinish();
 SpecialPowers.pushPrefEnv({'set': [["dom.experimental_forms", true]]}, function() {
 for each (var data in types) {
-  input.type = data[0];
+  var input = getFreshElement(data[0]);
   var apply = data[1];
 
   if (data[2]) {
@@ -227,10 +230,35 @@ for each (var data in types) {
     input.max = '10';
     input.value = '-9';
     checkValidity(input, false, apply, {low: -10, high: -8});
+
+    // If there is a value defined but no min, the step base is the value.
+    input = getFreshElement(data[0]);
+    input.setAttribute('value', '1');
+    input.step = 2;
+    checkValidity(input, true, apply);
+
+    input.value = 3;
+    checkValidity(input, true, apply);
+
+    input.value = 2;
+    checkValidity(input, false, apply, {low: 1, high: 3});
+
+    // Should also work with defaultValue.
+    input = getFreshElement(data[0]);
+    input.defaultValue = 1;
+    input.step = 2;
+    checkValidity(input, true, apply);
+
+    input.value = 3;
+    checkValidity(input, true, apply);
+
+    input.value = 2;
+    checkValidity(input, false, apply, {low: 1, high: 3});
   }
 
   if (input.type == 'number') {
     // Check that when the higher value is higher than max, we don't show it.
+    input = getFreshElement(data[0]);
     input.step = '2';
     input.min = '1';
     input.max = '10.9';
@@ -240,12 +268,6 @@ for each (var data in types) {
                                 "The nearest valid value is 9.",
        "The validation message should not include the higher value.");
   }
-
-  // Cleaning up,
-  input.removeAttribute('step');
-  input.removeAttribute('max');
-  input.removeAttribute('min');
-  input.value = '';
 }
 
 SimpleTest.finish();
diff --git a/content/html/content/test/forms/test_stepup_stepdown.html b/content/html/content/test/forms/test_stepup_stepdown.html
index 00b3b6439be2..19f3b809104f 100644
--- a/content/html/content/test/forms/test_stepup_stepdown.html
+++ b/content/html/content/test/forms/test_stepup_stepdown.html
@@ -124,8 +124,6 @@ function checkStepDownForNumber()
     [ '1',   null,  null,  null,  1.1,  '0',    false ],
     // With step values.
     [ '1',  '0.5',  null,  null,  null, '0.5',  false ],
-    [ null, '0.5',  null,  null,  null, '0',    false ],
-    [ null, '0.5',  null,  null,  null, '-0.5', false ],
     [ '1',  '0.25', null,  null,  4,    '0',    false ],
     // step = 0 isn't allowed (-> step = 1).
     [ '1',  '0',    null,  null,  null, '0',    false ],
@@ -147,21 +145,21 @@ function checkStepDownForNumber()
     [ '1',  null,   null,  '-10', null, '-10',  false ],
     [ '1',  null,   null,  '1',   null, '0',    false ],
     [ '5',  null,   null,  '3',   '3',  '2',    false ],
-    [ '5',  '2',    null,  '3',   '2',  '2',    false ],
+    [ '5',  '2',    '-6',  '3',   '2',  '2',    false ],
     [ '-3', '5',    '-10', '-3',  null, '-5',   false ],
     // Step mismatch.
     [ '1',  '2',    '-2',  null,  null, '0',    false ],
     [ '3',  '2',    '-2',  null,  null, '2',    false ],
     [ '3',  '2',    '-2',  null,  '2',  '0',    false ],
     [ '3',  '2',    '-2',  null,  '-2', '6',    false ],
-    [ '1',  '2',    null,  null,  null, '0',    false ],
+    [ '1',  '2',    '-6',  null,  null, '0',    false ],
     [ '1',  '2',    '-2',  null,  null, '0',    false ],
-    [ '1',  '3',    null,  null,  null, '0',    false ],
-    [ '2',  '3',    null,  null,  null, '0',    false ],
+    [ '1',  '3',    '-6',  null,  null, '0',    false ],
+    [ '2',  '3',    '-6',  null,  null, '0',    false ],
     [ '2',  '3',    '1',   null,  null, '1',    false ],
     [ '5',  '3',    '1',   null,  null, '4',    false ],
-    [ '3',  '2',    null,  null,  null, '2',    false ],
-    [ '5',  '2',    null,  null,  null, '4',    false ],
+    [ '3',  '2',    '-6',  null,  null, '2',    false ],
+    [ '5',  '2',    '-6',  null,  null, '4',    false ],
     [ '6',  '2',   '1',    null,  null, '5',    false ],
     [ '8',  '3',   '1',    null,  null, '7',    false ],
     [ '9',  '2',   '-10',  null,  null, '8',    false ],
@@ -178,13 +176,16 @@ function checkStepDownForNumber()
     [ '0',  'ANY',  null,  null,  1,    null,   true ],
     [ '0',  'AnY',  null,  null,  1,    null,   true ],
     [ '0',  'aNy',  null,  null,  1,    null,   true ],
+    // With @value = step base.
+    [ '1',  '2',    null,  null,  null, '-1',   false ],
   ];
 
-  var element = document.createElement("input");
-  element.type = 'number';
   for each (var data in testData) {
+    var element = document.createElement("input");
+    element.type = 'number';
+
     if (data[0] != null) {
-      element.value = data[0];
+      element.setAttribute('value', data[0]);
     }
 
     if (data[1] != null) {
@@ -216,10 +217,6 @@ function checkStepDownForNumber()
     } finally {
       is(exceptionCaught, data[6], "exception status should be " + data[6]);
     }
-
-    element.removeAttribute('step');
-    element.removeAttribute('min');
-    element.removeAttribute('max');
   }
 }
 
@@ -240,8 +237,6 @@ function checkStepUpForNumber()
     [ '1',   null,  null,  null,  1.1,  '2',   false ],
     // With step values.
     [ '1',  '0.5',  null,  null,  null, '1.5', false ],
-    [ null, '0.5',  null,  null,  null, '2',   false ],
-    [ null, '0.5',  null,  null,  null, '2.5', false ],
     [ '1',  '0.25', null,  null,  4,    '2',   false ],
     // step = 0 isn't allowed (-> step = 1).
     [ '1',  '0',    null,  null,  null, '2',   false ],
@@ -269,7 +264,7 @@ function checkStepUpForNumber()
     [ '1',  '2',    '0',   null,  null, '2',   false ],
     [ '1',  '2',    '0',   null,  '2',  '4',   false ],
     [ '8',  '2',    null,  '9',   null, '8',   false ],
-    [ '-3', '2',    null,  null,  null, '-2',  false ],
+    [ '-3', '2',    '-6',  null,  null, '-2',  false ],
     [ '9',  '3',    '-10', null,  null, '11',  false ],
     [ '7',  '3',    '-10', null,  null, '8',   false ],
     [ '7',  '3',    '5',   null,  null, '8',   false ],
@@ -282,8 +277,8 @@ function checkStepUpForNumber()
     [ '-9', '3',    '-8', '-1',  '5',   '-2',  false ],
     [ '-9', '3',    '8',  '15',  '15',  '14',  false ],
     [ '-1', '3',    '-1', '4',   '3',   '2',   false ],
-    [ '-3', '2',    null,  '-2',  null, '-2',  false ],
-    [ '-3', '2',    null,  '-1',  null, '-2',  false ],
+    [ '-3', '2',    '-6',  '-2',  null, '-2',  false ],
+    [ '-3', '2',    '-6',  '-1',  null, '-2',  false ],
     // value = "" (NaN).
     [ '',   null,   null,  null,  null, '',    false ],
     // With step = 'any'.
@@ -291,13 +286,16 @@ function checkStepUpForNumber()
     [ '0',  'ANY',  null,  null,  1,    null,  true ],
     [ '0',  'AnY',  null,  null,  1,    null,  true ],
     [ '0',  'aNy',  null,  null,  1,    null,  true ],
+    // With @value = step base.
+    [ '1',  '2',    null,  null,  null, '3',   false ],
   ];
 
-  var element = document.createElement("input");
-  element.type = 'number';
   for each (var data in testData) {
+    var element = document.createElement("input");
+    element.type = 'number';
+
     if (data[0] != null) {
-      element.value = data[0];
+      element.setAttribute('value', data[0]);
     }
 
     if (data[1] != null) {
@@ -329,10 +327,6 @@ function checkStepUpForNumber()
     } finally {
       is(exceptionCaught, data[6], "exception status should be " + data[6]);
     }
-
-    element.removeAttribute('step');
-    element.removeAttribute('min');
-    element.removeAttribute('max');
   }
 }
 

From 3c21e292266788257d611fd7c95162cf9026f8b5 Mon Sep 17 00:00:00 2001
From: Eric Chou <echou@mozilla.com>
Date: Mon, 26 Nov 2012 20:51:29 +0800
Subject: [PATCH 031/160] Bug 814376 - Improve the mechanism for setting file
 extension of a blob, r=sicking

---
 dom/bluetooth/BluetoothOppManager.cpp | 47 +++++++++++++++++++++------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/dom/bluetooth/BluetoothOppManager.cpp b/dom/bluetooth/BluetoothOppManager.cpp
index 203e0a2bdf93..d1b5b9a830cf 100644
--- a/dom/bluetooth/BluetoothOppManager.cpp
+++ b/dom/bluetooth/BluetoothOppManager.cpp
@@ -17,13 +17,14 @@
 #include "mozilla/RefPtr.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPtr.h"
+#include "nsCExternalHandlerService.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
 #include "nsIDOMFile.h"
 #include "nsIFile.h"
 #include "nsIInputStream.h"
+#include "nsIMIMEService.h"
 #include "nsIOutputStream.h"
-#include "nsLocalFile.h"
 #include "nsNetUtil.h"
 
 #define TARGET_FOLDER "/sdcard/downloads/bluetooth/"
@@ -283,22 +284,48 @@ BluetoothOppManager::SendFile(BlobParent* aActor)
    */
   mBlob = aActor->GetBlob();
 
-  nsCOMPtr<nsIDOMFile> domFile = do_QueryInterface(mBlob);
-  nsString fullPath;
+  sFileName.Truncate();
 
-  if (domFile && NS_SUCCEEDED(domFile->GetMozFullPathInternal(fullPath))) {
-    nsCOMPtr<nsIFile> localFile = new nsLocalFile();
-    NS_NewLocalFile(fullPath, false, getter_AddRefs(localFile));
-
-    if (localFile) {
-      localFile->GetLeafName(sFileName);
-    }
+  nsCOMPtr<nsIDOMFile> file = do_QueryInterface(mBlob);
+  if (file) {
+    file->GetName(sFileName);
   }
 
+  /**
+   * We try our best to get the file extention to avoid interoperability issues.
+   * However, once we found that we are unable to get suitable extension or
+   * information about the content type, sending a pre-defined file name without
+   * extension would be fine.
+   */
   if (sFileName.IsEmpty()) {
     sFileName.AssignLiteral("Unknown");
   }
 
+  int32_t offset = sFileName.RFindChar('/');
+  if (offset != kNotFound) {
+    sFileName = Substring(sFileName, offset + 1);
+  }
+
+  offset = sFileName.RFindChar('.');
+  if (offset == kNotFound) {
+    nsCOMPtr<nsIMIMEService> mimeSvc = do_GetService(NS_MIMESERVICE_CONTRACTID);
+
+    if (mimeSvc) {
+      nsString mimeType;
+      mBlob->GetType(mimeType);
+
+      nsCString extension;
+      nsresult rv =
+        mimeSvc->GetPrimaryExtension(NS_LossyConvertUTF16toASCII(mimeType),
+                                     EmptyCString(),
+                                     extension);
+      if (NS_SUCCEEDED(rv)) {
+        sFileName.AppendLiteral(".");
+        AppendUTF8toUTF16(extension, sFileName);
+      }
+    }
+  }
+
   SendConnectRequest();
 
   return true;

From a1dcf9ad81ca2a325fec87ec9985667d455d60ee Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 26 Nov 2012 09:52:54 -0500
Subject: [PATCH 032/160] Bug 814509 - Downloads summary background is
 different from "Show all downloads" button background on winstripe. r=mak.

---
 browser/themes/winstripe/downloads/downloads-aero.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/themes/winstripe/downloads/downloads-aero.css b/browser/themes/winstripe/downloads/downloads-aero.css
index 4600bfc4ec5e..46db5c6c7959 100644
--- a/browser/themes/winstripe/downloads/downloads-aero.css
+++ b/browser/themes/winstripe/downloads/downloads-aero.css
@@ -7,7 +7,8 @@
 %undef WINSTRIPE_AERO
 
 @media (-moz-windows-default-theme) {
-  #downloadsPanel[hasdownloads] #downloadsHistory {
+  #downloadsPanel[hasdownloads] > #downloadsHistory,
+  #downloadsSummary {
     background-color: #f1f5fb;
   }
 

From 895e7127a8f9c2754c174bff930cc94a35cfdd06 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Mon, 26 Nov 2012 11:02:47 -0500
Subject: [PATCH 033/160] Bug 807998 - Turn on memory.free_dirty_pages in
 Fennec. r=jlebar

---
 mobile/android/app/mobile.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 33af782c1eea..487db1932d0b 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -667,3 +667,7 @@ pref("dom.event.touch.coalescing.enabled", false);
 // default orientation for the app, default to undefined
 // the java GeckoScreenOrientationListener needs this to be defined
 pref("app.orientation.default", "");
+
+// On memory pressure, release dirty but unused pages held by jemalloc
+// back to the system.
+pref("memory.free_dirty_pages", true);

From 9bbf39372f136a569355f8a69bd41514b32db730 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 26 Nov 2012 16:18:25 +0000
Subject: [PATCH 034/160] bug 814383 - fix javascript strict-mode warnings in
 browser.js. r=gavin

---
 browser/base/content/browser-addons.js     |  2 +-
 browser/base/content/browser-fullScreen.js |  4 ++--
 browser/base/content/browser-plugins.js    |  4 ++--
 browser/base/content/browser.js            | 14 ++++++++------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js
index 4866bd03a200..b638f31f9ea2 100644
--- a/browser/base/content/browser-addons.js
+++ b/browser/base/content/browser-addons.js
@@ -91,7 +91,7 @@ const gXPInstallObserver = {
                               action, null, options);
       break;
     case "addon-install-started":
-      function needsDownload(aInstall) {
+      var needsDownload = function needsDownload(aInstall) {
         return aInstall.state != AddonManager.STATE_DOWNLOADED;
       }
       // If all installs have already been downloaded then there is no need to
diff --git a/browser/base/content/browser-fullScreen.js b/browser/base/content/browser-fullScreen.js
index f737dc5783c6..da5f0e09655e 100644
--- a/browser/base/content/browser-fullScreen.js
+++ b/browser/base/content/browser-fullScreen.js
@@ -358,7 +358,7 @@ var FullScreen = {
                            Services.perms.ALLOW_ACTION,
                            Services.perms.EXPIRE_SESSION);
         let host = uri.host;
-        function onFullscreenchange(event) {
+        var onFullscreenchange = function onFullscreenchange(event) {
           if (event.target == document && document.mozFullScreenElement == null) {
             // The chrome document has left fullscreen. Remove the temporary permission grant.
             Services.perms.remove(host, "fullscreen");
@@ -545,7 +545,7 @@ var FullScreen = {
           el.setAttribute("inFullscreen", true);
         }
         else {
-          function restoreAttr(attrName) {
+          var restoreAttr = function restoreAttr(attrName) {
             var savedAttr = "saved-" + attrName;
             if (el.hasAttribute(savedAttr)) {
               el.setAttribute(attrName, el.getAttribute(savedAttr));
diff --git a/browser/base/content/browser-plugins.js b/browser/base/content/browser-plugins.js
index bbcee11b0a85..0c3e760a27d0 100644
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -116,7 +116,7 @@ var gPluginHandler = {
   // Helper to get the binding handler type from a plugin object
   _getBindingType : function(plugin) {
     if (!(plugin instanceof Ci.nsIObjectLoadingContent))
-      return;
+      return null;
 
     switch (plugin.pluginFallbackType) {
       case Ci.nsIObjectLoadingContent.PLUGIN_UNSUPPORTED:
@@ -137,7 +137,7 @@ var gPluginHandler = {
         return "PluginPlayPreview";
       default:
         // Not all states map to a handler
-        return;
+        return null;
     }
   },
 
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 230ef9e8cb68..e603ee8e2075 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -105,6 +105,7 @@ XPCOMUtils.defineLazyGetter(this, "PopupNotifications", function () {
                                       document.getElementById("notification-popup-box"));
   } catch (ex) {
     Cu.reportError(ex);
+    return null;
   }
 });
 
@@ -3310,7 +3311,7 @@ const BrowserSearch = {
         win.BrowserSearch.webSearch();
       } else {
         // If there are no open browser windows, open a new one
-        function observer(subject, topic, data) {
+        var observer = function observer(subject, topic, data) {
           if (subject == win) {
             BrowserSearch.webSearch();
             Services.obs.removeObserver(observer, "browser-delayed-startup-finished");
@@ -4156,12 +4157,12 @@ var XULBrowserWindow = {
       }
 
       // Utility functions for disabling find
-      function shouldDisableFind(aDocument) {
+      var shouldDisableFind = function shouldDisableFind(aDocument) {
         let docElt = aDocument.documentElement;
         return docElt && docElt.getAttribute("disablefastfind") == "true";
       }
 
-      function disableFindCommands(aDisable) {
+      var disableFindCommands = function disableFindCommands(aDisable) {
         let findCommands = [document.getElementById("cmd_find"),
                             document.getElementById("cmd_findAgain"),
                             document.getElementById("cmd_findPrevious")];
@@ -4173,7 +4174,7 @@ var XULBrowserWindow = {
         }
       }
 
-      function onContentRSChange(e) {
+      var onContentRSChange = function onContentRSChange(e) {
         if (e.target.readyState != "interactive" && e.target.readyState != "complete")
           return;
 
@@ -5153,7 +5154,7 @@ function getBrowserSelection(aCharLen) {
   // try getting a selected text in text input.
   if (!selection) {
     let element = commandDispatcher.focusedElement;
-    function isOnTextInput(elem) {
+    var isOnTextInput = function isOnTextInput(elem) {
       // we avoid to return a value if a selection is in password field.
       // ref. bug 565717
       return elem instanceof HTMLTextAreaElement ||
@@ -6276,7 +6277,7 @@ function BrowserOpenAddonsMgr(aView) {
     let emWindow;
     let browserWindow;
 
-    function receivePong(aSubject, aTopic, aData) {
+    var receivePong = function receivePong(aSubject, aTopic, aData) {
       let browserWin = aSubject.QueryInterface(Ci.nsIInterfaceRequestor)
                                .getInterface(Ci.nsIWebNavigation)
                                .QueryInterface(Ci.nsIDocShellTreeItem)
@@ -7454,6 +7455,7 @@ XPCOMUtils.defineLazyGetter(this, "HUDConsoleUI", function () {
   }
   catch (ex) {
     Components.utils.reportError(ex);
+    return null;
   }
 });
 

From 9ce11fb93cc15a252b206a12512f0f0f56664536 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Mon, 26 Nov 2012 08:54:17 -0800
Subject: [PATCH 035/160] Bug 813766: Set EXPORTED_SYMBOLS on this instead of
 the global. r=gps

---
 services/sync/modules/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/sync/modules/constants.js b/services/sync/modules/constants.js
index 37b413c7147d..58a09e120a6d 100644
--- a/services/sync/modules/constants.js
+++ b/services/sync/modules/constants.js
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Process each item in the "constants hash" to add to "global" and give a name
-let EXPORTED_SYMBOLS = [((this[key] = val), key) for ([key, val] in Iterator({
+this.EXPORTED_SYMBOLS = [((this[key] = val), key) for ([key, val] in Iterator({
 
 WEAVE_CHANNEL:                         "@weave_channel@",
 WEAVE_VERSION:                         "@weave_version@",

From 439a5889faa5c887173cb13070344018589992af Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Mon, 26 Nov 2012 08:55:12 -0800
Subject: [PATCH 036/160] Bug 813762: Teach OS.File about compartment sharing.
 r=mrbkap

---
 dom/system/Makefile.in         |  5 ++++-
 dom/system/OSFileConstants.cpp | 13 ++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in
index c39f962d9e34..b4007e018091 100644
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -78,7 +78,10 @@ EXPORTS_mozilla = \
   $(NULL)
 
 # We fire the nsDOMDeviceAcceleration
-LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src
+LOCAL_INCLUDES += \
+  -I$(topsrcdir)/content/events/src \
+  -I$(topsrcdir)/js/xpconnect/loader \
+  $(NULL)
 
 ifdef ENABLE_TESTS
 DIRS += tests
diff --git a/dom/system/OSFileConstants.cpp b/dom/system/OSFileConstants.cpp
index c9159566786a..41bf8b6007e3 100644
--- a/dom/system/OSFileConstants.cpp
+++ b/dom/system/OSFileConstants.cpp
@@ -36,6 +36,7 @@
 #include "nsAutoPtr.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsAppDirectoryServiceDefs.h"
+#include "mozJSComponentLoader.h"
 
 #include "OSFileConstants.h"
 #include "nsIOSFileConstantsService.h"
@@ -699,11 +700,13 @@ OSFileConstantsService::Init(JSContext *aCx)
     return rv;
   }
 
-  JSObject *global = JS_GetGlobalForScopeChain(aCx);
-  if (!global) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-  if (!mozilla::DefineOSFileConstants(aCx, global)) {
+  JSObject *targetObj = nullptr;
+
+  mozJSComponentLoader* loader = mozJSComponentLoader::Get();
+  rv = loader->FindTargetObject(aCx, &targetObj);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (!mozilla::DefineOSFileConstants(aCx, targetObj)) {
     return NS_ERROR_FAILURE;
   }
 

From d91ef531e3aeda1ce1b8ef69237be1a853ce2c26 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Mon, 26 Nov 2012 08:56:56 -0800
Subject: [PATCH 037/160] Bug 814104: Create the function in the right
 compartment. r=dcamp

---
 .../devtools/debugger/server/dbg-server.jsm   | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/toolkit/devtools/debugger/server/dbg-server.jsm b/toolkit/devtools/debugger/server/dbg-server.jsm
index ece7be88dc5a..5dc7cf07aa98 100644
--- a/toolkit/devtools/debugger/server/dbg-server.jsm
+++ b/toolkit/devtools/debugger/server/dbg-server.jsm
@@ -17,18 +17,20 @@ const Cu = Components.utils;
 
 this.EXPORTED_SYMBOLS = ["DebuggerServer"];
 
-function loadSubScript(aURL)
-{
-  try {
-    let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
-      .getService(Ci.mozIJSSubScriptLoader);
-    loader.loadSubScript(aURL, this);
-  } catch(e) {
-    dump("Error loading: " + aURL + ": " + e + " - " + e.stack + "\n");
-
-    throw e;
-  }
-}
+var loadSubScript =
+  "function loadSubScript(aURL)\n" +
+  "{\n" +
+  "const Ci = Components.interfaces;\n" +
+  "const Cc = Components.classes;\n" +
+  "  try {\n" +
+  "    let loader = Cc[\"@mozilla.org/moz/jssubscript-loader;1\"]\n" +
+  "      .getService(Ci.mozIJSSubScriptLoader);\n" +
+  "    loader.loadSubScript(aURL, this);\n" +
+  "  } catch(e) {\n" +
+  "    dump(\"Error loading: \" + aURL + \": \" + e + \" - \" + e.stack + \"\\n\");\n" +
+  "    throw e;\n" +
+  "  }\n" +
+  "}";
 
 Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
 
@@ -37,7 +39,7 @@ var systemPrincipal = Cc["@mozilla.org/systemprincipal;1"]
                       .createInstance(Ci.nsIPrincipal);
 
 var gGlobal = Cu.Sandbox(systemPrincipal);
-gGlobal.importFunction(loadSubScript);
+Cu.evalInSandbox(loadSubScript, gGlobal, "1.8");
 gGlobal.loadSubScript("chrome://global/content/devtools/dbg-server.js");
 
 this.DebuggerServer = gGlobal.DebuggerServer;

From fbc44adf924c3596629e67bc5f245d214624e6c2 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Mon, 26 Nov 2012 12:27:05 -0500
Subject: [PATCH 038/160] Factor common register allocation code and add
 integrity checker to RegisterAllocator.h, add baseline StupidAllocator, bug
 812945. r=jandem

---
 js/src/Makefile.in               |   2 +
 js/src/ion/Ion.cpp               |  38 ++-
 js/src/ion/Ion.h                 |  15 +-
 js/src/ion/IonSpewer.h           |   2 +-
 js/src/ion/LIR-Common.h          |  11 +-
 js/src/ion/LIR.cpp               |  38 +++
 js/src/ion/LIR.h                 | 148 +++++++++-
 js/src/ion/LinearScan.cpp        |  49 +---
 js/src/ion/LinearScan.h          | 222 ++-------------
 js/src/ion/RegisterAllocator.cpp | 464 +++++++++++++++++++++++++++++++
 js/src/ion/RegisterAllocator.h   | 336 ++++++++++++++++++++++
 js/src/ion/Safepoints.cpp        |  19 +-
 js/src/ion/StupidAllocator.cpp   | 419 ++++++++++++++++++++++++++++
 js/src/ion/StupidAllocator.h     |  84 ++++++
 js/src/shell/js.cpp              |   7 +-
 15 files changed, 1582 insertions(+), 272 deletions(-)
 create mode 100644 js/src/ion/RegisterAllocator.cpp
 create mode 100644 js/src/ion/RegisterAllocator.h
 create mode 100644 js/src/ion/StupidAllocator.cpp
 create mode 100644 js/src/ion/StupidAllocator.h

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index ae1fa49b6975..0fa1cd658c6b 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -294,8 +294,10 @@ CPPSRCS +=	MIR.cpp \
 		MIRGraph.cpp \
 		MoveResolver.cpp \
 		EdgeCaseAnalysis.cpp \
+		RegisterAllocator.cpp \
 		Snapshots.cpp \
 		Safepoints.cpp \
+		StupidAllocator.cpp \
 		TypeOracle.cpp \
 		TypePolicy.cpp \
 		ValueNumbering.cpp \
diff --git a/js/src/ion/Ion.cpp b/js/src/ion/Ion.cpp
index 250d5bc126f8..8530025e499c 100644
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -21,6 +21,7 @@
 #include "jsworkers.h"
 #include "IonCompartment.h"
 #include "CodeGenerator.h"
+#include "StupidAllocator.h"
 
 #if defined(JS_CPU_X86)
 # include "x86/Lowering-x86.h"
@@ -949,16 +950,47 @@ CompileBackEnd(MIRGenerator *mir)
     if (mir->shouldCancel("Generate LIR"))
         return NULL;
 
-    if (js_IonOptions.lsra) {
+    AllocationIntegrityState integrity(*lir);
+
+    switch (js_IonOptions.registerAllocator) {
+      case RegisterAllocator_LSRA: {
+#ifdef DEBUG
+        integrity.record();
+#endif
+
         LinearScanAllocator regalloc(mir, &lirgen, *lir);
         if (!regalloc.go())
             return NULL;
-        IonSpewPass("Allocate Registers", &regalloc);
 
-        if (mir->shouldCancel("Allocate Registers"))
+#ifdef DEBUG
+        integrity.check(false);
+#endif
+
+        IonSpewPass("Allocate Registers [LSRA]", &regalloc);
+        break;
+      }
+
+      case RegisterAllocator_Stupid: {
+        // Use the integrity checker to populate safepoint information, so
+        // run it in all builds.
+        integrity.record();
+
+        StupidAllocator regalloc(mir, &lirgen, *lir);
+        if (!regalloc.go())
             return NULL;
+        if (!integrity.check(true))
+            return NULL;
+        IonSpewPass("Allocate Registers [Stupid]");
+        break;
+      }
+
+      default:
+        JS_NOT_REACHED("Bad regalloc");
     }
 
+    if (mir->shouldCancel("Allocate Registers"))
+        return NULL;
+
     CodeGenerator *codegen = js_new<CodeGenerator>(mir, lir);
     if (!codegen || !codegen->generate()) {
         js_delete(codegen);
diff --git a/js/src/ion/Ion.h b/js/src/ion/Ion.h
index 21db9dabee8e..d8bcd20effc9 100644
--- a/js/src/ion/Ion.h
+++ b/js/src/ion/Ion.h
@@ -19,6 +19,12 @@ namespace ion {
 
 class TempAllocator;
 
+// Possible register allocators which may be used.
+enum IonRegisterAllocator {
+    RegisterAllocator_LSRA,
+    RegisterAllocator_Stupid
+};
+
 struct IonOptions
 {
     // Toggles whether global value numbering is used.
@@ -47,11 +53,10 @@ struct IonOptions
     // Default: true
     bool limitScriptSize;
 
-    // Toggles whether Linear Scan Register Allocation is used. If LSRA is not
-    // used, then Greedy Register Allocation is used instead.
+    // Describes which register allocator to use.
     //
-    // Default: true
-    bool lsra;
+    // Default: LSRA
+    IonRegisterAllocator registerAllocator;
 
     // Toggles whether inlining is performed.
     //
@@ -162,7 +167,7 @@ struct IonOptions
         licm(true),
         osr(true),
         limitScriptSize(true),
-        lsra(true),
+        registerAllocator(RegisterAllocator_LSRA),
         inlining(true),
         edgeCaseAnalysis(true),
         rangeAnalysis(true),
diff --git a/js/src/ion/IonSpewer.h b/js/src/ion/IonSpewer.h
index 507912a12f53..b21070a5b2b4 100644
--- a/js/src/ion/IonSpewer.h
+++ b/js/src/ion/IonSpewer.h
@@ -32,7 +32,7 @@ namespace ion {
     _(Range)                                \
     /* Information during LICM */           \
     _(LICM)                                 \
-    /* Information during LSRA */           \
+    /* Information during regalloc */       \
     _(RegAlloc)                             \
     /* Information during inlining */       \
     _(Inlining)                             \
diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h
index 00b91ddc2b26..62002eb56bde 100644
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -105,10 +105,13 @@ class LMoveGroup : public LInstructionHelper<0, 0, 0>
     LIR_HEADER(MoveGroup);
 
     void printOperands(FILE *fp);
-    bool add(LAllocation *from, LAllocation *to) {
-        JS_ASSERT(*from != *to);
-        return moves_.append(LMove(from, to));
-    }
+
+    // Add a move which takes place simultaneously with all others in the group.
+    bool add(LAllocation *from, LAllocation *to);
+
+    // Add a move which takes place after existing moves in the group.
+    bool addAfter(LAllocation *from, LAllocation *to);
+
     size_t numMoves() const {
         return moves_.length();
     }
diff --git a/js/src/ion/LIR.cpp b/js/src/ion/LIR.cpp
index ce67eb0c237f..85294396deb6 100644
--- a/js/src/ion/LIR.cpp
+++ b/js/src/ion/LIR.cpp
@@ -314,6 +314,44 @@ LInstruction::initSafepoint()
     JS_ASSERT(safepoint_);
 }
 
+bool
+LMoveGroup::add(LAllocation *from, LAllocation *to)
+{
+#ifdef DEBUG
+    JS_ASSERT(*from != *to);
+    for (size_t i = 0; i < moves_.length(); i++)
+        JS_ASSERT(*to != *moves_[i].to());
+#endif
+    return moves_.append(LMove(from, to));
+}
+
+bool
+LMoveGroup::addAfter(LAllocation *from, LAllocation *to)
+{
+    // Transform the operands to this move so that performing the result
+    // simultaneously with existing moves in the group will have the same
+    // effect as if the original move took place after the existing moves.
+
+    for (size_t i = 0; i < moves_.length(); i++) {
+        if (*moves_[i].to() == *from) {
+            from = moves_[i].from();
+            break;
+        }
+    }
+
+    if (*from == *to)
+        return true;
+
+    for (size_t i = 0; i < moves_.length(); i++) {
+        if (*to == *moves_[i].to()) {
+            moves_[i] = LMove(from, to);
+            return true;
+        }
+    }
+
+    return add(from, to);
+}
+
 void
 LMoveGroup::printOperands(FILE *fp)
 {
diff --git a/js/src/ion/LIR.h b/js/src/ion/LIR.h
index 05bfa3007ae0..870bc299c978 100644
--- a/js/src/ion/LIR.h
+++ b/js/src/ion/LIR.h
@@ -194,6 +194,10 @@ class LAllocation : public TempObject
         return bits_ != other.bits_;
     }
 
+    HashNumber hash() const {
+        return bits_;
+    }
+
     static void PrintAllocation(FILE *fp, const LAllocation *a);
 };
 
@@ -740,6 +744,9 @@ class LBlock : public TempObject
     LInstructionReverseIterator rbegin() {
         return instructions_.rbegin();
     }
+    LInstructionReverseIterator rbegin(LInstruction *at) {
+        return instructions_.rbegin(at);
+    }
     LInstructionReverseIterator rend() {
         return instructions_.rend();
     }
@@ -935,6 +942,9 @@ class LSafepoint : public TempObject
 #ifdef JS_NUNBOX32
     // List of registers which contain pieces of values.
     NunboxList nunboxParts_;
+
+    // Number of nunboxParts which are not completely filled in.
+    uint32 partialNunboxes_;
 #elif JS_PUNBOX64
     // List of registers which contain values.
     GeneralRegisterSet valueRegs_;
@@ -942,17 +952,20 @@ class LSafepoint : public TempObject
 
   public:
     LSafepoint()
-      : safepointOffset_(INVALID_SAFEPOINT_OFFSET),
-        osiCallPointOffset_(0)
+      : safepointOffset_(INVALID_SAFEPOINT_OFFSET)
+      , osiCallPointOffset_(0)
+#ifdef JS_NUNBOX32
+      , partialNunboxes_(0)
+#endif
     { }
     void addLiveRegister(AnyRegister reg) {
-        liveRegs_.add(reg);
+        liveRegs_.addUnchecked(reg);
     }
     const RegisterSet &liveRegs() const {
         return liveRegs_;
     }
     void addGcRegister(Register reg) {
-        gcRegs_.add(reg);
+        gcRegs_.addUnchecked(reg);
     }
     GeneralRegisterSet gcRegs() const {
         return gcRegs_;
@@ -964,6 +977,27 @@ class LSafepoint : public TempObject
         return gcSlots_;
     }
 
+    void addGcPointer(LAllocation alloc) {
+        if (alloc.isRegister())
+            addGcRegister(alloc.toRegister().gpr());
+        else if (alloc.isStackSlot())
+            addGcSlot(alloc.toStackSlot()->slot());
+    }
+
+    bool hasGcPointer(LAllocation alloc) {
+        if (alloc.isRegister())
+            return gcRegs().has(alloc.toRegister().gpr());
+        if (alloc.isStackSlot()) {
+            for (size_t i = 0; i < gcSlots_.length(); i++) {
+                if (gcSlots_[i] == alloc.toStackSlot()->slot())
+                    return true;
+            }
+            return false;
+        }
+        JS_ASSERT(alloc.isArgument());
+        return true;
+    }
+
     bool addValueSlot(uint32 slot) {
         return valueSlots_.append(slot);
     }
@@ -971,21 +1005,125 @@ class LSafepoint : public TempObject
         return valueSlots_;
     }
 
+    bool hasValueSlot(uint32 slot) {
+        for (size_t i = 0; i < valueSlots_.length(); i++) {
+            if (valueSlots_[i] == slot)
+                return true;
+        }
+        return false;
+    }
+
 #ifdef JS_NUNBOX32
+
     bool addNunboxParts(LAllocation type, LAllocation payload) {
         return nunboxParts_.append(NunboxEntry(type, payload));
     }
+
+    bool addNunboxType(uint32 typeVreg, LAllocation type) {
+        for (size_t i = 0; i < nunboxParts_.length(); i++) {
+            if (nunboxParts_[i].type == type)
+                return true;
+            if (nunboxParts_[i].type == LUse(LUse::ANY, typeVreg)) {
+                nunboxParts_[i].type = type;
+                partialNunboxes_--;
+                return true;
+            }
+        }
+        partialNunboxes_++;
+
+        // vregs for nunbox pairs are adjacent, with the type coming first.
+        uint32 payloadVreg = typeVreg + 1;
+        return nunboxParts_.append(NunboxEntry(type, LUse(payloadVreg, LUse::ANY)));
+    }
+
+    bool hasNunboxType(LAllocation type) {
+        if (type.isArgument())
+            return true;
+        if (type.isStackSlot() && hasValueSlot(type.toStackSlot()->slot() + 1))
+            return true;
+        for (size_t i = 0; i < nunboxParts_.length(); i++) {
+            if (nunboxParts_[i].type == type)
+                return true;
+        }
+        return false;
+    }
+
+    bool addNunboxPayload(uint32 payloadVreg, LAllocation payload) {
+        for (size_t i = 0; i < nunboxParts_.length(); i++) {
+            if (nunboxParts_[i].payload == payload)
+                return true;
+            if (nunboxParts_[i].payload == LUse(LUse::ANY, payloadVreg)) {
+                partialNunboxes_--;
+                nunboxParts_[i].payload = payload;
+                return true;
+            }
+        }
+        partialNunboxes_++;
+
+        // vregs for nunbox pairs are adjacent, with the type coming first.
+        uint32 typeVreg = payloadVreg - 1;
+        return nunboxParts_.append(NunboxEntry(LUse(typeVreg, LUse::ANY), payload));
+    }
+
+    bool hasNunboxPayload(LAllocation payload) {
+        if (payload.isArgument())
+            return true;
+        if (payload.isStackSlot() && hasValueSlot(payload.toStackSlot()->slot()))
+            return true;
+        for (size_t i = 0; i < nunboxParts_.length(); i++) {
+            if (nunboxParts_[i].payload == payload)
+                return true;
+        }
+        return false;
+    }
+
     NunboxList &nunboxParts() {
         return nunboxParts_;
     }
+
+    uint32 partialNunboxes() {
+        return partialNunboxes_;
+    }
+
 #elif JS_PUNBOX64
+
     void addValueRegister(Register reg) {
         valueRegs_.add(reg);
     }
     GeneralRegisterSet valueRegs() {
         return valueRegs_;
     }
-#endif
+
+    bool addBoxedValue(LAllocation alloc) {
+        if (alloc.isRegister()) {
+            Register reg = alloc.toRegister().gpr();
+            if (!valueRegs().has(reg))
+                addValueRegister(reg);
+            return true;
+        }
+        if (alloc.isStackSlot()) {
+            uint32 slot = alloc.toStackSlot()->slot();
+            for (size_t i = 0; i < valueSlots().length(); i++) {
+                if (valueSlots()[i] == slot)
+                    return true;
+            }
+            return addValueSlot(slot);
+        }
+        JS_ASSERT(alloc.isArgument());
+        return true;
+    }
+
+    bool hasBoxedValue(LAllocation alloc) {
+        if (alloc.isRegister())
+            return valueRegs().has(alloc.toRegister().gpr());
+        if (alloc.isStackSlot())
+            return hasValueSlot(alloc.toStackSlot()->slot());
+        JS_ASSERT(alloc.isArgument());
+        return true;
+    }
+
+#endif // JS_PUNBOX64
+
     bool encoded() const {
         return safepointOffset_ != INVALID_SAFEPOINT_OFFSET;
     }
diff --git a/js/src/ion/LinearScan.cpp b/js/src/ion/LinearScan.cpp
index 14b431536716..e31393525ecb 100644
--- a/js/src/ion/LinearScan.cpp
+++ b/js/src/ion/LinearScan.cpp
@@ -360,9 +360,6 @@ LiveInterval::firstIncompatibleUse(LAllocation alloc)
     return CodePosition::MAX;
 }
 
-const CodePosition CodePosition::MAX(UINT_MAX);
-const CodePosition CodePosition::MIN(0);
-
 /*
  * This function pre-allocates and initializes as much global state as possible
  * to avoid littering the algorithms with memory management cruft.
@@ -370,6 +367,9 @@ const CodePosition CodePosition::MIN(0);
 bool
 LinearScanAllocator::createDataStructures()
 {
+    if (!RegisterAllocator::init())
+        return false;
+
     liveIn = lir->mir()->allocate<BitSet*>(graph.numBlockIds());
     if (!liveIn)
         return false;
@@ -387,9 +387,6 @@ LinearScanAllocator::createDataStructures()
     if (!vregs.init(lir->mir(), graph.numVirtualRegisters()))
         return false;
 
-    if (!insData.init(lir->mir(), graph.numInstructions()))
-        return false;
-
     // Build virtual register objects
     for (size_t i = 0; i < graph.numBlocks(); i++) {
         if (mir->shouldCancel("LSRA create data structures (main loop)"))
@@ -405,7 +402,6 @@ LinearScanAllocator::createDataStructures()
                         return false;
                 }
             }
-            insData[*ins].init(*ins, block);
 
             for (size_t j = 0; j < ins->numTemps(); j++) {
                 LDefinition *def = ins->getTemp(j);
@@ -420,7 +416,6 @@ LinearScanAllocator::createDataStructures()
             LDefinition *def = phi->getDef(0);
             if (!vregs[def].init(phi->id(), block, phi, def, /* isTemp */ false))
                 return false;
-            insData[phi].init(phi, block);
         }
     }
 
@@ -1870,44 +1865,6 @@ LinearScanAllocator::canCoexist(LiveInterval *a, LiveInterval *b)
     return true;
 }
 
-LMoveGroup *
-LinearScanAllocator::getInputMoveGroup(CodePosition pos)
-{
-    InstructionData *data = &insData[pos];
-    JS_ASSERT(!data->ins()->isPhi());
-    JS_ASSERT(!data->ins()->isLabel());;
-    JS_ASSERT(inputOf(data->ins()) == pos);
-
-    if (data->inputMoves())
-        return data->inputMoves();
-
-    LMoveGroup *moves = new LMoveGroup;
-    data->setInputMoves(moves);
-    data->block()->insertBefore(data->ins(), moves);
-
-    return moves;
-}
-
-LMoveGroup *
-LinearScanAllocator::getMoveGroupAfter(CodePosition pos)
-{
-    InstructionData *data = &insData[pos];
-    JS_ASSERT(!data->ins()->isPhi());
-    JS_ASSERT(outputOf(data->ins()) == pos);
-
-    if (data->movesAfter())
-        return data->movesAfter();
-
-    LMoveGroup *moves = new LMoveGroup;
-    data->setMovesAfter(moves);
-
-    if (data->ins()->isLabel())
-        data->block()->insertAfter(data->block()->getEntryMoveGroup(), moves);
-    else
-        data->block()->insertAfter(data->ins(), moves);
-    return moves;
-}
-
 bool
 LinearScanAllocator::addMove(LMoveGroup *moves, LiveInterval *from, LiveInterval *to)
 {
diff --git a/js/src/ion/LinearScan.h b/js/src/ion/LinearScan.h
index bb5ac6922a13..e26b88666ddc 100644
--- a/js/src/ion/LinearScan.h
+++ b/js/src/ion/LinearScan.h
@@ -5,15 +5,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/. */
 
-#ifndef js_ion_registerallocator_h__
-#define js_ion_registerallocator_h__
+#ifndef js_ion_linearscan_h__
+#define js_ion_linearscan_h__
 
-#include "Ion.h"
-#include "MIR.h"
-#include "MIRGraph.h"
-#include "InlineList.h"
-#include "LIR.h"
-#include "Lowering.h"
+#include "RegisterAllocator.h"
 #include "BitSet.h"
 #include "StackSlotAllocator.h"
 
@@ -24,109 +19,6 @@ namespace ion {
 
 class VirtualRegister;
 
-/*
- * Represents with better-than-instruction precision a position in the
- * instruction stream.
- *
- * An issue comes up when dealing with live intervals as to how to represent
- * information such as "this register is only needed for the input of
- * this instruction, it can be clobbered in the output". Just having ranges
- * of instruction IDs is insufficiently expressive to denote all possibilities.
- * This class solves this issue by associating an extra bit with the instruction
- * ID which indicates whether the position is the input half or output half of
- * an instruction.
- */
-class CodePosition
-{
-  private:
-    CodePosition(const uint32 &bits)
-      : bits_(bits)
-    { }
-
-    static const unsigned int INSTRUCTION_SHIFT = 1;
-    static const unsigned int SUBPOSITION_MASK = 1;
-    uint32 bits_;
-
-  public:
-    static const CodePosition MAX;
-    static const CodePosition MIN;
-
-    /*
-     * This is the half of the instruction this code position represents, as
-     * described in the huge comment above.
-     */
-    enum SubPosition {
-        INPUT,
-        OUTPUT
-    };
-
-    CodePosition() : bits_(0)
-    { }
-
-    CodePosition(uint32 instruction, SubPosition where) {
-        JS_ASSERT(instruction < 0x80000000u);
-        JS_ASSERT(((uint32)where & SUBPOSITION_MASK) == (uint32)where);
-        bits_ = (instruction << INSTRUCTION_SHIFT) | (uint32)where;
-    }
-
-    uint32 ins() const {
-        return bits_ >> INSTRUCTION_SHIFT;
-    }
-
-    uint32 pos() const {
-        return bits_;
-    }
-
-    SubPosition subpos() const {
-        return (SubPosition)(bits_ & SUBPOSITION_MASK);
-    }
-
-    bool operator <(const CodePosition &other) const {
-        return bits_ < other.bits_;
-    }
-
-    bool operator <=(const CodePosition &other) const {
-        return bits_ <= other.bits_;
-    }
-
-    bool operator !=(const CodePosition &other) const {
-        return bits_ != other.bits_;
-    }
-
-    bool operator ==(const CodePosition &other) const {
-        return bits_ == other.bits_;
-    }
-
-    bool operator >(const CodePosition &other) const {
-        return bits_ > other.bits_;
-    }
-
-    bool operator >=(const CodePosition &other) const {
-        return bits_ >= other.bits_;
-    }
-
-    CodePosition previous() const {
-        JS_ASSERT(*this != MIN);
-        return CodePosition(bits_ - 1);
-    }
-    CodePosition next() const {
-        JS_ASSERT(*this != MAX);
-        return CodePosition(bits_ + 1);
-    }
-};
-
-struct UsePosition : public TempObject,
-                     public InlineForwardListNode<UsePosition>
-{
-    LUse *use;
-    CodePosition pos;
-
-    UsePosition(LUse *use, CodePosition pos) :
-        use(use),
-        pos(pos)
-    { }
-};
-
 class Requirement
 {
   public:
@@ -198,6 +90,18 @@ class Requirement
     CodePosition position_;
 };
 
+struct UsePosition : public TempObject,
+                     public InlineForwardListNode<UsePosition>
+{
+    LUse *use;
+    CodePosition pos;
+
+    UsePosition(LUse *use, CodePosition pos) :
+        use(use),
+        pos(pos)
+    { }
+};
+
 typedef InlineForwardListIterator<UsePosition> UsePositionIterator;
 
 /*
@@ -494,70 +398,6 @@ class VirtualRegisterMap
     }
 };
 
-class InstructionData
-{
-    LInstruction *ins_;
-    LBlock *block_;
-    LMoveGroup *inputMoves_;
-    LMoveGroup *movesAfter_;
-
-  public:
-    void init(LInstruction *ins, LBlock *block) {
-        JS_ASSERT(!ins_);
-        JS_ASSERT(!block_);
-        ins_ = ins;
-        block_ = block;
-    }
-    LInstruction *ins() const {
-        return ins_;
-    }
-    LBlock *block() const {
-        return block_;
-    }
-    void setInputMoves(LMoveGroup *moves) {
-        inputMoves_ = moves;
-    }
-    LMoveGroup *inputMoves() const {
-        return inputMoves_;
-    }
-    void setMovesAfter(LMoveGroup *moves) {
-        movesAfter_ = moves;
-    }
-    LMoveGroup *movesAfter() const {
-        return movesAfter_;
-    }
-};
-
-class InstructionDataMap
-{
-    InstructionData *insData_;
-    uint32 numIns_;
-
-  public:
-    InstructionDataMap()
-      : insData_(NULL),
-        numIns_(0)
-    { }
-
-    bool init(MIRGenerator *gen, uint32 numInstructions) {
-        insData_ = gen->allocate<InstructionData>(numInstructions);
-        numIns_ = numInstructions;
-        if (!insData_)
-            return false;
-        memset(insData_, 0, sizeof(InstructionData) * numInstructions);
-        return true;
-    }
-
-    InstructionData &operator[](const CodePosition &pos) {
-        JS_ASSERT(pos.ins() < numIns_);
-        return insData_[pos.ins()];
-    }
-    InstructionData &operator[](LInstruction *ins) {
-        JS_ASSERT(ins->id() < numIns_);
-        return insData_[ins->id()];
-    }
-};
-
 typedef HashMap<uint32,
                 LInstruction *,
                 DefaultHasher<uint32>,
@@ -571,7 +411,7 @@ typedef HashMap<uint32,
 typedef InlineList<LiveInterval>::iterator IntervalIterator;
 typedef InlineList<LiveInterval>::reverse_iterator IntervalReverseIterator;
 
-class LinearScanAllocator
+class LinearScanAllocator : public RegisterAllocator
 {
     friend class C1Spewer;
     friend class JSONSpewer;
@@ -590,15 +430,9 @@ class LinearScanAllocator
         LiveInterval *dequeue();
     };
 
-    // Context
-    MIRGenerator *mir;
-    LIRGenerator *lir;
-    LIRGraph &graph;
-
     // Computed inforamtion
     BitSet **liveIn;
     VirtualRegisterMap vregs;
-    InstructionDataMap insData;
     FixedArityList<LiveInterval *, AnyRegister::Total> fixedIntervals;
 
     // Union of all ranges in fixedIntervals, used to quickly determine
@@ -612,9 +446,6 @@ class LinearScanAllocator
     SlotList finishedSlots_;
     SlotList finishedDoubleSlots_;
 
-    // Pool of all registers that should be considered allocateable
-    RegisterSet allRegisters_;
-
     // Run-time state
     UnhandledQueue unhandled;
     InlineList<LiveInterval> active;
@@ -643,8 +474,6 @@ class LinearScanAllocator
     AnyRegister::Code findBestFreeRegister(CodePosition *freeUntil);
     AnyRegister::Code findBestBlockedRegister(CodePosition *nextUsed);
     bool canCoexist(LiveInterval *a, LiveInterval *b);
-    LMoveGroup *getInputMoveGroup(CodePosition pos);
-    LMoveGroup *getMoveGroupAfter(CodePosition pos);
     bool addMove(LMoveGroup *moves, LiveInterval *from, LiveInterval *to);
     bool moveInput(CodePosition pos, LiveInterval *from, LiveInterval *to);
     bool moveInputAlloc(CodePosition pos, LAllocation *from, LAllocation *to);
@@ -669,31 +498,14 @@ class LinearScanAllocator
     inline void validateVirtualRegisters() { };
 #endif
 
-    CodePosition outputOf(uint32 pos) {
-        return CodePosition(pos, CodePosition::OUTPUT);
-    }
-    CodePosition outputOf(LInstruction *ins) {
-        return CodePosition(ins->id(), CodePosition::OUTPUT);
-    }
-    CodePosition inputOf(uint32 pos) {
-        return CodePosition(pos, CodePosition::INPUT);
-    }
-    CodePosition inputOf(LInstruction *ins) {
-        return CodePosition(ins->id(), CodePosition::INPUT);
-    }
 #ifdef JS_NUNBOX32
     VirtualRegister *otherHalfOfNunbox(VirtualRegister *vreg);
 #endif
 
   public:
     LinearScanAllocator(MIRGenerator *mir, LIRGenerator *lir, LIRGraph &graph)
-      : mir(mir),
-        lir(lir),
-        graph(graph),
-        allRegisters_(RegisterSet::All())
+      : RegisterAllocator(mir, lir, graph)
     {
-        if (FramePointer != InvalidReg && lir->mir()->instrumentedProfiling())
-            allRegisters_.take(AnyRegister(FramePointer));
     }
 
     bool go();
diff --git a/js/src/ion/RegisterAllocator.cpp b/js/src/ion/RegisterAllocator.cpp
new file mode 100644
index 000000000000..8be440033c98
--- /dev/null
+++ b/js/src/ion/RegisterAllocator.cpp
@@ -0,0 +1,464 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "RegisterAllocator.h"
+
+using namespace js;
+using namespace js::ion;
+
+bool
+AllocationIntegrityState::record()
+{
+    // Ignore repeated record() calls.
+    if (!instructions.empty())
+        return true;
+
+    if (!instructions.reserve(graph.numInstructions()))
+        return false;
+    for (size_t i = 0; i < graph.numInstructions(); i++)
+        instructions.infallibleAppend(InstructionInfo());
+
+    if (!virtualRegisters.reserve(graph.numVirtualRegisters()))
+        return false;
+    for (size_t i = 0; i < graph.numVirtualRegisters(); i++)
+        virtualRegisters.infallibleAppend(NULL);
+
+    if (!blocks.reserve(graph.numBlocks()))
+        return false;
+    for (size_t i = 0; i < graph.numBlocks(); i++) {
+        blocks.infallibleAppend(BlockInfo());
+        LBlock *block = graph.getBlock(i);
+        JS_ASSERT(block->mir()->id() == i);
+
+        BlockInfo &blockInfo = blocks[i];
+        if (!blockInfo.phis.reserve(block->numPhis()))
+            return false;
+
+        for (size_t j = 0; j < block->numPhis(); j++) {
+            blockInfo.phis.infallibleAppend(InstructionInfo());
+            InstructionInfo &info = blockInfo.phis[j];
+            LPhi *phi = block->getPhi(j);
+            for (size_t k = 0; k < phi->numDefs(); k++) {
+                uint32 vreg = phi->getDef(k)->virtualRegister();
+                virtualRegisters[vreg] = phi->getDef(k);
+                if (!info.outputs.append(vreg))
+                    return false;
+            }
+            for (size_t k = 0; k < phi->numOperands(); k++) {
+                if (!info.inputs.append(phi->getOperand(k)->toUse()->virtualRegister()))
+                    return false;
+            }
+        }
+
+        for (LInstructionIterator iter = block->begin(); iter != block->end(); iter++) {
+            LInstruction *ins = *iter;
+            InstructionInfo &info = instructions[ins->id()];
+
+            for (size_t k = 0; k < ins->numDefs(); k++) {
+                uint32 vreg = ins->getDef(k)->virtualRegister();
+                virtualRegisters[vreg] = ins->getDef(k);
+                if (!info.outputs.append(vreg))
+                    return false;
+            }
+            for (LInstruction::InputIterator alloc(*ins); alloc.more(); alloc.next()) {
+                if (!info.inputs.append(alloc->isUse() ? alloc->toUse()->virtualRegister() : UINT32_MAX))
+                    return false;
+            }
+        }
+    }
+
+    return seen.init();
+}
+
+bool
+AllocationIntegrityState::check(bool populateSafepoints)
+{
+    JS_ASSERT(!instructions.empty());
+
+#ifdef DEBUG
+    for (size_t blockIndex = 0; blockIndex < graph.numBlocks(); blockIndex++) {
+        LBlock *block = graph.getBlock(blockIndex);
+
+        // Check that all instruction inputs and outputs have been assigned an allocation.
+        for (LInstructionIterator iter = block->begin(); iter != block->end(); iter++) {
+            LInstruction *ins = *iter;
+
+            for (LInstruction::InputIterator alloc(*ins); alloc.more(); alloc.next())
+                JS_ASSERT(!alloc->isUse());
+
+            for (size_t i = 0; i < ins->numDefs(); i++) {
+                LDefinition *def = ins->getDef(i);
+                JS_ASSERT_IF(def->policy() != LDefinition::PASSTHROUGH, !def->output()->isUse());
+
+                if (def->output()->isRegister()) {
+                    // The live regs for an instruction's safepoint should
+                    // exclude the instruction's definitions.
+                    LSafepoint *safepoint = ins->safepoint();
+                    JS_ASSERT_IF(safepoint, !safepoint->liveRegs().has(def->output()->toRegister()));
+                }
+            }
+        }
+    }
+#endif
+
+    // Check that the register assignment and move groups preserve the original
+    // semantics of the virtual registers. Each virtual register has a single
+    // write (owing to the SSA representation), but the allocation may move the
+    // written value around between registers and memory locations along
+    // different paths through the script.
+    //
+    // For each use of an allocation, follow the physical value which is read
+    // backward through the script, along all paths to the value's virtual
+    // register's definition.
+    for (size_t blockIndex = 0; blockIndex < graph.numBlocks(); blockIndex++) {
+        LBlock *block = graph.getBlock(blockIndex);
+        for (LInstructionIterator iter = block->begin(); iter != block->end(); iter++) {
+            LInstruction *ins = *iter;
+            const InstructionInfo &info = instructions[ins->id()];
+
+            size_t inputIndex = 0;
+            for (LInstruction::InputIterator alloc(*ins); alloc.more(); alloc.next()) {
+                uint32 vreg = info.inputs[inputIndex++];
+                if (vreg == UINT32_MAX)
+                    continue;
+
+                // Start checking at the previous instruction, in case this
+                // instruction reuses its input register for an output.
+                LInstructionReverseIterator riter = block->rbegin(ins);
+                riter++;
+                checkIntegrity(block, *riter, vreg, **alloc, populateSafepoints);
+
+                while (!worklist.empty()) {
+                    IntegrityItem item = worklist.back();
+                    worklist.popBack();
+                    checkIntegrity(item.block, *item.block->rbegin(), item.vreg, item.alloc, populateSafepoints);
+                }
+            }
+        }
+    }
+
+    if (IonSpewEnabled(IonSpew_RegAlloc))
+        dump();
+
+    return true;
+}
+
+bool
+AllocationIntegrityState::checkIntegrity(LBlock *block, LInstruction *ins,
+                                         uint32 vreg, LAllocation alloc, bool populateSafepoints)
+{
+    for (LInstructionReverseIterator iter(block->rbegin(ins)); iter != block->rend(); iter++) {
+        ins = *iter;
+
+        // Follow values through assignments in move groups. All assignments in
+        // a move group are considered to happen simultaneously, so stop after
+        // the first matching move is found.
+        if (ins->isMoveGroup()) {
+            LMoveGroup *group = ins->toMoveGroup();
+            for (int i = group->numMoves() - 1; i >= 0; i--) {
+                if (*group->getMove(i).to() == alloc) {
+                    alloc = *group->getMove(i).from();
+                    break;
+                }
+            }
+        }
+
+        const InstructionInfo &info = instructions[ins->id()];
+
+        // Make sure the physical location being tracked is not clobbered by
+        // another instruction, and that if the originating vreg definition is
+        // found that it is writing to the tracked location.
+
+        for (size_t i = 0; i < ins->numDefs(); i++) {
+            LDefinition *def = ins->getDef(i);
+            if (def->policy() == LDefinition::PASSTHROUGH)
+                continue;
+            if (info.outputs[i] == vreg) {
+                check(*def->output() == alloc,
+                      "Found vreg definition, but tracked value does not match");
+
+                // Found the original definition, done scanning.
+                return true;
+            } else {
+                check(*def->output() != alloc,
+                      "Tracked value clobbered by intermediate definition");
+            }
+        }
+
+        for (size_t i = 0; i < ins->numTemps(); i++) {
+            LDefinition *temp = ins->getTemp(i);
+            if (!temp->isBogusTemp()) {
+                check(*temp->output() != alloc,
+                      "Tracked value clobbered by intermediate temporary");
+            }
+        }
+
+        LSafepoint *safepoint = ins->safepoint();
+        if (!safepoint)
+            continue;
+
+        if (alloc.isRegister()) {
+            AnyRegister reg = alloc.toRegister();
+            if (populateSafepoints)
+                safepoint->addLiveRegister(reg);
+            else
+                check(safepoint->liveRegs().has(reg), "Register not marked in safepoint");
+        }
+
+        LDefinition::Type type = virtualRegisters[vreg]
+                                 ? virtualRegisters[vreg]->type()
+                                 : LDefinition::GENERAL;
+
+        switch (type) {
+          case LDefinition::OBJECT:
+            if (populateSafepoints)
+                safepoint->addGcPointer(alloc);
+            else
+                check(safepoint->hasGcPointer(alloc), "GC register not marked in safepoint");
+            break;
+#ifdef JS_NUNBOX32
+          // If a vreg for a value's components are copied in multiple places
+          // then the safepoint information may be incomplete and not reflect
+          // all copies. See SafepointWriter::writeNunboxParts.
+          case LDefinition::TYPE:
+            if (populateSafepoints)
+                safepoint->addNunboxType(vreg, alloc);
+            break;
+          case LDefinition::PAYLOAD:
+            if (populateSafepoints)
+                safepoint->addNunboxPayload(vreg, alloc);
+            break;
+#else
+          case LDefinition::BOX:
+            if (populateSafepoints)
+                safepoint->addBoxedValue(alloc);
+            else
+                check(safepoint->hasBoxedValue(alloc), "Boxed value not marked in safepoint");
+            break;
+#endif
+          default:
+            break;
+        }
+    }
+
+    // Phis are effectless, but change the vreg we are tracking. Check if there
+    // is one which produced this vreg. We need to follow back through the phi
+    // inputs as it is not guaranteed the register allocator filled in physical
+    // allocations for the inputs and outputs of the phis.
+    for (size_t i = 0; i < block->numPhis(); i++) {
+        InstructionInfo &info = blocks[block->mir()->id()].phis[i];
+        LPhi *phi = block->getPhi(i);
+        if (info.outputs[0] == vreg) {
+            for (size_t j = 0; j < phi->numOperands(); j++) {
+                uint32 newvreg = info.inputs[j];
+                LBlock *predecessor = graph.getBlock(block->mir()->getPredecessor(j)->id());
+                if (!addPredecessor(predecessor, newvreg, alloc))
+                    return false;
+            }
+            return true;
+        }
+    }
+
+    // No phi which defined the vreg we are tracking, follow back through all
+    // predecessors with the existing vreg.
+    for (size_t i = 0; i < block->mir()->numPredecessors(); i++) {
+        LBlock *predecessor = graph.getBlock(block->mir()->getPredecessor(i)->id());
+        if (!addPredecessor(predecessor, vreg, alloc))
+            return false;
+    }
+
+    return true;
+}
+
+bool
+AllocationIntegrityState::addPredecessor(LBlock *block, uint32 vreg, LAllocation alloc)
+{
+    // There is no need to reanalyze if we have already seen this predecessor.
+    // We share the seen allocations across analysis of each use, as there will
+    // likely be common ground between different uses of the same vreg.
+    IntegrityItem item;
+    item.block = block;
+    item.vreg = vreg;
+    item.alloc = alloc;
+    item.index = seen.count();
+
+    IntegrityItemSet::AddPtr p = seen.lookupForAdd(item);
+    if (p)
+        return true;
+    if (!seen.add(p, item))
+        return false;
+
+    return worklist.append(item);
+}
+
+void
+AllocationIntegrityState::check(bool cond, const char *msg)
+{
+  if (!cond) {
+    if (IonSpewEnabled(IonSpew_RegAlloc))
+      dump();
+    printf("%s\n", msg);
+    JS_NOT_REACHED("Regalloc integrity failure");
+  }
+}
+
+void
+AllocationIntegrityState::dump()
+{
+#ifdef DEBUG
+    printf("Register Allocation:\n");
+
+    for (size_t blockIndex = 0; blockIndex < graph.numBlocks(); blockIndex++) {
+        LBlock *block = graph.getBlock(blockIndex);
+        MBasicBlock *mir = block->mir();
+
+        printf("\nBlock %lu", blockIndex);
+        for (size_t i = 0; i < mir->numSuccessors(); i++)
+            printf(" [successor %u]", mir->getSuccessor(i)->id());
+        printf("\n");
+
+        for (size_t i = 0; i < block->numPhis(); i++) {
+            InstructionInfo &info = blocks[blockIndex].phis[i];
+            LPhi *phi = block->getPhi(i);
+
+            printf("Phi v%u <-", info.outputs[0]);
+            for (size_t j = 0; j < phi->numOperands(); j++)
+                printf(" v%u", info.inputs[j]);
+            printf("\n");
+        }
+
+        for (LInstructionIterator iter = block->begin(); iter != block->end(); iter++) {
+            LInstruction *ins = *iter;
+            InstructionInfo &info = instructions[ins->id()];
+
+            printf("[%s]", ins->opName());
+
+            if (ins->isMoveGroup()) {
+                LMoveGroup *group = ins->toMoveGroup();
+                for (int i = group->numMoves() - 1; i >= 0; i--) {
+                    printf(" [");
+                    LAllocation::PrintAllocation(stdout, group->getMove(i).from());
+                    printf(" -> ");
+                    LAllocation::PrintAllocation(stdout, group->getMove(i).to());
+                    printf("]");
+                }
+                printf("\n");
+                continue;
+            }
+
+            for (size_t i = 0; i < ins->numTemps(); i++) {
+                LDefinition *temp = ins->getTemp(i);
+                if (!temp->isBogusTemp()) {
+                    printf(" [temp ");
+                    LAllocation::PrintAllocation(stdout, temp->output());
+                    printf("]");
+                }
+            }
+
+            for (size_t i = 0; i < ins->numDefs(); i++) {
+                LDefinition *def = ins->getDef(i);
+                printf(" [def v%u ", info.outputs[i]);
+                LAllocation::PrintAllocation(stdout, def->output());
+                printf("]");
+            }
+
+            size_t index = 0;
+            for (LInstruction::InputIterator alloc(*ins); alloc.more(); alloc.next()) {
+                uint32 vreg = info.inputs[index++];
+                if (vreg == UINT32_MAX)
+                    continue;
+                printf(" [use v%u ", vreg);
+                LAllocation::PrintAllocation(stdout, *alloc);
+                printf("]");
+            }
+
+            printf("\n");
+        }
+    }
+
+    printf("\nIntermediate Allocations:\n\n");
+
+    // Print discovered allocations at the ends of blocks, in the order they
+    // were discovered.
+
+    Vector<IntegrityItem, 20, SystemAllocPolicy> seenOrdered;
+    for (size_t i = 0; i < seen.count(); i++)
+        seenOrdered.append(IntegrityItem());
+
+    for (IntegrityItemSet::Enum iter(seen); !iter.empty(); iter.popFront()) {
+        IntegrityItem item = iter.front();
+        seenOrdered[item.index] = item;
+    }
+
+    for (size_t i = 0; i < seenOrdered.length(); i++) {
+        IntegrityItem item = seenOrdered[i];
+        printf("block %u reg v%u alloc ", item.block->mir()->id(), item.vreg);
+        LAllocation::PrintAllocation(stdout, &item.alloc);
+        printf("\n");
+    }
+
+    printf("\n");
+#endif
+}
+
+const CodePosition CodePosition::MAX(UINT_MAX);
+const CodePosition CodePosition::MIN(0);
+
+bool
+RegisterAllocator::init()
+{
+    if (!insData.init(lir->mir(), graph.numInstructions()))
+        return false;
+
+    for (size_t i = 0; i < graph.numBlocks(); i++) {
+        LBlock *block = graph.getBlock(i);
+        for (LInstructionIterator ins = block->begin(); ins != block->end(); ins++)
+            insData[*ins].init(*ins, block);
+        for (size_t j = 0; j < block->numPhis(); j++) {
+            LPhi *phi = block->getPhi(j);
+            insData[phi].init(phi, block);
+        }
+    }
+
+    return true;
+}
+
+LMoveGroup *
+RegisterAllocator::getInputMoveGroup(uint32 ins)
+{
+    InstructionData *data = &insData[ins];
+    JS_ASSERT(!data->ins()->isPhi());
+    JS_ASSERT(!data->ins()->isLabel());
+
+    if (data->inputMoves())
+        return data->inputMoves();
+
+    LMoveGroup *moves = new LMoveGroup;
+    data->setInputMoves(moves);
+    data->block()->insertBefore(data->ins(), moves);
+
+    return moves;
+}
+
+LMoveGroup *
+RegisterAllocator::getMoveGroupAfter(uint32 ins)
+{
+    InstructionData *data = &insData[ins];
+    JS_ASSERT(!data->ins()->isPhi());
+
+    if (data->movesAfter())
+        return data->movesAfter();
+
+    LMoveGroup *moves = new LMoveGroup;
+    data->setMovesAfter(moves);
+
+    if (data->ins()->isLabel())
+        data->block()->insertAfter(data->block()->getEntryMoveGroup(), moves);
+    else
+        data->block()->insertAfter(data->ins(), moves);
+    return moves;
+}
diff --git a/js/src/ion/RegisterAllocator.h b/js/src/ion/RegisterAllocator.h
new file mode 100644
index 000000000000..bf82c0734e4b
--- /dev/null
+++ b/js/src/ion/RegisterAllocator.h
@@ -0,0 +1,336 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef js_ion_registerallocator_h__
+#define js_ion_registerallocator_h__
+
+#include "Ion.h"
+#include "MIR.h"
+#include "MIRGraph.h"
+#include "InlineList.h"
+#include "LIR.h"
+#include "Lowering.h"
+
+// Generic structures and functions for use by register allocators.
+
+namespace js {
+namespace ion {
+
+// Structure for running a liveness analysis on a finished register allocation.
+// This analysis can be used for two purposes:
+//
+// - Check the integrity of the allocation, i.e. that the reads and writes of
+//   physical values preserve the semantics of the original virtual registers.
+//
+// - Populate safepoints with live registers, GC thing and value data, to
+//   streamline the process of prototyping new allocators.
+struct AllocationIntegrityState
+{
+    AllocationIntegrityState(LIRGraph &graph)
+      : graph(graph)
+    {}
+
+    // Record all virtual registers in the graph. This must be called before
+    // register allocation, to pick up the original LUses.
+    bool record();
+
+    // Perform the liveness analysis on the graph, and assert on an invalid
+    // allocation. This must be called after register allocation, to pick up
+    // all assigned physical values. If populateSafepoints is specified,
+    // safepoints will be filled in with liveness information.
+    bool check(bool populateSafepoints);
+
+  private:
+
+    LIRGraph &graph;
+
+    // For all instructions and phis in the graph, keep track of the virtual
+    // registers for all inputs and outputs of the nodes. These are overwritten
+    // in place during register allocation. This information is kept on the
+    // side rather than in the instructions and phis themselves to avoid
+    // debug-builds-only bloat in the size of the involved structures.
+
+    struct InstructionInfo {
+        Vector<uint32, 2, SystemAllocPolicy> inputs;
+        Vector<uint32, 1, SystemAllocPolicy> outputs;
+        InstructionInfo() {}
+        InstructionInfo(const InstructionInfo &o) {
+            for (size_t i = 0; i < o.inputs.length(); i++)
+                inputs.append(o.inputs[i]);
+            for (size_t i = 0; i < o.outputs.length(); i++)
+                outputs.append(o.outputs[i]);
+        }
+    };
+    Vector<InstructionInfo, 0, SystemAllocPolicy> instructions;
+
+    struct BlockInfo {
+        Vector<InstructionInfo, 5, SystemAllocPolicy> phis;
+        BlockInfo() {}
+        BlockInfo(const BlockInfo &o) {
+            for (size_t i = 0; i < o.phis.length(); i++)
+                phis.append(o.phis[i]);
+        }
+    };
+    Vector<BlockInfo, 0, SystemAllocPolicy> blocks;
+
+    Vector<LDefinition*, 20, SystemAllocPolicy> virtualRegisters;
+
+    // Describes a correspondence that should hold at the end of a block.
+    // The value which was written to vreg in the original LIR should be
+    // physically stored in alloc after the register allocation.
+    struct IntegrityItem
+    {
+        LBlock *block;
+        uint32 vreg;
+        LAllocation alloc;
+
+        // Order of insertion into seen, for sorting.
+        uint32 index;
+
+        typedef IntegrityItem Lookup;
+        static HashNumber hash(const IntegrityItem &item) {
+            HashNumber hash = item.alloc.hash();
+            hash = JS_ROTATE_LEFT32(hash, 4) ^ item.vreg;
+            hash = JS_ROTATE_LEFT32(hash, 4) ^ HashNumber(item.block->mir()->id());
+            return hash;
+        }
+        static bool match(const IntegrityItem &one, const IntegrityItem &two) {
+            return one.block == two.block
+                && one.vreg == two.vreg
+                && one.alloc == two.alloc;
+        }
+    };
+
+    // Items still to be processed.
+    Vector<IntegrityItem, 10, SystemAllocPolicy> worklist;
+
+    // Set of all items that have already been processed.
+    typedef HashSet<IntegrityItem, IntegrityItem, SystemAllocPolicy> IntegrityItemSet;
+    IntegrityItemSet seen;
+
+    bool checkIntegrity(LBlock *block, LInstruction *ins, uint32 vreg, LAllocation alloc,
+                        bool populateSafepoints);
+    bool addPredecessor(LBlock *block, uint32 vreg, LAllocation alloc);
+
+    void check(bool cond, const char *msg);
+    void dump();
+};
+
+// Represents with better-than-instruction precision a position in the
+// instruction stream.
+//
+// An issue comes up when performing register allocation as to how to represent
+// information such as "this register is only needed for the input of
+// this instruction, it can be clobbered in the output". Just having ranges
+// of instruction IDs is insufficiently expressive to denote all possibilities.
+// This class solves this issue by associating an extra bit with the instruction
+// ID which indicates whether the position is the input half or output half of
+// an instruction.
+class CodePosition
+{
+  private:
+    CodePosition(const uint32 &bits)
+      : bits_(bits)
+    { }
+
+    static const unsigned int INSTRUCTION_SHIFT = 1;
+    static const unsigned int SUBPOSITION_MASK = 1;
+    uint32 bits_;
+
+  public:
+    static const CodePosition MAX;
+    static const CodePosition MIN;
+
+    // This is the half of the instruction this code position represents, as
+    // described in the huge comment above.
+    enum SubPosition {
+        INPUT,
+        OUTPUT
+    };
+
+    CodePosition() : bits_(0)
+    { }
+
+    CodePosition(uint32 instruction, SubPosition where) {
+        JS_ASSERT(instruction < 0x80000000u);
+        JS_ASSERT(((uint32)where & SUBPOSITION_MASK) == (uint32)where);
+        bits_ = (instruction << INSTRUCTION_SHIFT) | (uint32)where;
+    }
+
+    uint32 ins() const {
+        return bits_ >> INSTRUCTION_SHIFT;
+    }
+
+    uint32 pos() const {
+        return bits_;
+    }
+
+    SubPosition subpos() const {
+        return (SubPosition)(bits_ & SUBPOSITION_MASK);
+    }
+
+    bool operator <(const CodePosition &other) const {
+        return bits_ < other.bits_;
+    }
+
+    bool operator <=(const CodePosition &other) const {
+        return bits_ <= other.bits_;
+    }
+
+    bool operator !=(const CodePosition &other) const {
+        return bits_ != other.bits_;
+    }
+
+    bool operator ==(const CodePosition &other) const {
+        return bits_ == other.bits_;
+    }
+
+    bool operator >(const CodePosition &other) const {
+        return bits_ > other.bits_;
+    }
+
+    bool operator >=(const CodePosition &other) const {
+        return bits_ >= other.bits_;
+    }
+
+    CodePosition previous() const {
+        JS_ASSERT(*this != MIN);
+        return CodePosition(bits_ - 1);
+    }
+    CodePosition next() const {
+        JS_ASSERT(*this != MAX);
+        return CodePosition(bits_ + 1);
+    }
+};
+
+// Structure to track moves inserted before or after an instruction.
+class InstructionData
+{
+    LInstruction *ins_;
+    LBlock *block_;
+    LMoveGroup *inputMoves_;
+    LMoveGroup *movesAfter_;
+
+  public:
+    void init(LInstruction *ins, LBlock *block) {
+        JS_ASSERT(!ins_);
+        JS_ASSERT(!block_);
+        ins_ = ins;
+        block_ = block;
+    }
+    LInstruction *ins() const {
+        return ins_;
+    }
+    LBlock *block() const {
+        return block_;
+    }
+    void setInputMoves(LMoveGroup *moves) {
+        inputMoves_ = moves;
+    }
+    LMoveGroup *inputMoves() const {
+        return inputMoves_;
+    }
+    void setMovesAfter(LMoveGroup *moves) {
+        movesAfter_ = moves;
+    }
+    LMoveGroup *movesAfter() const {
+        return movesAfter_;
+    }
+};
+
+// Structure to track all moves inserted next to instructions in a graph.
+class InstructionDataMap
+{
+    InstructionData *insData_;
+    uint32 numIns_;
+
+  public:
+    InstructionDataMap()
+      : insData_(NULL),
+        numIns_(0)
+    { }
+
+    bool init(MIRGenerator *gen, uint32 numInstructions) {
+        insData_ = gen->allocate<InstructionData>(numInstructions);
+        numIns_ = numInstructions;
+        if (!insData_)
+            return false;
+        memset(insData_, 0, sizeof(InstructionData) * numInstructions);
+        return true;
+    }
+
+    InstructionData &operator[](const CodePosition &pos) {
+        JS_ASSERT(pos.ins() < numIns_);
+        return insData_[pos.ins()];
+    }
+    InstructionData &operator[](LInstruction *ins) {
+        JS_ASSERT(ins->id() < numIns_);
+        return insData_[ins->id()];
+    }
+    InstructionData &operator[](uint32 ins) {
+        JS_ASSERT(ins < numIns_);
+        return insData_[ins];
+    }
+};
+
+// Common superclass for register allocators.
+class RegisterAllocator
+{
+  protected:
+    // Context
+    MIRGenerator *mir;
+    LIRGenerator *lir;
+    LIRGraph &graph;
+
+    // Pool of all registers that should be considered allocateable
+    RegisterSet allRegisters_;
+
+    // Computed data
+    InstructionDataMap insData;
+
+  public:
+    RegisterAllocator(MIRGenerator *mir, LIRGenerator *lir, LIRGraph &graph)
+      : mir(mir),
+        lir(lir),
+        graph(graph),
+        allRegisters_(RegisterSet::All())
+    {
+        if (FramePointer != InvalidReg && lir->mir()->instrumentedProfiling())
+            allRegisters_.take(AnyRegister(FramePointer));
+    }
+
+  protected:
+    bool init();
+
+    CodePosition outputOf(uint32 pos) {
+        return CodePosition(pos, CodePosition::OUTPUT);
+    }
+    CodePosition outputOf(LInstruction *ins) {
+        return CodePosition(ins->id(), CodePosition::OUTPUT);
+    }
+    CodePosition inputOf(uint32 pos) {
+        return CodePosition(pos, CodePosition::INPUT);
+    }
+    CodePosition inputOf(LInstruction *ins) {
+        return CodePosition(ins->id(), CodePosition::INPUT);
+    }
+
+    LMoveGroup *getInputMoveGroup(uint32 ins);
+    LMoveGroup *getMoveGroupAfter(uint32 ins);
+
+    LMoveGroup *getInputMoveGroup(CodePosition pos) {
+        return getInputMoveGroup(pos.ins());
+    }
+    LMoveGroup *getMoveGroupAfter(CodePosition pos) {
+        return getMoveGroupAfter(pos.ins());
+    }
+};
+
+} // namespace ion
+} // namespace js
+
+#endif
diff --git a/js/src/ion/Safepoints.cpp b/js/src/ion/Safepoints.cpp
index d148cf2cfa55..0ac250ccefd5 100644
--- a/js/src/ion/Safepoints.cpp
+++ b/js/src/ion/Safepoints.cpp
@@ -226,11 +226,26 @@ SafepointWriter::writeNunboxParts(LSafepoint *safepoint)
     }
 # endif
 
-    stream_.writeUnsigned(entries.length());
+    // Safepoints are permitted to have partially filled in entries for nunboxes,
+    // provided that only the type is live and not the payload. Omit these from
+    // the written safepoint.
+    //
+    // Note that partial entries typically appear when one part of a nunbox is
+    // stored in multiple places, in which case we will end up with incomplete
+    // information about all the places the value is stored. This will need to
+    // be fixed when the GC is permitted to move structures.
+    uint32 partials = safepoint->partialNunboxes();
+
+    stream_.writeUnsigned(entries.length() - partials);
 
     for (size_t i = 0; i < entries.length(); i++) {
         SafepointNunboxEntry &entry = entries[i];
 
+        if (entry.type.isUse() || entry.payload.isUse()) {
+            partials--;
+            continue;
+        }
+
         uint16 header = 0;
 
         header |= (AllocationToPartKind(entry.type) << TYPE_KIND_SHIFT);
@@ -256,6 +271,8 @@ SafepointWriter::writeNunboxParts(LSafepoint *safepoint)
         if (payloadExtra)
             stream_.writeUnsigned(payloadVal);
     }
+
+    JS_ASSERT(partials == 0);
 }
 #endif
 
diff --git a/js/src/ion/StupidAllocator.cpp b/js/src/ion/StupidAllocator.cpp
new file mode 100644
index 000000000000..9a83164000cc
--- /dev/null
+++ b/js/src/ion/StupidAllocator.cpp
@@ -0,0 +1,419 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "StupidAllocator.h"
+
+using namespace js;
+using namespace js::ion;
+
+static inline uint32
+DefaultStackSlot(uint32 vreg)
+{
+#if JS_BITS_PER_WORD == 32
+    return vreg * 2 + 2;
+#else
+    return vreg + 1;
+#endif
+}
+
+LAllocation *
+StupidAllocator::stackLocation(uint32 vreg)
+{
+    LDefinition *def = virtualRegisters[vreg];
+    if (def->policy() == LDefinition::PRESET && def->output()->kind() == LAllocation::ARGUMENT)
+        return def->output();
+
+    return new LStackSlot(DefaultStackSlot(vreg), def->type() == LDefinition::DOUBLE);
+}
+
+StupidAllocator::RegisterIndex
+StupidAllocator::registerIndex(AnyRegister reg)
+{
+    for (size_t i = 0; i < registerCount; i++) {
+        if (reg == registers[i].reg)
+            return i;
+    }
+    JS_NOT_REACHED("Bad register");
+    return UINT32_MAX;
+}
+
+bool
+StupidAllocator::init()
+{
+    if (!RegisterAllocator::init())
+        return false;
+
+    if (!virtualRegisters.reserve(graph.numVirtualRegisters()))
+        return false;
+    for (size_t i = 0; i < graph.numVirtualRegisters(); i++)
+        virtualRegisters.infallibleAppend(NULL);
+
+    for (size_t i = 0; i < graph.numBlocks(); i++) {
+        LBlock *block = graph.getBlock(i);
+        for (LInstructionIterator ins = block->begin(); ins != block->end(); ins++) {
+            for (size_t j = 0; j < ins->numDefs(); j++) {
+                LDefinition *def = ins->getDef(j);
+                if (def->policy() != LDefinition::PASSTHROUGH)
+                    virtualRegisters[def->virtualRegister()] = def;
+            }
+
+            for (size_t j = 0; j < ins->numTemps(); j++) {
+                LDefinition *def = ins->getTemp(j);
+                if (def->isBogusTemp())
+                    continue;
+                virtualRegisters[def->virtualRegister()] = def;
+            }
+        }
+        for (size_t j = 0; j < block->numPhis(); j++) {
+            LPhi *phi = block->getPhi(j);
+            LDefinition *def = phi->getDef(0);
+            uint32 vreg = def->virtualRegister();
+
+            virtualRegisters[vreg] = def;
+        }
+    }
+
+    // Assign physical registers to the tracked allocation.
+    {
+        registerCount = 0;
+        RegisterSet remainingRegisters(allRegisters_);
+        while (!remainingRegisters.empty(/* float = */ false))
+            registers[registerCount++].reg = AnyRegister(remainingRegisters.takeGeneral());
+        while (!remainingRegisters.empty(/* float = */ true))
+            registers[registerCount++].reg = AnyRegister(remainingRegisters.takeFloat());
+        JS_ASSERT(registerCount <= MAX_REGISTERS);
+    }
+
+    return true;
+}
+
+static inline bool
+AllocationRequiresRegister(const LAllocation *alloc, AnyRegister reg)
+{
+    if (alloc->isRegister() && alloc->toRegister() == reg)
+        return true;
+    if (alloc->isUse()) {
+        const LUse *use = alloc->toUse();
+        if (use->policy() == LUse::FIXED && AnyRegister::FromCode(use->registerCode()) == reg)
+            return true;
+    }
+    return false;
+}
+
+static inline bool
+RegisterIsReserved(LInstruction *ins, AnyRegister reg)
+{
+    // Whether reg is already reserved for an input or output of ins.
+    for (LInstruction::InputIterator alloc(*ins); alloc.more(); alloc.next()) {
+        if (AllocationRequiresRegister(*alloc, reg))
+            return true;
+    }
+    for (size_t i = 0; i < ins->numTemps(); i++) {
+        if (AllocationRequiresRegister(ins->getTemp(i)->output(), reg))
+            return true;
+    }
+    for (size_t i = 0; i < ins->numDefs(); i++) {
+        if (AllocationRequiresRegister(ins->getDef(i)->output(), reg))
+            return true;
+    }
+    return false;
+}
+
+AnyRegister
+StupidAllocator::ensureHasRegister(LInstruction *ins, uint32 vreg)
+{
+    // Ensure that vreg is held in a register before ins.
+
+    // Check if the virtual register is already held in a physical register.
+    RegisterIndex existing = findExistingRegister(vreg);
+    if (existing != UINT32_MAX) {
+        if (RegisterIsReserved(ins, registers[existing].reg)) {
+            evictRegister(ins, existing);
+        } else {
+            registers[existing].age = ins->id();
+            return registers[existing].reg;
+        }
+    }
+
+    RegisterIndex best = allocateRegister(ins, vreg);
+    loadRegister(ins, vreg, best);
+
+    return registers[best].reg;
+}
+
+StupidAllocator::RegisterIndex
+StupidAllocator::allocateRegister(LInstruction *ins, uint32 vreg)
+{
+    // Pick a register for vreg, evicting an existing register if necessary.
+    // Spill code will be placed before ins, and no existing allocated input
+    // for ins will be touched.
+    JS_ASSERT(ins);
+
+    LDefinition *def = virtualRegisters[vreg];
+    JS_ASSERT(def);
+
+    RegisterIndex best = UINT32_MAX;
+
+    for (size_t i = 0; i < registerCount; i++) {
+        AnyRegister reg = registers[i].reg;
+
+        if (reg.isFloat() != (def->type() == LDefinition::DOUBLE))
+            continue;
+
+        // Skip the register if it is in use for an allocated input or output.
+        if (RegisterIsReserved(ins, reg))
+            continue;
+
+        if (registers[i].vreg == MISSING_ALLOCATION ||
+            best == UINT32_MAX ||
+            registers[best].age > registers[i].age)
+        {
+            best = i;
+        }
+    }
+
+    evictRegister(ins, best);
+    return best;
+}
+
+void
+StupidAllocator::syncRegister(LInstruction *ins, RegisterIndex index)
+{
+    if (registers[index].dirty) {
+        LMoveGroup *input = getInputMoveGroup(ins->id());
+        LAllocation *source = new LAllocation(registers[index].reg);
+
+        uint32 existing = registers[index].vreg;
+        LAllocation *dest = stackLocation(existing);
+        input->addAfter(source, dest);
+
+        registers[index].dirty = false;
+    }
+}
+
+void
+StupidAllocator::evictRegister(LInstruction *ins, RegisterIndex index)
+{
+    syncRegister(ins, index);
+    registers[index].set(MISSING_ALLOCATION);
+}
+
+void
+StupidAllocator::loadRegister(LInstruction *ins, uint32 vreg, RegisterIndex index)
+{
+    // Load a vreg from its stack location to a register.
+    LMoveGroup *input = getInputMoveGroup(ins->id());
+    LAllocation *source = stackLocation(vreg);
+    LAllocation *dest = new LAllocation(registers[index].reg);
+    input->addAfter(source, dest);
+    registers[index].set(vreg, ins);
+}
+
+StupidAllocator::RegisterIndex
+StupidAllocator::findExistingRegister(uint32 vreg)
+{
+    for (size_t i = 0; i < registerCount; i++) {
+        if (registers[i].vreg == vreg)
+            return i;
+    }
+    return UINT32_MAX;
+}
+
+bool
+StupidAllocator::go()
+{
+    // This register allocator is intended to be as simple as possible, while
+    // still being complicated enough to share properties with more complicated
+    // allocators. Namely, physical registers may be used to carry virtual
+    // registers across LIR instructions, but not across basic blocks.
+    //
+    // This algorithm does not pay any attention to liveness. It is performed
+    // as a single forward pass through the basic blocks in the program. As
+    // virtual registers and temporaries are defined they are assigned physical
+    // registers, evicting existing allocations in an LRU fashion.
+
+    // For virtual registers not carried in a register, a canonical spill
+    // location is used. Each vreg has a different spill location; since we do
+    // not track liveness we cannot determine that two vregs have disjoint
+    // lifetimes. Thus, the maximum stack height is the number of vregs (scaled
+    // by two on 32 bit platforms to allow storing double values).
+    graph.setLocalSlotCount(DefaultStackSlot(graph.numVirtualRegisters() - 1) + 1);
+
+    if (!init())
+        return false;
+
+    for (size_t blockIndex = 0; blockIndex < graph.numBlocks(); blockIndex++) {
+        LBlock *block = graph.getBlock(blockIndex);
+        JS_ASSERT(block->mir()->id() == blockIndex);
+
+        for (size_t i = 0; i < registerCount; i++)
+            registers[i].set(MISSING_ALLOCATION);
+
+        for (LInstructionIterator iter = block->begin(); iter != block->end(); iter++) {
+            LInstruction *ins = *iter;
+
+            if (ins == *block->rbegin())
+                syncForBlockEnd(block, ins);
+
+            allocateForInstruction(ins);
+        }
+    }
+
+    return true;
+}
+
+void
+StupidAllocator::syncForBlockEnd(LBlock *block, LInstruction *ins)
+{
+    // Sync any dirty registers, and update the synced state for phi nodes at
+    // each successor of a block. We cannot conflate the storage for phis with
+    // that of their inputs, as we cannot prove the live ranges of the phi and
+    // its input do not overlap. The values for the two may additionally be
+    // different, as the phi could be for the value of the input in a previous
+    // loop iteration.
+
+    for (size_t i = 0; i < registerCount; i++)
+        syncRegister(ins, i);
+
+    LMoveGroup *group = NULL;
+
+    MBasicBlock *successor = block->mir()->successorWithPhis();
+    if (successor) {
+        uint32 position = block->mir()->positionInPhiSuccessor();
+        LBlock *lirsuccessor = graph.getBlock(successor->id());
+        for (size_t i = 0; i < lirsuccessor->numPhis(); i++) {
+            LPhi *phi = lirsuccessor->getPhi(i);
+
+            uint32 sourcevreg = phi->getOperand(position)->toUse()->virtualRegister();
+            uint32 destvreg = phi->getDef(0)->virtualRegister();
+
+            if (sourcevreg == destvreg)
+                continue;
+
+            LAllocation *source = stackLocation(sourcevreg);
+            LAllocation *dest = stackLocation(destvreg);
+
+            if (!group) {
+                // The moves we insert here need to happen simultaneously with
+                // each other, yet after any existing moves before the instruction.
+                LMoveGroup *input = getInputMoveGroup(ins->id());
+                if (input->numMoves() == 0) {
+                    group = input;
+                } else {
+                    group = new LMoveGroup;
+                    block->insertAfter(input, group);
+                }
+            }
+
+            group->add(source, dest);
+        }
+    }
+}
+
+void
+StupidAllocator::allocateForInstruction(LInstruction *ins)
+{
+    // Sync all registers before making a call.
+    if (ins->isCall()) {
+        for (size_t i = 0; i < registerCount; i++)
+            syncRegister(ins, i);
+    }
+
+    // Allocate for inputs which are required to be in registers.
+    for (LInstruction::InputIterator alloc(*ins); alloc.more(); alloc.next()) {
+        if (!alloc->isUse())
+            continue;
+        LUse *use = alloc->toUse();
+        uint32 vreg = use->virtualRegister();
+        if (use->policy() == LUse::REGISTER) {
+            AnyRegister reg = ensureHasRegister(ins, vreg);
+            alloc.replace(LAllocation(reg));
+        } else if (use->policy() == LUse::FIXED) {
+            AnyRegister reg = AnyRegister::FromCode(use->registerCode());
+            RegisterIndex index = registerIndex(reg);
+            if (registers[index].vreg != vreg) {
+                evictRegister(ins, index);
+                RegisterIndex existing = findExistingRegister(vreg);
+                if (existing != UINT32_MAX)
+                    evictRegister(ins, existing);
+                loadRegister(ins, vreg, index);
+            }
+            alloc.replace(LAllocation(reg));
+        } else {
+            // Inputs which are not required to be in a register are not
+            // allocated until after temps/definitions, as the latter may need
+            // to evict registers which hold these inputs.
+        }
+    }
+
+    // Find registers to hold all temporaries and outputs of the instruction.
+    for (size_t i = 0; i < ins->numTemps(); i++) {
+        LDefinition *def = ins->getTemp(i);
+        if (!def->isBogusTemp())
+            allocateForDefinition(ins, def);
+    }
+    for (size_t i = 0; i < ins->numDefs(); i++) {
+        LDefinition *def = ins->getDef(i);
+        if (def->policy() != LDefinition::PASSTHROUGH)
+            allocateForDefinition(ins, def);
+    }
+
+    // Allocate for remaining inputs which do not need to be in registers.
+    for (LInstruction::InputIterator alloc(*ins); alloc.more(); alloc.next()) {
+        if (!alloc->isUse())
+            continue;
+        LUse *use = alloc->toUse();
+        uint32 vreg = use->virtualRegister();
+        JS_ASSERT(use->policy() != LUse::REGISTER && use->policy() != LUse::FIXED);
+
+        RegisterIndex index = findExistingRegister(vreg);
+        if (index == UINT32_MAX) {
+            LAllocation *stack = stackLocation(use->virtualRegister());
+            alloc.replace(*stack);
+        } else {
+            registers[index].age = ins->id();
+            alloc.replace(LAllocation(registers[index].reg));
+        }
+    }
+
+    // If this is a call, evict all registers except for those holding outputs.
+    if (ins->isCall()) {
+        for (size_t i = 0; i < registerCount; i++) {
+            if (!registers[i].dirty)
+                registers[i].set(MISSING_ALLOCATION);
+        }
+    }
+}
+
+void
+StupidAllocator::allocateForDefinition(LInstruction *ins, LDefinition *def)
+{
+    uint32 vreg = def->virtualRegister();
+
+    CodePosition from;
+    if ((def->output()->isRegister() && def->policy() == LDefinition::PRESET) ||
+        def->policy() == LDefinition::MUST_REUSE_INPUT)
+    {
+        // Result will be in a specific register, spill any vreg held in
+        // that register before the instruction.
+        RegisterIndex index =
+            registerIndex(def->policy() == LDefinition::PRESET
+                          ? def->output()->toRegister()
+                          : ins->getOperand(def->getReusedInput())->toRegister());
+        evictRegister(ins, index);
+        registers[index].set(vreg, ins, true);
+        def->setOutput(LAllocation(registers[index].reg));
+    } else if (def->policy() == LDefinition::PRESET) {
+        // The result must be a stack location.
+        def->setOutput(*stackLocation(vreg));
+    } else {
+        // Find a register to hold the result of the instruction.
+        RegisterIndex best = allocateRegister(ins, vreg);
+        registers[best].set(vreg, ins, true);
+        def->setOutput(LAllocation(registers[best].reg));
+    }
+}
diff --git a/js/src/ion/StupidAllocator.h b/js/src/ion/StupidAllocator.h
new file mode 100644
index 000000000000..d922282fc441
--- /dev/null
+++ b/js/src/ion/StupidAllocator.h
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99:
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef js_ion_stupidallocator_h__
+#define js_ion_stupidallocator_h__
+
+#include "RegisterAllocator.h"
+
+// Simple register allocator that only carries registers within basic blocks.
+
+namespace js {
+namespace ion {
+
+class StupidAllocator : public RegisterAllocator
+{
+    static const uint32 MAX_REGISTERS = Registers::Allocatable + FloatRegisters::Allocatable;
+    static const uint32 MISSING_ALLOCATION = UINT32_MAX;
+
+    struct AllocatedRegister {
+        AnyRegister reg;
+
+        // Virtual register this physical reg backs, or MISSING_ALLOCATION.
+        uint32 vreg;
+
+        // id of the instruction which most recently used this register.
+        uint32 age;
+
+        // Whether the physical register is not synced with the backing stack slot.
+        bool dirty;
+
+        void set(uint32 vreg, LInstruction *ins = NULL, bool dirty = false) {
+            this->vreg = vreg;
+            this->age = ins ? ins->id() : 0;
+            this->dirty = dirty;
+        }
+    };
+
+    // Active allocation for the current code position.
+    AllocatedRegister registers[MAX_REGISTERS];
+    uint32 registerCount;
+
+    // Type indicating an index into registers.
+    typedef uint32 RegisterIndex;
+
+    // Information about each virtual register.
+    Vector<LDefinition*, 0, SystemAllocPolicy> virtualRegisters;
+
+  public:
+    StupidAllocator(MIRGenerator *mir, LIRGenerator *lir, LIRGraph &graph)
+      : RegisterAllocator(mir, lir, graph)
+    {
+    }
+
+    bool go();
+
+  private:
+    bool init();
+
+    void syncForBlockEnd(LBlock *block, LInstruction *ins);
+    void allocateForInstruction(LInstruction *ins);
+    void allocateForDefinition(LInstruction *ins, LDefinition *def);
+
+    LAllocation *stackLocation(uint32 vreg);
+
+    RegisterIndex registerIndex(AnyRegister reg);
+
+    AnyRegister ensureHasRegister(LInstruction *ins, uint32 vreg);
+    RegisterIndex allocateRegister(LInstruction *ins, uint32 vreg);
+
+    void syncRegister(LInstruction *ins, RegisterIndex index);
+    void evictRegister(LInstruction *ins, RegisterIndex index);
+    void loadRegister(LInstruction *ins, uint32 vreg, RegisterIndex index);
+
+    RegisterIndex findExistingRegister(uint32 vreg);
+};
+
+} // namespace ion
+} // namespace js
+
+#endif
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index e3adcbf1f298..82f8b4473682 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -4850,7 +4850,9 @@ ProcessArgs(JSContext *cx, JSObject *obj_, OptionParser *op)
 
     if (const char *str = op->getStringOption("ion-regalloc")) {
         if (strcmp(str, "lsra") == 0)
-            ion::js_IonOptions.lsra = true;
+            ion::js_IonOptions.registerAllocator = ion::RegisterAllocator_LSRA;
+        else if (strcmp(str, "stupid") == 0)
+            ion::js_IonOptions.registerAllocator = ion::RegisterAllocator_Stupid;
         else
             return OptionFailure("ion-regalloc", str);
     }
@@ -5079,7 +5081,8 @@ main(int argc, char **argv, char **envp)
                                "Don't compile very large scripts (default: on, off to disable)")
         || !op.addStringOption('\0', "ion-regalloc", "[mode]",
                                "Specify Ion register allocation:\n"
-                               "  lsra: Linear Scan register allocation (default)")
+                               "  lsra: Linear Scan register allocation (default)\n"
+                               "  stupid: Simple greedy register allocation")
         || !op.addBoolOption('\0', "ion-eager", "Always ion-compile methods")
 #ifdef JS_THREADSAFE
         || !op.addStringOption('\0', "ion-parallel-compile", "on/off",

From 9704a03379dda6af2d26ba51128106a2cb478f0b Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 16 Nov 2012 19:39:44 -0800
Subject: [PATCH 039/160] Bug 813211 - Remove unneeded includes and forward
 declarations for threading code; r=hsivonen

---
 parser/htmlparser/src/nsParser.cpp | 1 -
 parser/htmlparser/src/nsParser.h   | 2 --
 2 files changed, 3 deletions(-)

diff --git a/parser/htmlparser/src/nsParser.cpp b/parser/htmlparser/src/nsParser.cpp
index 8a0dde739de0..17af61912113 100644
--- a/parser/htmlparser/src/nsParser.cpp
+++ b/parser/htmlparser/src/nsParser.cpp
@@ -33,7 +33,6 @@
 #include "nsNetUtil.h"
 #include "nsScriptLoader.h"
 #include "nsDataHashtable.h"
-#include "nsIThreadPool.h"
 #include "nsXPCOMCIDInternal.h"
 #include "nsMimeTypes.h"
 #include "mozilla/CondVar.h"
diff --git a/parser/htmlparser/src/nsParser.h b/parser/htmlparser/src/nsParser.h
index 6094e0c3b0ca..901c0add4dd9 100644
--- a/parser/htmlparser/src/nsParser.h
+++ b/parser/htmlparser/src/nsParser.h
@@ -50,7 +50,6 @@
 #include "nsITokenizer.h"
 #include "nsHTMLTags.h"
 #include "nsDTDUtils.h"
-#include "nsThreadUtils.h"
 #include "nsIContentSink.h"
 #include "nsCOMArray.h"
 #include "nsCycleCollectionParticipant.h"
@@ -59,7 +58,6 @@
 class nsICharsetConverterManager;
 class nsIDTD;
 class nsScanner;
-class nsIThreadPool;
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4275 )

From 1039582660518d9a9f789d546d6ec9694cd60540 Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Mon, 26 Nov 2012 13:48:20 -0800
Subject: [PATCH 040/160] Backed out csets 807f2c3df974, 1637c39b4ed6,
 ec29e09a270e (bug 811958) for burning android

---
 dom/plugins/base/nsNPAPIPluginInstance.cpp   |   9 +-
 dom/plugins/base/nsPluginInstanceOwner.cpp   |   8 +-
 gfx/gl/GLContext.cpp                         | 555 +++++++++++++++++-
 gfx/gl/GLContext.h                           | 437 +++++++++++++-
 gfx/gl/GLContextProviderEGL.cpp              |  90 ++-
 gfx/gl/GLContextTypes.h                      |  44 --
 gfx/gl/GLTextureImage.cpp                    | 573 -------------------
 gfx/gl/GLTextureImage.h                      | 385 -------------
 gfx/gl/Makefile.in                           |   3 -
 gfx/layers/SharedTextureImage.h              |   4 +-
 gfx/layers/basic/BasicCanvasLayer.cpp        |  15 +-
 gfx/layers/ipc/LayersSurfaces.ipdlh          |   4 +-
 gfx/layers/ipc/ShadowLayerUtils.h            |   4 +-
 gfx/layers/opengl/CanvasLayerOGL.cpp         |   5 +-
 gfx/layers/opengl/ImageLayerOGL.h            |   2 +-
 gfx/layers/opengl/LayerManagerOGL.cpp        |  89 +--
 gfx/layers/opengl/LayerManagerOGL.h          |  98 +++-
 gfx/layers/opengl/LayerManagerOGLProgram.cpp | 111 ----
 gfx/layers/opengl/LayerManagerOGLProgram.h   |  96 +++-
 gfx/layers/opengl/ReusableTileStoreOGL.cpp   |   2 -
 widget/cocoa/nsChildView.mm                  |  20 +-
 21 files changed, 1179 insertions(+), 1375 deletions(-)
 delete mode 100644 gfx/gl/GLContextTypes.h
 delete mode 100644 gfx/gl/GLTextureImage.cpp
 delete mode 100644 gfx/gl/GLTextureImage.h

diff --git a/dom/plugins/base/nsNPAPIPluginInstance.cpp b/dom/plugins/base/nsNPAPIPluginInstance.cpp
index 6094d5ed9518..cfce39aeb98a 100644
--- a/dom/plugins/base/nsNPAPIPluginInstance.cpp
+++ b/dom/plugins/base/nsNPAPIPluginInstance.cpp
@@ -129,10 +129,7 @@ public:
     if (mTextureInfo.mWidth == 0 || mTextureInfo.mHeight == 0)
       return 0;
 
-    SharedTextureHandle handle =
-      sPluginContext->CreateSharedHandle(GLContext::SameProcess,
-                                         (void*)mTextureInfo.mTexture,
-                                         GLContext::TextureID);
+    SharedTextureHandle handle = sPluginContext->CreateSharedHandle(TextureImage::ThreadShared, (void*)mTextureInfo.mTexture, GLContext::TextureID);
 
     // We want forget about this now, so delete the texture. Assigning it to zero
     // ensures that we create a new one in Lock()
@@ -1003,9 +1000,7 @@ SharedTextureHandle nsNPAPIPluginInstance::CreateSharedHandle()
     return mContentTexture->CreateSharedHandle();
   } else if (mContentSurface) {
     EnsureGLContext();
-    return sPluginContext->CreateSharedHandle(GLContext::SameProcess,
-                                              mContentSurface,
-                                              GLContext::SurfaceTexture);
+    return sPluginContext->CreateSharedHandle(TextureImage::ThreadShared, mContentSurface, GLContext::SurfaceTexture);
   } else return 0;
 }
 
diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp
index 55014898a03e..bf2d859833ca 100644
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -186,7 +186,7 @@ nsPluginInstanceOwner::GetImageContainer()
 
   SharedTextureImage::Data data;
   data.mHandle = mInstance->CreateSharedHandle();
-  data.mShareType = mozilla::gl::GLContext::SameProcess;
+  data.mShareType = mozilla::gl::TextureImage::ThreadShared;
   data.mInverted = mInstance->Inverted();
 
   gfxRect r = GetPluginRect();
@@ -1723,10 +1723,8 @@ already_AddRefed<ImageContainer> nsPluginInstanceOwner::GetImageContainerForVide
 
   SharedTextureImage::Data data;
 
-  data.mShareType = gl::GLContext::SameProcess;
-  data.mHandle = mInstance->GLContext()->CreateSharedHandle(data.mShareType,
-                                                            aVideoInfo->mSurfaceTexture,
-                                                            gl::GLContext::SurfaceTexture);
+  data.mHandle = mInstance->GLContext()->CreateSharedHandle(gl::TextureImage::ThreadShared, aVideoInfo->mSurfaceTexture, gl::GLContext::SurfaceTexture);
+  data.mShareType = mozilla::gl::TextureImage::ThreadShared;
 
   // The logic below for Honeycomb is just a guess, but seems to work. We don't have a separate
   // inverted flag for video.
diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 17197535c857..8f183eae5afb 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -23,8 +23,6 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/Util.h" // for DebugOnly
 
-#include "GLTextureImage.h"
-
 using namespace mozilla::gfx;
 
 namespace mozilla {
@@ -740,19 +738,6 @@ GLContext::CreateTextureImage(const nsIntSize& aSize,
     return CreateBasicTextureImage(texture, aSize, aWrapMode, aContentType, this, aFlags);
 }
 
-already_AddRefed<TextureImage>
-GLContext::CreateBasicTextureImage(GLuint aTexture,
-                        const nsIntSize& aSize,
-                        GLenum aWrapMode,
-                        TextureImage::ContentType aContentType,
-                        GLContext* aContext,
-                        TextureImage::Flags aFlags)
-{
-    nsRefPtr<BasicTextureImage> teximage(
-        new BasicTextureImage(aTexture, aSize, aWrapMode, aContentType, aContext, aFlags));
-    return teximage.forget();
-}
-
 void GLContext::ApplyFilterToBoundTexture(gfxPattern::GraphicsFilter aFilter)
 {
     ApplyFilterToBoundTexture(LOCAL_GL_TEXTURE_2D, aFilter);
@@ -770,6 +755,546 @@ void GLContext::ApplyFilterToBoundTexture(GLuint aTarget,
     }
 }
 
+BasicTextureImage::~BasicTextureImage()
+{
+    GLContext *ctx = mGLContext;
+    if (ctx->IsDestroyed() || !ctx->IsOwningThreadCurrent()) {
+        ctx = ctx->GetSharedContext();
+    }
+
+    // If we have a context, then we need to delete the texture;
+    // if we don't have a context (either real or shared),
+    // then they went away when the contex was deleted, because it
+    // was the only one that had access to it.
+    if (ctx && !ctx->IsDestroyed()) {
+        mGLContext->MakeCurrent();
+        mGLContext->fDeleteTextures(1, &mTexture);
+    }
+}
+
+gfxASurface*
+BasicTextureImage::BeginUpdate(nsIntRegion& aRegion)
+{
+    NS_ASSERTION(!mUpdateSurface, "BeginUpdate() without EndUpdate()?");
+
+    // determine the region the client will need to repaint
+    if (mGLContext->CanUploadSubTextures()) {
+        GetUpdateRegion(aRegion);
+    } else {
+        aRegion = nsIntRect(nsIntPoint(0, 0), mSize);
+    }
+
+    mUpdateRegion = aRegion;
+
+    nsIntRect rgnSize = mUpdateRegion.GetBounds();
+    if (!nsIntRect(nsIntPoint(0, 0), mSize).Contains(rgnSize)) {
+        NS_ERROR("update outside of image");
+        return NULL;
+    }
+
+    ImageFormat format =
+        (GetContentType() == gfxASurface::CONTENT_COLOR) ?
+        gfxASurface::ImageFormatRGB24 : gfxASurface::ImageFormatARGB32;
+    mUpdateSurface =
+        GetSurfaceForUpdate(gfxIntSize(rgnSize.width, rgnSize.height), format);
+
+    if (!mUpdateSurface || mUpdateSurface->CairoStatus()) {
+        mUpdateSurface = NULL;
+        return NULL;
+    }
+
+    mUpdateSurface->SetDeviceOffset(gfxPoint(-rgnSize.x, -rgnSize.y));
+
+    return mUpdateSurface;
+}
+
+void
+BasicTextureImage::GetUpdateRegion(nsIntRegion& aForRegion)
+{
+  // if the texture hasn't been initialized yet, or something important
+  // changed, we need to recreate our backing surface and force the
+  // client to paint everything
+  if (mTextureState != Valid)
+      aForRegion = nsIntRect(nsIntPoint(0, 0), mSize);
+}
+
+void
+BasicTextureImage::EndUpdate()
+{
+    NS_ASSERTION(!!mUpdateSurface, "EndUpdate() without BeginUpdate()?");
+
+    // FIXME: this is the slow boat.  Make me fast (with GLXPixmap?).
+
+    // Undo the device offset that BeginUpdate set; doesn't much matter for us here,
+    // but important if we ever do anything directly with the surface.
+    mUpdateSurface->SetDeviceOffset(gfxPoint(0, 0));
+
+    bool relative = FinishedSurfaceUpdate();
+
+    mShaderType =
+        mGLContext->UploadSurfaceToTexture(mUpdateSurface,
+                                           mUpdateRegion,
+                                           mTexture,
+                                           mTextureState == Created,
+                                           mUpdateOffset,
+                                           relative);
+    FinishedSurfaceUpload();
+
+    mUpdateSurface = nullptr;
+    mTextureState = Valid;
+}
+
+void
+BasicTextureImage::BindTexture(GLenum aTextureUnit)
+{
+    mGLContext->fActiveTexture(aTextureUnit);
+    mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
+    mGLContext->fActiveTexture(LOCAL_GL_TEXTURE0);
+}
+
+void
+BasicTextureImage::ApplyFilter()
+{
+  mGLContext->ApplyFilterToBoundTexture(mFilter);
+}
+
+
+already_AddRefed<gfxASurface>
+BasicTextureImage::GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt)
+{
+    return gfxPlatform::GetPlatform()->
+        CreateOffscreenSurface(aSize, gfxASurface::ContentFromFormat(aFmt));
+}
+
+bool
+BasicTextureImage::FinishedSurfaceUpdate()
+{
+    return false;
+}
+
+void
+BasicTextureImage::FinishedSurfaceUpload()
+{
+}
+
+bool 
+BasicTextureImage::DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom /* = nsIntPoint(0, 0) */)
+{
+    nsIntRect bounds = aRegion.GetBounds();
+    nsIntRegion region;
+    if (mTextureState != Valid) {
+        bounds = nsIntRect(0, 0, mSize.width, mSize.height);
+        region = nsIntRegion(bounds);
+    } else {
+        region = aRegion;
+    }
+
+    mShaderType =
+        mGLContext->UploadSurfaceToTexture(aSurf,
+                                           region,
+                                           mTexture,
+                                           mTextureState == Created,
+                                           bounds.TopLeft() + aFrom,
+                                           false);
+    mTextureState = Valid;
+    return true;
+}
+
+void
+BasicTextureImage::Resize(const nsIntSize& aSize)
+{
+    NS_ASSERTION(!mUpdateSurface, "Resize() while in update?");
+
+    mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
+
+    mGLContext->fTexImage2D(LOCAL_GL_TEXTURE_2D,
+                            0,
+                            LOCAL_GL_RGBA,
+                            aSize.width,
+                            aSize.height,
+                            0,
+                            LOCAL_GL_RGBA,
+                            LOCAL_GL_UNSIGNED_BYTE,
+                            NULL);
+
+    mTextureState = Allocated;
+    mSize = aSize;
+}
+
+TiledTextureImage::TiledTextureImage(GLContext* aGL,
+                                     nsIntSize aSize,
+                                     TextureImage::ContentType aContentType,
+                                     TextureImage::Flags aFlags)
+    : TextureImage(aSize, LOCAL_GL_CLAMP_TO_EDGE, aContentType, aFlags)
+    , mCurrentImage(0)
+    , mIterationCallback(nullptr)
+    , mInUpdate(false)
+    , mRows(0)
+    , mColumns(0)
+    , mGL(aGL)
+    , mTextureState(Created)
+{
+    mTileSize = (!(aFlags & TextureImage::ForceSingleTile) && mGL->WantsSmallTiles())
+        ? 256 : mGL->GetMaxTextureSize();
+    if (aSize != nsIntSize(0,0)) {
+        Resize(aSize);
+    }
+}
+
+TiledTextureImage::~TiledTextureImage()
+{
+}
+
+bool 
+TiledTextureImage::DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom /* = nsIntPoint(0, 0) */)
+{
+    nsIntRegion region;
+
+    if (mTextureState != Valid) {
+        nsIntRect bounds = nsIntRect(0, 0, mSize.width, mSize.height);
+        region = nsIntRegion(bounds);
+    } else {
+        region = aRegion;
+    }
+
+    bool result = true;
+    int oldCurrentImage = mCurrentImage;
+    BeginTileIteration();
+    do {
+        nsIntRect tileRect = GetSrcTileRect();
+        int xPos = tileRect.x;
+        int yPos = tileRect.y;
+
+        nsIntRegion tileRegion;
+        tileRegion.And(region, tileRect); // intersect with tile
+
+        if (tileRegion.IsEmpty())
+            continue;
+
+        if (mGL->CanUploadSubTextures()) {
+          tileRegion.MoveBy(-xPos, -yPos); // translate into tile local space
+        } else {
+          // If sub-textures are unsupported, expand to tile boundaries
+          tileRect.x = tileRect.y = 0;
+          tileRegion = nsIntRegion(tileRect);
+        }
+
+        result &= mImages[mCurrentImage]->
+          DirectUpdate(aSurf, tileRegion, aFrom + nsIntPoint(xPos, yPos));
+
+        if (mCurrentImage == mImages.Length() - 1) {
+            // We know we're done, but we still need to ensure that the callback
+            // gets called (e.g. to update the uploaded region).
+            NextTile();
+            break;
+        }
+        // Override a callback cancelling iteration if the texture wasn't valid.
+        // We need to force the update in that situation, or we may end up
+        // showing invalid/out-of-date texture data.
+    } while (NextTile() || (mTextureState != Valid));
+    mCurrentImage = oldCurrentImage;
+
+    mShaderType = mImages[0]->GetShaderProgramType();
+    mTextureState = Valid;
+    return result;
+}
+
+void
+TiledTextureImage::GetUpdateRegion(nsIntRegion& aForRegion)
+{
+    if (mTextureState != Valid) {
+        // if the texture hasn't been initialized yet, or something important
+        // changed, we need to recreate our backing surface and force the
+        // client to paint everything
+        aForRegion = nsIntRect(nsIntPoint(0, 0), mSize);
+        return;
+    }
+
+    nsIntRegion newRegion;
+
+    // We need to query each texture with the region it will be drawing and
+    // set aForRegion to be the combination of all of these regions
+    for (unsigned i = 0; i < mImages.Length(); i++) {
+        int xPos = (i % mColumns) * mTileSize;
+        int yPos = (i / mColumns) * mTileSize;
+        nsIntRect imageRect = nsIntRect(nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize()));
+
+        if (aForRegion.Intersects(imageRect)) {
+            // Make a copy of the region
+            nsIntRegion subRegion;
+            subRegion.And(aForRegion, imageRect);
+            // Translate it into tile-space
+            subRegion.MoveBy(-xPos, -yPos);
+            // Query region
+            mImages[i]->GetUpdateRegion(subRegion);
+            // Translate back
+            subRegion.MoveBy(xPos, yPos);
+            // Add to the accumulated region
+            newRegion.Or(newRegion, subRegion);
+        }
+    }
+
+    aForRegion = newRegion;
+}
+
+gfxASurface*
+TiledTextureImage::BeginUpdate(nsIntRegion& aRegion)
+{
+    NS_ASSERTION(!mInUpdate, "nested update");
+    mInUpdate = true;
+
+    // Note, we don't call GetUpdateRegion here as if the updated region is
+    // fully contained in a single tile, we get to avoid iterating through
+    // the tiles again (and a little copying).
+    if (mTextureState != Valid)
+    {
+        // if the texture hasn't been initialized yet, or something important
+        // changed, we need to recreate our backing surface and force the
+        // client to paint everything
+        aRegion = nsIntRect(nsIntPoint(0, 0), mSize);
+    }
+
+    nsIntRect bounds = aRegion.GetBounds();
+
+    for (unsigned i = 0; i < mImages.Length(); i++) {
+        int xPos = (i % mColumns) * mTileSize;
+        int yPos = (i / mColumns) * mTileSize;
+        nsIntRegion imageRegion = nsIntRegion(nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize()));
+
+        // a single Image can handle this update request
+        if (imageRegion.Contains(aRegion)) {
+            // adjust for tile offset
+            aRegion.MoveBy(-xPos, -yPos);
+            // forward the actual call
+            nsRefPtr<gfxASurface> surface = mImages[i]->BeginUpdate(aRegion);
+            // caller expects container space
+            aRegion.MoveBy(xPos, yPos);
+            // Correct the device offset
+            gfxPoint offset = surface->GetDeviceOffset();
+            surface->SetDeviceOffset(gfxPoint(offset.x - xPos,
+                                              offset.y - yPos));
+            // we don't have a temp surface
+            mUpdateSurface = nullptr;
+            // remember which image to EndUpdate
+            mCurrentImage = i;
+            return surface.get();
+        }
+    }
+
+    // Get the real updated region, taking into account the capabilities of
+    // each TextureImage tile
+    GetUpdateRegion(aRegion);
+    mUpdateRegion = aRegion;
+    bounds = aRegion.GetBounds();
+
+    // update covers multiple Images - create a temp surface to paint in
+    gfxASurface::gfxImageFormat format =
+        (GetContentType() == gfxASurface::CONTENT_COLOR) ?
+        gfxASurface::ImageFormatRGB24 : gfxASurface::ImageFormatARGB32;
+    mUpdateSurface = gfxPlatform::GetPlatform()->
+        CreateOffscreenSurface(gfxIntSize(bounds.width, bounds.height), gfxASurface::ContentFromFormat(format));
+    mUpdateSurface->SetDeviceOffset(gfxPoint(-bounds.x, -bounds.y));
+
+    return mUpdateSurface;
+}
+
+void
+TiledTextureImage::EndUpdate()
+{
+    NS_ASSERTION(mInUpdate, "EndUpdate not in update");
+    if (!mUpdateSurface) { // update was to a single TextureImage
+        mImages[mCurrentImage]->EndUpdate();
+        mInUpdate = false;
+        mTextureState = Valid;
+        mShaderType = mImages[mCurrentImage]->GetShaderProgramType();
+        return;
+    }
+
+    // upload tiles from temp surface
+    for (unsigned i = 0; i < mImages.Length(); i++) {
+        int xPos = (i % mColumns) * mTileSize;
+        int yPos = (i / mColumns) * mTileSize;
+        nsIntRect imageRect = nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize());
+
+        nsIntRegion subregion;
+        subregion.And(mUpdateRegion, imageRect);
+        if (subregion.IsEmpty())
+            continue;
+        subregion.MoveBy(-xPos, -yPos); // Tile-local space
+        // copy tile from temp surface
+        gfxASurface* surf = mImages[i]->BeginUpdate(subregion);
+        nsRefPtr<gfxContext> ctx = new gfxContext(surf);
+        gfxUtils::ClipToRegion(ctx, subregion);
+        ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
+        ctx->SetSource(mUpdateSurface, gfxPoint(-xPos, -yPos));
+        ctx->Paint();
+        mImages[i]->EndUpdate();
+    }
+
+    mUpdateSurface = nullptr;
+    mInUpdate = false;
+    mShaderType = mImages[0]->GetShaderProgramType();
+    mTextureState = Valid;
+}
+
+void TiledTextureImage::BeginTileIteration()
+{
+    mCurrentImage = 0;
+}
+
+bool TiledTextureImage::NextTile()
+{
+    bool continueIteration = true;
+
+    if (mIterationCallback)
+        continueIteration = mIterationCallback(this, mCurrentImage,
+                                               mIterationCallbackData);
+
+    if (mCurrentImage + 1 < mImages.Length()) {
+        mCurrentImage++;
+        return continueIteration;
+    }
+    return false;
+}
+
+void TiledTextureImage::SetIterationCallback(TileIterationCallback aCallback,
+                                             void* aCallbackData)
+{
+    mIterationCallback = aCallback;
+    mIterationCallbackData = aCallbackData;
+}
+
+nsIntRect TiledTextureImage::GetTileRect()
+{
+    nsIntRect rect = mImages[mCurrentImage]->GetTileRect();
+    unsigned int xPos = (mCurrentImage % mColumns) * mTileSize;
+    unsigned int yPos = (mCurrentImage / mColumns) * mTileSize;
+    rect.MoveBy(xPos, yPos);
+    return rect;
+}
+
+nsIntRect TiledTextureImage::GetSrcTileRect()
+{
+    nsIntRect rect = GetTileRect();
+    unsigned int srcY = mFlags & NeedsYFlip
+                        ? mSize.height - rect.height - rect.y
+                        : rect.y;
+    return nsIntRect(rect.x, srcY, rect.width, rect.height);
+}
+
+void
+TiledTextureImage::BindTexture(GLenum aTextureUnit)
+{
+    mImages[mCurrentImage]->BindTexture(aTextureUnit);
+}
+
+void
+TiledTextureImage::ApplyFilter()
+{
+   mGL->ApplyFilterToBoundTexture(mFilter);
+}
+
+/*
+ * Resize, trying to reuse tiles. The reuse strategy is to decide on reuse per
+ * column. A tile on a column is reused if it hasn't changed size, otherwise it
+ * is discarded/replaced. Extra tiles on a column are pruned after iterating
+ * each column, and extra rows are pruned after iteration over the entire image
+ * finishes.
+ */
+void TiledTextureImage::Resize(const nsIntSize& aSize)
+{
+    if (mSize == aSize && mTextureState != Created) {
+        return;
+    }
+
+    // calculate rows and columns, rounding up
+    unsigned int columns = (aSize.width  + mTileSize - 1) / mTileSize;
+    unsigned int rows = (aSize.height + mTileSize - 1) / mTileSize;
+
+    // Iterate over old tile-store and insert/remove tiles as necessary
+    int row;
+    unsigned int i = 0;
+    for (row = 0; row < (int)rows; row++) {
+        // If we've gone beyond how many rows there were before, set mColumns to
+        // zero so that we only create new tiles.
+        if (row >= (int)mRows)
+            mColumns = 0;
+
+        // Similarly, if we're on the last row of old tiles and the height has
+        // changed, discard all tiles in that row.
+        // This will cause the pruning of columns not to work, but we don't need
+        // to worry about that, as no more tiles will be reused past this point
+        // anyway.
+        if ((row == (int)mRows - 1) && (aSize.height != mSize.height))
+            mColumns = 0;
+
+        int col;
+        for (col = 0; col < (int)columns; col++) {
+            nsIntSize size( // use tilesize first, then the remainder
+                    (col+1) * mTileSize > (unsigned int)aSize.width  ? aSize.width  % mTileSize : mTileSize,
+                    (row+1) * mTileSize > (unsigned int)aSize.height ? aSize.height % mTileSize : mTileSize);
+
+            bool replace = false;
+
+            // Check if we can re-use old tiles.
+            if (col < (int)mColumns) {
+                // Reuse an existing tile. If the tile is an end-tile and the
+                // width differs, replace it instead.
+                if (mSize.width != aSize.width) {
+                    if (col == (int)mColumns - 1) {
+                        // Tile at the end of the old column, replace it with
+                        // a new one.
+                        replace = true;
+                    } else if (col == (int)columns - 1) {
+                        // Tile at the end of the new column, create a new one.
+                    } else {
+                        // Before the last column on both the old and new sizes,
+                        // reuse existing tile.
+                        i++;
+                        continue;
+                    }
+                } else {
+                    // Width hasn't changed, reuse existing tile.
+                    i++;
+                    continue;
+                }
+            }
+
+            // Create a new tile.
+            nsRefPtr<TextureImage> teximg =
+                    mGL->TileGenFunc(size, mContentType, mFlags);
+            if (replace)
+                mImages.ReplaceElementAt(i, teximg.forget());
+            else
+                mImages.InsertElementAt(i, teximg.forget());
+            i++;
+        }
+
+        // Prune any unused tiles on the end of the column.
+        if (row < (int)mRows) {
+            for (col = (int)mColumns - col; col > 0; col--) {
+                mImages.RemoveElementAt(i);
+            }
+        }
+    }
+
+    // Prune any unused tiles at the end of the store.
+    unsigned int length = mImages.Length();
+    for (; i < length; i++)
+      mImages.RemoveElementAt(mImages.Length()-1);
+
+    // Reset tile-store properties.
+    mRows = rows;
+    mColumns = columns;
+    mSize = aSize;
+    mTextureState = Allocated;
+    mCurrentImage = 0;
+}
+
+uint32_t TiledTextureImage::GetTileCount()
+{
+    return mImages.Length();
+}
 
 GLContext::GLFormats
 GLContext::ChooseGLFormats(ContextFormat& aCF, ColorByteOrder aByteOrder)
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index d8a327b26d41..b109b782578c 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -32,8 +32,6 @@
 #include "nsRegion.h"
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
-#include "GLContextTypes.h"
-#include "GLTextureImage.h"
 
 typedef char realGLboolean;
 
@@ -57,6 +55,391 @@ class GLContext;
 
 typedef uintptr_t SharedTextureHandle;
 
+enum ShaderProgramType {
+    RGBALayerProgramType,
+    RGBALayerExternalProgramType,
+    BGRALayerProgramType,
+    RGBXLayerProgramType,
+    BGRXLayerProgramType,
+    RGBARectLayerProgramType,
+    RGBAExternalLayerProgramType,
+    ColorLayerProgramType,
+    YCbCrLayerProgramType,
+    ComponentAlphaPass1ProgramType,
+    ComponentAlphaPass2ProgramType,
+    Copy2DProgramType,
+    Copy2DRectProgramType,
+    NumProgramTypes
+};
+
+
+/**
+ * A TextureImage encapsulates a surface that can be drawn to by a
+ * Thebes gfxContext and (hopefully efficiently!) synchronized to a
+ * texture in the server.  TextureImages are associated with one and
+ * only one GLContext.
+ *
+ * Implementation note: TextureImages attempt to unify two categories
+ * of backends
+ *
+ *  (1) proxy to server-side object that can be bound to a texture;
+ *      e.g. Pixmap on X11.
+ *
+ *  (2) efficient manager of texture memory; e.g. by having clients draw
+ *      into a scratch buffer which is then uploaded with
+ *      glTexSubImage2D().
+ */
+class TextureImage
+{
+    NS_INLINE_DECL_REFCOUNTING(TextureImage)
+public:
+    enum TextureState
+    {
+      Created, // Texture created, but has not had glTexImage called to initialize it.
+      Allocated,  // Texture memory exists, but contents are invalid.
+      Valid  // Texture fully ready to use.
+    };
+
+    enum Flags {
+        NoFlags          = 0x0,
+        UseNearestFilter = 0x1,
+        NeedsYFlip       = 0x2,
+        ForceSingleTile  = 0x4
+    };
+
+    enum TextureShareType {
+        ThreadShared     = 0x0,
+        ProcessShared    = 0x1
+    };
+
+    typedef gfxASurface::gfxContentType ContentType;
+
+    virtual ~TextureImage() {}
+
+    /**
+     * Returns a gfxASurface for updating |aRegion| of the client's
+     * image if successul, NULL if not.  |aRegion|'s bounds must fit
+     * within Size(); its coordinate space (if any) is ignored.  If
+     * the update begins successfully, the returned gfxASurface is
+     * owned by this.  Otherwise, NULL is returned.
+     *
+     * |aRegion| is an inout param: the returned region is what the
+     * client must repaint.  Category (1) regions above can
+     * efficiently handle repaints to "scattered" regions, while (2)
+     * can only efficiently handle repaints to rects.
+     *
+     * Painting the returned surface outside of |aRegion| results 
+     * in undefined behavior.
+     *
+     * BeginUpdate() calls cannot be "nested", and each successful
+     * BeginUpdate() must be followed by exactly one EndUpdate() (see
+     * below).  Failure to do so can leave this in a possibly
+     * inconsistent state.  Unsuccessful BeginUpdate()s must not be
+     * followed by EndUpdate().
+     */
+    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion) = 0;
+    /**
+     * Retrieves the region that will require updating, given a
+     * region that needs to be updated. This can be used for
+     * making decisions about updating before calling BeginUpdate().
+     *
+     * |aRegion| is an inout param.
+     */
+    virtual void GetUpdateRegion(nsIntRegion& aForRegion) {
+    }
+    /**
+     * Finish the active update and synchronize with the server, if
+     * necessary.
+     *
+     * BeginUpdate() must have been called exactly once before
+     * EndUpdate().
+     */
+    virtual void EndUpdate() = 0;
+
+    /**
+     * The Image may contain several textures for different regions (tiles).
+     * These functions iterate over each sub texture image tile.
+     */
+    virtual void BeginTileIteration() {
+    }
+
+    virtual bool NextTile() {
+        return false;
+    }
+
+    // Function prototype for a tile iteration callback. Returning false will
+    // cause iteration to be interrupted (i.e. the corresponding NextTile call
+    // will return false).
+    typedef bool (* TileIterationCallback)(TextureImage* aImage,
+                                           int aTileNumber,
+                                           void* aCallbackData);
+
+    // Sets a callback to be called every time NextTile is called.
+    virtual void SetIterationCallback(TileIterationCallback aCallback,
+                                      void* aCallbackData) {
+    }
+
+    virtual nsIntRect GetTileRect() {
+        return nsIntRect(nsIntPoint(0,0), mSize);
+    }
+
+    virtual GLuint GetTextureID() = 0;
+
+    virtual uint32_t GetTileCount() {
+        return 1;
+    }
+
+    /**
+     * Set this TextureImage's size, and ensure a texture has been
+     * allocated.  Must not be called between BeginUpdate and EndUpdate.
+     * After a resize, the contents are undefined.
+     *
+     * If this isn't implemented by a subclass, it will just perform
+     * a dummy BeginUpdate/EndUpdate pair.
+     */
+    virtual void Resize(const nsIntSize& aSize) {
+        mSize = aSize;
+        nsIntRegion r(nsIntRect(0, 0, aSize.width, aSize.height));
+        BeginUpdate(r);
+        EndUpdate();
+    }
+
+    /**
+     * Mark this texture as having valid contents. Call this after modifying
+     * the texture contents externally.
+     */
+    virtual void MarkValid() {}
+
+    /**
+     * aSurf - the source surface to update from
+     * aRegion - the region in this image to update
+     * aFrom - offset in the source to update from
+     */
+    virtual bool DirectUpdate(gfxASurface *aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0)) = 0;
+
+    virtual void BindTexture(GLenum aTextureUnit) = 0;
+    virtual void ReleaseTexture() {}
+
+    void BindTextureAndApplyFilter(GLenum aTextureUnit) {
+        BindTexture(aTextureUnit);
+        ApplyFilter();
+    }
+
+    class ScopedBindTexture
+    {
+    public:
+        ScopedBindTexture(TextureImage *aTexture, GLenum aTextureUnit) :
+          mTexture(aTexture)
+        {
+            if (mTexture) {
+                mTexture->BindTexture(aTextureUnit);
+            }
+        }
+
+        ~ScopedBindTexture()
+        {
+            if (mTexture) {
+                mTexture->ReleaseTexture();
+            }       
+        }
+
+    protected:
+        TextureImage *mTexture;
+    };
+
+    class ScopedBindTextureAndApplyFilter
+        : public ScopedBindTexture
+    {
+    public:
+        ScopedBindTextureAndApplyFilter(TextureImage *aTexture, GLenum aTextureUnit) :
+          ScopedBindTexture(aTexture, aTextureUnit)
+        {
+            if (mTexture) {
+                mTexture->ApplyFilter();
+            }
+        }
+    };
+
+    /**
+     * Returns the shader program type that should be used to render
+     * this texture. Only valid after a matching BeginUpdate/EndUpdate
+     * pair have been called.
+     */
+    virtual ShaderProgramType GetShaderProgramType()
+    {
+         return mShaderType;
+    }
+
+    /** Can be called safely at any time. */
+
+    /**
+     * If this TextureImage has a permanent gfxASurface backing,
+     * return it.  Otherwise return NULL.
+     */
+    virtual already_AddRefed<gfxASurface> GetBackingSurface()
+    { return NULL; }
+
+    const nsIntSize& GetSize() const { return mSize; }
+    ContentType GetContentType() const { return mContentType; }
+    virtual bool InUpdate() const = 0;
+    GLenum GetWrapMode() const { return mWrapMode; }
+
+    void SetFilter(gfxPattern::GraphicsFilter aFilter) { mFilter = aFilter; }
+
+    /**
+     * Applies this TextureImage's filter, assuming that its texture is
+     * the currently bound texture.
+     */
+    virtual void ApplyFilter() = 0;
+
+protected:
+    friend class GLContext;
+
+    /**
+     * After the ctor, the TextureImage is invalid.  Implementations
+     * must allocate resources successfully before returning the new
+     * TextureImage from GLContext::CreateTextureImage().  That is,
+     * clients must not be given partially-constructed TextureImages.
+     */
+    TextureImage(const nsIntSize& aSize,
+                 GLenum aWrapMode, ContentType aContentType,
+                 Flags aFlags = NoFlags)
+        : mSize(aSize)
+        , mWrapMode(aWrapMode)
+        , mContentType(aContentType)
+        , mFilter(gfxPattern::FILTER_GOOD)
+        , mFlags(aFlags)
+    {}
+
+    virtual nsIntRect GetSrcTileRect() {
+        return nsIntRect(nsIntPoint(0,0), mSize);
+    }
+
+    nsIntSize mSize;
+    GLenum mWrapMode;
+    ContentType mContentType;
+    ShaderProgramType mShaderType;
+    gfxPattern::GraphicsFilter mFilter;
+    Flags mFlags;
+};
+
+/**
+ * BasicTextureImage is the baseline TextureImage implementation ---
+ * it updates its texture by allocating a scratch buffer for the
+ * client to draw into, then using glTexSubImage2D() to upload the new
+ * pixels.  Platforms must provide the code to create a new surface
+ * into which the updated pixels will be drawn, and the code to
+ * convert the update surface's pixels into an image on which we can
+ * glTexSubImage2D().
+ */
+class BasicTextureImage
+    : public TextureImage
+{
+public:
+    typedef gfxASurface::gfxImageFormat ImageFormat;
+    virtual ~BasicTextureImage();
+
+    BasicTextureImage(GLuint aTexture,
+                      const nsIntSize& aSize,
+                      GLenum aWrapMode,
+                      ContentType aContentType,
+                      GLContext* aContext,
+                      TextureImage::Flags aFlags = TextureImage::NoFlags)
+        : TextureImage(aSize, aWrapMode, aContentType, aFlags)
+        , mTexture(aTexture)
+        , mTextureState(Created)
+        , mGLContext(aContext)
+        , mUpdateOffset(0, 0)
+    {}
+
+    virtual void BindTexture(GLenum aTextureUnit);
+
+    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion);
+    virtual void GetUpdateRegion(nsIntRegion& aForRegion);
+    virtual void EndUpdate();
+    virtual bool DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0));
+    virtual GLuint GetTextureID() { return mTexture; }
+    // Returns a surface to draw into
+    virtual already_AddRefed<gfxASurface>
+      GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt);
+
+    virtual void MarkValid() { mTextureState = Valid; }
+
+    // Call when drawing into the update surface is complete.
+    // Returns true if textures should be upload with a relative 
+    // offset - See UploadSurfaceToTexture.
+    virtual bool FinishedSurfaceUpdate();
+
+    // Call after surface data has been uploaded to a texture.
+    virtual void FinishedSurfaceUpload();
+
+    virtual bool InUpdate() const { return !!mUpdateSurface; }
+
+    virtual void Resize(const nsIntSize& aSize);
+
+    virtual void ApplyFilter();
+protected:
+
+    GLuint mTexture;
+    TextureState mTextureState;
+    GLContext* mGLContext;
+    nsRefPtr<gfxASurface> mUpdateSurface;
+    nsIntRegion mUpdateRegion;
+
+    // The offset into the update surface at which the update rect is located.
+    nsIntPoint mUpdateOffset;
+};
+
+/**
+ * A container class that complements many sub TextureImages into a big TextureImage.
+ * Aims to behave just like the real thing.
+ */
+
+class TiledTextureImage
+    : public TextureImage
+{
+public:
+    TiledTextureImage(GLContext* aGL, nsIntSize aSize,
+        TextureImage::ContentType, TextureImage::Flags aFlags = TextureImage::NoFlags);
+    ~TiledTextureImage();
+    void DumpDiv();
+    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion);
+    virtual void GetUpdateRegion(nsIntRegion& aForRegion);
+    virtual void EndUpdate();
+    virtual void Resize(const nsIntSize& aSize);
+    virtual uint32_t GetTileCount();
+    virtual void BeginTileIteration();
+    virtual bool NextTile();
+    virtual void SetIterationCallback(TileIterationCallback aCallback,
+                                      void* aCallbackData);
+    virtual nsIntRect GetTileRect();
+    virtual GLuint GetTextureID() {
+        return mImages[mCurrentImage]->GetTextureID();
+    }
+    virtual bool DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0));
+    virtual bool InUpdate() const { return mInUpdate; }
+    virtual void BindTexture(GLenum);
+    virtual void ApplyFilter();
+
+protected:
+    virtual nsIntRect GetSrcTileRect();
+
+    unsigned int mCurrentImage;
+    TileIterationCallback mIterationCallback;
+    void* mIterationCallbackData;
+    nsTArray< nsRefPtr<TextureImage> > mImages;
+    bool mInUpdate;
+    nsIntSize mSize;
+    unsigned int mTileSize;
+    unsigned int mRows, mColumns;
+    GLContext* mGL;
+    // A temporary surface to faciliate cross-tile updates.
+    nsRefPtr<gfxASurface> mUpdateSurface;
+    // The region of update requested
+    nsIntRegion mUpdateRegion;
+    TextureState mTextureState;
+};
+
 struct THEBES_API ContextFormat
 {
     static const ContextFormat BasicRGBA32Format;
@@ -546,12 +929,6 @@ public:
         return IsExtensionSupported(EXT_framebuffer_blit) || IsExtensionSupported(ANGLE_framebuffer_blit);
     }
 
-
-    enum SharedTextureShareType {
-        SameProcess = 0,
-        CrossProcess
-    };
-
     enum SharedTextureBufferType {
         TextureID
 #ifdef MOZ_WIDGET_ANDROID
@@ -562,26 +939,23 @@ public:
     /**
      * Create new shared GLContext content handle, must be released by ReleaseSharedHandle.
      */
-    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType)
-    { return 0; }
+    virtual SharedTextureHandle CreateSharedHandle(TextureImage::TextureShareType aType) { return 0; }
     /*
      * Create a new shared GLContext content handle, using the passed buffer as a source.
      * Must be released by ReleaseSharedHandle. UpdateSharedHandle will have no effect
      * on handles created with this method, as the caller owns the source (the passed buffer)
      * and is responsible for updating it accordingly.
      */
-    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType,
-                                                   void* buffer,
-                                                   SharedTextureBufferType bufferType)
-    { return 0; }
+    virtual SharedTextureHandle CreateSharedHandle(TextureImage::TextureShareType aType,
+                                                   void* aBuffer,
+                                                   SharedTextureBufferType aBufferType) { return 0; }
     /**
      * Publish GLContext content to intermediate buffer attached to shared handle.
      * Shared handle content is ready to be used after call returns, and no need extra Flush/Finish are required.
      * GLContext must be current before this call
      */
-    virtual void UpdateSharedHandle(SharedTextureShareType shareType,
-                                    SharedTextureHandle sharedHandle)
-    { }
+    virtual void UpdateSharedHandle(TextureImage::TextureShareType aType,
+                                    SharedTextureHandle aSharedHandle) { }
     /**
      * - It is better to call ReleaseSharedHandle before original GLContext destroyed,
      *     otherwise warning will be thrown on attempt to destroy Texture associated with SharedHandle, depends on backend implementation.
@@ -595,9 +969,8 @@ public:
      * SharedHandle (currently EGLImage) does not require GLContext because it is EGL call, and can be destroyed
      *   at any time, unless EGLImage have siblings (which are not expected with current API).
      */
-    virtual void ReleaseSharedHandle(SharedTextureShareType shareType,
-                                     SharedTextureHandle sharedHandle)
-    { }
+    virtual void ReleaseSharedHandle(TextureImage::TextureShareType aType,
+                                     SharedTextureHandle aSharedHandle) { }
 
 
     typedef struct {
@@ -610,24 +983,21 @@ public:
      * Returns information necessary for rendering a shared handle.
      * These values change depending on what sharing mechanism is in use
      */
-    virtual bool GetSharedHandleDetails(SharedTextureShareType shareType,
-                                        SharedTextureHandle sharedHandle,
-                                        SharedHandleDetails& details)
-    { return false; }
+    virtual bool GetSharedHandleDetails(TextureImage::TextureShareType aType,
+                                        SharedTextureHandle aSharedHandle,
+                                        SharedHandleDetails& aDetails) { return false; }
     /**
      * Attach Shared GL Handle to GL_TEXTURE_2D target
      * GLContext must be current before this call
      */
-    virtual bool AttachSharedHandle(SharedTextureShareType shareType,
-                                    SharedTextureHandle sharedHandle)
-    { return false; }
+    virtual bool AttachSharedHandle(TextureImage::TextureShareType aType,
+                                    SharedTextureHandle aSharedHandle) { return false; }
 
     /**
      * Detach Shared GL Handle from GL_TEXTURE_2D target
      */
-    virtual void DetachSharedHandle(SharedTextureShareType shareType,
-                                    SharedTextureHandle sharedHandle)
-    { }
+    virtual void DetachSharedHandle(TextureImage::TextureShareType aType,
+                                    SharedTextureHandle aSharedHandle) { return; }
 
 private:
     GLuint mUserBoundDrawFBO;
@@ -1566,7 +1936,12 @@ protected:
                             GLenum aWrapMode,
                             TextureImage::ContentType aContentType,
                             GLContext* aContext,
-                            TextureImage::Flags aFlags = TextureImage::NoFlags);
+                            TextureImage::Flags aFlags = TextureImage::NoFlags)
+    {
+        nsRefPtr<BasicTextureImage> teximage(
+            new BasicTextureImage(aTexture, aSize, aWrapMode, aContentType, aContext, aFlags));
+        return teximage.forget();
+    }
 
     bool IsOffscreenSizeAllowed(const gfxIntSize& aSize) const {
         int32_t biggerDimension = NS_MAX(aSize.width, aSize.height);
diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index 0f7b7cbc1efd..e080cb10159b 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -646,19 +646,19 @@ public:
         return sEGLLibrary.HasKHRLockSurface();
     }
 
-    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType);
-    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType,
-                                                   void* buffer,
-                                                   SharedTextureBufferType bufferType);
-    virtual void UpdateSharedHandle(SharedTextureShareType shareType,
-                                    SharedTextureHandle sharedHandle);
-    virtual void ReleaseSharedHandle(SharedTextureShareType shareType,
-                                     SharedTextureHandle sharedHandle);
-    virtual bool GetSharedHandleDetails(SharedTextureShareType shareType,
-                                        SharedTextureHandle sharedHandle,
-                                        SharedHandleDetails& details);
-    virtual bool AttachSharedHandle(SharedTextureShareType shareType,
-                                    SharedTextureHandle sharedHandle);
+    virtual SharedTextureHandle CreateSharedHandle(TextureImage::TextureShareType aType);
+    virtual SharedTextureHandle CreateSharedHandle(TextureImage::TextureShareType aType,
+                                                   void* aBuffer,
+                                                   SharedTextureBufferType aBufferType);
+    virtual void UpdateSharedHandle(TextureImage::TextureShareType aType,
+                                    SharedTextureHandle aSharedHandle);
+    virtual void ReleaseSharedHandle(TextureImage::TextureShareType aType,
+                                     SharedTextureHandle aSharedHandle);
+    virtual bool GetSharedHandleDetails(TextureImage::TextureShareType aType,
+                                        SharedTextureHandle aSharedHandle,
+                                        SharedHandleDetails& aDetails);
+    virtual bool AttachSharedHandle(TextureImage::TextureShareType aType,
+                                    SharedTextureHandle aSharedHandle);
 protected:
     friend class GLContextProviderEGL;
 
@@ -854,15 +854,15 @@ private:
 };
 
 void
-GLContextEGL::UpdateSharedHandle(SharedTextureShareType shareType,
-                                 SharedTextureHandle sharedHandle)
+GLContextEGL::UpdateSharedHandle(TextureImage::TextureShareType aType,
+                                 SharedTextureHandle aSharedHandle)
 {
-    if (shareType != SameProcess) {
+    if (aType != TextureImage::ThreadShared) {
         NS_ERROR("Implementation not available for this sharing type");
         return;
     }
 
-    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(sharedHandle);
+    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(aSharedHandle);
 
     NS_ASSERTION(wrapper->Type() == SharedHandleType::Image, "Expected EGLImage shared handle");
     NS_ASSERTION(mShareWithEGLImage, "EGLImage not supported or disabled in runtime");
@@ -895,9 +895,9 @@ GLContextEGL::UpdateSharedHandle(SharedTextureShareType shareType,
 }
 
 SharedTextureHandle
-GLContextEGL::CreateSharedHandle(SharedTextureShareType shareType)
+GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType)
 {
-    if (shareType != SameProcess)
+    if (aType != TextureImage::ThreadShared)
         return 0;
 
     if (!mShareWithEGLImage)
@@ -914,7 +914,7 @@ GLContextEGL::CreateSharedHandle(SharedTextureShareType shareType)
 
     if (!ok) {
         NS_ERROR("EGLImage creation for EGLTextureWrapper failed");
-        ReleaseSharedHandle(shareType, (SharedTextureHandle)tex);
+        ReleaseSharedHandle(aType, (SharedTextureHandle)tex);
         return 0;
     }
 
@@ -923,16 +923,16 @@ GLContextEGL::CreateSharedHandle(SharedTextureShareType shareType)
 }
 
 SharedTextureHandle
-GLContextEGL::CreateSharedHandle(SharedTextureShareType shareType,
-                                 void* buffer,
-                                 SharedTextureBufferType bufferType)
+GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType,
+                                 void* aBuffer,
+                                 SharedTextureBufferType aBufferType)
 {
     // Both EGLImage and SurfaceTexture only support ThreadShared currently, but
     // it's possible to make SurfaceTexture work across processes. We should do that.
-    if (shareType != SameProcess)
+    if (aType != TextureImage::ThreadShared)
         return 0;
 
-    switch (bufferType) {
+    switch (aBufferType) {
 #ifdef MOZ_WIDGET_ANDROID
     case SharedTextureBufferType::SurfaceTexture:
         if (!IsExtensionSupported(GLContext::OES_EGL_image_external)) {
@@ -940,13 +940,13 @@ GLContextEGL::CreateSharedHandle(SharedTextureShareType shareType,
             return 0;
         }
 
-        return (SharedTextureHandle) new SurfaceTextureWrapper(reinterpret_cast<nsSurfaceTexture*>(buffer));
+        return (SharedTextureHandle) new SurfaceTextureWrapper(reinterpret_cast<nsSurfaceTexture*>(aBuffer));
 #endif
     case SharedTextureBufferType::TextureID: {
         if (!mShareWithEGLImage)
             return 0;
 
-        GLuint texture = (uintptr_t)buffer;
+        GLuint texture = (uintptr_t)aBuffer;
         EGLTextureWrapper* tex = new EGLTextureWrapper();
         if (!tex->CreateEGLImage(this, texture)) {
             NS_ERROR("EGLImage creation for EGLTextureWrapper failed");
@@ -962,15 +962,15 @@ GLContextEGL::CreateSharedHandle(SharedTextureShareType shareType,
     }
 }
 
-void GLContextEGL::ReleaseSharedHandle(SharedTextureShareType shareType,
-                                       SharedTextureHandle sharedHandle)
+void GLContextEGL::ReleaseSharedHandle(TextureImage::TextureShareType aType,
+                                       SharedTextureHandle aSharedHandle)
 {
-    if (shareType != SameProcess) {
+    if (aType != TextureImage::ThreadShared) {
         NS_ERROR("Implementation not available for this sharing type");
         return;
     }
 
-    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(sharedHandle);
+    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(aSharedHandle);
 
     switch (wrapper->Type()) {
 #ifdef MOZ_WIDGET_ANDROID
@@ -982,25 +982,24 @@ void GLContextEGL::ReleaseSharedHandle(SharedTextureShareType shareType,
     case SharedHandleType::Image: {
         NS_ASSERTION(mShareWithEGLImage, "EGLImage not supported or disabled in runtime");
 
-        EGLTextureWrapper* wrap = (EGLTextureWrapper*)sharedHandle;
+        EGLTextureWrapper* wrap = (EGLTextureWrapper*)aSharedHandle;
         delete wrap;
         break;
     }
 
     default:
         NS_ERROR("Unknown shared handle type");
-        return;
     }
 }
 
-bool GLContextEGL::GetSharedHandleDetails(SharedTextureShareType shareType,
-                                          SharedTextureHandle sharedHandle,
-                                          SharedHandleDetails& details)
+bool GLContextEGL::GetSharedHandleDetails(TextureImage::TextureShareType aType,
+                                          SharedTextureHandle aSharedHandle,
+                                          SharedHandleDetails& aDetails)
 {
-    if (shareType != SameProcess)
+    if (aType != TextureImage::ThreadShared)
         return false;
 
-    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(sharedHandle);
+    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(aSharedHandle);
 
     switch (wrapper->Type()) {
 #ifdef MOZ_WIDGET_ANDROID
@@ -1015,8 +1014,8 @@ bool GLContextEGL::GetSharedHandleDetails(SharedTextureShareType shareType,
 #endif
 
     case SharedHandleType::Image:
-        details.mTarget = LOCAL_GL_TEXTURE_2D;
-        details.mProgramType = RGBALayerProgramType;
+        aDetails.mTarget = LOCAL_GL_TEXTURE_2D;
+        aDetails.mProgramType = RGBALayerProgramType;
         break;
 
     default:
@@ -1027,13 +1026,13 @@ bool GLContextEGL::GetSharedHandleDetails(SharedTextureShareType shareType,
     return true;
 }
 
-bool GLContextEGL::AttachSharedHandle(SharedTextureShareType shareType,
-                                      SharedTextureHandle sharedHandle)
+bool GLContextEGL::AttachSharedHandle(TextureImage::TextureShareType aType,
+                                      SharedTextureHandle aSharedHandle)
 {
-    if (shareType != SameProcess)
+    if (aType != TextureImage::ThreadShared)
         return false;
 
-    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(sharedHandle);
+    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(aSharedHandle);
 
     switch (wrapper->Type()) {
 #ifdef MOZ_WIDGET_ANDROID
@@ -1058,7 +1057,7 @@ bool GLContextEGL::AttachSharedHandle(SharedTextureShareType shareType,
     case SharedHandleType::Image: {
         NS_ASSERTION(mShareWithEGLImage, "EGLImage not supported or disabled in runtime");
 
-        EGLTextureWrapper* wrap = (EGLTextureWrapper*)sharedHandle;
+        EGLTextureWrapper* wrap = (EGLTextureWrapper*)aSharedHandle;
         wrap->WaitSync();
         fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, wrap->GetEGLImage());
         break;
@@ -1072,7 +1071,6 @@ bool GLContextEGL::AttachSharedHandle(SharedTextureShareType shareType,
     return true;
 }
 
-
 bool
 GLContextEGL::BindTex2DOffscreen(GLContext *aOffscreen)
 {
diff --git a/gfx/gl/GLContextTypes.h b/gfx/gl/GLContextTypes.h
deleted file mode 100644
index e369b07a6361..000000000000
--- a/gfx/gl/GLContextTypes.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * GLContextStuff.h
- *
- *  Created on: Nov 13, 2012
- *      Author: jgilbert
- */
-
-#ifndef GLCONTEXTSTUFF_H_
-#define GLCONTEXTSTUFF_H_
-
-/**
- * We don't include GLDefs.h here since we don't want to drag in all defines
- * in for all our users.
- */
-typedef unsigned int GLenum;
-typedef unsigned int GLbitfield;
-typedef unsigned int GLuint;
-typedef int GLint;
-typedef int GLsizei;
-
-namespace mozilla {
-namespace gl {
-
-enum ShaderProgramType {
-    RGBALayerProgramType,
-    RGBALayerExternalProgramType,
-    BGRALayerProgramType,
-    RGBXLayerProgramType,
-    BGRXLayerProgramType,
-    RGBARectLayerProgramType,
-    RGBAExternalLayerProgramType,
-    ColorLayerProgramType,
-    YCbCrLayerProgramType,
-    ComponentAlphaPass1ProgramType,
-    ComponentAlphaPass2ProgramType,
-    Copy2DProgramType,
-    Copy2DRectProgramType,
-    NumProgramTypes
-};
-
-} // namespace gl
-} // namespace mozilla
-
-#endif /* GLCONTEXTSTUFF_H_ */
diff --git a/gfx/gl/GLTextureImage.cpp b/gfx/gl/GLTextureImage.cpp
deleted file mode 100644
index fbfef04fa4e6..000000000000
--- a/gfx/gl/GLTextureImage.cpp
+++ /dev/null
@@ -1,573 +0,0 @@
-/* -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40; -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "GLTextureImage.h"
-#include "GLContext.h"
-#include "gfxContext.h"
-#include "gfxPlatform.h"
-#include "gfxUtils.h"
-
-using namespace mozilla::gl;
-
-already_AddRefed<TextureImage>
-TextureImage::Create(GLContext* gl,
-                     const nsIntSize& size,
-                     TextureImage::ContentType contentType,
-                     GLenum wrapMode,
-                     TextureImage::Flags flags)
-{
-    return gl->CreateTextureImage(size, contentType, wrapMode, flags);
-}
-
-BasicTextureImage::~BasicTextureImage()
-{
-    GLContext *ctx = mGLContext;
-    if (ctx->IsDestroyed() || !ctx->IsOwningThreadCurrent()) {
-        ctx = ctx->GetSharedContext();
-    }
-
-    // If we have a context, then we need to delete the texture;
-    // if we don't have a context (either real or shared),
-    // then they went away when the contex was deleted, because it
-    // was the only one that had access to it.
-    if (ctx && !ctx->IsDestroyed()) {
-        mGLContext->MakeCurrent();
-        mGLContext->fDeleteTextures(1, &mTexture);
-    }
-}
-
-gfxASurface*
-BasicTextureImage::BeginUpdate(nsIntRegion& aRegion)
-{
-    NS_ASSERTION(!mUpdateSurface, "BeginUpdate() without EndUpdate()?");
-
-    // determine the region the client will need to repaint
-    if (mGLContext->CanUploadSubTextures()) {
-        GetUpdateRegion(aRegion);
-    } else {
-        aRegion = nsIntRect(nsIntPoint(0, 0), mSize);
-    }
-
-    mUpdateRegion = aRegion;
-
-    nsIntRect rgnSize = mUpdateRegion.GetBounds();
-    if (!nsIntRect(nsIntPoint(0, 0), mSize).Contains(rgnSize)) {
-        NS_ERROR("update outside of image");
-        return NULL;
-    }
-
-    ImageFormat format =
-        (GetContentType() == gfxASurface::CONTENT_COLOR) ?
-        gfxASurface::ImageFormatRGB24 : gfxASurface::ImageFormatARGB32;
-    mUpdateSurface =
-        GetSurfaceForUpdate(gfxIntSize(rgnSize.width, rgnSize.height), format);
-
-    if (!mUpdateSurface || mUpdateSurface->CairoStatus()) {
-        mUpdateSurface = NULL;
-        return NULL;
-    }
-
-    mUpdateSurface->SetDeviceOffset(gfxPoint(-rgnSize.x, -rgnSize.y));
-
-    return mUpdateSurface;
-}
-
-void
-BasicTextureImage::GetUpdateRegion(nsIntRegion& aForRegion)
-{
-  // if the texture hasn't been initialized yet, or something important
-  // changed, we need to recreate our backing surface and force the
-  // client to paint everything
-  if (mTextureState != Valid)
-      aForRegion = nsIntRect(nsIntPoint(0, 0), mSize);
-}
-
-void
-BasicTextureImage::EndUpdate()
-{
-    NS_ASSERTION(!!mUpdateSurface, "EndUpdate() without BeginUpdate()?");
-
-    // FIXME: this is the slow boat.  Make me fast (with GLXPixmap?).
-
-    // Undo the device offset that BeginUpdate set; doesn't much matter for us here,
-    // but important if we ever do anything directly with the surface.
-    mUpdateSurface->SetDeviceOffset(gfxPoint(0, 0));
-
-    bool relative = FinishedSurfaceUpdate();
-
-    mShaderType =
-        mGLContext->UploadSurfaceToTexture(mUpdateSurface,
-                                           mUpdateRegion,
-                                           mTexture,
-                                           mTextureState == Created,
-                                           mUpdateOffset,
-                                           relative);
-    FinishedSurfaceUpload();
-
-    mUpdateSurface = nullptr;
-    mTextureState = Valid;
-}
-
-void
-BasicTextureImage::BindTexture(GLenum aTextureUnit)
-{
-    mGLContext->fActiveTexture(aTextureUnit);
-    mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
-    mGLContext->fActiveTexture(LOCAL_GL_TEXTURE0);
-}
-
-void
-BasicTextureImage::ApplyFilter()
-{
-  mGLContext->ApplyFilterToBoundTexture(mFilter);
-}
-
-
-already_AddRefed<gfxASurface>
-BasicTextureImage::GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt)
-{
-    return gfxPlatform::GetPlatform()->
-        CreateOffscreenSurface(aSize, gfxASurface::ContentFromFormat(aFmt));
-}
-
-bool
-BasicTextureImage::FinishedSurfaceUpdate()
-{
-    return false;
-}
-
-void
-BasicTextureImage::FinishedSurfaceUpload()
-{
-}
-
-bool
-BasicTextureImage::DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom /* = nsIntPoint(0, 0) */)
-{
-    nsIntRect bounds = aRegion.GetBounds();
-    nsIntRegion region;
-    if (mTextureState != Valid) {
-        bounds = nsIntRect(0, 0, mSize.width, mSize.height);
-        region = nsIntRegion(bounds);
-    } else {
-        region = aRegion;
-    }
-
-    mShaderType =
-        mGLContext->UploadSurfaceToTexture(aSurf,
-                                           region,
-                                           mTexture,
-                                           mTextureState == Created,
-                                           bounds.TopLeft() + aFrom,
-                                           false);
-    mTextureState = Valid;
-    return true;
-}
-
-void
-BasicTextureImage::Resize(const nsIntSize& aSize)
-{
-    NS_ASSERTION(!mUpdateSurface, "Resize() while in update?");
-
-    mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
-
-    mGLContext->fTexImage2D(LOCAL_GL_TEXTURE_2D,
-                            0,
-                            LOCAL_GL_RGBA,
-                            aSize.width,
-                            aSize.height,
-                            0,
-                            LOCAL_GL_RGBA,
-                            LOCAL_GL_UNSIGNED_BYTE,
-                            NULL);
-
-    mTextureState = Allocated;
-    mSize = aSize;
-}
-
-TiledTextureImage::TiledTextureImage(GLContext* aGL,
-                                     nsIntSize aSize,
-                                     TextureImage::ContentType aContentType,
-                                     TextureImage::Flags aFlags)
-    : TextureImage(aSize, LOCAL_GL_CLAMP_TO_EDGE, aContentType, aFlags)
-    , mCurrentImage(0)
-    , mIterationCallback(nullptr)
-    , mInUpdate(false)
-    , mRows(0)
-    , mColumns(0)
-    , mGL(aGL)
-    , mTextureState(Created)
-{
-    mTileSize = (!(aFlags & TextureImage::ForceSingleTile) && mGL->WantsSmallTiles())
-        ? 256 : mGL->GetMaxTextureSize();
-    if (aSize != nsIntSize(0,0)) {
-        Resize(aSize);
-    }
-}
-
-TiledTextureImage::~TiledTextureImage()
-{
-}
-
-bool
-TiledTextureImage::DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom /* = nsIntPoint(0, 0) */)
-{
-    nsIntRegion region;
-
-    if (mTextureState != Valid) {
-        nsIntRect bounds = nsIntRect(0, 0, mSize.width, mSize.height);
-        region = nsIntRegion(bounds);
-    } else {
-        region = aRegion;
-    }
-
-    bool result = true;
-    int oldCurrentImage = mCurrentImage;
-    BeginTileIteration();
-    do {
-        nsIntRect tileRect = GetSrcTileRect();
-        int xPos = tileRect.x;
-        int yPos = tileRect.y;
-
-        nsIntRegion tileRegion;
-        tileRegion.And(region, tileRect); // intersect with tile
-
-        if (tileRegion.IsEmpty())
-            continue;
-
-        if (mGL->CanUploadSubTextures()) {
-          tileRegion.MoveBy(-xPos, -yPos); // translate into tile local space
-        } else {
-          // If sub-textures are unsupported, expand to tile boundaries
-          tileRect.x = tileRect.y = 0;
-          tileRegion = nsIntRegion(tileRect);
-        }
-
-        result &= mImages[mCurrentImage]->
-          DirectUpdate(aSurf, tileRegion, aFrom + nsIntPoint(xPos, yPos));
-
-        if (mCurrentImage == mImages.Length() - 1) {
-            // We know we're done, but we still need to ensure that the callback
-            // gets called (e.g. to update the uploaded region).
-            NextTile();
-            break;
-        }
-        // Override a callback cancelling iteration if the texture wasn't valid.
-        // We need to force the update in that situation, or we may end up
-        // showing invalid/out-of-date texture data.
-    } while (NextTile() || (mTextureState != Valid));
-    mCurrentImage = oldCurrentImage;
-
-    mShaderType = mImages[0]->GetShaderProgramType();
-    mTextureState = Valid;
-    return result;
-}
-
-void
-TiledTextureImage::GetUpdateRegion(nsIntRegion& aForRegion)
-{
-    if (mTextureState != Valid) {
-        // if the texture hasn't been initialized yet, or something important
-        // changed, we need to recreate our backing surface and force the
-        // client to paint everything
-        aForRegion = nsIntRect(nsIntPoint(0, 0), mSize);
-        return;
-    }
-
-    nsIntRegion newRegion;
-
-    // We need to query each texture with the region it will be drawing and
-    // set aForRegion to be the combination of all of these regions
-    for (unsigned i = 0; i < mImages.Length(); i++) {
-        int xPos = (i % mColumns) * mTileSize;
-        int yPos = (i / mColumns) * mTileSize;
-        nsIntRect imageRect = nsIntRect(nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize()));
-
-        if (aForRegion.Intersects(imageRect)) {
-            // Make a copy of the region
-            nsIntRegion subRegion;
-            subRegion.And(aForRegion, imageRect);
-            // Translate it into tile-space
-            subRegion.MoveBy(-xPos, -yPos);
-            // Query region
-            mImages[i]->GetUpdateRegion(subRegion);
-            // Translate back
-            subRegion.MoveBy(xPos, yPos);
-            // Add to the accumulated region
-            newRegion.Or(newRegion, subRegion);
-        }
-    }
-
-    aForRegion = newRegion;
-}
-
-gfxASurface*
-TiledTextureImage::BeginUpdate(nsIntRegion& aRegion)
-{
-    NS_ASSERTION(!mInUpdate, "nested update");
-    mInUpdate = true;
-
-    // Note, we don't call GetUpdateRegion here as if the updated region is
-    // fully contained in a single tile, we get to avoid iterating through
-    // the tiles again (and a little copying).
-    if (mTextureState != Valid)
-    {
-        // if the texture hasn't been initialized yet, or something important
-        // changed, we need to recreate our backing surface and force the
-        // client to paint everything
-        aRegion = nsIntRect(nsIntPoint(0, 0), mSize);
-    }
-
-    nsIntRect bounds = aRegion.GetBounds();
-
-    for (unsigned i = 0; i < mImages.Length(); i++) {
-        int xPos = (i % mColumns) * mTileSize;
-        int yPos = (i / mColumns) * mTileSize;
-        nsIntRegion imageRegion = nsIntRegion(nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize()));
-
-        // a single Image can handle this update request
-        if (imageRegion.Contains(aRegion)) {
-            // adjust for tile offset
-            aRegion.MoveBy(-xPos, -yPos);
-            // forward the actual call
-            nsRefPtr<gfxASurface> surface = mImages[i]->BeginUpdate(aRegion);
-            // caller expects container space
-            aRegion.MoveBy(xPos, yPos);
-            // Correct the device offset
-            gfxPoint offset = surface->GetDeviceOffset();
-            surface->SetDeviceOffset(gfxPoint(offset.x - xPos,
-                                              offset.y - yPos));
-            // we don't have a temp surface
-            mUpdateSurface = nullptr;
-            // remember which image to EndUpdate
-            mCurrentImage = i;
-            return surface.get();
-        }
-    }
-
-    // Get the real updated region, taking into account the capabilities of
-    // each TextureImage tile
-    GetUpdateRegion(aRegion);
-    mUpdateRegion = aRegion;
-    bounds = aRegion.GetBounds();
-
-    // update covers multiple Images - create a temp surface to paint in
-    gfxASurface::gfxImageFormat format =
-        (GetContentType() == gfxASurface::CONTENT_COLOR) ?
-        gfxASurface::ImageFormatRGB24 : gfxASurface::ImageFormatARGB32;
-    mUpdateSurface = gfxPlatform::GetPlatform()->
-        CreateOffscreenSurface(gfxIntSize(bounds.width, bounds.height), gfxASurface::ContentFromFormat(format));
-    mUpdateSurface->SetDeviceOffset(gfxPoint(-bounds.x, -bounds.y));
-
-    return mUpdateSurface;
-}
-
-void
-TiledTextureImage::EndUpdate()
-{
-    NS_ASSERTION(mInUpdate, "EndUpdate not in update");
-    if (!mUpdateSurface) { // update was to a single TextureImage
-        mImages[mCurrentImage]->EndUpdate();
-        mInUpdate = false;
-        mTextureState = Valid;
-        mShaderType = mImages[mCurrentImage]->GetShaderProgramType();
-        return;
-    }
-
-    // upload tiles from temp surface
-    for (unsigned i = 0; i < mImages.Length(); i++) {
-        int xPos = (i % mColumns) * mTileSize;
-        int yPos = (i / mColumns) * mTileSize;
-        nsIntRect imageRect = nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize());
-
-        nsIntRegion subregion;
-        subregion.And(mUpdateRegion, imageRect);
-        if (subregion.IsEmpty())
-            continue;
-        subregion.MoveBy(-xPos, -yPos); // Tile-local space
-        // copy tile from temp surface
-        gfxASurface* surf = mImages[i]->BeginUpdate(subregion);
-        nsRefPtr<gfxContext> ctx = new gfxContext(surf);
-        gfxUtils::ClipToRegion(ctx, subregion);
-        ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
-        ctx->SetSource(mUpdateSurface, gfxPoint(-xPos, -yPos));
-        ctx->Paint();
-        mImages[i]->EndUpdate();
-    }
-
-    mUpdateSurface = nullptr;
-    mInUpdate = false;
-    mShaderType = mImages[0]->GetShaderProgramType();
-    mTextureState = Valid;
-}
-
-void TiledTextureImage::BeginTileIteration()
-{
-    mCurrentImage = 0;
-}
-
-bool TiledTextureImage::NextTile()
-{
-    bool continueIteration = true;
-
-    if (mIterationCallback)
-        continueIteration = mIterationCallback(this, mCurrentImage,
-                                               mIterationCallbackData);
-
-    if (mCurrentImage + 1 < mImages.Length()) {
-        mCurrentImage++;
-        return continueIteration;
-    }
-    return false;
-}
-
-void TiledTextureImage::SetIterationCallback(TileIterationCallback aCallback,
-                                             void* aCallbackData)
-{
-    mIterationCallback = aCallback;
-    mIterationCallbackData = aCallbackData;
-}
-
-nsIntRect TiledTextureImage::GetTileRect()
-{
-    nsIntRect rect = mImages[mCurrentImage]->GetTileRect();
-    unsigned int xPos = (mCurrentImage % mColumns) * mTileSize;
-    unsigned int yPos = (mCurrentImage / mColumns) * mTileSize;
-    rect.MoveBy(xPos, yPos);
-    return rect;
-}
-
-nsIntRect TiledTextureImage::GetSrcTileRect()
-{
-    nsIntRect rect = GetTileRect();
-    unsigned int srcY = mFlags & NeedsYFlip
-                        ? mSize.height - rect.height - rect.y
-                        : rect.y;
-    return nsIntRect(rect.x, srcY, rect.width, rect.height);
-}
-
-void
-TiledTextureImage::BindTexture(GLenum aTextureUnit)
-{
-    mImages[mCurrentImage]->BindTexture(aTextureUnit);
-}
-
-void
-TiledTextureImage::ApplyFilter()
-{
-   mGL->ApplyFilterToBoundTexture(mFilter);
-}
-
-/*
- * Resize, trying to reuse tiles. The reuse strategy is to decide on reuse per
- * column. A tile on a column is reused if it hasn't changed size, otherwise it
- * is discarded/replaced. Extra tiles on a column are pruned after iterating
- * each column, and extra rows are pruned after iteration over the entire image
- * finishes.
- */
-void TiledTextureImage::Resize(const nsIntSize& aSize)
-{
-    if (mSize == aSize && mTextureState != Created) {
-        return;
-    }
-
-    // calculate rows and columns, rounding up
-    unsigned int columns = (aSize.width  + mTileSize - 1) / mTileSize;
-    unsigned int rows = (aSize.height + mTileSize - 1) / mTileSize;
-
-    // Iterate over old tile-store and insert/remove tiles as necessary
-    int row;
-    unsigned int i = 0;
-    for (row = 0; row < (int)rows; row++) {
-        // If we've gone beyond how many rows there were before, set mColumns to
-        // zero so that we only create new tiles.
-        if (row >= (int)mRows)
-            mColumns = 0;
-
-        // Similarly, if we're on the last row of old tiles and the height has
-        // changed, discard all tiles in that row.
-        // This will cause the pruning of columns not to work, but we don't need
-        // to worry about that, as no more tiles will be reused past this point
-        // anyway.
-        if ((row == (int)mRows - 1) && (aSize.height != mSize.height))
-            mColumns = 0;
-
-        int col;
-        for (col = 0; col < (int)columns; col++) {
-            nsIntSize size( // use tilesize first, then the remainder
-                    (col+1) * mTileSize > (unsigned int)aSize.width  ? aSize.width  % mTileSize : mTileSize,
-                    (row+1) * mTileSize > (unsigned int)aSize.height ? aSize.height % mTileSize : mTileSize);
-
-            bool replace = false;
-
-            // Check if we can re-use old tiles.
-            if (col < (int)mColumns) {
-                // Reuse an existing tile. If the tile is an end-tile and the
-                // width differs, replace it instead.
-                if (mSize.width != aSize.width) {
-                    if (col == (int)mColumns - 1) {
-                        // Tile at the end of the old column, replace it with
-                        // a new one.
-                        replace = true;
-                    } else if (col == (int)columns - 1) {
-                        // Tile at the end of the new column, create a new one.
-                    } else {
-                        // Before the last column on both the old and new sizes,
-                        // reuse existing tile.
-                        i++;
-                        continue;
-                    }
-                } else {
-                    // Width hasn't changed, reuse existing tile.
-                    i++;
-                    continue;
-                }
-            }
-
-            // Create a new tile.
-            nsRefPtr<TextureImage> teximg =
-                    mGL->TileGenFunc(size, mContentType, mFlags);
-            if (replace)
-                mImages.ReplaceElementAt(i, teximg.forget());
-            else
-                mImages.InsertElementAt(i, teximg.forget());
-            i++;
-        }
-
-        // Prune any unused tiles on the end of the column.
-        if (row < (int)mRows) {
-            for (col = (int)mColumns - col; col > 0; col--) {
-                mImages.RemoveElementAt(i);
-            }
-        }
-    }
-
-    // Prune any unused tiles at the end of the store.
-    unsigned int length = mImages.Length();
-    for (; i < length; i++)
-      mImages.RemoveElementAt(mImages.Length()-1);
-
-    // Reset tile-store properties.
-    mRows = rows;
-    mColumns = columns;
-    mSize = aSize;
-    mTextureState = Allocated;
-    mCurrentImage = 0;
-}
-
-uint32_t TiledTextureImage::GetTileCount()
-{
-    return mImages.Length();
-}
-
-TextureImage::ScopedBindTexture::ScopedBindTexture(TextureImage* aTexture,
-                                                   GLenum aTextureUnit)
-    : mTexture(aTexture)
-{
-    if (mTexture) {
-        MOZ_ASSERT(aTextureUnit >= LOCAL_GL_TEXTURE0);
-        mTexture->BindTexture(aTextureUnit);
-    }
-}
diff --git a/gfx/gl/GLTextureImage.h b/gfx/gl/GLTextureImage.h
deleted file mode 100644
index 4217778fb0ef..000000000000
--- a/gfx/gl/GLTextureImage.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/* -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40; -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 GLTEXTUREIMAGE_H_
-#define GLTEXTUREIMAGE_H_
-
-#include "nsAutoPtr.h"
-#include "nsRegion.h"
-#include "gfxASurface.h"
-#include "GLContextTypes.h"
-#include "gfxPattern.h"
-
-namespace mozilla {
-namespace gl {
-class GLContext;
-
-/**
- * A TextureImage encapsulates a surface that can be drawn to by a
- * Thebes gfxContext and (hopefully efficiently!) synchronized to a
- * texture in the server.  TextureImages are associated with one and
- * only one GLContext.
- *
- * Implementation note: TextureImages attempt to unify two categories
- * of backends
- *
- *  (1) proxy to server-side object that can be bound to a texture;
- *      e.g. Pixmap on X11.
- *
- *  (2) efficient manager of texture memory; e.g. by having clients draw
- *      into a scratch buffer which is then uploaded with
- *      glTexSubImage2D().
- */
-class TextureImage
-{
-    NS_INLINE_DECL_REFCOUNTING(TextureImage)
-public:
-    enum TextureState
-    {
-      Created, // Texture created, but has not had glTexImage called to initialize it.
-      Allocated,  // Texture memory exists, but contents are invalid.
-      Valid  // Texture fully ready to use.
-    };
-
-    enum Flags {
-        NoFlags          = 0x0,
-        UseNearestFilter = 0x1,
-        NeedsYFlip       = 0x2,
-        ForceSingleTile  = 0x4
-    };
-
-    typedef gfxASurface::gfxContentType ContentType;
-
-    static already_AddRefed<TextureImage> Create(
-                       GLContext* gl,
-                       const nsIntSize& aSize,
-                       TextureImage::ContentType aContentType,
-                       GLenum aWrapMode,
-                       TextureImage::Flags aFlags = TextureImage::NoFlags);
-
-    virtual ~TextureImage() {}
-
-    /**
-     * Returns a gfxASurface for updating |aRegion| of the client's
-     * image if successul, NULL if not.  |aRegion|'s bounds must fit
-     * within Size(); its coordinate space (if any) is ignored.  If
-     * the update begins successfully, the returned gfxASurface is
-     * owned by this.  Otherwise, NULL is returned.
-     *
-     * |aRegion| is an inout param: the returned region is what the
-     * client must repaint.  Category (1) regions above can
-     * efficiently handle repaints to "scattered" regions, while (2)
-     * can only efficiently handle repaints to rects.
-     *
-     * Painting the returned surface outside of |aRegion| results
-     * in undefined behavior.
-     *
-     * BeginUpdate() calls cannot be "nested", and each successful
-     * BeginUpdate() must be followed by exactly one EndUpdate() (see
-     * below).  Failure to do so can leave this in a possibly
-     * inconsistent state.  Unsuccessful BeginUpdate()s must not be
-     * followed by EndUpdate().
-     */
-    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion) = 0;
-    /**
-     * Retrieves the region that will require updating, given a
-     * region that needs to be updated. This can be used for
-     * making decisions about updating before calling BeginUpdate().
-     *
-     * |aRegion| is an inout param.
-     */
-    virtual void GetUpdateRegion(nsIntRegion& aForRegion) {
-    }
-    /**
-     * Finish the active update and synchronize with the server, if
-     * necessary.
-     *
-     * BeginUpdate() must have been called exactly once before
-     * EndUpdate().
-     */
-    virtual void EndUpdate() = 0;
-
-    /**
-     * The Image may contain several textures for different regions (tiles).
-     * These functions iterate over each sub texture image tile.
-     */
-    virtual void BeginTileIteration() {
-    }
-
-    virtual bool NextTile() {
-        return false;
-    }
-
-    // Function prototype for a tile iteration callback. Returning false will
-    // cause iteration to be interrupted (i.e. the corresponding NextTile call
-    // will return false).
-    typedef bool (* TileIterationCallback)(TextureImage* aImage,
-                                           int aTileNumber,
-                                           void* aCallbackData);
-
-    // Sets a callback to be called every time NextTile is called.
-    virtual void SetIterationCallback(TileIterationCallback aCallback,
-                                      void* aCallbackData) {
-    }
-
-    virtual nsIntRect GetTileRect() {
-        return nsIntRect(nsIntPoint(0,0), mSize);
-    }
-
-    virtual GLuint GetTextureID() = 0;
-
-    virtual uint32_t GetTileCount() {
-        return 1;
-    }
-
-    /**
-     * Set this TextureImage's size, and ensure a texture has been
-     * allocated.  Must not be called between BeginUpdate and EndUpdate.
-     * After a resize, the contents are undefined.
-     *
-     * If this isn't implemented by a subclass, it will just perform
-     * a dummy BeginUpdate/EndUpdate pair.
-     */
-    virtual void Resize(const nsIntSize& aSize) {
-        mSize = aSize;
-        nsIntRegion r(nsIntRect(0, 0, aSize.width, aSize.height));
-        BeginUpdate(r);
-        EndUpdate();
-    }
-
-    /**
-     * Mark this texture as having valid contents. Call this after modifying
-     * the texture contents externally.
-     */
-    virtual void MarkValid() {}
-
-    /**
-     * aSurf - the source surface to update from
-     * aRegion - the region in this image to update
-     * aFrom - offset in the source to update from
-     */
-    virtual bool DirectUpdate(gfxASurface *aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0)) = 0;
-
-    virtual void BindTexture(GLenum aTextureUnit) = 0;
-    virtual void ReleaseTexture() {}
-
-    void BindTextureAndApplyFilter(GLenum aTextureUnit) {
-        BindTexture(aTextureUnit);
-        ApplyFilter();
-    }
-
-    class ScopedBindTexture
-    {
-    public:
-        ScopedBindTexture(TextureImage *aTexture, GLenum aTextureUnit);
-
-        ~ScopedBindTexture()
-        {
-            if (mTexture) {
-                mTexture->ReleaseTexture();
-            }
-        }
-
-    protected:
-        TextureImage *mTexture;
-    };
-
-    class ScopedBindTextureAndApplyFilter
-        : public ScopedBindTexture
-    {
-    public:
-        ScopedBindTextureAndApplyFilter(TextureImage *aTexture, GLenum aTextureUnit) :
-          ScopedBindTexture(aTexture, aTextureUnit)
-        {
-            if (mTexture) {
-                mTexture->ApplyFilter();
-            }
-        }
-    };
-
-    /**
-     * Returns the shader program type that should be used to render
-     * this texture. Only valid after a matching BeginUpdate/EndUpdate
-     * pair have been called.
-     */
-    virtual ShaderProgramType GetShaderProgramType()
-    {
-         return mShaderType;
-    }
-
-    /** Can be called safely at any time. */
-
-    /**
-     * If this TextureImage has a permanent gfxASurface backing,
-     * return it.  Otherwise return NULL.
-     */
-    virtual already_AddRefed<gfxASurface> GetBackingSurface()
-    { return NULL; }
-
-    const nsIntSize& GetSize() const { return mSize; }
-    ContentType GetContentType() const { return mContentType; }
-    virtual bool InUpdate() const = 0;
-    GLenum GetWrapMode() const { return mWrapMode; }
-
-    void SetFilter(gfxPattern::GraphicsFilter aFilter) { mFilter = aFilter; }
-
-    /**
-     * Applies this TextureImage's filter, assuming that its texture is
-     * the currently bound texture.
-     */
-    virtual void ApplyFilter() = 0;
-
-protected:
-    friend class GLContext;
-
-    /**
-     * After the ctor, the TextureImage is invalid.  Implementations
-     * must allocate resources successfully before returning the new
-     * TextureImage from GLContext::CreateTextureImage().  That is,
-     * clients must not be given partially-constructed TextureImages.
-     */
-    TextureImage(const nsIntSize& aSize,
-                 GLenum aWrapMode, ContentType aContentType,
-                 Flags aFlags = NoFlags)
-        : mSize(aSize)
-        , mWrapMode(aWrapMode)
-        , mContentType(aContentType)
-        , mFilter(gfxPattern::FILTER_GOOD)
-        , mFlags(aFlags)
-    {}
-
-    virtual nsIntRect GetSrcTileRect() {
-        return nsIntRect(nsIntPoint(0,0), mSize);
-    }
-
-    nsIntSize mSize;
-    GLenum mWrapMode;
-    ContentType mContentType;
-    ShaderProgramType mShaderType;
-    gfxPattern::GraphicsFilter mFilter;
-    Flags mFlags;
-};
-
-/**
- * BasicTextureImage is the baseline TextureImage implementation ---
- * it updates its texture by allocating a scratch buffer for the
- * client to draw into, then using glTexSubImage2D() to upload the new
- * pixels.  Platforms must provide the code to create a new surface
- * into which the updated pixels will be drawn, and the code to
- * convert the update surface's pixels into an image on which we can
- * glTexSubImage2D().
- */
-class BasicTextureImage
-    : public TextureImage
-{
-public:
-    typedef gfxASurface::gfxImageFormat ImageFormat;
-    virtual ~BasicTextureImage();
-
-    BasicTextureImage(GLuint aTexture,
-                      const nsIntSize& aSize,
-                      GLenum aWrapMode,
-                      ContentType aContentType,
-                      GLContext* aContext,
-                      TextureImage::Flags aFlags = TextureImage::NoFlags)
-        : TextureImage(aSize, aWrapMode, aContentType, aFlags)
-        , mTexture(aTexture)
-        , mTextureState(Created)
-        , mGLContext(aContext)
-        , mUpdateOffset(0, 0)
-    {}
-
-    virtual void BindTexture(GLenum aTextureUnit);
-
-    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion);
-    virtual void GetUpdateRegion(nsIntRegion& aForRegion);
-    virtual void EndUpdate();
-    virtual bool DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0));
-    virtual GLuint GetTextureID() { return mTexture; }
-    // Returns a surface to draw into
-    virtual already_AddRefed<gfxASurface>
-      GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt);
-
-    virtual void MarkValid() { mTextureState = Valid; }
-
-    // Call when drawing into the update surface is complete.
-    // Returns true if textures should be upload with a relative
-    // offset - See UploadSurfaceToTexture.
-    virtual bool FinishedSurfaceUpdate();
-
-    // Call after surface data has been uploaded to a texture.
-    virtual void FinishedSurfaceUpload();
-
-    virtual bool InUpdate() const { return !!mUpdateSurface; }
-
-    virtual void Resize(const nsIntSize& aSize);
-
-    virtual void ApplyFilter();
-protected:
-
-    GLuint mTexture;
-    TextureState mTextureState;
-    GLContext* mGLContext;
-    nsRefPtr<gfxASurface> mUpdateSurface;
-    nsIntRegion mUpdateRegion;
-
-    // The offset into the update surface at which the update rect is located.
-    nsIntPoint mUpdateOffset;
-};
-
-/**
- * A container class that complements many sub TextureImages into a big TextureImage.
- * Aims to behave just like the real thing.
- */
-
-class TiledTextureImage
-    : public TextureImage
-{
-public:
-    TiledTextureImage(GLContext* aGL, nsIntSize aSize,
-        TextureImage::ContentType, TextureImage::Flags aFlags = TextureImage::NoFlags);
-    ~TiledTextureImage();
-    void DumpDiv();
-    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion);
-    virtual void GetUpdateRegion(nsIntRegion& aForRegion);
-    virtual void EndUpdate();
-    virtual void Resize(const nsIntSize& aSize);
-    virtual uint32_t GetTileCount();
-    virtual void BeginTileIteration();
-    virtual bool NextTile();
-    virtual void SetIterationCallback(TileIterationCallback aCallback,
-                                      void* aCallbackData);
-    virtual nsIntRect GetTileRect();
-    virtual GLuint GetTextureID() {
-        return mImages[mCurrentImage]->GetTextureID();
-    }
-    virtual bool DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0));
-    virtual bool InUpdate() const { return mInUpdate; }
-    virtual void BindTexture(GLenum);
-    virtual void ApplyFilter();
-
-protected:
-    virtual nsIntRect GetSrcTileRect();
-
-    unsigned int mCurrentImage;
-    TileIterationCallback mIterationCallback;
-    void* mIterationCallbackData;
-    nsTArray< nsRefPtr<TextureImage> > mImages;
-    bool mInUpdate;
-    nsIntSize mSize;
-    unsigned int mTileSize;
-    unsigned int mRows, mColumns;
-    GLContext* mGL;
-    // A temporary surface to faciliate cross-tile updates.
-    nsRefPtr<gfxASurface> mUpdateSurface;
-    // The region of update requested
-    nsIntRegion mUpdateRegion;
-    TextureState mTextureState;
-};
-
-} // namespace gl
-} // namespace mozilla
-
-#endif /* GLTEXTUREIMAGE_H_ */
diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in
index 8f1cde8fe9de..4d8928ee8f8a 100644
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -18,13 +18,11 @@ FAIL_ON_WARNINGS = 1
 EXPORTS	= \
 	GLDefs.h \
 	GLContext.h \
-	GLContextTypes.h \
 	GLContextSymbols.h \
 	GLContextProvider.h \
 	GLContextProviderImpl.h \
 	GLLibraryLoader.h \
 	ForceDiscreteGPUHelperCGL.h \
-	GLTextureImage.h \
 	$(NULL)
 
 ifdef MOZ_X11
@@ -49,7 +47,6 @@ CPPSRCS	= \
 	GLContext.cpp \
 	GLContextUtils.cpp \
 	GLLibraryLoader.cpp \
-	GLTextureImage.cpp \
 	$(NULL)
 
 GL_PROVIDER = Null
diff --git a/gfx/layers/SharedTextureImage.h b/gfx/layers/SharedTextureImage.h
index 2a42154cfcf6..3f0732023954 100644
--- a/gfx/layers/SharedTextureImage.h
+++ b/gfx/layers/SharedTextureImage.h
@@ -20,7 +20,7 @@ class THEBES_API SharedTextureImage : public Image {
 public:
   struct Data {
     gl::SharedTextureHandle mHandle;
-    gl::GLContext::SharedTextureShareType mShareType;
+    gl::TextureImage::TextureShareType mShareType;
     gfxIntSize mSize;
     bool mInverted;
   };
@@ -41,4 +41,4 @@ private:
 } // layers
 } // mozilla
 
-#endif // GFX_SHAREDTEXTUREIMAGE_H
+#endif // GFX_SHAREDTEXTUREIMAGE_H
\ No newline at end of file
diff --git a/gfx/layers/basic/BasicCanvasLayer.cpp b/gfx/layers/basic/BasicCanvasLayer.cpp
index e028468f29b1..fdc133d38747 100644
--- a/gfx/layers/basic/BasicCanvasLayer.cpp
+++ b/gfx/layers/basic/BasicCanvasLayer.cpp
@@ -387,25 +387,24 @@ BasicShadowableCanvasLayer::Paint(gfxContext* aContext, Layer* aMaskLayer)
 
   if (mGLContext &&
       !mForceReadback &&
-      BasicManager()->GetParentBackendType() == mozilla::layers::LAYERS_OPENGL)
-  {
-    GLContext::SharedTextureShareType shareType;
+      BasicManager()->GetParentBackendType() == mozilla::layers::LAYERS_OPENGL) {
+    TextureImage::TextureShareType flags;
     // if process type is default, then it is single-process (non-e10s)
     if (XRE_GetProcessType() == GeckoProcessType_Default)
-      shareType = GLContext::SameProcess;
+      flags = TextureImage::ThreadShared;
     else
-      shareType = GLContext::CrossProcess;
+      flags = TextureImage::ProcessShared;
 
     SharedTextureHandle handle = GetSharedBackBufferHandle();
     if (!handle) {
-      handle = mGLContext->CreateSharedHandle(shareType);
+      handle = mGLContext->CreateSharedHandle(flags);
       if (handle) {
-        mBackBuffer = SharedTextureDescriptor(shareType, handle, mBounds.Size(), false);
+        mBackBuffer = SharedTextureDescriptor(flags, handle, mBounds.Size(), false);
       }
     }
     if (handle) {
       mGLContext->MakeCurrent();
-      mGLContext->UpdateSharedHandle(shareType, handle);
+      mGLContext->UpdateSharedHandle(flags, handle);
       // call Painted() to reset our dirty 'bit'
       Painted();
       FireDidTransactionCallback();
diff --git a/gfx/layers/ipc/LayersSurfaces.ipdlh b/gfx/layers/ipc/LayersSurfaces.ipdlh
index 2d8e763f05b8..39db98123782 100644
--- a/gfx/layers/ipc/LayersSurfaces.ipdlh
+++ b/gfx/layers/ipc/LayersSurfaces.ipdlh
@@ -22,7 +22,7 @@ using mozilla::layers::SurfaceDescriptorX11;
 using mozilla::null_t;
 using mozilla::WindowsHandle;
 using mozilla::gl::SharedTextureHandle;
-using mozilla::gl::GLContext::SharedTextureShareType;
+using mozilla::gl::TextureImage::TextureShareType;
 
 namespace mozilla {
 namespace layers {
@@ -37,7 +37,7 @@ struct SurfaceDescriptorD3D10 {
 };
 
 struct SharedTextureDescriptor {
-  SharedTextureShareType shareType;
+  TextureShareType shareType;
   SharedTextureHandle handle;
   nsIntSize size;
   bool inverted;
diff --git a/gfx/layers/ipc/ShadowLayerUtils.h b/gfx/layers/ipc/ShadowLayerUtils.h
index b7eaa1d4d191..4d66cef624bd 100644
--- a/gfx/layers/ipc/ShadowLayerUtils.h
+++ b/gfx/layers/ipc/ShadowLayerUtils.h
@@ -52,9 +52,9 @@ struct ParamTraits<mozilla::layers::SurfaceDescriptorX11> {
 #endif  // !defined(MOZ_HAVE_XSURFACEDESCRIPTORX11)
 
 template<>
-struct ParamTraits<mozilla::gl::GLContext::SharedTextureShareType>
+struct ParamTraits<mozilla::gl::TextureImage::TextureShareType>
 {
-  typedef mozilla::gl::GLContext::SharedTextureShareType paramType;
+  typedef mozilla::gl::TextureImage::TextureShareType paramType;
 
   static void Write(Message* msg, const paramType& param)
   {
diff --git a/gfx/layers/opengl/CanvasLayerOGL.cpp b/gfx/layers/opengl/CanvasLayerOGL.cpp
index 6616fb9fde05..3bd9e578b40e 100644
--- a/gfx/layers/opengl/CanvasLayerOGL.cpp
+++ b/gfx/layers/opengl/CanvasLayerOGL.cpp
@@ -420,10 +420,7 @@ ShadowCanvasLayerOGL::Swap(const CanvasSurface& aNewFront,
   } else if (IsValidSharedTexDescriptor(aNewFront)) {
     MakeTextureIfNeeded(gl(), mTexture);
     if (!IsValidSharedTexDescriptor(mFrontBufferDescriptor)) {
-      mFrontBufferDescriptor = SharedTextureDescriptor(GLContext::SameProcess,
-                                                       0,
-                                                       nsIntSize(0, 0),
-                                                       false);
+      mFrontBufferDescriptor = SharedTextureDescriptor(TextureImage::ThreadShared, 0, nsIntSize(0, 0), false);
     }
     *aNewBack = mFrontBufferDescriptor;
     mFrontBufferDescriptor = aNewFront;
diff --git a/gfx/layers/opengl/ImageLayerOGL.h b/gfx/layers/opengl/ImageLayerOGL.h
index 5995c12ef7c9..5db8b6e9c897 100644
--- a/gfx/layers/opengl/ImageLayerOGL.h
+++ b/gfx/layers/opengl/ImageLayerOGL.h
@@ -194,7 +194,7 @@ private:
 
   // For SharedTextureHandle
   gl::SharedTextureHandle mSharedHandle;
-  gl::GLContext::SharedTextureShareType mShareType;
+  gl::TextureImage::TextureShareType mShareType;
   bool mInverted;
   GLuint mTexture;
 
diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp
index 932150e4482e..7f794318f349 100644
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -3,13 +3,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/. */
 
-#include "LayerManagerOGL.h"
-
 #include "mozilla/layers/PLayers.h"
 
 /* This must occur *after* layers/PLayers.h to avoid typedefs conflicts. */
 #include "mozilla/Util.h"
+
 #include "Composer2D.h"
+#include "LayerManagerOGL.h"
 #include "ThebesLayerOGL.h"
 #include "ContainerLayerOGL.h"
 #include "ImageLayerOGL.h"
@@ -52,91 +52,6 @@ using namespace mozilla::gl;
 int ShaderProgramOGL::sCurrentProgramKey = 0;
 #endif
 
-bool
-LayerManagerOGL::Initialize(bool force)
-{
-  return Initialize(CreateContext(), force);
-}
-
-int32_t
-LayerManagerOGL::GetMaxTextureSize() const
-{
-  return mGLContext->GetMaxTextureSize();
-}
-
-void
-LayerManagerOGL::MakeCurrent(bool aForce)
-{
-  if (mDestroyed) {
-    NS_WARNING("Call on destroyed layer manager");
-    return;
-  }
-  mGLContext->MakeCurrent(aForce);
-}
-
-void*
-LayerManagerOGL::GetNSOpenGLContext() const
-{
-  return gl()->GetNativeData(GLContext::NativeGLContext);
-}
-
-
-void
-LayerManagerOGL::BindQuadVBO() {
-  mGLContext->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, mQuadVBO);
-}
-
-void
-LayerManagerOGL::QuadVBOVerticesAttrib(GLuint aAttribIndex) {
-  mGLContext->fVertexAttribPointer(aAttribIndex, 2,
-                                   LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
-                                   (GLvoid*) QuadVBOVertexOffset());
-}
-
-void
-LayerManagerOGL::QuadVBOTexCoordsAttrib(GLuint aAttribIndex) {
-  mGLContext->fVertexAttribPointer(aAttribIndex, 2,
-                                   LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
-                                   (GLvoid*) QuadVBOTexCoordOffset());
-}
-
-void
-LayerManagerOGL::QuadVBOFlippedTexCoordsAttrib(GLuint aAttribIndex) {
-  mGLContext->fVertexAttribPointer(aAttribIndex, 2,
-                                   LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
-                                   (GLvoid*) QuadVBOFlippedTexCoordOffset());
-}
-
-// Super common
-
-void
-LayerManagerOGL::BindAndDrawQuad(GLuint aVertAttribIndex,
-                     GLuint aTexCoordAttribIndex,
-                     bool aFlipped)
-{
-  BindQuadVBO();
-  QuadVBOVerticesAttrib(aVertAttribIndex);
-
-  if (aTexCoordAttribIndex != GLuint(-1)) {
-    if (aFlipped)
-      QuadVBOFlippedTexCoordsAttrib(aTexCoordAttribIndex);
-    else
-      QuadVBOTexCoordsAttrib(aTexCoordAttribIndex);
-
-    mGLContext->fEnableVertexAttribArray(aTexCoordAttribIndex);
-  }
-
-  mGLContext->fEnableVertexAttribArray(aVertAttribIndex);
-
-  mGLContext->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
-
-  mGLContext->fDisableVertexAttribArray(aVertAttribIndex);
-
-  if (aTexCoordAttribIndex != GLuint(-1)) {
-    mGLContext->fDisableVertexAttribArray(aTexCoordAttribIndex);
-  }
-}
-
 static const double kFpsWindowMs = 250.0;
 static const size_t kNumFrameTimeStamps = 16;
 struct FPSCounter {
diff --git a/gfx/layers/opengl/LayerManagerOGL.h b/gfx/layers/opengl/LayerManagerOGL.h
index 78059d36a8c9..623e009e0e64 100644
--- a/gfx/layers/opengl/LayerManagerOGL.h
+++ b/gfx/layers/opengl/LayerManagerOGL.h
@@ -9,23 +9,31 @@
 #include "LayerManagerOGLProgram.h"
 
 #include "mozilla/layers/ShadowLayers.h"
+
 #include "mozilla/TimeStamp.h"
 
 #ifdef XP_WIN
 #include <windows.h>
 #endif
 
+/**
+ * We don't include GLDefs.h here since we don't want to drag in all defines
+ * in for all our users.
+ */
+typedef unsigned int GLenum;
+typedef unsigned int GLbitfield;
+typedef unsigned int GLuint;
+typedef int GLint;
+typedef int GLsizei;
+
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
 #include "gfxContext.h"
 #include "gfx3DMatrix.h"
 #include "nsIWidget.h"
-#include "GLContextTypes.h"
+#include "GLContext.h"
 
 namespace mozilla {
-namespace gl {
-class GLContext;
-}
 namespace layers {
 
 class Composer2D;
@@ -63,7 +71,9 @@ public:
    *
    * \return True is initialization was succesful, false when it was not.
    */
-  bool Initialize(bool force = false);
+  bool Initialize(bool force = false) {
+    return Initialize(CreateContext(), force);
+  }
 
   bool Initialize(nsRefPtr<GLContext> aContext, bool force = false);
 
@@ -100,14 +110,18 @@ public:
 
   virtual void SetRoot(Layer* aLayer) { mRoot = aLayer; }
 
-  virtual bool CanUseCanvasLayerForSize(const gfxIntSize &aSize) {
-    if (!mGLContext)
-      return false;
-    int32_t maxSize = GetMaxTextureSize();
-    return aSize <= gfxIntSize(maxSize, maxSize);
+  virtual bool CanUseCanvasLayerForSize(const gfxIntSize &aSize)
+  {
+      if (!mGLContext)
+          return false;
+      int32_t maxSize = mGLContext->GetMaxTextureSize();
+      return aSize <= gfxIntSize(maxSize, maxSize);
   }
 
-  virtual int32_t GetMaxTextureSize() const;
+  virtual int32_t GetMaxTextureSize() const
+  {
+    return mGLContext->GetMaxTextureSize();
+  }
 
   virtual already_AddRefed<ThebesLayer> CreateThebesLayer();
 
@@ -137,7 +151,13 @@ public:
   /**
    * Helper methods.
    */
-  void MakeCurrent(bool aForce = false);
+  void MakeCurrent(bool aForce = false) {
+    if (mDestroyed) {
+      NS_WARNING("Call on destroyed layer manager");
+      return;
+    }
+    mGLContext->MakeCurrent(aForce);
+  }
 
   ShaderProgramOGL* GetBasicLayerProgram(bool aOpaque, bool aIsRGB,
                                          MaskType aMask = MaskNone)
@@ -183,9 +203,6 @@ public:
 
   GLContext* gl() const { return mGLContext; }
 
-  // |NSOpenGLContext*|:
-  void* GetNSOpenGLContext() const;
-
   DrawThebesLayerCallback GetThebesLayerCallback() const
   { return mThebesLayerCallback; }
 
@@ -237,15 +254,56 @@ public:
   GLintptr QuadVBOTexCoordOffset() { return sizeof(float)*4*2; }
   GLintptr QuadVBOFlippedTexCoordOffset() { return sizeof(float)*8*2; }
 
-  void BindQuadVBO();
-  void QuadVBOVerticesAttrib(GLuint aAttribIndex);
-  void QuadVBOTexCoordsAttrib(GLuint aAttribIndex);
-  void QuadVBOFlippedTexCoordsAttrib(GLuint aAttribIndex);
+  void BindQuadVBO() {
+    mGLContext->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, mQuadVBO);
+  }
+
+  void QuadVBOVerticesAttrib(GLuint aAttribIndex) {
+    mGLContext->fVertexAttribPointer(aAttribIndex, 2,
+                                     LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
+                                     (GLvoid*) QuadVBOVertexOffset());
+  }
+
+  void QuadVBOTexCoordsAttrib(GLuint aAttribIndex) {
+    mGLContext->fVertexAttribPointer(aAttribIndex, 2,
+                                     LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
+                                     (GLvoid*) QuadVBOTexCoordOffset());
+  }
+
+  void QuadVBOFlippedTexCoordsAttrib(GLuint aAttribIndex) {
+    mGLContext->fVertexAttribPointer(aAttribIndex, 2,
+                                     LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
+                                     (GLvoid*) QuadVBOFlippedTexCoordOffset());
+  }
 
   // Super common
+
   void BindAndDrawQuad(GLuint aVertAttribIndex,
                        GLuint aTexCoordAttribIndex,
-                       bool aFlipped = false);
+                       bool aFlipped = false)
+  {
+    BindQuadVBO();
+    QuadVBOVerticesAttrib(aVertAttribIndex);
+
+    if (aTexCoordAttribIndex != GLuint(-1)) {
+      if (aFlipped)
+        QuadVBOFlippedTexCoordsAttrib(aTexCoordAttribIndex);
+      else
+        QuadVBOTexCoordsAttrib(aTexCoordAttribIndex);
+
+      mGLContext->fEnableVertexAttribArray(aTexCoordAttribIndex);
+    }
+
+    mGLContext->fEnableVertexAttribArray(aVertAttribIndex);
+
+    mGLContext->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
+
+    mGLContext->fDisableVertexAttribArray(aVertAttribIndex);
+
+    if (aTexCoordAttribIndex != GLuint(-1)) {
+      mGLContext->fDisableVertexAttribArray(aTexCoordAttribIndex);
+    }
+  }
 
   void BindAndDrawQuad(ShaderProgramOGL *aProg,
                        bool aFlipped = false)
diff --git a/gfx/layers/opengl/LayerManagerOGLProgram.cpp b/gfx/layers/opengl/LayerManagerOGLProgram.cpp
index 3631e831da50..155b28870693 100644
--- a/gfx/layers/opengl/LayerManagerOGLProgram.cpp
+++ b/gfx/layers/opengl/LayerManagerOGLProgram.cpp
@@ -3,16 +3,9 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "LayerManagerOGLProgram.h"
-
-#ifdef GLCONTEXT_H_
-#error GLContext.h should not have been included here.
-#endif
-
 #include "LayerManagerOGLShaders.h"
 #include "LayerManagerOGL.h"
 
-#include "GLContext.h"
-
 namespace mozilla {
 namespace layers {
 
@@ -234,28 +227,6 @@ ProgramProfileOGL::GetProfileFor(gl::ShaderProgramType aType,
 const char* const ShaderProgramOGL::VertexCoordAttrib = "aVertexCoord";
 const char* const ShaderProgramOGL::TexCoordAttrib = "aTexCoord";
 
-ShaderProgramOGL::ShaderProgramOGL(GLContext* aGL, const ProgramProfileOGL& aProfile)
-  : mIsProjectionMatrixStale(false)
-  , mGL(aGL)
-  , mProgram(0)
-  , mProfile(aProfile)
-  , mProgramState(STATE_NEW)
-{}
-
-ShaderProgramOGL::~ShaderProgramOGL()
-{
-  if (mProgram <= 0) {
-    return;
-  }
-
-  nsRefPtr<GLContext> ctx = mGL->GetSharedContext();
-  if (!ctx) {
-    ctx = mGL;
-  }
-  ctx->MakeCurrent();
-  ctx->fDeleteProgram(mProgram);
-}
-
 bool
 ShaderProgramOGL::Initialize()
 {
@@ -423,87 +394,5 @@ ShaderProgramOGL::LoadMask(Layer* aMaskLayer)
   return true;
 }
 
-void
-ShaderProgramOGL::Activate()
-{
-  if (mProgramState == STATE_NEW) {
-    if (!Initialize()) {
-      NS_WARNING("Shader could not be initialised");
-      return;
-    }
-  }
-  NS_ASSERTION(HasInitialized(), "Attempting to activate a program that's not in use!");
-  mGL->fUseProgram(mProgram);
-#if CHECK_CURRENT_PROGRAM
-  mGL->SetUserData(&sCurrentProgramKey, this);
-#endif
-  // check and set the projection matrix
-  if (mIsProjectionMatrixStale) {
-    SetProjectionMatrix(mProjectionMatrix);
-  }
-}
-
-
-void
-ShaderProgramOGL::SetUniform(GLint aLocation, float aFloatValue)
-{
-  ASSERT_THIS_PROGRAM;
-  NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-  mGL->fUniform1f(aLocation, aFloatValue);
-}
-
-void
-ShaderProgramOGL::SetUniform(GLint aLocation, const gfxRGBA& aColor)
-{
-  ASSERT_THIS_PROGRAM;
-  NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-  mGL->fUniform4f(aLocation, float(aColor.r), float(aColor.g), float(aColor.b), float(aColor.a));
-}
-
-void
-ShaderProgramOGL::SetUniform(GLint aLocation, int aLength, float *aFloatValues)
-{
-  ASSERT_THIS_PROGRAM;
-  NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-  if (aLength == 1) {
-    mGL->fUniform1fv(aLocation, 1, aFloatValues);
-  } else if (aLength == 2) {
-    mGL->fUniform2fv(aLocation, 1, aFloatValues);
-  } else if (aLength == 3) {
-    mGL->fUniform3fv(aLocation, 1, aFloatValues);
-  } else if (aLength == 4) {
-    mGL->fUniform4fv(aLocation, 1, aFloatValues);
-  } else {
-    NS_NOTREACHED("Bogus aLength param");
-  }
-}
-
-void
-ShaderProgramOGL::SetUniform(GLint aLocation, GLint aIntValue)
-{
-  ASSERT_THIS_PROGRAM;
-  NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-  mGL->fUniform1i(aLocation, aIntValue);
-}
-
-void
-ShaderProgramOGL::SetMatrixUniform(GLint aLocation, const gfx3DMatrix& aMatrix)
-{
-  SetMatrixUniform(aLocation, &aMatrix._11);
-}
-
-void
-ShaderProgramOGL::SetMatrixUniform(GLint aLocation, const float *aFloatValues)
-{
-  ASSERT_THIS_PROGRAM;
-  NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-  mGL->fUniformMatrix4fv(aLocation, 1, false, aFloatValues);
-}
-
 } /* layers */
 } /* mozilla */
diff --git a/gfx/layers/opengl/LayerManagerOGLProgram.h b/gfx/layers/opengl/LayerManagerOGLProgram.h
index f6ed2b7a64bb..ac4a2151f9bb 100644
--- a/gfx/layers/opengl/LayerManagerOGLProgram.h
+++ b/gfx/layers/opengl/LayerManagerOGLProgram.h
@@ -10,16 +10,11 @@
 
 #include "prenv.h"
 
-#include "nsAutoPtr.h"
 #include "nsString.h"
-#include "GLContextTypes.h"
+#include "GLContext.h"
 #include "gfx3DMatrix.h"
-#include "gfxColor.h"
 
 namespace mozilla {
-namespace gl {
-class GLContext;
-}
 namespace layers {
 
 class Layer;
@@ -145,16 +140,45 @@ class ShaderProgramOGL
 public:
   typedef mozilla::gl::GLContext GLContext;
 
-  ShaderProgramOGL(GLContext* aGL, const ProgramProfileOGL& aProfile);
+  ShaderProgramOGL(GLContext* aGL, const ProgramProfileOGL& aProfile) :
+    mIsProjectionMatrixStale(false), mGL(aGL), mProgram(0),
+    mProfile(aProfile), mProgramState(STATE_NEW) { }
 
-  ~ShaderProgramOGL();
+  ~ShaderProgramOGL() {
+    if (mProgram <= 0) {
+      return;
+    }
+
+    nsRefPtr<GLContext> ctx = mGL->GetSharedContext();
+    if (!ctx) {
+      ctx = mGL;
+    }
+    ctx->MakeCurrent();
+    ctx->fDeleteProgram(mProgram);
+  }
 
   bool HasInitialized() {
     NS_ASSERTION(mProgramState != STATE_OK || mProgram > 0, "Inconsistent program state");
     return mProgramState == STATE_OK;
   }
 
-  void Activate();
+  void Activate() {
+    if (mProgramState == STATE_NEW) {
+      if (!Initialize()) {
+        NS_WARNING("Shader could not be initialised");
+        return;
+      }
+    }
+    NS_ASSERTION(HasInitialized(), "Attempting to activate a program that's not in use!");
+    mGL->fUseProgram(mProgram);
+#if CHECK_CURRENT_PROGRAM
+    mGL->SetUserData(&sCurrentProgramKey, this);
+#endif
+    // check and set the projection matrix
+    if (mIsProjectionMatrixStale) {
+      SetProjectionMatrix(mProjectionMatrix);
+    }
+  }
 
   bool Initialize();
 
@@ -305,12 +329,54 @@ protected:
   static int sCurrentProgramKey;
 #endif
 
-  void SetUniform(GLint aLocation, float aFloatValue);
-  void SetUniform(GLint aLocation, const gfxRGBA& aColor);
-  void SetUniform(GLint aLocation, int aLength, float *aFloatValues);
-  void SetUniform(GLint aLocation, GLint aIntValue);
-  void SetMatrixUniform(GLint aLocation, const gfx3DMatrix& aMatrix);
-  void SetMatrixUniform(GLint aLocation, const float *aFloatValues);
+  void SetUniform(GLint aLocation, float aFloatValue) {
+    ASSERT_THIS_PROGRAM;
+    NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+    mGL->fUniform1f(aLocation, aFloatValue);
+  }
+
+  void SetUniform(GLint aLocation, const gfxRGBA& aColor) {
+    ASSERT_THIS_PROGRAM;
+    NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+    mGL->fUniform4f(aLocation, float(aColor.r), float(aColor.g), float(aColor.b), float(aColor.a));
+  }
+
+  void SetUniform(GLint aLocation, int aLength, float *aFloatValues) {
+    ASSERT_THIS_PROGRAM;
+    NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+    if (aLength == 1) {
+      mGL->fUniform1fv(aLocation, 1, aFloatValues);
+    } else if (aLength == 2) {
+      mGL->fUniform2fv(aLocation, 1, aFloatValues);
+    } else if (aLength == 3) {
+      mGL->fUniform3fv(aLocation, 1, aFloatValues);
+    } else if (aLength == 4) {
+      mGL->fUniform4fv(aLocation, 1, aFloatValues);
+    } else {
+      NS_NOTREACHED("Bogus aLength param");
+    }
+  }
+
+  void SetUniform(GLint aLocation, GLint aIntValue) {
+    ASSERT_THIS_PROGRAM;
+    NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+    mGL->fUniform1i(aLocation, aIntValue);
+  }
+
+  void SetMatrixUniform(GLint aLocation, const gfx3DMatrix& aMatrix) {
+    SetMatrixUniform(aLocation, &aMatrix._11);
+  }
+
+  void SetMatrixUniform(GLint aLocation, const float *aFloatValues) {
+    ASSERT_THIS_PROGRAM;
+    NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+    mGL->fUniformMatrix4fv(aLocation, 1, false, aFloatValues);
+  }
 };
 
 
diff --git a/gfx/layers/opengl/ReusableTileStoreOGL.cpp b/gfx/layers/opengl/ReusableTileStoreOGL.cpp
index 6c52f74c060f..63e4d531785e 100644
--- a/gfx/layers/opengl/ReusableTileStoreOGL.cpp
+++ b/gfx/layers/opengl/ReusableTileStoreOGL.cpp
@@ -4,8 +4,6 @@
 
 #include "ReusableTileStoreOGL.h"
 
-#include "GLContext.h"
-
 namespace mozilla {
 namespace layers {
 
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 403183554a59..e7ba09c2b627 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -51,7 +51,7 @@
 #include "nsRegion.h"
 #include "Layers.h"
 #include "LayerManagerOGL.h"
-#include "GLTextureImage.h"
+#include "GLContext.h"
 #include "mozilla/layers/CompositorCocoaWidgetHelper.h"
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"
@@ -67,10 +67,6 @@
 
 #include "nsIDOMWheelEvent.h"
 
-#ifdef GLCONTEXT_H_
-#error GLContext.h should not have been included here.
-#endif
-
 using namespace mozilla;
 using namespace mozilla::layers;
 using namespace mozilla::gl;
@@ -1696,7 +1692,8 @@ nsChildView::CreateCompositor()
     LayerManagerOGL *manager =
       static_cast<LayerManagerOGL*>(compositor::GetLayerManager(mCompositorParent));
 
-    NSOpenGLContext *glContext = (NSOpenGLContext *)manager->GetNSOpenGLContext();
+    NSOpenGLContext *glContext =
+      (NSOpenGLContext *) manager->gl()->GetNativeData(GLContext::NativeGLContext);
 
     [(ChildView *)mView setGLContext:glContext];
     [(ChildView *)mView setUsingOMTCompositor:true];
@@ -1759,11 +1756,10 @@ nsChildView::DrawWindowOverlay(LayerManager* aManager, nsIntRect aRect)
   }
 
   if (!mResizerImage) {
-    mResizerImage = TextureImage::Create(manager->gl(),
-                                         nsIntSize(15, 15),
-                                         gfxASurface::CONTENT_COLOR_ALPHA,
-                                         LOCAL_GL_CLAMP_TO_EDGE,
-                                         TextureImage::UseNearestFilter);
+    mResizerImage = manager->gl()->CreateTextureImage(nsIntSize(15, 15),
+                                                      gfxASurface::CONTENT_COLOR_ALPHA,
+                                                      LOCAL_GL_CLAMP_TO_EDGE,
+                                                      TextureImage::UseNearestFilter);
 
     // Creation of texture images can fail.
     if (!mResizerImage)
@@ -2461,7 +2457,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
 
     LayerManagerOGL *manager = static_cast<LayerManagerOGL*>(layerManager);
     manager->SetClippingRegion(region);
-    glContext = (NSOpenGLContext *)manager->GetNSOpenGLContext();
+    glContext = (NSOpenGLContext *)manager->gl()->GetNativeData(mozilla::gl::GLContext::NativeGLContext);
 
     if (!mGLContext) {
       [self setGLContext:glContext];

From 6d96cbc37a5d0882f4822791e344e9dac2ce894b Mon Sep 17 00:00:00 2001
From: David Keeler <dkeeler@mozilla.com>
Date: Tue, 20 Nov 2012 16:58:22 -0800
Subject: [PATCH 041/160] bug 812562 - click-to-play: reshow notification for
 blocklisted plugins r=jaws

---
 browser/base/content/browser-plugins.js       |  4 -
 browser/base/content/test/Makefile.in         |  3 +
 .../test/blockPluginVulnerableNoUpdate.xml    | 11 +++
 .../test/blockPluginVulnerableUpdatable.xml   | 11 +++
 .../base/content/test/browser_bug812562.js    | 81 +++++++++++++++++++
 .../test/browser_pluginnotification.js        | 64 +++------------
 browser/base/content/test/head.js             | 21 +++++
 7 files changed, 138 insertions(+), 57 deletions(-)
 create mode 100644 browser/base/content/test/blockPluginVulnerableNoUpdate.xml
 create mode 100644 browser/base/content/test/blockPluginVulnerableUpdatable.xml
 create mode 100644 browser/base/content/test/browser_bug812562.js

diff --git a/browser/base/content/browser-plugins.js b/browser/base/content/browser-plugins.js
index 0c3e760a27d0..0c5c0dc56ce8 100644
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -416,11 +416,7 @@ var gPluginHandler = {
   },
 
   reshowClickToPlayNotification: function PH_reshowClickToPlayNotification() {
-    if (!Services.prefs.getBoolPref("plugins.click_to_play"))
-      return;
-
     let browser = gBrowser.selectedBrowser;
-
     let pluginsPermission = Services.perms.testPermission(browser.currentURI, "plugins");
     if (pluginsPermission == Ci.nsIPermissionManager.DENY_ACTION)
       return;
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index a60f5334c7cb..c8735d595d29 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -269,6 +269,9 @@ _BROWSER_FILES = \
                  browser_tabDrop.js \
                  browser_lastAccessedTab.js \
                  browser_bug734076.js \
+                 browser_bug812562.js \
+                 blockPluginVulnerableUpdatable.xml \
+                 blockPluginVulnerableNoUpdate.xml \
                  browser_social.js \
                  browser_social_toolbar.js \
                  browser_social_shareButton.js \
diff --git a/browser/base/content/test/blockPluginVulnerableNoUpdate.xml b/browser/base/content/test/blockPluginVulnerableNoUpdate.xml
new file mode 100644
index 000000000000..bf8545afee9a
--- /dev/null
+++ b/browser/base/content/test/blockPluginVulnerableNoUpdate.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1336406310000">
+  <emItems>
+  </emItems>
+  <pluginItems>
+    <pluginItem blockID="p9999">
+      <match name="filename" exp="libnptest\.so|nptest\.dll|Test\.plugin" />
+      <versionRange severity="0" vulnerabilitystatus="2"></versionRange>
+    </pluginItem>
+  </pluginItems>
+</blocklist>
diff --git a/browser/base/content/test/blockPluginVulnerableUpdatable.xml b/browser/base/content/test/blockPluginVulnerableUpdatable.xml
new file mode 100644
index 000000000000..5545162b1b07
--- /dev/null
+++ b/browser/base/content/test/blockPluginVulnerableUpdatable.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1336406310000">
+  <emItems>
+  </emItems>
+  <pluginItems>
+    <pluginItem blockID="p9999">
+      <match name="filename" exp="libnptest\.so|nptest\.dll|Test\.plugin" />
+      <versionRange severity="0" vulnerabilitystatus="1"></versionRange>
+    </pluginItem>
+  </pluginItems>
+</blocklist>
diff --git a/browser/base/content/test/browser_bug812562.js b/browser/base/content/test/browser_bug812562.js
new file mode 100644
index 000000000000..a81bde3c5b29
--- /dev/null
+++ b/browser/base/content/test/browser_bug812562.js
@@ -0,0 +1,81 @@
+var gHttpTestRoot = getRootDirectory(gTestPath).replace("chrome://mochitests/content/", "http://127.0.0.1:8888/");
+var gTestBrowser = null;
+var gNextTest = null;
+
+Components.utils.import("resource://gre/modules/Services.jsm");
+
+function test() {
+  waitForExplicitFinish();
+  registerCleanupFunction(function() {
+    Services.prefs.clearUserPref("plugins.click_to_play");
+  });
+
+  Services.prefs.setBoolPref("plugins.click_to_play", false);
+  var newTab = gBrowser.addTab();
+  gBrowser.selectedTab = newTab;
+  gTestBrowser = gBrowser.selectedBrowser;
+  gTestBrowser.addEventListener("load", pageLoad, true);
+  setAndUpdateBlocklist(gHttpTestRoot + "blockPluginVulnerableUpdatable.xml",
+  function() {
+    prepareTest(testPart1, gHttpTestRoot + "plugin_test.html");
+  });
+}
+
+function finishTest() {
+  gTestBrowser.removeEventListener("load", pageLoad, true);
+  gBrowser.removeCurrentTab();
+  window.focus();
+  resetBlocklist(finish);
+}
+
+function pageLoad(aEvent) {
+  // The plugin events are async dispatched and can come after the load event
+  // This just allows the events to fire before we then go on to test the states
+  if (gNextTest != null)
+    executeSoon(gNextTest);
+}
+
+function prepareTest(nextTest, url) {
+  gNextTest = nextTest;
+  gTestBrowser.contentWindow.location = url;
+}
+
+// Tests that the going back will reshow the notification for click-to-play
+// blocklisted plugins (part 1/4)
+function testPart1() {
+  var popupNotification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  ok(popupNotification, "test part 1: Should have a click-to-play notification");
+  var plugin = gTestBrowser.contentDocument.getElementById("test");
+  var objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
+  is(objLoadingContent.pluginFallbackType, Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_UPDATABLE, "test part 1: plugin fallback type should be PLUGIN_VULNERABLE_UPDATABLE");
+  ok(!objLoadingContent.activated, "test part 1: plugin should not be activated");
+
+  prepareTest(testPart2, "about:blank");
+}
+
+function testPart2() {
+  var popupNotification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  ok(!popupNotification, "test part 2: Should not have a click-to-play notification");
+  var plugin = gTestBrowser.contentDocument.getElementById("test");
+  ok(!plugin, "test part 2: Should not have a plugin in this page");
+
+  Services.obs.addObserver(testPart3, "PopupNotifications-updateNotShowing", false);
+  gTestBrowser.contentWindow.history.back();
+}
+
+function testPart3() {
+  Services.obs.removeObserver(testPart3, "PopupNotifications-updateNotShowing", false);
+  var condition = function() PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  waitForCondition(condition, testPart4, "test part 3: waited too long for click-to-play-plugin notification");
+}
+
+function testPart4() {
+  var popupNotification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  ok(popupNotification, "test part 4: Should have a click-to-play notification");
+  var plugin = gTestBrowser.contentDocument.getElementById("test");
+  var objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
+  is(objLoadingContent.pluginFallbackType, Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_UPDATABLE, "test part 4: plugin fallback type should be PLUGIN_VULNERABLE_UPDATABLE");
+  ok(!objLoadingContent.activated, "test part 4: plugin should not be activated");
+
+  finishTest();
+}
diff --git a/browser/base/content/test/browser_pluginnotification.js b/browser/base/content/test/browser_pluginnotification.js
index 6f3a37c98e50..1692218532cc 100644
--- a/browser/base/content/test/browser_pluginnotification.js
+++ b/browser/base/content/test/browser_pluginnotification.js
@@ -527,53 +527,10 @@ function test17() {
   var missingNotification = PopupNotifications.getNotification("missing-plugins", gTestBrowser);
   ok(!missingNotification, "Test 17, Should not have a missing plugin notification");
 
-  registerFakeBlocklistService(Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE);
-  prepareTest(test18a, gHttpTestRoot + "plugin_test.html");
-}
-
-const Cr = Components.results;
-const Cm = Components.manager;
-const Cc = Components.classes;
-const gReg = Cm.QueryInterface(Ci.nsIComponentRegistrar);
-const gRealBlocklistServiceCID = Cc["@mozilla.org/extensions/blocklist;1"];
-const gFakeBlocklistServiceCID = Components.ID("{614b68a0-3c53-4ec0-8146-28cc1e25f8a1}");
-var gFactory = null;
-
-function registerFakeBlocklistService(blockState) {
-
-  var BlocklistService = {
-    getPluginBlocklistState: function(plugin, appVersion, toolkitVersion) {
-      return blockState;
-    },
-
-    classID: gFakeBlocklistServiceCID,
-    QueryInterface: XPCOMUtils.generateQI([Ci.nsIBlocklistService])
-  };
-
-  gFactory = {
-    createInstance: function(outer, iid) {
-      if (outer != null)
-        throw Cr.NS_ERROR_NO_AGGREGATION;
-      return BlocklistService.QueryInterface(iid);
-    }
-  };
-
-  gReg.registerFactory(gFakeBlocklistServiceCID,
-                       "Fake Blocklist Service",
-                       "@mozilla.org/extensions/blocklist;1",
-                       gFactory);
-}
-
-function unregisterFakeBlocklistService() {
-  if (gFactory != null ) {
-    gReg.unregisterFactory(gFakeBlocklistServiceCID, gFactory);
-    gFactory = null;
-    // This should restore the original blocklist service:
-    gReg.registerFactory(gRealBlocklistServiceCID,
-                         "Blocklist Service",
-                         "@mozilla.org/extensions/blocklist;1",
-                         null);
-  }
+  setAndUpdateBlocklist(gHttpTestRoot + "blockPluginVulnerableUpdatable.xml",
+  function() {
+    prepareTest(test18a, gHttpTestRoot + "plugin_test.html");
+  });
 }
 
 // Tests a vulnerable, updatable plugin
@@ -613,9 +570,10 @@ function test18b() {
   var overlay = doc.getAnonymousElementByAttribute(plugin, "class", "mainBox");
   ok(overlay.style.visibility != "hidden", "Test 18b, Plugin overlay should exist, not be hidden");
 
-  unregisterFakeBlocklistService();
-  registerFakeBlocklistService(Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE);
-  prepareTest(test18c, gHttpTestRoot + "plugin_test.html");
+  setAndUpdateBlocklist(gHttpTestRoot + "blockPluginVulnerableNoUpdate.xml",
+  function() {
+    prepareTest(test18c, gHttpTestRoot + "plugin_test.html");
+  });
 }
 
 // Tests a vulnerable plugin with no update
@@ -658,10 +616,10 @@ function test18e() {
   var objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
   ok(objLoadingContent.activated, "Test 18e, Plugin should be activated");
 
-  unregisterFakeBlocklistService();
   Services.perms.removeAll();
-
-  prepareTest(test19a, gTestRoot + "plugin_test.html");
+  resetBlocklist(function () {
+    prepareTest(test19a, gTestRoot + "plugin_test.html");
+  });
 }
 
 // Tests that clicking the icon of the overlay activates the plugin
diff --git a/browser/base/content/test/head.js b/browser/base/content/test/head.js
index 9ec29374b092..727aac2fa68b 100644
--- a/browser/base/content/test/head.js
+++ b/browser/base/content/test/head.js
@@ -201,6 +201,27 @@ function runSocialTests(tests, cbPreTest, cbPostTest, cbFinish) {
   runNextTest();
 }
 
+function updateBlocklist(aCallback) {
+  var blocklistNotifier = Cc["@mozilla.org/extensions/blocklist;1"]
+                          .getService(Ci.nsITimerCallback);
+  var observer = function() {
+    aCallback();
+    Services.obs.removeObserver(observer, "blocklist-updated");
+  };
+  Services.obs.addObserver(observer, "blocklist-updated", false);
+  blocklistNotifier.notify(null);
+}
+
+function setAndUpdateBlocklist(aURL, aCallback) {
+  Services.prefs.setCharPref("extensions.blocklist.url", aURL);
+  updateBlocklist(aCallback);
+}
+
+function resetBlocklist(aCallback) {
+  Services.prefs.clearUserPref("extensions.blocklist.url");
+  updateBlocklist(aCallback);
+}
+
 function whenNewWindowLoaded(aOptions, aCallback) {
   let win = OpenBrowserWindow(aOptions);
   win.addEventListener("load", function onLoad() {

From 58eba6e6b719e8ddb801c7855f14b379b75af9c8 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Mon, 26 Nov 2012 09:52:19 -0800
Subject: [PATCH 042/160] Bug 564815 - Tests for window.devicePixelRatio

---
 dom/tests/mochitest/general/test_innerScreen.xul | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dom/tests/mochitest/general/test_innerScreen.xul b/dom/tests/mochitest/general/test_innerScreen.xul
index 907a5a9d31bb..e94ebd3eb086 100644
--- a/dom/tests/mochitest/general/test_innerScreen.xul
+++ b/dom/tests/mochitest/general/test_innerScreen.xul
@@ -38,6 +38,9 @@ function doTests()
   var domWindowUtils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
                            .getInterface(Components.interfaces.nsIDOMWindowUtils);
   var devPxPerCSSPx = domWindowUtils.screenPixelsPerCSSPixel;
+
+  is(window.devicePixelRatio, devPxPerCSSPx, "window.devicePixelRatio");
+
   var windowBO = document.documentElement.boxObject;
   isRounded(window.mozInnerScreenX*devPxPerCSSPx, windowBO.screenX,
             "window screen X");
@@ -64,6 +67,8 @@ function doTests()
   is(frameDomWindowUtils.screenPixelsPerCSSPixel, 2*devPxPerCSSPx,
      "frame screen pixels per CSS pixel");
 
+  is(f.contentWindow.devicePixelRatio, 2*devPxPerCSSPx, "frame devicePixelRatio");
+
   isRounded(f.contentWindow.mozInnerScreenX*2,
             window.mozInnerScreenX + fBounds.left,
             "zoomed frame screen X");

From ce71c8bd00b7fcba86fbadd9032e1a98692378db Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 26 Nov 2012 13:08:00 -0500
Subject: [PATCH 043/160] Bug 815001 - Pass in the privacy information for the
 view sourced document to the web browser persist service when using an
 external view source program; r=jdm

---
 .../viewsource/content/viewSourceUtils.js        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/toolkit/components/viewsource/content/viewSourceUtils.js b/toolkit/components/viewsource/content/viewSourceUtils.js
index 56d09afd9212..91e1ede5a7ba 100644
--- a/toolkit/components/viewsource/content/viewSourceUtils.js
+++ b/toolkit/components/viewsource/content/viewSourceUtils.js
@@ -111,14 +111,6 @@ var gViewSourceUtils = {
           var file = this.getTemporaryFile(uri, aDocument, contentType);
           this.viewSourceProgressListener.file = file;
 
-          var webBrowserPersist = Components
-                                  .classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
-                                  .createInstance(this.mnsIWebBrowserPersist);
-          // the default setting is to not decode. we need to decode.
-          webBrowserPersist.persistFlags = this.mnsIWebBrowserPersist.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
-          webBrowserPersist.progressListener = this.viewSourceProgressListener;
-          webBrowserPersist.saveURI(uri, null, null, null, null, file);
-
           let fromPrivateWindow = false;
           if (aDocument) {
             try {
@@ -132,6 +124,14 @@ var gViewSourceUtils = {
             }
           }
 
+          var webBrowserPersist = Components
+                                  .classes["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
+                                  .createInstance(this.mnsIWebBrowserPersist);
+          // the default setting is to not decode. we need to decode.
+          webBrowserPersist.persistFlags = this.mnsIWebBrowserPersist.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
+          webBrowserPersist.progressListener = this.viewSourceProgressListener;
+          webBrowserPersist.savePrivacyAwareURI(uri, null, null, null, null, file, fromPrivateWindow);
+
           let helperService = Components.classes["@mozilla.org/uriloader/external-helper-app-service;1"]
                                         .getService(Components.interfaces.nsPIExternalAppLauncher);
           if (fromPrivateWindow) {

From 340359b404b0d1ddb2c02845b4988cc9e4ed3b99 Mon Sep 17 00:00:00 2001
From: Tim Taubert <ttaubert@mozilla.com>
Date: Mon, 26 Nov 2012 19:13:53 +0100
Subject: [PATCH 044/160] Bug 813277 - Unable to long-tap hold on the
 home-screen to invoke the wallpaper menu r=smaug

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

diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 277032396de1..2239f722f004 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -1927,6 +1927,9 @@ nsEventStateManager::FireContextClick()
         }
       }
 
+      nsIDocument* doc = mGestureDownContent->GetCurrentDoc();
+      nsAutoHandlingUserInputStatePusher userInpStatePusher(true, &event, doc);
+
       // dispatch to DOM
       nsEventDispatcher::Dispatch(mGestureDownContent, mPresContext, &event,
                                   nullptr, &status);

From 3ab6be9a62e0b4ad417ac031e50101cd90fb39b4 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 22 Nov 2012 15:50:06 -0500
Subject: [PATCH 045/160] Bug 814513 - Enable browser_save_link-perwindowpb.js.
 r=ehsan

---
 browser/base/content/test/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 268359380db2..a60f5334c7cb 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -304,7 +304,7 @@ ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING
 _BROWSER_FILES += \
                 browser_bug763468_perwindowpb.js \
                 browser_private_browsing_window.js \
-                $(filter disabled-until-bug-722850, browser_save_link-perwindowpb.js) \
+                browser_save_link-perwindowpb.js \
                 $(NULL)
 else
 _BROWSER_FILES += \

From e69205c689e7877c066c76898c180b26abfa2b67 Mon Sep 17 00:00:00 2001
From: Suhas Nandakumar <snandaku@cisco.com>
Date: Mon, 26 Nov 2012 08:38:14 -0800
Subject: [PATCH 046/160] Bug 814734 - Fixed Log format string mismatches r=ekr

---
 .../src/media-conduit/AudioConduit.cpp        | 20 +++++++++----------
 .../src/media-conduit/VideoConduit.cpp        |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
index 3a5c6cc21ec9..75deb9ca5851 100644
--- a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
@@ -265,7 +265,7 @@ WebrtcAudioConduit::ConfigureRecvMediaCodecs(
     {
       if( mPtrVoEBase->LastError() == VE_CANNOT_STOP_PLAYOUT)
       {
-        CSFLogDebug(logTag, "%s Stop-Playout Failed %d", mPtrVoEBase->LastError());
+        CSFLogDebug(logTag, "%s Stop-Playout Failed %d", __FUNCTION__, mPtrVoEBase->LastError());
         return kMediaConduitPlayoutError;
       }
     }
@@ -327,7 +327,7 @@ WebrtcAudioConduit::ConfigureRecvMediaCodecs(
   if(mPtrVoEBase->StartReceive(mChannel) == -1)
   {
     error = mPtrVoEBase->LastError();
-    CSFLogError(logTag ,  "StartReceive Failed %d ",error);
+    CSFLogError(logTag ,  "%s StartReceive Failed %d ",__FUNCTION__, error);
     if(error == VE_RECV_SOCKET_ERROR)
     {
       return kMediaConduitSocketError;
@@ -338,7 +338,7 @@ WebrtcAudioConduit::ConfigureRecvMediaCodecs(
 
   if(mPtrVoEBase->StartPlayout(mChannel) == -1)
   {
-    CSFLogError(logTag, "Starting playout Failed");
+    CSFLogError(logTag, "%s Starting playout Failed", __FUNCTION__);
     return kMediaConduitPlayoutError;
   }
 
@@ -397,7 +397,7 @@ WebrtcAudioConduit::SendAudioFrame(const int16_t audio_data[],
                                                 capture_delay) == -1)
   {
     int error = mPtrVoEBase->LastError();
-    CSFLogError(logTag,  "Inserting audio data Failed %d", error);
+    CSFLogError(logTag,  "%s Inserting audio data Failed %d", __FUNCTION__, error);
     if(error == VE_RUNTIME_REC_ERROR)
     {
       return kMediaConduitRecordingError;
@@ -459,7 +459,7 @@ WebrtcAudioConduit::GetAudioFrame(int16_t speechData[],
                                             lengthSamples) == -1)
   {
     int error = mPtrVoEBase->LastError();
-    CSFLogError(logTag,  "Getting audio data Failed %d", error);
+    CSFLogError(logTag,  "%s Getting audio data Failed %d", __FUNCTION__, error);
     if(error == VE_RUNTIME_PLAY_ERROR)
     {
       return kMediaConduitPlayoutError;
@@ -483,7 +483,7 @@ WebrtcAudioConduit::ReceivedRTPPacket(const void *data, int len)
     if(mPtrVoENetwork->ReceivedRTPPacket(mChannel,data,len) == -1)
     {
       int error = mPtrVoEBase->LastError();
-      CSFLogError(logTag, "%s RTP Processing Error %d ", error);
+      CSFLogError(logTag, "%s RTP Processing Error %d", __FUNCTION__, error);
       if(error == VE_RTP_RTCP_MODULE_ERROR)
       {
         return kMediaConduitRTPRTCPModuleError;
@@ -492,7 +492,7 @@ WebrtcAudioConduit::ReceivedRTPPacket(const void *data, int len)
     }
   } else {
     //engine not receiving
-    CSFLogError(logTag, "ReceivedRTPPacket: Engine Error");
+    CSFLogError(logTag, "%s ReceivedRTPPacket: Engine Error", __FUNCTION__);
     return kMediaConduitSessionNotInited;
   }
   //good here
@@ -502,14 +502,14 @@ WebrtcAudioConduit::ReceivedRTPPacket(const void *data, int len)
 MediaConduitErrorCode
 WebrtcAudioConduit::ReceivedRTCPPacket(const void *data, int len)
 {
-  CSFLogDebug(logTag,  "%s : channel %d ",__FUNCTION__, mChannel);
+  CSFLogDebug(logTag,  "%s : channel %d",__FUNCTION__, mChannel);
 
   if(mEngineReceiving)
   {
     if(mPtrVoENetwork->ReceivedRTCPPacket(mChannel, data, len) == -1)
     {
       int error = mPtrVoEBase->LastError();
-      CSFLogError(logTag, "%s RTCP Processing Error %d ", error);
+      CSFLogError(logTag, "%s RTCP Processing Error %d", __FUNCTION__, error);
       if(error == VE_RTP_RTCP_MODULE_ERROR)
       {
         return kMediaConduitRTPRTCPModuleError;
@@ -518,7 +518,7 @@ WebrtcAudioConduit::ReceivedRTCPPacket(const void *data, int len)
     }
   } else {
     //engine not running
-    CSFLogError(logTag, "ReceivedRTPPacket: Engine Error");
+    CSFLogError(logTag, "%s ReceivedRTPPacket: Engine Error", __FUNCTION__);
     return kMediaConduitSessionNotInited;
   }
   //good here
diff --git a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
index 5e2f9a84e1de..225c983cb394 100644
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -133,7 +133,7 @@ MediaConduitErrorCode WebrtcVideoConduit::Init()
   }
 
 
-  CSFLogDebug(logTag, "%sEngine Created: Init'ng the interfaces ",__FUNCTION__);
+  CSFLogDebug(logTag, "%s Engine Created: Init'ng the interfaces ",__FUNCTION__);
 
   if(mPtrViEBase->Init() == -1)
   {
@@ -184,7 +184,7 @@ MediaConduitErrorCode WebrtcVideoConduit::Init()
   }
 
 
-  CSFLogError(logTag, "Initialization Done");
+  CSFLogError(logTag, "%s Initialization Done", __FUNCTION__);
   return kMediaConduitNoError;
 }
 

From 901b5336db107f667fad159f8a276ae789ded386 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Mon, 26 Nov 2012 14:04:07 -0500
Subject: [PATCH 047/160] Bug 815229 - Make search completion test for private
 browsing test all autocomplete entries. r=ehsan

---
 browser/components/search/test/browser_private_search.js        | 2 +-
 .../search/test/browser_private_search_perwindowpb.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/search/test/browser_private_search.js b/browser/components/search/test/browser_private_search.js
index 6ef21950dec3..baf5d0b432e8 100644
--- a/browser/components/search/test/browser_private_search.js
+++ b/browser/components/search/test/browser_private_search.js
@@ -22,7 +22,7 @@ function doPrivateTest(searchBar) {
   popup.addEventListener("popupshowing", function showing() {
     let entries = getMenuEntries(searchBar);
     for (var i = 0; i < entries.length; i++)
-      isnot(entries[0], "private test", "shouldn't see private autocomplete entries");
+      isnot(entries[i], "private test", "shouldn't see private autocomplete entries");
     popup.removeEventListener("popupshowing", showing, false);
 
     searchBar.textbox.toggleHistoryPopup();
diff --git a/browser/components/search/test/browser_private_search_perwindowpb.js b/browser/components/search/test/browser_private_search_perwindowpb.js
index 2c62df91b8ca..71e01b6c5b4a 100644
--- a/browser/components/search/test/browser_private_search_perwindowpb.js
+++ b/browser/components/search/test/browser_private_search_perwindowpb.js
@@ -89,7 +89,7 @@ function checkSearchPopup(aWin, aCallback) {
 
     let entries = getMenuEntries(searchBar);
     for (let i = 0; i < entries.length; i++) {
-      isnot(entries[0], "private test",
+      isnot(entries[i], "private test",
             "shouldn't see private autocomplete entries");
     }
 

From ed24acb94f13658d383c85c5689a1fe3a042d323 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <amccreight@mozilla.com>
Date: Fri, 23 Nov 2012 11:13:39 -0800
Subject: [PATCH 048/160] Bug 814738 - Modernize Traverse for nsTObserverArray.
 r=smaug

---
 accessible/src/base/nsAccessiblePivot.cpp     | 17 +----------------
 content/events/src/nsEventListenerManager.cpp | 15 ++++++++++-----
 dom/base/nsGlobalWindow.cpp                   | 14 ++++++++++----
 xpcom/glue/nsTObserverArray.h                 |  8 ++++----
 4 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/accessible/src/base/nsAccessiblePivot.cpp b/accessible/src/base/nsAccessiblePivot.cpp
index 5a44ca43b8eb..254a68d7ddbf 100644
--- a/accessible/src/base/nsAccessiblePivot.cpp
+++ b/accessible/src/base/nsAccessiblePivot.cpp
@@ -54,22 +54,7 @@ nsAccessiblePivot::nsAccessiblePivot(Accessible* aRoot) :
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(nsAccessiblePivot)
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsAccessiblePivot)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mRoot)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPosition)
-  uint32_t i, length = tmp->mObservers.Length();
-  for (i = 0; i < length; ++i) {
-    cb.NoteXPCOMChild(tmp->mObservers.ElementAt(i));
-  }
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsAccessiblePivot)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mRoot)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mPosition)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mObservers)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+NS_IMPL_CYCLE_COLLECTION_3(nsAccessiblePivot, mRoot, mPosition, mObservers)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsAccessiblePivot)
   NS_INTERFACE_MAP_ENTRY(nsIAccessiblePivot)
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index 7477adca4866..6dda2b5dcba1 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -150,12 +150,17 @@ NS_IMPL_CYCLE_COLLECTION_NATIVE_CLASS(nsEventListenerManager)
 NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(nsEventListenerManager, AddRef)
 NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(nsEventListenerManager, Release)
 
+inline void
+ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback,
+                            nsListenerStruct& aField,
+                            const char* aName,
+                            unsigned aFlags)
+{
+  CycleCollectionNoteChild(aCallback, aField.mListener.get(), aName, aFlags);
+}
+
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsEventListenerManager)
-  uint32_t count = tmp->mListeners.Length();
-  for (uint32_t i = 0; i < count; i++) {
-    NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mListeners[i] mListener");
-    cb.NoteXPCOMChild(tmp->mListeners.ElementAt(i).mListener.get());
-  }  
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mListeners)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsEventListenerManager)
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index a7a077195e54..b1a53b15cfe2 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -1210,6 +1210,15 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_BEGIN(nsGlobalWindow)
   return tmp->IsBlackForCC();
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
 
+inline void
+ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback,
+                            IdleObserverHolder& aField,
+                            const char* aName,
+                            unsigned aFlags)
+{
+  CycleCollectionNoteChild(aCallback, aField.mIdleObserver.get(), aName, aFlags);
+}
+
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsGlobalWindow)
   if (MOZ_UNLIKELY(cb.WantDebugInfo())) {
     char name[512];
@@ -1259,10 +1268,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsGlobalWindow)
 
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPendingStorageEvents)
 
-  for (uint32_t i = 0; i < tmp->mIdleObservers.Length(); i++) {
-    NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mIdleObservers[i].nsIIdleObserverPtr");
-    cb.NoteXPCOMChild(tmp->mIdleObservers.ElementAt(i).mIdleObserver.get());
-  }
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mIdleObservers)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGlobalWindow)
diff --git a/xpcom/glue/nsTObserverArray.h b/xpcom/glue/nsTObserverArray.h
index 67c50e201c0e..f377ad094d71 100644
--- a/xpcom/glue/nsTObserverArray.h
+++ b/xpcom/glue/nsTObserverArray.h
@@ -370,17 +370,17 @@ class nsTObserverArray : public nsAutoTObserverArray<T, 0> {
     }
 };
 
-template <typename T>
+template <typename T, uint32_t N>
 inline void
-ImplCycleCollectionUnlink(nsTObserverArray<T>& aField)
+ImplCycleCollectionUnlink(nsAutoTObserverArray<T, N>& aField)
 {
   aField.Clear();
 }
 
-template <typename T>
+template <typename T, uint32_t N>
 inline void
 ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback,
-                            nsTObserverArray<T>& aField,
+                            nsAutoTObserverArray<T, N>& aField,
                             const char* aName,
                             uint32_t aFlags = 0)
 {

From ead425b3e03994eabd7c8cb25e61420bc6f5d95c Mon Sep 17 00:00:00 2001
From: Andrew McCreight <amccreight@mozilla.com>
Date: Fri, 23 Nov 2012 11:27:06 -0800
Subject: [PATCH 049/160] Bug 814453 - Eliminate
 NS_IMPL_CYCLE_COLLECTION_UNLINK_NATIVE_0 and
 NS_IMPL_CYCLE_COLLECTION_TRACE_NATIVE_BEGIN. r=smaug

---
 content/base/src/nsNodeInfoManager.cpp    |  2 +-
 content/media/webaudio/AudioContext.cpp   |  6 +-----
 content/media/webaudio/AudioListener.cpp  |  5 ++---
 content/media/webaudio/AudioParam.cpp     |  4 +---
 content/xul/content/src/nsXULElement.cpp  |  2 +-
 dom/base/nsGlobalWindow.cpp               |  2 +-
 xpcom/glue/nsCycleCollectionParticipant.h | 19 ++-----------------
 7 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/content/base/src/nsNodeInfoManager.cpp b/content/base/src/nsNodeInfoManager.cpp
index 9b0631d39fdd..ac3d430256e4 100644
--- a/content/base/src/nsNodeInfoManager.cpp
+++ b/content/base/src/nsNodeInfoManager.cpp
@@ -131,7 +131,7 @@ nsNodeInfoManager::~nsNodeInfoManager()
 
 
 NS_IMPL_CYCLE_COLLECTION_NATIVE_CLASS(nsNodeInfoManager)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_NATIVE_0(nsNodeInfoManager)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_0(nsNodeInfoManager)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsNodeInfoManager)
   if (tmp->mDocument &&
       nsCCUncollectableMarker::InGeneration(cb,
diff --git a/content/media/webaudio/AudioContext.cpp b/content/media/webaudio/AudioContext.cpp
index c7ed39ecd218..ce589933c691 100644
--- a/content/media/webaudio/AudioContext.cpp
+++ b/content/media/webaudio/AudioContext.cpp
@@ -32,14 +32,10 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(AudioContext)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDestination)
-  // Cannot use NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR since AudioListener
-  // does not inherit from nsISupports.
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mListener)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-NS_IMPL_CYCLE_COLLECTION_TRACE_NATIVE_BEGIN(AudioContext)
-  NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER
-NS_IMPL_CYCLE_COLLECTION_TRACE_END
+NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(AudioContext)
 NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(AudioContext, AddRef)
 NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(AudioContext, Release)
 
diff --git a/content/media/webaudio/AudioListener.cpp b/content/media/webaudio/AudioListener.cpp
index ef07e766cea0..408901d0bb2c 100644
--- a/content/media/webaudio/AudioListener.cpp
+++ b/content/media/webaudio/AudioListener.cpp
@@ -25,9 +25,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(AudioListener)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
-NS_IMPL_CYCLE_COLLECTION_TRACE_NATIVE_BEGIN(AudioListener)
-  NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER
-NS_IMPL_CYCLE_COLLECTION_TRACE_END
+NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(AudioListener)
+
 NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(AudioListener, AddRef)
 NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(AudioListener, Release)
 
diff --git a/content/media/webaudio/AudioParam.cpp b/content/media/webaudio/AudioParam.cpp
index f7070f126d5d..b760dce04841 100644
--- a/content/media/webaudio/AudioParam.cpp
+++ b/content/media/webaudio/AudioParam.cpp
@@ -22,9 +22,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(AudioParam)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mContext)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-NS_IMPL_CYCLE_COLLECTION_TRACE_NATIVE_BEGIN(AudioParam)
-  NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER
-NS_IMPL_CYCLE_COLLECTION_TRACE_END
+NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(AudioParam)
 NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(AudioParam, AddRef)
 NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(AudioParam, Release)
 
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index e38d56a8d4ba..2410fac5b1d9 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -1855,7 +1855,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULPrototypeNode)
     }
     NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-NS_IMPL_CYCLE_COLLECTION_TRACE_NATIVE_BEGIN(nsXULPrototypeNode)
+NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(nsXULPrototypeNode)
     if (tmp->mType == nsXULPrototypeNode::eType_Script) {
         nsXULPrototypeScript *script =
             static_cast<nsXULPrototypeScript*>(tmp);
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index b1a53b15cfe2..0c2533ae640b 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -487,7 +487,7 @@ nsTimeout::~nsTimeout()
 }
 
 NS_IMPL_CYCLE_COLLECTION_LEGACY_NATIVE_CLASS(nsTimeout)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_NATIVE_0(nsTimeout)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_0(nsTimeout)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsTimeout)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPrincipal)
diff --git a/xpcom/glue/nsCycleCollectionParticipant.h b/xpcom/glue/nsCycleCollectionParticipant.h
index 42aa397244aa..af1a0545daf8 100644
--- a/xpcom/glue/nsCycleCollectionParticipant.h
+++ b/xpcom/glue/nsCycleCollectionParticipant.h
@@ -403,20 +403,8 @@ T* DowncastCCParticipant(void *p)
   }
 
 #define NS_IMPL_CYCLE_COLLECTION_UNLINK_0(_class)                              \
-  NS_METHOD                                                                    \
-  NS_CYCLE_COLLECTION_CLASSNAME(_class)::UnlinkImpl(void *p)                   \
-  {                                                                            \
-    MOZ_ASSERT(CheckForRightISupports(static_cast<nsISupports*>(p)),           \
-               "not the nsISupports pointer we expect");                       \
-    return NS_OK;                                                              \
-  }
-
-#define NS_IMPL_CYCLE_COLLECTION_UNLINK_NATIVE_0(_class)                       \
-  NS_METHOD                                                                    \
-  NS_CYCLE_COLLECTION_CLASSNAME(_class)::UnlinkImpl(void *p)                   \
-  {                                                                            \
-    return NS_OK;                                                              \
-  }
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(_class)                                \
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -483,9 +471,6 @@ T* DowncastCCParticipant(void *p)
                                                           aCallback,           \
                                                           aClosure);
 
-#define NS_IMPL_CYCLE_COLLECTION_TRACE_NATIVE_BEGIN(_class)                    \
-  NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(_class)
-
 #define NS_IMPL_CYCLE_COLLECTION_TRACE_JS_CALLBACK(_object, _name)             \
   if (_object)                                                                 \
     aCallback(_object, _name, aClosure);

From db826ecfb96ae765a9f463ac75201283884131cb Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Wed, 21 Nov 2012 11:53:25 -0800
Subject: [PATCH 050/160] Bug 792373: XHDPI and XXHDPI icons for Fennec.
 [r=mfinkle]

---
 mobile/android/base/Makefile.in                 |  14 ++++++++++++--
 .../branding/aurora/content/fennec_144x144.png  | Bin 0 -> 33141 bytes
 .../branding/aurora/content/fennec_96x96.png    | Bin 0 -> 17360 bytes
 .../branding/beta/content/fennec_144x144.png    | Bin 0 -> 28774 bytes
 .../branding/beta/content/fennec_96x96.png      | Bin 0 -> 16011 bytes
 .../branding/nightly/content/fennec_144x144.png | Bin 0 -> 29988 bytes
 .../branding/nightly/content/fennec_96x96.png   | Bin 0 -> 15997 bytes
 .../official/content/fennec_144x144.png         | Bin 0 -> 30481 bytes
 .../branding/official/content/fennec_96x96.png  | Bin 0 -> 16471 bytes
 .../unofficial/content/fennec_144x144.png       | Bin 0 -> 19935 bytes
 .../unofficial/content/fennec_96x96.png         | Bin 0 -> 11976 bytes
 11 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 mobile/android/branding/aurora/content/fennec_144x144.png
 create mode 100644 mobile/android/branding/aurora/content/fennec_96x96.png
 create mode 100644 mobile/android/branding/beta/content/fennec_144x144.png
 create mode 100644 mobile/android/branding/beta/content/fennec_96x96.png
 create mode 100644 mobile/android/branding/nightly/content/fennec_144x144.png
 create mode 100644 mobile/android/branding/nightly/content/fennec_96x96.png
 create mode 100644 mobile/android/branding/official/content/fennec_144x144.png
 create mode 100644 mobile/android/branding/official/content/fennec_96x96.png
 create mode 100644 mobile/android/branding/unofficial/content/fennec_144x144.png
 create mode 100644 mobile/android/branding/unofficial/content/fennec_96x96.png

diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 33a01cea9b71..b34b6c2ef2c2 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -305,6 +305,8 @@ MOZ_ANDROID_SHARED_ACCOUNT_TYPE = "$(ANDROID_PACKAGE_NAME)_sync"
 ifeq ($(MOZ_APP_NAME),fennec)
 ICON_PATH = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_48x48.png
 ICON_PATH_HDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_72x72.png
+ICON_PATH_XHDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_96x96.png
+ICON_PATH_XXHDPI = $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/fennec_144x144.png
 
 # we released these builds to the public with shared IDs and need to keep them
 ifeq (org.mozilla.firefox,$(ANDROID_PACKAGE_NAME))
@@ -1131,6 +1133,14 @@ res/drawable-hdpi/icon.png: $(MOZ_APP_ICON)
 	$(NSINSTALL) -D res/drawable-hdpi
 	cp $(ICON_PATH_HDPI) $@
 
+res/drawable-xhdpi/icon.png: $(MOZ_APP_ICON)
+	$(NSINSTALL) -D res/drawable-xhdpi
+	cp $(ICON_PATH_XHDPI) $@
+
+res/drawable-xxhdpi/icon.png: $(MOZ_APP_ICON)
+	$(NSINSTALL) -D res/drawable-xxhdpi
+	cp $(ICON_PATH_XXHDPI) $@
+
 RES_DRAWABLE = $(addprefix res/drawable/,$(notdir $(MOZ_ANDROID_DRAWABLES)))
 $(RES_DRAWABLE): $(addprefix $(topsrcdir)/,$(MOZ_ANDROID_DRAWABLES))
 	$(NSINSTALL) -D res/drawable
@@ -1164,10 +1174,10 @@ $(RESOURCES): $(RES_DIRS) $(subst res/,$(srcdir)/resources/,$(RESOURCES))
 	$(NSINSTALL) $(subst res/,$(srcdir)/resources/,$@) $(dir $@)
 
 
-R.java: $(MOZ_APP_ICON) $(RESOURCES) $(RES_DRAWABLE) $(RES_BRANDING_DRAWABLE_MDPI) $(RES_BRANDING_DRAWABLE_HDPI) $(RES_BRANDING_DRAWABLE_XHDPI) $(PP_RES_XML) res/values/defaults.xml res/drawable/icon.png res/drawable-hdpi/icon.png res/values/strings.xml AndroidManifest.xml FORCE
+R.java: $(MOZ_APP_ICON) $(RESOURCES) $(RES_DRAWABLE) $(RES_BRANDING_DRAWABLE_MDPI) $(RES_BRANDING_DRAWABLE_HDPI) $(RES_BRANDING_DRAWABLE_XHDPI) $(PP_RES_XML) res/values/defaults.xml res/drawable/icon.png res/drawable-hdpi/icon.png res/drawable-xhdpi/icon.png res/drawable-xxhdpi/icon.png res/values/strings.xml AndroidManifest.xml FORCE
 	$(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar -S res -J . --custom-package org.mozilla.gecko
 
-gecko.ap_: AndroidManifest.xml res/drawable/icon.png res/drawable-hdpi/icon.png $(RESOURCES) $(RES_DRAWABLE) $(RES_BRANDING_DRAWABLE_MDPI) $(RES_BRANDING_DRAWABLE_HDPI) $(RES_BRANDING_DRAWABLE_XHDPI) $(PP_RES_XML) res/values/defaults.xml res/values/strings.xml FORCE
+gecko.ap_: AndroidManifest.xml res/drawable/icon.png res/drawable-hdpi/icon.png res/drawable-xhdpi/icon.png res/drawable-xxhdpi/icon.png $(RESOURCES) $(RES_DRAWABLE) $(RES_BRANDING_DRAWABLE_MDPI) $(RES_BRANDING_DRAWABLE_HDPI) $(RES_BRANDING_DRAWABLE_XHDPI) $(PP_RES_XML) res/values/defaults.xml res/values/strings.xml FORCE
 	$(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar  -S res -F $@
 
 libs:: classes.dex package-name.txt
diff --git a/mobile/android/branding/aurora/content/fennec_144x144.png b/mobile/android/branding/aurora/content/fennec_144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f7da46624173b82bc7e21e14e30be447cf255aa
GIT binary patch
literal 33141
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

literal 0
HcmV?d00001

diff --git a/mobile/android/branding/aurora/content/fennec_96x96.png b/mobile/android/branding/aurora/content/fennec_96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd31107e69cc2410c8a53363a322d815f45995a7
GIT binary patch
literal 17360
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
afB^vZ1(1aU<Q^FS0000<MNUMnLSTZ;dVWy=

literal 0
HcmV?d00001

diff --git a/mobile/android/branding/beta/content/fennec_144x144.png b/mobile/android/branding/beta/content/fennec_144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..178d594212756cc2f13eb765057a5db11d9c4526
GIT binary patch
literal 28774
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

literal 0
HcmV?d00001

diff --git a/mobile/android/branding/beta/content/fennec_96x96.png b/mobile/android/branding/beta/content/fennec_96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe74ef2eca433474d9b400e5e445f077e1c3a384
GIT binary patch
literal 16011
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%0AnBvT-F{K
z=y7RicAsI?UA}S~a^U!C)dkxiwt-G3xC2f7<3=Lg>$1h!`~8KkT+gqxU7*#1gAf!W
z!*pNcFjP6~3#$|@^3~s+h`kS_9SX<pX&q+L@8-@0jqj0iKw?u_eb!K&;o_>wJ~rQK
zqZ`QWVkE2hGq{9U9Q;QcE@M%tD_tq%Aa*dNP;%Zf3)czn_c|J4%f^8rVZ-p2Td9Tj
zY6|Bs$xrb+1S*3`gLl?gFM25GHe|qyN&ZkNtkU`G06q^W{W<kXWMakZCy3f;9^VdF
z&XCJ?cT;$Jg-a^TpU-}a5IgtVtyOj6Pkv8w^35kd8#-K^271*~Y{vU;(_r6a7=$zL
z;(#k-)|Cw>(QUi^Jp!aR1aSQrZ??IJOXRRS?eMG*rXw<gsB;l_#ZCp~ROX=zCbc*!
z2gTHEhEwhR_e}Z#{%4t#XD)6j4khq5Aa%4c@7CTeW2zC1$FTkB#XZd-Bt(LzA_C=+
z9ma4fI3esPY73dUiE%U+1-9Q!Bpm#?U^(tJeh1-f7tL@vf`WWIlnm?6ORwcHwwK-)
z0^Zr8u$#}_?N9le7l%`hzNly@`1mcZKuW7IWKhWir^^8&yRI{_^H7L0Tvlz2iSRj}
z019F@pbGfM=ebyYe7cJMoopp;b+g#}uDqO8OvyQR43oI%&Cx)p8QzOlM0SP=EC^gP
zV_^}N>81fEJ32i-wl<U51T;awKrff=;>0}nD^XPqztdQpcT6M#m+ZV8p@2j;Vpdi+
zOd(!Bt~xPL4BHxg6^m%v9U}jp7)p8AfT)w`oZ>NMV9fO9_vOt%!2IcA!(&BRD2ngp
z6MD^ZU4YyV{^2(~ypB`ifwU%s!rKxr{SGy%zMYknn=StZn!^Aub2omjq_|iMzQnC~
zWyK?i&1PJu;e9-Aq~p0^8TD@>#w+MZ?U}Q#l1+!)jN{5Jl>}C%%-Nw<)_NJ5#RZL9
zLY-G-t(@fxw4q*DSz$ukr-`AB;utyhXtU;JCMx!*dTy9GD!S}g!7*P-)r<KQQqJ^z
z>+gxXt)9c2_eBwa>7M&DIpw;Y%?I}*SiA{*(8<iUpHm(lCigGLuvnzlWt9`oXHUHe
zUI8Q?<d$z~T{qJd0+2B?zmF8h$b6M?dJ%6`6ZSuT#C!BC9T6ud>r(aYHsZE@dwb<q
ze?UNpU7&#d1?-4qgj(0Sr<q^OK#hCrC{vBx%fwCj)P}UOZwzfld+sbqA*T>s3G~;{
zkh@)&=7%r98R-0~Fwicya|ey)ExCLjSHDUqXiG38htHl|#5r<6UOgtm67~n>S>h8t
z%@jG6MR~bmO<R+MByuJ_h{gX!=Hm4xLI%9;b($psZLo<n^kLvjBa-+rUJe`lxxv=g
z5Hx&qaZrafvAFjkp?osr&W?m@Pr%1jb|rVth4c$N(dp~6DDQ<+BQC6sb7YEqp2;AN
zmPq#?>DtNPg&nlsZF+AYIj42zpjulAq&(tvOfR;=Mk4&(xGSGZ%|;QCb>#Z$d#j$N
zR$ft{w3d0XHsLO{w?nr4-?^T@(>fFc2gcpM^1HYDvVPrZ%z5h%MsyOQ?AWAV+|O?J
z5#7GrCtjZoF4p;MlC};#{l*KvI=P_86V`1f(TbJzaNFtM^q3^Ql<+X=?h=tlhTc#x
zmUp4p{Lv5U;W+nv9z0bLMMBh-6h-|)A~sKX9ES8>!F5mLSWXwGIo%J@2*FaQ-sfTk
zq@@d#O3**Uo+^<l$sn%TFl6{S|2!3Qvb*V1x|_9rJhTkCl7cnRW((_`AJ4f!O%l+m
zP`y%uUSOGny8S}jhMm@4l<eIqRLOO7QsnvBI2B(Nx@0qs=C9Wpimx@eh@G2o`}hUo
zLQ#e#)&KRn{v}+YsC=Wk?xRJ{&GK_~Jx}kgfoH~RB+KnWSHrB?1FHsyY$U`4>u%b6
zyzGXZAu5zg_bY|vPZpALhp0#@qo3bxg1P8n(pbe{3d6L{3M;mk{}fHN;?;o`>+JyX
zX%f_qhJ|oCV_6LX>!d=D0@M3If^UaMP`P<LEYE)J!{6w<N-K7-Bf@Xi;pzK_YxTzJ
zu5A_wY7pTH%DySoCJWcQo!-+qS(4q*pu=YSyhUt&e95q3c;C5v>fQUvt<In8JhyNo
zGee5*q{3=5?4^W{Bcm0Zb?<!HOSp9<LoR*+#Ba$Lq1{)q2|KJr8yQ<d38<jZ$4i34
zTJi#J4Q2eq)$Q>_kxRtD>-MjPAp*QzQ^XMwAM+Bo<fb|Ke5w;-@gF?E{CxU7Lj$#~
zGO^s`K;2cOIpvxSdQOg%%_7IHw{&*wCz4_{#?*A$JXdTg*Uy6cq*<#!t&GbFNUVtM
z{6Q2I&YcE{pq7S<+X6|q!&`MO*^9uLgLyqha$N;A*UDQA_$7^n`As?mrn|rJ7bz73
zT~sDLe?uh^k=}fiS;|MbQ>PS6&q1{mP6q$haV!r5q$kn}`g5B1escAxN6>7Yi#;=@
zF9RU7j6n-o2DadQKH@te9!iLDyuc4x2mEOEJ-6%JD6?ywkdMBX%`WOp&WXOsqf7<t
z#|Qtaqz$-PwIfeqTH{E*W#3MY+{XEB9Z?mR_8$#vp_RLGdKAE^FTOp_iMhIDr?YS4
zS83Y)WsL@MZZ*rYGBNu$_7oi@l<o+jj*g5Wz0DC!K*+RM`JD$@`^n%T9ChDopAym-
zw%>RJbUnR0_jzMUSq|b)2?4QoE4n0K8%y2WPKv_~R)e>7TM1dV9@)DchmMC;^HBnc
zv*f?--QOhk$r;V0+$)}J#6Qk#gw;*PYkh9d>Kh2)U*cB%L|K<wR3e41Z`T?MX}Q?$
zuo6#Y3J}6jV<XneR9r`MoDe*M(x)PnEiE^@kr`?mI7_kID4*bPJAXNMR@Ep!o?sPs
z$Bg&7io&F+ci$HeJwG>N_qhSE=XnsCcOUaX_<m-s_I#V|y+x!<a(u5%t?GYDrrqAG
z-)>9U#x99`)%HEWB1my5oFfOW-es-kvT<B+9;$6}Je1s5StAorA!XpkV9y%{>!cKq
zis{SkmE$U@6=`+0L)?Z^fpZ+ZqpWy})=1t@{sChCkcr`ZPn5_bP6=;-fO3n+%*0+D
zPU+ts-#J$B{8R~3#3vMQudRjrJc4HsG;*vzaE}!wORShy+G$#T+qt)4QApTXV9=P_
zWr8rzCz$ceIxo!oZ0mWfYBW)=AbBvgCgo~6lIg|*$nU7#2-`S|$<o;g)Kh161_WSr
zAUGHSWPam+@yvs5NRF;b*$X22_Kp@_<&Ef{pV}5QnE4H#BRSb_3?gq+?vm>`|MYH3
zCa`JNVtbY;5G1|R_s*P~1L5D^0Pf)X*v5Hi!;#jH-F8-=0!Y<I8OY*K3zX~l&Y~*l
zK0a{oQ^~+j_*_Q`^A)uGQTk-=r+$gFJj3bGSu-WYE;s$y>1@O@8?o@==fg5yLWk>$
zYkM2e$ypEIYAP+(_K-<=@-pz7>Z`Q@POkRt6;UG<<b&-vK9oN}M=CrLe!rH2KpYF9
zHw?C$yYZ3FwvQ}v<d(e~8^Oeab*iHY$&8mVNu|72{7BvherBC-6U6q4|7mb)4^u4L
zb!6eH!b-ZkV)jkFmCWUK&kN5RM{i{pIpI>h6nRUR`Dw+RU}w_P0sdjmIA4QB#HtQ4
zDZ8VZZIry{?mG^(=WW<kiZtflP7k^3X|C&#flyQuPjF^=xcXMT2))90`tkr3JQJV0
zu?thEs!abP)5X&=k`@(vW3`bhOOf9MP8CLrVaKqkE?4{CAfMkoc51KpI~4qzF&uGy
zkKSdLLmfv`jOMHNT#l8N>3D2FyK-$ruNT+3*$?_1P?3Qw{P7=Q8?m}TV;2vm0ZeHH
z_D)ZnG!N=#Pn~ZnkI6dgjX1cJ(RPFFKWJ$O_UK3mgw#e*(#awUbX&R#^6PxRH6wND
zZk>Gmj2bw07Tpd(j*f%;5Or9~s-qT5a%v2<V4&84NW+`iyup}J%Vg;9dt2RM;Qcvl
zbuR2Y#loGZJ2`S>$7aBZdjm4WF5b)aANuq)im<2|R}a<Qy6vVmALjzlGq}vhzg<Aq
zYnBVm5?oEkY}FYs>|NSt7p^@BgI!+Nm#oIq2zk(XokNDsKgr_lzuhHc4Y29Ck?EK9
zdpL91c08bU3kEuHf3RXmi2t%|kCT*PF?KPJVSawT((~j7gyO&!SZ9#Z+d+Oh!1`uY
zFC(`je7>hZ2RT%3MMTW|dwy$Mc^@$Y{rZg4D4ebvhO(j#h;;V8i9fn2oHE&sON=U<
zF^f*jrt_pw0d<dX1xCQEM6&)~j8mRVXXA_36t-8hdX<%ot$#~V<vKDhmlG1jSM(aV
ziNP&iBUkwu?so2YG?egzTeVBzj}(6AW$VK4T$zDp^PhP0l2NlMT~`Vh>k-&>UC<;9
zJ&~1%G&kX6?0~|JL@<yFQOY{-+hHJ2Kt{Y8WN#^su7n5a$6?&#IpNyG8(vZ5UBIf-
z0{uw}OkhoT9qUZ(j|7z};hzEP_yMHsKiItFt|+fXt0s~$x>RnjNJ=*XF|CKn!lBXQ
zeku`z)w18Wo%zSYSXK5_S8*rBg8R+N8JZgGmIGaj3&1TJ&NX|xe^}c2FOJ}BHbS}7
zf*9pLt^^2tlrwZsO)Rp*UB`@2(dnO;pz%9E$B>^A<Q)X!mRHIIG_x#_&+1A;r6QQ$
zYF{RH#(rl-L7Ad_WBOf}0>-&?$ZxC+8x)56`dNAO6-@#<xf{<pRwt_V;y!xmQmkV=
z^<=6lfAY;+-X^NBlwTJ@>j4g-rB7FqK}!@QgBwfz^QmbsU#byh2I<)WOZaWm!)UjR
zpDx7Kfar1iRgP4F53_08Meei--!u<293kc>z-~jX%%}Hv6S$=SX!$}6FEx*3MFJl`
zI@a%~Veo6K8+Ip59qsPeP=RjV_@o()BWM+Z@dubEY3x^XG-<GR-DesbtWD0o{c&rg
z$!w;CW3$xh^|hD}Z`v}})|r<t@Fdc=MFmW;m9HqmrF~~JbY?$8Fl@&XG?TFh2u$!Z
z!fwLBLa5>}A6@q=VrIrdtxL0=jyKaiE)AxnA6siYpAoCflxl|W&Fmtk;8~8p#2D0>
z05Qj|wnpPtY;C*bf^t;aOeW#<6T$SQP;y_lUF9;LUIk_^`(BPGN_p<ojOv1m=h6{k
zK+&NZgEx`H*YLwK8XsK14$GjVidx>ar|&VRQ?RYWLwel_ir2Xi;a#+_u@DnE&f5a*
zRG+_I;YUJ+ZyZ+QK-eaiUw;UcZR}Pc9zws(<-^pDDCev3bj+o&{RCT}V{vMCqauGj
zF8%xryLu}%+#!Sy5nzYE(|~yf5es@@8@T}mw%2dhkqIY#TOG_*mI18as6`}4g)ut#
zm>K||4(XDTiXswb-Nvxg1*_XC!=IZ}t}UhWy)+>M`Z7x!EogzQ)PY>yFAV{vk}%)4
zM1@yXum;b2{}8Y$-kCWeNUIv&O7QD@Umg-|O6{QEl>YM8nx$x|&5HV%_#^q48F@nW
zv{Lj%2TAS*=AjrwRNI~NhX!Mi#!ToU97v5s`U@2vANDY}a=WeZ@aMU+N!5_ng0Zm#
z)Te>G*ZXiXi-7TAbSAmU6S}e#US0D+&d(3Lw*$44^k13+%Lc{0;MfAMkd<jt9>c#}
z_ua0C?-KmsejeviWXXAK#aq}vtDgFNNQDoCo28qVGFFuYzH$+^B87Esfu^n)Xf%dC
zb2aSCVCz_S$7ani;GGR(0QjcDOk|<bnCQl5%gA%Ik(r?tZ2n$qA1y9lN82lCT4N8W
zD=(p2Ib8HwaK5WX&xCkL-q>7pYFss)rFWy<wqsXF5$itAp_glQzL&3P-RFHyOMEFJ
z$$ic_X~x0IIV~)u0%DcEzqQ^h*YWe+h(Nu2?y%P&K?@|@fzl&agu!|-Lm~1t$_+2z
zi>VC>*l53VG>fM8)luDzcFtE{RU&rSX)s(mj{L5B7ts5)45Ol+<rxHpOhE$X&m}GF
zdH<o1?{3w>+<hE@=9@bSqrDu9NldGc9hB@;Uq^D``w+G9v=(u12lwy;uDv1<(-iZ0
zdBPf0MFzGF=SwV#`K$t^xO)sI6r|h6>AsvbsHvUObWl4MiuH9#HoEL)!<nM;?`m{~
z3{<u!dhy-J#5xY_ZuHk;lt;AZS^rlO=Q$d{_}`7p=^pNomwuTZZ;x}M5$?zz;#Qrr
z_aPAJb8dXco%X~iUli6reVL%NVg^W+`8i8LFn{0jbYsMK-|VaDE@$<FyQwO+Us!gs
zv7X~4JrisEC3Ku_$EXTCTb=0F<tbG2ozS$sj~}aU=PO}dLV(;~^wIeN{y?AeqYDuq
z?}e`rfnO6~$zo#{-XSJId2`p8z6NsO&wQwU(J02?H#DVz43L7T-cIO_Y@pY#Xwc?Z
z8(=4Eq-pzB5*(8OdFTkx7gAYPbC(6*m;Hu9@AGn9$ua^Bh>*bqP(A5vaKaBG5h>-j
zF7Xw>$Uo}^7&2s?-F_iH3vuM*hV>_EOu!R4-RUf*i|fh#a`a!$sXo1lhwwZ5*r!8Y
zicjva9BU649t!$)cjc$gRWS)2e6G6V(%a{OKju}k)3;ap4lBJ_^2btz(^)CU@n%qZ
zAalC-@XJG#mcHSX$=}l&-oEt;quM<teaX33i_MRHF5Nu5u#SpgLNqraw!}Nmy2{)N
zdQU{}Ph-!Z&=xS6yAW4R0{>hTviP+*i0XWrXwGg^1mh2g?Yo&N-3i9vF^oHxX^^}!
zyy>YmZj*r#iuCTW4WR-i8aiLN+0hp>Xd>4{+c06`S+w)=Psf^onoo&KL*E-HBgjxx
z*x}fn{YY;I${So36pQz3-eu77sXW(3|E|U5NT3^5S-T|2O<>4REhwM{ig8Kf1l;I3
zKNHT>1@5Gv|J;0sWfTK`F&>;Bq6C!!##|7_9n8`~T5AB5{bb#l36clLpQ0`ewv;bu
zR)H!}nD^#$jG=;J;&42dC5EyGGxeGD;XT~;Q@)jWd%MQykBSa@#V|~8<N3p>o`MA~
z<5&iBP`)ln8Z2C})00Vm6p#cKe_UH?-{)R9dD*~T4+n8Zu+P<<8ki>u22uzF2QvcV
Wvt-(^7yWZQTuMw{v{u+K`2PSieS@|D

literal 0
HcmV?d00001

diff --git a/mobile/android/branding/nightly/content/fennec_144x144.png b/mobile/android/branding/nightly/content/fennec_144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..c48c696784f313082a7e81fe1d9d519138036408
GIT binary patch
literal 29988
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
P00000NkvXXu0mjfh_p?;

literal 0
HcmV?d00001

diff --git a/mobile/android/branding/nightly/content/fennec_96x96.png b/mobile/android/branding/nightly/content/fennec_96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c19eaecdae726d22472c72721bdee9a9a2d16a4
GIT binary patch
literal 15997
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
F{6Dj3x6uFq

literal 0
HcmV?d00001

diff --git a/mobile/android/branding/official/content/fennec_144x144.png b/mobile/android/branding/official/content/fennec_144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..d30f0d275aafbc6ef4bdefb2aaabd8d25bd144be
GIT binary patch
literal 30481
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

literal 0
HcmV?d00001

diff --git a/mobile/android/branding/official/content/fennec_96x96.png b/mobile/android/branding/official/content/fennec_96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..fabf8bf998ec50adf15aae09ba91b55d92ed9a86
GIT binary patch
literal 16471
zcmbWeV{~P~w=WuF$F^<Twr$(CZL@=&q|-4vw$({G*|9q8*fw7O&pqe9_u-EF;jOXO
zs;ar>Z>r|}uxeDrsVd7L0q_A}U|>jcvXbimTGRhLa4`Sgd$~Tm{~A0`DP2zu7i&)+
zGj}U6F-sS7D^fWpGaD;)D>F+!w_jF*U|^88cAC1Lx=M=t7A{WAX8++~_H}aohXw-^
z6!CR6vv9ETBsI6Pv2zw8zv}KMC$+N_BG=(kVpVdLu(Gw2^>??@@K@Hf@OQA_vm_T0
zCKdGM|0lr7%F~S0*U8b@gWp$({J-S#|LgyU%tB83Uo4&uLgfF;C|xC0QVAD#D^f0I
z4kim$Ha1djZe})4E^cl%MpAZGHg*=)e>XQ18z(;(H$OWM>3?73|FpSVTJx(*O8>X6
ze<LAsTTf3{eijxVA0K8P4rUj38x}S`KED6RU}tCg$HC;`=j>_b%jE1q@jntItvoE;
z?OZ+WT%1Y&Bhk#<#miHO{GX-&%LOM_C8hr@*xBR11NARtEWT#0ENslIEKW}U@$0|1
zJv`N|{$DfxkK7)bey&z5>Q){uUhWqE=EIuef587@_kUOPAI5*y@T<7n{hJgsM@bh8
zFDEN!PdP~;@_%2LE$uA%rFnUz+1PkES$Wu5xp~>xcv*Qlq{Z3!#P}qn*x5PQ{zu0D
z3CqF9E6ph-$;T?m#>2)Y#m>jU$tuRj#wE?e%FV|sDfK^CIcE<~GiM8{|IusrPw#(Y
zdH=6iehGIgGfx+HO&1r(|H%MVTNh6k4_g;kQV9)iQd%W53p?lk5a|9hLI2BNNh^0d
zZ!1e_cNZtp|B5ib-T%P?K6VaHNijZYDK2*Q|Lr*^4>z|o`@ekR<stuXtmXfosImMr
zhUGu$@&8Ge{~`U$!T)ssck=%m{O|Iya{gB{?*EEIejLmBUtLAXNs4LuuAc|N_E=eY
zU9Ep)2CQFrRQ#b+Bv}U|kBwyyM-y+Q6waW<4^qppE&U9{zhksD=Sj!m0-_rP+DkS<
zf!l@8!{Wl^3j0`JPG39~1$%#N>7Ttl^1T_uKtVrHAv-_yR$TT@hJ5I}^wq$V?L2)2
z2YlUcC+s`{o?Sj>6GK3p7e1#$%%AU0A8Jr6ae`mdz>~to+P3HjQpGptV@Yw`{2vQn
zqV1k$>)NIQ$u`!B(%i*sX61F=_+p+xy;y%j?o0~QK8!H@(H~o%bGF+cW?t@pPeu5j
zeKeP4-5pZfyyh=OJFj8uCPRDU5FzK{y>3D+a1XE|fe?GFOTr4}#o8(mV04%uFa;Ms
z;PUI>1X<8a&Pd=4K7&dRHgl0a92!E-5XOTWz#d$tWI~#Hgmu2&_xpb0%qGq9a|5y?
z3r*%=qn3hH&sjuOT;Q<}=2I2)Kv6>~->5BBpZWFs$8f6$(KQvNR|baz?4m0}RR<DD
z25dJYD7Z+Hr#o1Mjs~au?9hnui|HRMFOTU~uijJo{cpCuvH`wxZw&z(X+~uv`TU&P
zO^8J5dYG5$n6E!ZLCx-9%ZT2?r(5KV3<s(^FtGGpf(Ww`aQW1qgeG+fIadfTxe+pw
zJaD&$GA_A~s%T6pS#0bZ;e{zGgO>zt5gV>jSE@Gy>7zy@U%TDLuPk3on66{p{ckB0
z8&Cbc?0g5jwsUq(kGtine>w<XvvGExu@X#wml{v#s~=M?5@Y&;hg8X^uSOhZaKM%z
zs{()&nle~sC!)hqLR>hPTWo*;=U~F>GA-LyaavEG-*viruhSuYM}JU0ax@1Jwm%Bn
z&)3@C7M5<{$K^Is#S&)kQN)5T>?e>8cAo!c5B%7bGBw~wtz8fkZ@U(ZwKie@KI*{c
zq>)oi1+^`lkc<QB7o`iI!NoR(6`${=uyFOY#-|=9VD<WfTcr86Q$ilU`I4tq)4ly!
z=2Ljr`h^bgz1a?OIT##Aet)01+=R@w5~H^er!S8AGoO?yGjT#ZIaI}>i!d4pqnKG+
z;uG2b2Ydn_UE6#juEBLzk8l*>8I@@F4ljh{4*bV;nCm{cZ<>dQ?hmA|z~)eg%SW_q
z)EQP+7QL;0i?#WoY=>>P$K$Vd0Pg|Qm-oTUTU#HQ?Q4Dp+khO!K4v!gazjl0CFVT~
z!@w__+AvP~C@2?m)mA0C4lFyOF16F2?4DHT&*;VUesSnSIBZaHP?)<cZw3(dOVom|
z6UM%N_r<Qed=;X{?K?BwZNmhgzoYZdz~=QsKE_I>T>P)5gzp8)!LDL*oZDu<QecZP
zowuHP=a0(*NbrK*Z^$qpD<cr8vYOJU>mxk3>1B^NX_+Pm<XH4m265=9_7cOgg;%Wx
zN;3z;mCw|lGru3hQ;k?R{BHhAz8FW%ybu3=ePVMPZO0P+(;9543n9g219GXZeP}5p
zE&R{G2`aRe@9~z&K$MPU$ss|b`4VW^O5$aq|0}uKU^WV(NR9g3DBwn~RQ+u*L+C5q
zC-AO7#-%&p9b~Z)gP2)VC?0K*mwI80aIyywl}}-I8JP4^cqWHfk*U8d+kjQ|hO~mC
zqy;yld`^^%E*aJtvLHim+41-l0bOT|QMm#Nc;R^V;6Gx%uV+>lGzL{CF@P@@f>(sB
zhWDZbqIe(>C<}fBu70&9xh^?Kn{5|S&<MY;rv1zbxsAr45%yR<viW?doeB;pkJUc_
z?7}AWkn~nx!KdD})qHuMskrp_@v~Xu+4fQI#U~XAY2ivMTtOm`NK_}Q?uSMY@3yKw
z(|Yz}H9|DeVxl9%Z^?-HiPMuhBH+%Z@uSa1AsEw?zFe7=j|}O=r1T%9*_q|TK(N?9
z{A4J(>OgYcU0EK!5P21jbuDOkNKcrJ8aAmN#1HV<?W=>m{5(A#8-)$t3$ok$D!ADk
zYpq!8SA%|DF}zlvyXOwWw%d8jp)3~Ioo(pZD<N=s`MzCCmJT0{giuzUaUvClBgR7>
zs0dcBO!vLm8KbTUGjzyD4W60a6bkQGUndOIfgS3TA<C<gNtEjq1>*!Mwk@G*R;x_u
zoyR%et=|i=dT23k#?A{|c`04PHLKYI7m@o16|SKV;`_nxiXpD;cQUvTD3@0^SuC94
z6p?1AzUP=Hy_^(B-mflwp7V|$?kDHYSIK!b$+I6_0AGDJ(vC+6np|cTyOLvc-<%Ss
zt>U0zCYlA0@xDt0li>5m4ddD3FzexttJR4cg;XXcvBL~lhE3?`EJ%jGqIPb?(c1T+
zVb_*x$8>l^>~(Uhfgdtvzdi*9mL+;<TNF3KmZh#Bu28ntk;j0)rga45p<>r<=8_@N
z(<38UpbhTt`s5Qx8h9jZ{m3Gp_ltTLcFdaQL@9DNeV~M0hmc%v7*=+_rNZe+jVu`F
zuDYQ(`hV&BUMwPAH@V_C`sM{Sm_f1NznXM^o3%rA4m=pmIs3i*MviERreE8rhG=(0
zQSs+N<kfr2ZR1-dv4qPCTmCvXKqMpD5iP1%szgAR?Sj$Pmp6}@7V!{>f|r`bUgB~a
zjQLvUIux-Ttr#C}8;M&Rae1uTw=c9)^rrnC2xk;Xc?-s?Pl|nks4IF-G>;*Og;NT*
zilJYbXQaVpYvzu<gCPu)Fc)E^9hxF<r!AOE#0R0{^g>qP{iyDVaSsEVm8yrlb#BJ{
z*r4G$b6Gs_a?;zl3%$$}G)@TL{5ihTb2sqEqcn7KJh=vUXhO=C2_jD-5`Zd3%iLim
z+wIXq5M_OBhJJ|g_t!(|bpo7-9_u-$eh7Y4J}iL{*+xcG(J0?)&yhXvU0+Qo>6EB$
zJZd!J_Zn;c2#TC{p_aBD_+Bw;3(JS^k(T6b*X~irlx9FvxQ6WJBUF;w7_xbzLaauY
zHgFFvlwDYp2$ksP(l`pOX-HMF=jM&XftoJX?hq*F;Jb%LUoZTt_W1i+*p_ovs0ZqT
z*Earw&WC{O(+3P(m2Bf2ff9e~VQ&@Vr)0>0A}wsqzCFKjiPk)XDXv(2CO8J9SbDG6
z>iWmlzup6{)0n~Lu_Tm~#XL;kv#?><tP;@T$!^san1kKG%*wzkHlNgdZz6Q$tH=~e
zb%A70G`k{QyMn8&H(7~G%)yc4jI`Elwu6XF_<-lQm<Gm8ov?zf6lr7+F*pI$V<b%O
zAmb3>QIm@jv6oz8o?p#3H^w1|^})ZKu2on%FkV~bEL}ETFOQTXsrz!myDOC>G&fRK
z^1=h^Cx)E}W}?0kkII^_81wq6{8;U-?D#u3%Qz!c!)AI4c~;MTm>&Ye3_u^`&9@_i
zf~P(n<ot0R9V)Wb2S28+uv5FlO(<X~;j<MMxNd2+NQTrbhWyAK-`KE*&>-||rfbND
zNUU!ViH|`J(XDV)mVXuFQt%?h`?&a^O6%p8+H&1R2rb5+Lr3|?F3y4adUr%YcKz4T
z0VGrR$xsQvpJ^yD!mT2f(Gk$=Yu^-R2!R#F;;5a52}HN&@S0E&25i3?BwD;Ax%yts
z?#`#cG)nGR<dpeGP($;B=DJ(|xL+R~nhu{$x>~{Hy;x#L&(4)J{<;oe@tX)<CbhkF
z$+_a5OwvNrj|ZWZSCm5>i=Y^3kxYcQR^!x)<KTD4W!sjt0*_Nw9JB$R{HW2Kh}BCH
z8LSV@#U<ZlKtoRu)TZ9pd1^(IAeg|?BNt%66bU(xNi^oN>8=Le&=?01VWO5IFFq6-
zk`(~K@dDO?c}NAy1CC}S&{G2D5Z^p7bT$Lxm>6OtDCHH_w_YW4kiP}V`5l+OBr;Bq
z6Jh)1)Mt=R1mehOG3K1s{M6nPYhVIJ!pRb);D#GTnB7M}V}(PcozR*@pwVNE;ITeP
zn^aa4AChcKR8!)au56UTo4Xpkr3uDTnMKUs2%o78;`dKB+a!|c<uo-{nz^Bh>s;c4
z;X?k{6r%9Fx2wZ%*+Ui1*`m<E2a3lOgAY|AVYGOO&A<pbeL2uj80Lj=X?pYda0`MY
z`Au$2e#z6h%x(?=`1BIm<FynftUeS^YbYuPR%inXWkb?6YGN)vd#m8$UCnO#lcG4t
z7j>I%XQ@E|MLA$in${u_>sbr}W5U%M|KKM{S2pr+e}5Ukq*WW*D-p@UM-zDEH?=JI
z+Bvu)$lxcc>C6}08HIBxRvvyLkOkmA0{RA~UG;G#1@<NC@+TZs!T54`&|bs8zrb~H
zSnMd5ky|4VPe00#Nq&;dBmLb>=i;xFWN-pD+qz1;MuFM`QO^yj)r3(KpTg8bH?$=U
zO&6YHi!1cOB~XeK>=gW^B+X=p(4#4|B`f14#lWV+ODoIZw8e!{-b|SS--|CL5<(D}
zOnDG%*PurKYB$eIiiQb<f?aV{lY~FmIEF5??N0|4!9N9Ck>Kk9qL&c^FZ9$zoA(F~
z=sVfE=*^D@vWXiJ?5+<%RuyWZSct*RWZi6I`Yn_g9$Y;yqBadTN7kxx$3z@lqy~tx
z&&c8l5#R;~5Q`hV?Y`KSZvaE|q$zlHG<5YqtkAfn7R<4BT2TDVU6DUhZw{$rqX0CF
zxh}PX1hdW0>tFM0kjGJdnu@chg7@_d;c;tj6PKv2OOMqt%R`slSEDRKvE#<9cT}$0
z#1vWa@^HtW*7T(M7}sq)4+CBbDiLc{^i$MAe;Te{hxTT_)&aCD<W9&hKerr)OF6o3
z&|stROTGSO8s<xE1(`9TnZ+M)G9Dy&hPBq4F$0*t#CoM+dOzjhaRJ3Miz{_AzOI*j
zAvOihEAE+D0f2b%R6=8RGQ@(BqnjgYl97ic5Ak4_-lELL78ZowQBF@B4$zX-uXS`b
z{CDOG%VE$D=O1HveTer?myiO*ViMxok&Mh*^n(n-3o%6kNrI1X_JN3;(>n7t$<Xq$
z6vcuhNC<jlgC{;)90(#Z&(*|Zym2k<F29?2K3)N$yBoCcqq8y-bE)hzTyyzCo<c3b
zkyPOrUAX2amU^CQ>dzDI*KYpF#1+6bW{}yV1K9y5Q(;MEG^p*ege2l_hiM0$3rbGt
zqYSRNuEz+7K~ydYQtk-Uf>f8Tmq!EJ{Fu<x&M|$7HpUgM$MKIrkVR#TCN4Hk+*%0`
z6b_zev*neoV?wAt1pDJj)Czs=l?Cu0;%p+tQLj<n4?sv2YNf70)&9oX7>riy_scwY
z!$3;kNzA`dC1l?O`(v)591L>pS3FMEYS!ine+zX!Y3jP)L-zMzOZCXn%tcaW={`+3
zgINBFbwtGu#_DMEY=vAG+Fgt{av1T3khPU<K*Y)ygZ#Wz*ehT*h)UE%FQhj2`6rO+
zJQ;R0UQSy^4^Pvnya1xi8)y!}@Qq1dJR>aC3I{>a^}-Q*>%Q*c7&<ZpuK9o-&IMu`
zeg3>pD)37<9n%Hot}GfM<j$Yy5`T0A14Dh6t0cg5XF<h*`PlZ$+o<nlKRrOUEWbBK
zb)n#v%_0f+i*_6^r_ZI>#o3ppy2tQQ@k>(+=-&#5`<Ls~J4_G*l3g>c_-_froemO}
z`=rk{${GO+Y>+G1CJ~3KCxN=UEpKD5C;PN+FOY>8=8CET<}fHeVoWJlR4;^buc_^p
zJZmBiB-g19KM;-rsuM2;c#vkHsuGS`CgDQ*%kE^Fp3M@6|F)@<o|VBJI+tcSkG{V>
z*hwaiu8h)q@Qm2yibD0?bCcC_jNAmmbPkS2fT4WG6RQ??Zcgq&F9u=?iz_f#mT*`A
zIkqCB)luj&?z2W?3MFXIDj3t*t(eIwmnn2)D3m32UGtai+K$6utKuY5`FarCV~8W_
zBQ{D{Z^3%NnvV|3`a_+3{y@WCb(I-yS{@GPd7RUQhq&0x`Br&$5?WwFKS=xv4YYb7
z4u&g~JA8gf)$f7B!flG3R>a@>V44O8CbZ(9G08xIT0c@Z8ZoWHO!8UCmz?+h3On+W
zCGep(g6nq{Xuqhly(MC?eh%)k+*@sOF4_KxM{LuKEfXam`)h`*RPZf0nLiwxFj4@t
zpe>n6TWFU*@<-CcNJBmrh242ly~<bug5ppte%*E7`*}1;B%F^4asjJ9XquEPw+ij*
zsYHJ~65x>p<FCDtqyVzKP=~jCAja7h)$fzpLS$|CAVl7FBUv0DTgy<ODNcm{4&7xp
zEWwcgWYeNh6^EmywJ+H*FvSdPjE{e?TG+Ap6eF%V5zlgA!u43d5wd_2pX)7RU1xgR
znK8c|`koixOWoZX-AIWl69;bhV@Ds6K{TPpDqJq@hx~AUQ*e@TXgVj`4_1z$Szrh1
z;t>NFd}6I*{7dh|`A?d`oe3!2gcY%J;+d()m%H3IhOGvC!IG|2*@b7nqDqRtgP}WR
z;j+&Q8`41cV^r%Crb?F})M-O(_ix<d_O5VNs?xHP1Iqzz!*(oVV4Hsu!0{qH0U5s%
zQ94`ka(lec{f#?dPEmwmtQ+Wd6KZF^iA@&vVK(d#s2G4}km!BrBri2W8wdjm-HP2Y
zN4Q$#iC&tb*Wm^AgsoMy(y__wXJo}Z2zO*Gg=k8nkpP8^`bW>9+*!*dR9?%`Wd6i?
z1(AO2l%6;B9BrbHRt@1t6;A`pn=(L~HL!HZW{zy~?-fx_R1?Vfeqc0amGHN+;lw{m
zEjjaNR+jBa3q8}+F`!4kEiK^n!C1_ZhZd$p?0(-lYsYn6U*m=~E?pn2O;DVHp-6%%
z!zKGE>h|MWDLWNscH2O@%c(9vnixp18_+5Xi_*LiN*+Rq2ce;?1S5!q!5odFMSz{w
zB8-MmY>ZQtpA?@OUS|T3*AU5wv}3QY<|^qpfubdBM)Ws!#a|sB2K8JiyZSi6+Pu(D
z6a|4l!=?=QgmfVEdA37J5TKBUu#hRRJ?H-=CnTAK99pG-voDpU4~rz3r1;KZu2G{N
zF&U=zqp0NS2HHR(VW5yf;tVAA$w&nK(JM5y18854UWGGLnI*6BfZEpv3bJa=-UDqs
z%h&1JuZ{5eCq$f}6+eg9|1yme#Yzhyn&#rQVYX7%wwJSVnN1Gm4BfSzB`9Z5#*fRA
z>y^!Ay0%2-prTNz&?D=nitGv=3%tCf>hr@bn-Wip<LKhNr+u$_lQDg*kJ+JkvfRyw
z<#J`8D4n;PMnOzQ0})T86O-<JHm2sP5T9zNRgnrClruILsAiFizk=r#tZg6|`yq!*
zM<6*pe!}YdQp#4Z+Q-HXO^Z4_lIo^Sd(ck8TA|#dA9Crb+rxRo-$ARBH}MS8H3N%e
zUhNpb)DB4yO>%w%Oqz&y6>?y_^%AJ27-jQ(FcEmzkkNUNqv~7fl9z*%HxVZ|D-*1F
zsl^eojtJpwY~=J&57l#DkAQ6tX3x9E2wOfvqr^BS7UFFUu<jC&6DMAMW4hoMyr@<6
zxW>9xUz9D?T-V=}W|omOYtx3I7z?wQ<P)#K`v&!!FcZN?-U5OLZ)O^nRx>y+tul6x
z&!Ij3dVn<cJn@A9vruz*8739qG#{rzZGXF+7(=1Qb5_p^8bRk`7to>li^JAAun(Yc
zcNmPSsije)eQT%wX{2!>S^~w?!o3y-bz|q#)DdA_dbTH)EmcgUv;{l&jQ+hvs|PLc
zkJ}F1{*Fptarkg<=sa9p#;mxG3B1NTmgy0~bb304TiWq`6rOXXA)CfnPd(KX1?}qc
zGiBt&CO8>)z&UlBel*oku%>h*A!jL1jXbfRL=KjC5<Cz*Muq@X*iMD`GCx!XBM)OH
z>jSdzv@BS{3&sAC=sa;C{@!D|A!WntP$%TROGmQdHJULG`laHiZ?P7f-K}D)H{$Xu
zTrVSbDXo-)yzj3reExa1t=p{>0?i&W;KOkuoS;AYM<J8l3qF<Jb9Y#_6i3<C2;@6|
zSkd*GOu$ZU1MvEc+Vb@c=<=5z*MBRH)p!0T)tEE(x^gNyp5L%vf`zJr1_e7+zYmI0
z9eYSTR3^4S1K23hL*1?~LoU{l0uv)|pG4ZNHke`02Sp}U1`zoW1z)}=-zq~yR*o!K
zOKXCQ4#&nifS_}n8wzNd^JPQ^5!TAZ$+jD=^iJ5Gu!P8?3<QMmjESQn>(AD<P%?pX
z`_dY@U|fv4z!)G<s%fbYM_ajb5;;uuTrB|hr|QqOP?1CiMJH~*xzW<-K?96eSSy&O
zDtM%uMxjIVqp2oca1jP*CN9n966R{bEkG(1duQ4`N;wb5K5crNv!EcLPR#^d1yybO
zwIEK<I7!(3x{@rnb;-{FnmhkwJ@QAeK&LX~C}xb{>s_nH(<PLFT{<Ogi0iipM?g59
zrnywM9&M~c7gZ99Splia@D#0%Q_Vpaj*ZaI=PE4I;p~BSTT7+C5cpko$8u*YzK_O5
z8;UXdnMtww+UT+Okr4Nh=#?+x;uTp;-0)kLQlvr>!A>5Vk$uCW;3oYRFy6C_VfUsy
zm^yXg%p?8?9BM5hAT{3$=T!_E47_F=lAy$rh#vN4b1Kg9WFW8$1PM{E6(xHl8!E{I
zZEf~@IA)N9L<(kM&va@G%WEe_ctJ|{+~|B*ML0Lyp}*QAkyU{&kw8clZv$EkON2#f
z56*4^%OVt3pFZWarg=_zIxpX~mxH6kBtRZI*P2t)OQ}&@kHdyq%CI=SKG$(1n`HJl
z_h+M4Ax#O`XW@z)+B9uVMX?;3Wl8?v5*txxPoCUQkGc!z(1i`8mn?=syyFNsvq_mj
z2VXY*KPby7_27qxzIQ*b4~f^thLXe8#?Di3jLn7g98jNkt~TimA~OlC?`(f_uot5e
z<vMAChys4>JYyjFK3Bjr6FS(T=+fz>A5OY(v_Yu&qw=D6sfEEJJ4p8*otiDkZr@$b
z`v>0sq@gw4Tll7<7RKkWtWeLw$9|)GX>6CS4nOK2nT^UxZLSY-g*W_w{O&3$HP{R>
zv6ps}dhHb>txBj3z_FjloFLTIMkH&tgkRmH!iL&yeit^X%T(KLM-ACCW(X#sBl|vy
zPh(snKPir72^pM-iH2Z2-vRf2tN6x7W)7&5sN-f>OB8@?c+ViV73P&!V(BTu|Bii7
z!p9!5PnOO;KuX+9bJ*p36OeLjJ?N#j3thud$p5zzz{+{UuQ=7dj@lbZUle&Ul5rxD
zw=0Q$#x;i~d>5d=Y!wGh%n(*vY${`M#&eK|v*M<gSrQx5D9a~{RD~`*$&MI_Con3-
zhHqh3LjzZqs1>11p)0TsK$@=3VT8;r0>9dcorW(BJu!EDs6_=dIt?ON-Kb4l9Q1}e
zvd*d0y)p(=FXxAQ<{&He1qUME#h=fkb3Q6dh${Fp8d(L6#0DN(ppAh7q~~8@rkjw$
z>&#nTDp4a{&>;MXY+Cl~>s!F|sunGY2gFkpvhC>*^nQ><0pdSw*)|5t!Whk9sy5Cu
zQM@N3PitYbs;GIBk$V-IRe4WvSDhaR^Ts7vBdeBzVp5UFV0loHbA{&6M2|d<-1M^o
zC=ci5On=|7J%WW(0w$*=R|z1r!!>m&w{c*Ngk|i_Oa6jm##Yc&uo07g@9^TpOk`4^
zTNn*Z5?=}jc-GN{3b2p5GUC?*#*}^>Sx$=xq{fKMTtwZ6B75^s69*N#q8dlJ_$n=?
zQbF-O5^)6XjC)FnZKO(2kW*jdILMQEQU|j)b;G}TFL$P|6`iP+A7{q-*2K6vwBYyo
z9wk_&dlL+-)!?hfVEX3KTh}tL_{Bzr;Y)#+{a!}riw>8X)5|Tfa^KMq$C;34vguxI
zK#hwmaeBFf-nxmDrSig6IK)5xNG^yKwYIQUnn|ZX+(RoWB-ihDQ7A{ZRF7e;{5fxM
z0Cw63J`oOV(N5{ntL`P10vEdSzaF?BU-5Zc5H|7bZUc^n@p${Kxz1_wC~%-_VqmE?
z#5Dd*gPFcQ0_sdg;y^2Bc+kq)=TbN{T~pVi+fc~N%FiU>1m6W`aAgvCuZ90Q^E8@)
zK*O@O0>#Ennr4c~QpnYU7P{h7@x6h5rX=i{>;YAISJLH*)rowkBZyi@MX+K&%{$0t
z9g?HyYo%&6tHaHKyMf`8X!~L_p~ER|9ATJCfX++y;8-`pJ9d)z@#FPfgOBBmCers+
zMGr!ej_)3MxSG9*O3EV#k-oSxvQ)W5y9-<-cn`pMeHyVle(?0FFzkjdQ%nigS%`LB
zsOB1!`GlOwZxY5cny41wOMa{Cw$XX|u>gmAUJ}11DSx-Ql+OjE#+VfFAo~If0GgMJ
zzv5tWK50_vOloG+v!6UT-5+ZSW%+AWY%E*?VjcC!ic`yH<BV+gE~Qv~C2Qj@Y&Pg1
z%l;pLWM4%5e3K_{kthiAsbc4_A_cnTvZ-beKg<sr>I@`3gOpz25?qOKnp~pNu-l>#
z>&w;#>IfSy2||~Lq1sX*;t_Oy?9?x`aZKjWsKRiPN;z0xeub)aaj6D|$7{YyO<Q1x
zgdWb2ssL%_D(QFAxL@DvQjsK7H-Ak|i8Y=w##%2jD=l;gQTeDX{C$$lPZSafV*Cxi
z%y*?9{_kH~8U1}v4hwaO;&;u<1RRHLl3QENR5*c{*dPA=p}w8P0uDnjPP^#_EYfoz
z1c<`7s)|S=HIN_xDp)n7A7#CSdMh-hxQ;Hl!ObgkROT7UZ9Z$FMJ&J^&?x$BZk!{X
z)t|P9k4q4KYAADEh^UN}PKo)8j_&~N*>^c{-^(3^uwPgNYVesC#)^-`(t3g@uqZd7
zauH2dN*&>;TL9oX^AntLLp{{g5fH5-`6SW_fzLcX?@O0Ts=SHlmm2@fYCzSxyul{c
zxX*Vz@9EC4KT+I7IkO<e%iTmd6f*x!j;?!*fgJW0yr4J;E_e^QEF4kWlhIL$DnQ@R
zMjp<XvOJ{4s~SY7(ry7cVJr!%^#VARHh(v$goZ993S3IeNcEE(6f5cC=fE#~te!9z
zw42z4YI3KD@xke6vQk*G0KED-HCqt#$|^N<2C_6!kW{~&mOd#Rh`zt5VY1%%oSoZt
z4dEz7bo_A?t9iiZ%pdG@feq0tF&SB7mT2w)Zwdw!wCrc*Gq+LvLa-2lFV4)!W@y-M
zy~k<v34}av<Gy{CG#rcNFj7)r9L<G&moX?}GkLy?F@?6^FsUsq5l;`Kx=$XJfO3*@
zrGp^Br6v7rH>?Mo?Z3cKc{a({ZajArxibRig>1$&A%_~)y>w%QObCbHk_UwLCHxBX
zxmD&fulnEJSUl&HRn^I)gRmi#a5$qB4LyyT$V!$Gs<hagVoA3LbVFgtbtKY(M4GYG
zf5VjOWE4Q|U?)VP2tR|KkHQ)T4qd-R5_(-*>I0Km{V1FC1S>1CNz_ntGX7dJm@4c)
z?H>7+QJ^l@u+zj^mS-?!T_%|jRP~VUY#%sS=9SQ}z@pQ_*e=R=Riwg~<EGd4%peF3
z{U{*)OPP%>EE&Pk4vHru`QwK2=LFUI=svBY78?4;$!k~9JOP>n@*wJiiqSnBgM~Mv
zYL3R_m>@!ySazh++%`Mbg(QJHBNvV(t#sz|a?kG2k-W~(%Bjs@jy?;lNp9i1H~F!<
zMTHX=T7k1;M1qFTQ1m$^rYfAa4vfAv_T%EM>(Z9RF0xOVBPm()Ej6-P;5UT<wLiS7
z_Z%}6nsVZYc4R#tF9JImJV>I<1h*h8c$`YZ^I2EAsEvB4wfa{?XR&Dd37IAuAY@L@
zi2y<U!$XDh#PMOIP2N-@Kz-0TVG2!?_?qoEcR_4~Gl6jHjJ>B4l@0Q(MWUBrrIoJW
zw-IfzMoUnaA!fm^R7_7(!=p-wkYz6fM>!!lllp#4XIB*n72U~UP0;A<$;#1=`4Msl
zXAsT4hAkys43pZ_cd=P(vYfN<-!)x32rRjgy(u9mTh9we!yRm3%RBD%f$Akpl2&lX
ztfaA1$QOOBrNHOc_F@s_ug)b?6=VW3gC6H)F$cBuSm`yXyX&xOWYlTsbSyjfRPg*T
zLS%$vVRGFSows`pdePj&O|J$0^eRrZQy81!`;^1eLf<A_OFi)vG+s9D^i%f1DSSt?
zg3y!n2N1iKfYr5Wg%m{`r4rBnIy{Zn;-kcqZfVZ$$6@=fOR2*yxDRw<w2*4jJge>W
z5X>8CZ4)*B1=lSmap^-xCuAieJcB!!-NQ-E&TFf{Zcm8)fS6NU3kzaVN!a<QgC{0y
zN^~_pDp4@TtrYC%fmVR(b>){oZA4?7_@jRA3J6tqBFXpU=LA?ypW`uW34HDV6!Dl)
zB1W@SS?i@l)|kc<q~gaHx6{#|MB9C%#f~rtD#d$4x!<%*E59np*UqR87wp;)j9+r;
zbWt-USgU00;W|YHfVreOTxzJ){YXZ|3T=jW)=KbN3hY3Hj3SQTg-$=%U2Mj4t5B)i
zZ8x*^VFSVXSu(&K*4RNhEJtd;rcL4Nd7s#xhtK>)hk=+}_RqaaFP|N5e~`!2x=U1g
z!xgxvfy73ujp!sY<mii*f<WAX7pOrLl^pOpkD?*qxsF(VN<)QK&i;#KBgVm^QNJg<
z^NEemdrVqW+uTHyPJ-_yOZ$OpLSIEDs%ZB~9n~sKyRGV~_Y63V#Mv<GvAVFS1~ZW3
ziHFF@JAro2zRfo>wJzyTHoi!`yAfc_tVw&pj?qEpVobL8d5NF1T?A(7ECf*ZMjU=v
zh%$I=ghIi|X&G8^-s4l1zn8F1JRHWKDrAALfK~$AAmjw7+pqwiKc-?bS>nLA5Ddv~
z0Qg2;(famRvmc0Nv-HSU2Gg*VTqQFH=qtTY8EwfhfQbOkgpCt_BQ($vHI!)`*#)t3
zNk=9^b9((isOuF#=ZldWN+Dd&hC=LNgEU&0$elNzm`Bu8<GAS@j?q`ecl9+ags7o^
zm(7WWJ{v&Kb2m3k)+^sgS5Sa=fM0eNSVXbdfb8jne_md+j_smgCQ!W)tW;v_OOPzZ
zs=AF(?F7SGS2pILhyj6IdjRy6Q6#-1nMF7g?2yfjCRp$JlixV;bi(<Q+W*?@UCd<G
z9VQ6#v|icKnO>~WgamHH;jW^R=X-#!MxM!*mAXT98YkRA3Mso!5GYFNQDo6ARLU`r
zwxagVX<}fY|84b+4`26gv5UqUNRAOaHaQpVvkc3?cK;p9D<8ZRENMae{fB^4(_*Fc
z^nC0<qMe`bO8wDr<S{k!v|ei(9nc*~j!SO!H~oUT9O;nvZrYhJ;0u;ri*`>2^h^f7
zSQBly+j7f2J30@fW6}L?1R2;lqdOxq$t#}Z|C-FJNmTtk?L)Kp)6%e&!H8u!!qI9n
zsz}R^FCt|z^N`l=fFG2}2@o*?twA6eJ;Yf-#?}c=T3Kc-dQl~!s<9q;a~iHm#%m6B
z>{!&U_11wyYl{9{i8gEpuWFe&L&MGvhUn7EAFt5L*3w_2%|+H|K2p#i*b!Jb^M$WU
zW7zfKv)3O^l`B^Vqfz){C(mty?i$nZwn}oI5n-FDYKPWtg=Fr64YL&A5{%94wVZG7
zr7GAE0k~sew*jIn)RZP9MRoFsl+BIQo1e<ON<L`8q(8kDpx9Y*dnI0H<$;k6@BO?u
zWn?caK*H~&(CbyDU=)O>>Da?2=fPQo_YgX{rBtoHiOA0$eku%%hvqRhiNfx3^c#xu
z%=x$8HOgRT`OCn+tv=eTN=;H8WEa4Z$k*(R^Zt;$V7h*MH1sWdX4hz~VANfMA#okj
zpy`K|M^3E~pVB?leklaXj0jSMm(t(o0h1K@DW=i4swv!2;yQ(Q8faTLA-Rm=zrSDJ
zdnLzxvI4Gpug@&@@aRn4mb=eW>wDvOy28bOkrFZF$bk!EqBYBPx9Yw7O&qcuoTsk4
zl{9&dCR82ZmTR1ocQusqJSaHnsq9Un2an?!+`1kqVck0>F(eYhh)0u8qE%MLTq<X&
z0dAw2j^ZIKxpZc0!><$xBeYYni_fAal&2I6UkB+sPp<>CoEz_a@hzwtwK;?grD58q
zSDtWa2uE@wX*r0lcUb$88a4-eX!oh=o3<59h95}7^GE8vzH{D!rArKRn64V#<iI7*
zI);s%x+twU2))p&P-D>De9!9ktyfe7TX-qdbWG=^-L=`u50$Ni=Z^%No+;&|pAkE2
zR;+@Jhwf3Ah^eoIsp#ndl8QZu*&fG@!E~~O$^)$`UJ%cl{C7#lQ(_Q^`4IYqI<Yrf
zQJ?^9^Gxt8Ezv7w63&e1bF-N&&%_caT3mW~(%7Kdo3}Yp!S6)a@<K~US9~FucAlh1
zG355w6oo{fwd0{5h+TxfC*Ar)hZs3xJ?@~(>5sr|R^1Y><%Sl?DqVMBRATJnCeZri
z0`t{{wuC)@6mc2@pW^HfX@k@&4yu5XrIZmri8<$d**Pi4UugP_<6!2>Y5Bqt$_~wo
zWrJ)iM4>)gjZpKnJ<hNgcrBnVhoLQPWa(bUSt>Ua%$vgX<WzBowuw`u&Z-fN>Jm2u
z_Vi8q!;<Iqy+(kxc>OYS?fy!S#fOn9z1bE=jE=O$k&r~L$+;QyGgl|A)W3a{i4ndc
zc!fW_*4=`o<`-nf)f?$H6-W%8v!3Fg2XBl@G#(!G-fy#6a0b#69#E`M%eZ)38o(ol
z>5dKL4bWA`XxzSKmVHAP?$7~xPo?9PDXt$M@;Q5Q2k%&vS`A8x=pxAABcoI|4ZJks
zZggggEz7H^@f2A;sp@a}!L30Ne~eS0{7Jg(s%fqPfllCrKHU8hYhy&)xgk^f4>taI
zl|d7nB%QIj)rj*3r}pO`1$**s{RYQ1YUSShz0nz!sU~tR(OW+l(^d$6Wuyk{Vs~@e
z+~<CG7E)dZsO@`4;nXyvcVa!V0mP;g5;(XmD=c-`MUt(*g^_0I0wmJ#;d4}>=x@|U
z8)TQB>4b5sjZ4lh%<4ZC!Fc-j*jAeoO~LC3>)@1B0gOw-M0BUDzm|d|;f*jK#VoC3
zcVn)^W@5&lx!+%mH3upKYkO247Btt5iNk6|z-cOcZr?Z?;CYOEiN^6r?COLTXE{FA
zdIzlzf%xngr4i}$fJrf>tn=ZSb>61n`4fXnK5*j&jWHL=;>||(4~B;Hz%`{9mM-TY
zes{x?HQOcT?r+hngoCTJOY)4l-yY3QV^Ka7tSqQOmUmH`O})RrkGYOycy<+Z$vQ_=
z+TGa-e@C6E7YyKWEX0p-IoE^Pm<(#{|F<8wWuKF%!9~l7*Ixx1+Nc|6{Tnt-^U>G{
zMw^dNT?bB|_nKJ8AveyW3JHox$NdqjW^I^2%(jpwltbmnnun@``%csdIztKdUEn0r
zkg`Rr@TSB;koOy_rADtR`Wx^n%LW#sYJMfe3i^6rS#=g=WacMA7dv;$Vd?@#nOH*M
zw;NMa)=>r}>SR+!(a$33O4h|u$u3nz8P81MZyktjRYpd87r<N^M(|8rua;oj6jgIG
zU58UGEOFjh7y(VT7^J&8xzoT?aka{t@QlI1U{;RbjwG{TPa8~w;3sO1p+3j4V}iRW
z3O4BWn{N<qs2$;G66Jp7VMYO1g?<X5aRLul`TTFDH-y}T0>olkr>N;$LPp^aUW?72
zE+4xM<)L@M{>MXCE~kKt{DuYTK&8VSnC1dD#EF&_NVaK-H$mOj!E;4**9*g=kD$FJ
zdKjl#%ZUTI8+vi3;NEI;cd!(P&A7(JoJZi??d}XDc88gf6TSV^%J&#lXX#{O1YXY=
z*GGAhZIU4z69dR^>7DVjsMy>SRZx~VR%BY_t8P~F(nZ26nGvuz)iRTZT4RKq2M_ba
z(f2Nn;xSK`YY<1+^o@?7n4_R;@ztPNqrd%%ef^r?_beQ`&y{b_BimLQvQiGh5~xm&
zyKRezXvU_{F1F^2qhJ@J0Z}kK^oVh|;w=%$^*~*mo3;*ksgbkXbq$f*uLN(n5U(NJ
zo{J6&*KJ*FXI|ZK*dOwZL0`ew^EIIY`=t?9$!J4v5#R-_<e>;F{;p5pkjz0vD9Bl<
zY$r9pqY6~<l3|Q;!xr+W@sIiR^G~zCrSDc!X-ng0%pkJ=yd`}0f)=q?uGWV1y=!A)
zU2KQjYJB(h{dHgyhDI1F)IDzURC}H;`_<>;?lUTA_&aMZzPiO#qD~pHk_Eq=GVP((
zxH!ylD-%AG>{r4rZqv*U1Z$aeEUM`4mYJ5Qwov?$pxsAPMZ;ko5sxaII$uBvzp>6b
zCg>YBYidHrha8pL0-7SQ!#yrluN>=(Q!usthSg6uRG<+ml{Ro!cf$3sqivR>9<DnN
zsRqdAo+~XfP+rpfXm5xl-0em62e%M*`!&L40KS1al=yMzu{f?%$)&&heu~@CU!Pd?
zD?2Cr_glq-k)0)UpV-DAtl+kaj%=IcstSYF<GJlnmlEDqWL2+yqI!t^?%Wn=(JCW(
zFj_f2ZUxKMo=YgQP+52S;IDfaOd+>nPmwPz%QHyxdIeL<auujMvNRccri_GGL~X3V
zZ}HPjl`M(Auw|TxD>=5R)!Lv39ySJddSbx=dun<OA@@Ym%tqLEqXW_?fy4Fc?2E{K
zO1-5QadC{G(IVulYIeP^<fgy4pz~PacVR}(-2EtHowy86Ii1aV;L`pMW1bmz-Edcu
zk?9Z1s<1eO1N&q{9BJ`6q+?%k!I}D87|LF9J{V4yymIwe>cz(BKgePljX($WXU)Dx
z))cohcctb6Q1;~9lGjPRZW;~ftcHUfNC4N_X#p$hF^{T=4_f6L^eW=+maxv{D*=NX
z=bM+Qai<B}2+96hVJcp|J3O+yySyr%=K+VcemngR)l!|kejElIV7L5;#_qLh=C9pM
z-6cgjrH0S;&B0Wd0h~y)t7SASwB$Ms^mL)8h>xXy2iWFsslnJ(mK5v&>u9KWavFz<
zl@4xnS5FlOb(og-4O5JbinF>0csFg=2m<`HP?)rzQqh)3z8$WBNVS7oA)}C*_7p4x
zcNBbsuKUg@DuV9^e$K94o;>w7PT}Q+^DA~sWA%Gt_ZN`TsyfRFnP?mU^m;&CXY&PQ
z3eaE(h0K}pPN?HhM%I)0>f!YccS2-a#}s<^@q=-vtbO^m8d@=r+)wvGJv4oB;*QhJ
zue^nzEc6La0}rOp&vRE~c3)N0lFkr$Vgrf{Ul+1{ZC%qtMrHA+bt9=QjDf!!3o+a#
z!M-QWeQsyst6eA1qe&hy1}GF3ph;UNtjS2OUzC2l2xen#Ue4N}L=c<9{EljpiC-9Y
z4qatem9+LMLCXsu)(rlTPSlf{jWaFR9iyc<^PNz`AIeWmbhD|+5kZbB!J8OI0>x{>
z7Oh>Q33a@CU_w9;7E7wDAmQPfui{6&Rz?xlsKfTY-^$GWgxr^_<%>s?hx2=bDy{8-
zd!Dgv@YzdHh-0F51F{{sbi$`+=J_-TU8l<}AKINTLc{MAmIcon*uAlbU_G^{)f>BM
zLN~0aIzQsy*amA`h_x%{lB&>&KB+3Q@V(>c6uqxS`F8rcB2#Qhtp=g4j|JL#ea9O8
zDz0Sgty0HP(!<_?xb<8c4~+pu<ay4h^UdUWZB8S3eIy`Th;&ORSDV7J&sF}*pj+lh
zSoZCF+ElPoU6p%rOzs#N*_d%D?U*_??*1{4wS|(ZM3%{k%OdKUJDYzN<HR0GH{g=?
zvmc7E6;JI*dOe&5p<FDya<fvNHguL&lLP8>^Lw|Gc5ru@jD|dv0bPWR#c&?qW&DXf
zW<N#Xx}8*n$vK^|-$@SgCza=?db}?)7El2~?v7FuA@qHlWF_F_HE&&p7WFq7whpTb
zt6d$=@2vEPoudjuBd!E;*$PkHCeG2n3~Zn5_YCE#sodyUn!)I$%4RA~ab=^5w8)c%
zqZfCQ1A~0&cdyY*9cz30w!QgVTccF=E1pm&>}e3>n6A1t?koLFo*IYDo<#-h5jE}W
zA@@}VKb$M->K146c3s55IoC4CcQNSIVDDOM0N-YlhC-Gni=-*iIhgVa)Cl1qI%ne7
zW84Y+`I>ZT@fvMuM<cqr<WnrHB`1OXnd1RdYzA|BdimjG##f^P9kGvXoN;JcFGSh4
zuzGq+$uYrV7k=OfuQ2)s;F`^VQ>0%7=-4VYr%~HMtZ&yf{d^zNff#jfOcCcD?U@jz
zN9y3w>Z1DpRxv?R#6Q_>o_buYZU|-u^#nx2e$QL#QtHBIQh=n_IP-C5Q*V7yFVuNW
zcf~?DWz;p+7&7oY3BT+4{n$dz*Pk}mY@+(Im84NV*0-4@pDTLPNnlTBU@ECYslwE+
zp6nLxiUVWFk}2lmF0||USRS)_BD^146mHTg4~<tBy*6YZeGF9`f^3?kpk@9p;`ho{
zjJNJ#$`|)D8oVQZ%d||AaY!pwpfNR7(HYv-kcf)m>ZJVzNM_pEUr@lV;O;|#9a~~9
zT}od!9=>7;tDKxO1(ROQF-_o<5`wM%YD)_4+cKn9#x4({h6x4^rn$qr*Nt8lZ?_&L
zq0DNIV-P$n2NM8Tal}(!g~|mfzADD+I_?X`MxgzdhTkQ}J4h3}H6N|4F(>C-lWb(X
zj2j1|*aYLHG6=r(6483T#b0kEP_N5rZa|I*Y7Y~e#Y)~T>*<&O#^_uAB!Iksau8hC
z55-PBa=flEd@n#nUSaC+^XGHK<ik~dY5d)={g^HA7#z=yp}o8<?<=Y$ge|zjCaM6n
z%Um8=a2uP+f7DT4&=$kIz4$g$1o@ZSt1rK=r72WL`LrPRm)=KgNo=#NL=z#uElot=
zuSmhBOwE~0iVO0se4U4Ur6pMo$pAV=iFD$tRp>aWAp63+)W3Vdv@tb^J^J0T*}@ou
z=V;(h)7U#xF)1+^x7>!M7vV*txkMGEV^a-yL6G!`jD01M+p5_na!|X+JSAX4Xt3_`
z@Oo75iRy@cFc+6bfq&f+m{;fXH{h^HAX;Q!o5^k#xtItSq$;LGbyf0O>e4xskh<n6
z-SL}GJ(Z8}sFY6~p~dpmVVH{5AqVr<r^xq&!a27BCuyuAY6<4zN%ZX}%Mst>DKfye
zN%Ww$dELotPq=qfS_8~J=y6`N@mY;{B0T!oKDl{fe_-u%W?k2u#*!eszP^s^?|=8L
z=h&shN`fxZke{Fyq#$7+bFd8}+4^%AzkB1JA024ad7#|AykJZehoTGEu8JNxn~Ke*
z-<`*1&bOyfm|EfgfTA)a{=G=0we&l-9TW7I%})c`P2r=riQ37-WzcDhwe}LnH82?6
zKOWq2?yr6;obyIb@q6(K@#nTY=x6y#7U*x;jUw%FvwFO0OkQZ=IfT?c`n9GeahgEq
zw(&!Dc@;;322#Wm<bfHd7Q(zG6NS2#l7td4Rorosfv~Wm)~brn{0eliZx(P;Q@>ns
zbIDAvY<t=eVIQwN--oSPUT%&5@sqT1@ztV)S_>cT9KX2~<xiba(ClX?EP6JvL4Z2A
zo1m}${oR_nD0;jsJaQjTQn3do)js+bs>bqkO|o2}tJ(}Nw}H1;5jEW3`G^@R<Kz<i
zPE`1H(1yYEFX-*$F@(?Klv`DzVu%Jb4K)hm{#txNw`Hf%0A0}lGd>NYb@6eK?~Ld8
zccQ>cvYRpkpP4^(jD59GMsje%!tI#{uu<Y-nNwCb-!w(l;iF4|bW}UM+@4gJ=_>EU
z;|NFd76pHqneb>btBdHSaNJ|CndQp#Jgk;71-#(vnuC~yq*KkAD~|}O4Z-YxWD0`s
zQO0A6rdm%Ggv0o!kqyiKPQ1i#P6<5C{&~gOYpV_4o*!EH9YhdES`bNeqX_ln_{pWk
zG?-Y+i=!&D0-+L%g$jG-Ss+r-wrYIyYITUm(9<{t#0|^lkI9|adfMOmMq0P5ImC&C
z=lhGmcN<>DT#z<*Zjl^yIDG+;GwGu2hkZ2Nk3fob6E+8)3n!uHzcMx?szZ+SWIT(0
zCD&(hE1d|Z!h3mui?vUWwsi>ECe2V~DhLnnFo^lM<~n1QgtLn&ZYyPhGGK#37%Pdl
zS>O!T<trlNDRP<S77`MNyrJMHPZ9gDkm(X!L#i6Q$zNs*5PBESN&M-SJMSY%_e_-`
zc2AP-WkvN5RJkMLz?1H^(nEf>87|r9o!KXeW7NNsqkHUL>13mfzvL)w^Pt|pW2CIb
zt&AFv#2YS_<19bwLbfM&!0v^`Ys8$7Rv_my;P6RTnUXU|EqB$G5WU}0JapUSb6U=S
zM)=>D{6s>J=@)(e9SM<c43ZTbZ_pV+2_YI3u>t7rAf?KeCu-M}GhM?8fD0&#!z-6&
zn$cjQ7AHlTXM}8bHtVShf-QzcmBDXo#1s!)<7(%_M|Hqcy~NF;+uB|$hF`cyfZt`N
z{j$85E-RsevSWzSg*Ow3Yi`})vK}hKrr&|@)@J4%iUbQfe&=Fj*@br&C;ORh9u?J(
zJoCj&3;ZBDM$5mArIgH*;X9Z7Q5a~bkO;z6DFsV2rP_sHiOoW#%=`(GFfW%HHCF@m
z+YGOV;9$D8WLvWv+scIH(F7O<prgcQ09kJWa(QX8(3u)9z0tV@1sSEKrAIuNVz%=k
zlCfFPhZH|s^@9el#vsB-oN9&j!DN1|l9ImA#1v1MkGR~9WdNQ-AP~WJ=5-!=qSjCT
QbJSl>N?EdA+%)|E0d%FhN&o-=

literal 0
HcmV?d00001

diff --git a/mobile/android/branding/unofficial/content/fennec_144x144.png b/mobile/android/branding/unofficial/content/fennec_144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..91974a1966fe43a54ff7a3d6243a1ab24e17903c
GIT binary patch
literal 19935
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
Rg0TPq002ovPDHLkV1hrMhMfQa

literal 0
HcmV?d00001

diff --git a/mobile/android/branding/unofficial/content/fennec_96x96.png b/mobile/android/branding/unofficial/content/fennec_96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..27e348b0d4af9aee666a42dc80bb682a11f17d7a
GIT binary patch
literal 11976
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
F{{z(jO>6)F

literal 0
HcmV?d00001


From 65a2d009d3c022a239dd971543bdc930fe673f02 Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Mon, 26 Nov 2012 14:23:27 -0800
Subject: [PATCH 051/160] Bug 811958 - Pull GLContext out of Cocoa stuff -
 r=bgirard

---
 gfx/gl/GLContext.h                           |  19 +---
 gfx/gl/GLContextTypes.h                      |  42 ++++++++
 gfx/gl/Makefile.in                           |   1 +
 gfx/layers/opengl/LayerManagerOGL.cpp        |  88 ++++++++++++++-
 gfx/layers/opengl/LayerManagerOGL.h          |  98 ++++-------------
 gfx/layers/opengl/LayerManagerOGLProgram.cpp | 107 +++++++++++++++++++
 gfx/layers/opengl/LayerManagerOGLProgram.h   |  96 +++--------------
 gfx/layers/opengl/ReusableTileStoreOGL.cpp   |   2 +
 widget/cocoa/nsChildView.mm                  |   6 +-
 9 files changed, 277 insertions(+), 182 deletions(-)
 create mode 100644 gfx/gl/GLContextTypes.h

diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index b109b782578c..38b26722f416 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -32,6 +32,7 @@
 #include "nsRegion.h"
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
+#include "GLContextTypes.h"
 
 typedef char realGLboolean;
 
@@ -55,24 +56,6 @@ class GLContext;
 
 typedef uintptr_t SharedTextureHandle;
 
-enum ShaderProgramType {
-    RGBALayerProgramType,
-    RGBALayerExternalProgramType,
-    BGRALayerProgramType,
-    RGBXLayerProgramType,
-    BGRXLayerProgramType,
-    RGBARectLayerProgramType,
-    RGBAExternalLayerProgramType,
-    ColorLayerProgramType,
-    YCbCrLayerProgramType,
-    ComponentAlphaPass1ProgramType,
-    ComponentAlphaPass2ProgramType,
-    Copy2DProgramType,
-    Copy2DRectProgramType,
-    NumProgramTypes
-};
-
-
 /**
  * A TextureImage encapsulates a surface that can be drawn to by a
  * Thebes gfxContext and (hopefully efficiently!) synchronized to a
diff --git a/gfx/gl/GLContextTypes.h b/gfx/gl/GLContextTypes.h
new file mode 100644
index 000000000000..948c67933a2a
--- /dev/null
+++ b/gfx/gl/GLContextTypes.h
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef GLCONTEXTSTUFF_H_
+#define GLCONTEXTSTUFF_H_
+
+/**
+ * We don't include GLDefs.h here since we don't want to drag in all defines
+ * in for all our users.
+ */
+typedef unsigned int GLenum;
+typedef unsigned int GLbitfield;
+typedef unsigned int GLuint;
+typedef int GLint;
+typedef int GLsizei;
+
+namespace mozilla {
+namespace gl {
+
+enum ShaderProgramType {
+    RGBALayerProgramType,
+    RGBALayerExternalProgramType,
+    BGRALayerProgramType,
+    RGBXLayerProgramType,
+    BGRXLayerProgramType,
+    RGBARectLayerProgramType,
+    RGBAExternalLayerProgramType,
+    ColorLayerProgramType,
+    YCbCrLayerProgramType,
+    ComponentAlphaPass1ProgramType,
+    ComponentAlphaPass2ProgramType,
+    Copy2DProgramType,
+    Copy2DRectProgramType,
+    NumProgramTypes
+};
+
+} // namespace gl
+} // namespace mozilla
+
+#endif /* GLCONTEXTSTUFF_H_ */
diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in
index 4d8928ee8f8a..e3729a278007 100644
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -18,6 +18,7 @@ FAIL_ON_WARNINGS = 1
 EXPORTS	= \
 	GLDefs.h \
 	GLContext.h \
+	GLContextTypes.h \
 	GLContextSymbols.h \
 	GLContextProvider.h \
 	GLContextProviderImpl.h \
diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp
index 7f794318f349..21afd011e224 100644
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -3,13 +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/. */
 
+#include "LayerManagerOGL.h"
+
 #include "mozilla/layers/PLayers.h"
 
 /* This must occur *after* layers/PLayers.h to avoid typedefs conflicts. */
 #include "mozilla/Util.h"
 
 #include "Composer2D.h"
-#include "LayerManagerOGL.h"
 #include "ThebesLayerOGL.h"
 #include "ContainerLayerOGL.h"
 #include "ImageLayerOGL.h"
@@ -52,6 +53,91 @@ using namespace mozilla::gl;
 int ShaderProgramOGL::sCurrentProgramKey = 0;
 #endif
 
+bool
+LayerManagerOGL::Initialize(bool force)
+{
+  return Initialize(CreateContext(), force);
+}
+
+int32_t
+LayerManagerOGL::GetMaxTextureSize() const
+{
+  return mGLContext->GetMaxTextureSize();
+}
+
+void
+LayerManagerOGL::MakeCurrent(bool aForce)
+{
+  if (mDestroyed) {
+    NS_WARNING("Call on destroyed layer manager");
+    return;
+  }
+  mGLContext->MakeCurrent(aForce);
+}
+
+void*
+LayerManagerOGL::GetNSOpenGLContext() const
+{
+  return gl()->GetNativeData(GLContext::NativeGLContext);
+}
+
+
+void
+LayerManagerOGL::BindQuadVBO() {
+  mGLContext->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, mQuadVBO);
+}
+
+void
+LayerManagerOGL::QuadVBOVerticesAttrib(GLuint aAttribIndex) {
+  mGLContext->fVertexAttribPointer(aAttribIndex, 2,
+                                   LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
+                                   (GLvoid*) QuadVBOVertexOffset());
+}
+
+void
+LayerManagerOGL::QuadVBOTexCoordsAttrib(GLuint aAttribIndex) {
+  mGLContext->fVertexAttribPointer(aAttribIndex, 2,
+                                   LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
+                                   (GLvoid*) QuadVBOTexCoordOffset());
+}
+
+void
+LayerManagerOGL::QuadVBOFlippedTexCoordsAttrib(GLuint aAttribIndex) {
+  mGLContext->fVertexAttribPointer(aAttribIndex, 2,
+                                   LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
+                                   (GLvoid*) QuadVBOFlippedTexCoordOffset());
+}
+
+// Super common
+
+void
+LayerManagerOGL::BindAndDrawQuad(GLuint aVertAttribIndex,
+                     GLuint aTexCoordAttribIndex,
+                     bool aFlipped)
+{
+  BindQuadVBO();
+  QuadVBOVerticesAttrib(aVertAttribIndex);
+
+  if (aTexCoordAttribIndex != GLuint(-1)) {
+    if (aFlipped)
+      QuadVBOFlippedTexCoordsAttrib(aTexCoordAttribIndex);
+    else
+      QuadVBOTexCoordsAttrib(aTexCoordAttribIndex);
+
+    mGLContext->fEnableVertexAttribArray(aTexCoordAttribIndex);
+  }
+
+  mGLContext->fEnableVertexAttribArray(aVertAttribIndex);
+
+  mGLContext->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
+
+  mGLContext->fDisableVertexAttribArray(aVertAttribIndex);
+
+  if (aTexCoordAttribIndex != GLuint(-1)) {
+    mGLContext->fDisableVertexAttribArray(aTexCoordAttribIndex);
+  }
+}
+
 static const double kFpsWindowMs = 250.0;
 static const size_t kNumFrameTimeStamps = 16;
 struct FPSCounter {
diff --git a/gfx/layers/opengl/LayerManagerOGL.h b/gfx/layers/opengl/LayerManagerOGL.h
index 623e009e0e64..78059d36a8c9 100644
--- a/gfx/layers/opengl/LayerManagerOGL.h
+++ b/gfx/layers/opengl/LayerManagerOGL.h
@@ -9,31 +9,23 @@
 #include "LayerManagerOGLProgram.h"
 
 #include "mozilla/layers/ShadowLayers.h"
-
 #include "mozilla/TimeStamp.h"
 
 #ifdef XP_WIN
 #include <windows.h>
 #endif
 
-/**
- * We don't include GLDefs.h here since we don't want to drag in all defines
- * in for all our users.
- */
-typedef unsigned int GLenum;
-typedef unsigned int GLbitfield;
-typedef unsigned int GLuint;
-typedef int GLint;
-typedef int GLsizei;
-
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
 #include "gfxContext.h"
 #include "gfx3DMatrix.h"
 #include "nsIWidget.h"
-#include "GLContext.h"
+#include "GLContextTypes.h"
 
 namespace mozilla {
+namespace gl {
+class GLContext;
+}
 namespace layers {
 
 class Composer2D;
@@ -71,9 +63,7 @@ public:
    *
    * \return True is initialization was succesful, false when it was not.
    */
-  bool Initialize(bool force = false) {
-    return Initialize(CreateContext(), force);
-  }
+  bool Initialize(bool force = false);
 
   bool Initialize(nsRefPtr<GLContext> aContext, bool force = false);
 
@@ -110,18 +100,14 @@ public:
 
   virtual void SetRoot(Layer* aLayer) { mRoot = aLayer; }
 
-  virtual bool CanUseCanvasLayerForSize(const gfxIntSize &aSize)
-  {
-      if (!mGLContext)
-          return false;
-      int32_t maxSize = mGLContext->GetMaxTextureSize();
-      return aSize <= gfxIntSize(maxSize, maxSize);
+  virtual bool CanUseCanvasLayerForSize(const gfxIntSize &aSize) {
+    if (!mGLContext)
+      return false;
+    int32_t maxSize = GetMaxTextureSize();
+    return aSize <= gfxIntSize(maxSize, maxSize);
   }
 
-  virtual int32_t GetMaxTextureSize() const
-  {
-    return mGLContext->GetMaxTextureSize();
-  }
+  virtual int32_t GetMaxTextureSize() const;
 
   virtual already_AddRefed<ThebesLayer> CreateThebesLayer();
 
@@ -151,13 +137,7 @@ public:
   /**
    * Helper methods.
    */
-  void MakeCurrent(bool aForce = false) {
-    if (mDestroyed) {
-      NS_WARNING("Call on destroyed layer manager");
-      return;
-    }
-    mGLContext->MakeCurrent(aForce);
-  }
+  void MakeCurrent(bool aForce = false);
 
   ShaderProgramOGL* GetBasicLayerProgram(bool aOpaque, bool aIsRGB,
                                          MaskType aMask = MaskNone)
@@ -203,6 +183,9 @@ public:
 
   GLContext* gl() const { return mGLContext; }
 
+  // |NSOpenGLContext*|:
+  void* GetNSOpenGLContext() const;
+
   DrawThebesLayerCallback GetThebesLayerCallback() const
   { return mThebesLayerCallback; }
 
@@ -254,56 +237,15 @@ public:
   GLintptr QuadVBOTexCoordOffset() { return sizeof(float)*4*2; }
   GLintptr QuadVBOFlippedTexCoordOffset() { return sizeof(float)*8*2; }
 
-  void BindQuadVBO() {
-    mGLContext->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, mQuadVBO);
-  }
-
-  void QuadVBOVerticesAttrib(GLuint aAttribIndex) {
-    mGLContext->fVertexAttribPointer(aAttribIndex, 2,
-                                     LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
-                                     (GLvoid*) QuadVBOVertexOffset());
-  }
-
-  void QuadVBOTexCoordsAttrib(GLuint aAttribIndex) {
-    mGLContext->fVertexAttribPointer(aAttribIndex, 2,
-                                     LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
-                                     (GLvoid*) QuadVBOTexCoordOffset());
-  }
-
-  void QuadVBOFlippedTexCoordsAttrib(GLuint aAttribIndex) {
-    mGLContext->fVertexAttribPointer(aAttribIndex, 2,
-                                     LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0,
-                                     (GLvoid*) QuadVBOFlippedTexCoordOffset());
-  }
+  void BindQuadVBO();
+  void QuadVBOVerticesAttrib(GLuint aAttribIndex);
+  void QuadVBOTexCoordsAttrib(GLuint aAttribIndex);
+  void QuadVBOFlippedTexCoordsAttrib(GLuint aAttribIndex);
 
   // Super common
-
   void BindAndDrawQuad(GLuint aVertAttribIndex,
                        GLuint aTexCoordAttribIndex,
-                       bool aFlipped = false)
-  {
-    BindQuadVBO();
-    QuadVBOVerticesAttrib(aVertAttribIndex);
-
-    if (aTexCoordAttribIndex != GLuint(-1)) {
-      if (aFlipped)
-        QuadVBOFlippedTexCoordsAttrib(aTexCoordAttribIndex);
-      else
-        QuadVBOTexCoordsAttrib(aTexCoordAttribIndex);
-
-      mGLContext->fEnableVertexAttribArray(aTexCoordAttribIndex);
-    }
-
-    mGLContext->fEnableVertexAttribArray(aVertAttribIndex);
-
-    mGLContext->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
-
-    mGLContext->fDisableVertexAttribArray(aVertAttribIndex);
-
-    if (aTexCoordAttribIndex != GLuint(-1)) {
-      mGLContext->fDisableVertexAttribArray(aTexCoordAttribIndex);
-    }
-  }
+                       bool aFlipped = false);
 
   void BindAndDrawQuad(ShaderProgramOGL *aProg,
                        bool aFlipped = false)
diff --git a/gfx/layers/opengl/LayerManagerOGLProgram.cpp b/gfx/layers/opengl/LayerManagerOGLProgram.cpp
index 155b28870693..be62af9fe1d8 100644
--- a/gfx/layers/opengl/LayerManagerOGLProgram.cpp
+++ b/gfx/layers/opengl/LayerManagerOGLProgram.cpp
@@ -3,9 +3,12 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "LayerManagerOGLProgram.h"
+
 #include "LayerManagerOGLShaders.h"
 #include "LayerManagerOGL.h"
 
+#include "GLContext.h"
+
 namespace mozilla {
 namespace layers {
 
@@ -227,6 +230,28 @@ ProgramProfileOGL::GetProfileFor(gl::ShaderProgramType aType,
 const char* const ShaderProgramOGL::VertexCoordAttrib = "aVertexCoord";
 const char* const ShaderProgramOGL::TexCoordAttrib = "aTexCoord";
 
+ShaderProgramOGL::ShaderProgramOGL(GLContext* aGL, const ProgramProfileOGL& aProfile)
+  : mIsProjectionMatrixStale(false)
+  , mGL(aGL)
+  , mProgram(0)
+  , mProfile(aProfile)
+  , mProgramState(STATE_NEW)
+{}
+
+ShaderProgramOGL::~ShaderProgramOGL()
+{
+  if (mProgram <= 0) {
+    return;
+  }
+
+  nsRefPtr<GLContext> ctx = mGL->GetSharedContext();
+  if (!ctx) {
+    ctx = mGL;
+  }
+  ctx->MakeCurrent();
+  ctx->fDeleteProgram(mProgram);
+}
+
 bool
 ShaderProgramOGL::Initialize()
 {
@@ -394,5 +419,87 @@ ShaderProgramOGL::LoadMask(Layer* aMaskLayer)
   return true;
 }
 
+void
+ShaderProgramOGL::Activate()
+{
+  if (mProgramState == STATE_NEW) {
+    if (!Initialize()) {
+      NS_WARNING("Shader could not be initialised");
+      return;
+    }
+  }
+  NS_ASSERTION(HasInitialized(), "Attempting to activate a program that's not in use!");
+  mGL->fUseProgram(mProgram);
+#if CHECK_CURRENT_PROGRAM
+  mGL->SetUserData(&sCurrentProgramKey, this);
+#endif
+  // check and set the projection matrix
+  if (mIsProjectionMatrixStale) {
+    SetProjectionMatrix(mProjectionMatrix);
+  }
+}
+
+
+void
+ShaderProgramOGL::SetUniform(GLint aLocation, float aFloatValue)
+{
+  ASSERT_THIS_PROGRAM;
+  NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+  mGL->fUniform1f(aLocation, aFloatValue);
+}
+
+void
+ShaderProgramOGL::SetUniform(GLint aLocation, const gfxRGBA& aColor)
+{
+  ASSERT_THIS_PROGRAM;
+  NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+  mGL->fUniform4f(aLocation, float(aColor.r), float(aColor.g), float(aColor.b), float(aColor.a));
+}
+
+void
+ShaderProgramOGL::SetUniform(GLint aLocation, int aLength, float *aFloatValues)
+{
+  ASSERT_THIS_PROGRAM;
+  NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+  if (aLength == 1) {
+    mGL->fUniform1fv(aLocation, 1, aFloatValues);
+  } else if (aLength == 2) {
+    mGL->fUniform2fv(aLocation, 1, aFloatValues);
+  } else if (aLength == 3) {
+    mGL->fUniform3fv(aLocation, 1, aFloatValues);
+  } else if (aLength == 4) {
+    mGL->fUniform4fv(aLocation, 1, aFloatValues);
+  } else {
+    NS_NOTREACHED("Bogus aLength param");
+  }
+}
+
+void
+ShaderProgramOGL::SetUniform(GLint aLocation, GLint aIntValue)
+{
+  ASSERT_THIS_PROGRAM;
+  NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+  mGL->fUniform1i(aLocation, aIntValue);
+}
+
+void
+ShaderProgramOGL::SetMatrixUniform(GLint aLocation, const gfx3DMatrix& aMatrix)
+{
+  SetMatrixUniform(aLocation, &aMatrix._11);
+}
+
+void
+ShaderProgramOGL::SetMatrixUniform(GLint aLocation, const float *aFloatValues)
+{
+  ASSERT_THIS_PROGRAM;
+  NS_ASSERTION(aLocation >= 0, "Invalid location");
+
+  mGL->fUniformMatrix4fv(aLocation, 1, false, aFloatValues);
+}
+
 } /* layers */
 } /* mozilla */
diff --git a/gfx/layers/opengl/LayerManagerOGLProgram.h b/gfx/layers/opengl/LayerManagerOGLProgram.h
index ac4a2151f9bb..f6ed2b7a64bb 100644
--- a/gfx/layers/opengl/LayerManagerOGLProgram.h
+++ b/gfx/layers/opengl/LayerManagerOGLProgram.h
@@ -10,11 +10,16 @@
 
 #include "prenv.h"
 
+#include "nsAutoPtr.h"
 #include "nsString.h"
-#include "GLContext.h"
+#include "GLContextTypes.h"
 #include "gfx3DMatrix.h"
+#include "gfxColor.h"
 
 namespace mozilla {
+namespace gl {
+class GLContext;
+}
 namespace layers {
 
 class Layer;
@@ -140,45 +145,16 @@ class ShaderProgramOGL
 public:
   typedef mozilla::gl::GLContext GLContext;
 
-  ShaderProgramOGL(GLContext* aGL, const ProgramProfileOGL& aProfile) :
-    mIsProjectionMatrixStale(false), mGL(aGL), mProgram(0),
-    mProfile(aProfile), mProgramState(STATE_NEW) { }
+  ShaderProgramOGL(GLContext* aGL, const ProgramProfileOGL& aProfile);
 
-  ~ShaderProgramOGL() {
-    if (mProgram <= 0) {
-      return;
-    }
-
-    nsRefPtr<GLContext> ctx = mGL->GetSharedContext();
-    if (!ctx) {
-      ctx = mGL;
-    }
-    ctx->MakeCurrent();
-    ctx->fDeleteProgram(mProgram);
-  }
+  ~ShaderProgramOGL();
 
   bool HasInitialized() {
     NS_ASSERTION(mProgramState != STATE_OK || mProgram > 0, "Inconsistent program state");
     return mProgramState == STATE_OK;
   }
 
-  void Activate() {
-    if (mProgramState == STATE_NEW) {
-      if (!Initialize()) {
-        NS_WARNING("Shader could not be initialised");
-        return;
-      }
-    }
-    NS_ASSERTION(HasInitialized(), "Attempting to activate a program that's not in use!");
-    mGL->fUseProgram(mProgram);
-#if CHECK_CURRENT_PROGRAM
-    mGL->SetUserData(&sCurrentProgramKey, this);
-#endif
-    // check and set the projection matrix
-    if (mIsProjectionMatrixStale) {
-      SetProjectionMatrix(mProjectionMatrix);
-    }
-  }
+  void Activate();
 
   bool Initialize();
 
@@ -329,54 +305,12 @@ protected:
   static int sCurrentProgramKey;
 #endif
 
-  void SetUniform(GLint aLocation, float aFloatValue) {
-    ASSERT_THIS_PROGRAM;
-    NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-    mGL->fUniform1f(aLocation, aFloatValue);
-  }
-
-  void SetUniform(GLint aLocation, const gfxRGBA& aColor) {
-    ASSERT_THIS_PROGRAM;
-    NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-    mGL->fUniform4f(aLocation, float(aColor.r), float(aColor.g), float(aColor.b), float(aColor.a));
-  }
-
-  void SetUniform(GLint aLocation, int aLength, float *aFloatValues) {
-    ASSERT_THIS_PROGRAM;
-    NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-    if (aLength == 1) {
-      mGL->fUniform1fv(aLocation, 1, aFloatValues);
-    } else if (aLength == 2) {
-      mGL->fUniform2fv(aLocation, 1, aFloatValues);
-    } else if (aLength == 3) {
-      mGL->fUniform3fv(aLocation, 1, aFloatValues);
-    } else if (aLength == 4) {
-      mGL->fUniform4fv(aLocation, 1, aFloatValues);
-    } else {
-      NS_NOTREACHED("Bogus aLength param");
-    }
-  }
-
-  void SetUniform(GLint aLocation, GLint aIntValue) {
-    ASSERT_THIS_PROGRAM;
-    NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-    mGL->fUniform1i(aLocation, aIntValue);
-  }
-
-  void SetMatrixUniform(GLint aLocation, const gfx3DMatrix& aMatrix) {
-    SetMatrixUniform(aLocation, &aMatrix._11);
-  }
-
-  void SetMatrixUniform(GLint aLocation, const float *aFloatValues) {
-    ASSERT_THIS_PROGRAM;
-    NS_ASSERTION(aLocation >= 0, "Invalid location");
-
-    mGL->fUniformMatrix4fv(aLocation, 1, false, aFloatValues);
-  }
+  void SetUniform(GLint aLocation, float aFloatValue);
+  void SetUniform(GLint aLocation, const gfxRGBA& aColor);
+  void SetUniform(GLint aLocation, int aLength, float *aFloatValues);
+  void SetUniform(GLint aLocation, GLint aIntValue);
+  void SetMatrixUniform(GLint aLocation, const gfx3DMatrix& aMatrix);
+  void SetMatrixUniform(GLint aLocation, const float *aFloatValues);
 };
 
 
diff --git a/gfx/layers/opengl/ReusableTileStoreOGL.cpp b/gfx/layers/opengl/ReusableTileStoreOGL.cpp
index 63e4d531785e..6c52f74c060f 100644
--- a/gfx/layers/opengl/ReusableTileStoreOGL.cpp
+++ b/gfx/layers/opengl/ReusableTileStoreOGL.cpp
@@ -4,6 +4,8 @@
 
 #include "ReusableTileStoreOGL.h"
 
+#include "GLContext.h"
+
 namespace mozilla {
 namespace layers {
 
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index e7ba09c2b627..0d6f08572e48 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -51,7 +51,6 @@
 #include "nsRegion.h"
 #include "Layers.h"
 #include "LayerManagerOGL.h"
-#include "GLContext.h"
 #include "mozilla/layers/CompositorCocoaWidgetHelper.h"
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"
@@ -1692,8 +1691,7 @@ nsChildView::CreateCompositor()
     LayerManagerOGL *manager =
       static_cast<LayerManagerOGL*>(compositor::GetLayerManager(mCompositorParent));
 
-    NSOpenGLContext *glContext =
-      (NSOpenGLContext *) manager->gl()->GetNativeData(GLContext::NativeGLContext);
+    NSOpenGLContext *glContext = (NSOpenGLContext *)manager->GetNSOpenGLContext();
 
     [(ChildView *)mView setGLContext:glContext];
     [(ChildView *)mView setUsingOMTCompositor:true];
@@ -2457,7 +2455,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
 
     LayerManagerOGL *manager = static_cast<LayerManagerOGL*>(layerManager);
     manager->SetClippingRegion(region);
-    glContext = (NSOpenGLContext *)manager->gl()->GetNativeData(mozilla::gl::GLContext::NativeGLContext);
+    glContext = (NSOpenGLContext *)manager->GetNSOpenGLContext();
 
     if (!mGLContext) {
       [self setGLContext:glContext];

From 601bff1c6fdab564891adbba3504c67a4f39aeba Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Mon, 26 Nov 2012 14:23:27 -0800
Subject: [PATCH 052/160] Bug 811958 - Fix and move ShateType type - r=bgirard

---
 dom/plugins/base/nsNPAPIPluginInstance.cpp |  9 +-
 dom/plugins/base/nsPluginInstanceOwner.cpp |  8 +-
 gfx/gl/GLContext.h                         | 48 ++++++-----
 gfx/gl/GLContextProviderEGL.cpp            | 95 +++++++++++-----------
 gfx/layers/SharedTextureImage.h            |  4 +-
 gfx/layers/basic/BasicCanvasLayer.cpp      | 15 ++--
 gfx/layers/ipc/LayersSurfaces.ipdlh        |  4 +-
 gfx/layers/ipc/ShadowLayerUtils.h          |  4 +-
 gfx/layers/opengl/CanvasLayerOGL.cpp       |  5 +-
 gfx/layers/opengl/ImageLayerOGL.h          |  2 +-
 10 files changed, 107 insertions(+), 87 deletions(-)

diff --git a/dom/plugins/base/nsNPAPIPluginInstance.cpp b/dom/plugins/base/nsNPAPIPluginInstance.cpp
index cfce39aeb98a..6094d5ed9518 100644
--- a/dom/plugins/base/nsNPAPIPluginInstance.cpp
+++ b/dom/plugins/base/nsNPAPIPluginInstance.cpp
@@ -129,7 +129,10 @@ public:
     if (mTextureInfo.mWidth == 0 || mTextureInfo.mHeight == 0)
       return 0;
 
-    SharedTextureHandle handle = sPluginContext->CreateSharedHandle(TextureImage::ThreadShared, (void*)mTextureInfo.mTexture, GLContext::TextureID);
+    SharedTextureHandle handle =
+      sPluginContext->CreateSharedHandle(GLContext::SameProcess,
+                                         (void*)mTextureInfo.mTexture,
+                                         GLContext::TextureID);
 
     // We want forget about this now, so delete the texture. Assigning it to zero
     // ensures that we create a new one in Lock()
@@ -1000,7 +1003,9 @@ SharedTextureHandle nsNPAPIPluginInstance::CreateSharedHandle()
     return mContentTexture->CreateSharedHandle();
   } else if (mContentSurface) {
     EnsureGLContext();
-    return sPluginContext->CreateSharedHandle(TextureImage::ThreadShared, mContentSurface, GLContext::SurfaceTexture);
+    return sPluginContext->CreateSharedHandle(GLContext::SameProcess,
+                                              mContentSurface,
+                                              GLContext::SurfaceTexture);
   } else return 0;
 }
 
diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp
index bf2d859833ca..55014898a03e 100644
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -186,7 +186,7 @@ nsPluginInstanceOwner::GetImageContainer()
 
   SharedTextureImage::Data data;
   data.mHandle = mInstance->CreateSharedHandle();
-  data.mShareType = mozilla::gl::TextureImage::ThreadShared;
+  data.mShareType = mozilla::gl::GLContext::SameProcess;
   data.mInverted = mInstance->Inverted();
 
   gfxRect r = GetPluginRect();
@@ -1723,8 +1723,10 @@ already_AddRefed<ImageContainer> nsPluginInstanceOwner::GetImageContainerForVide
 
   SharedTextureImage::Data data;
 
-  data.mHandle = mInstance->GLContext()->CreateSharedHandle(gl::TextureImage::ThreadShared, aVideoInfo->mSurfaceTexture, gl::GLContext::SurfaceTexture);
-  data.mShareType = mozilla::gl::TextureImage::ThreadShared;
+  data.mShareType = gl::GLContext::SameProcess;
+  data.mHandle = mInstance->GLContext()->CreateSharedHandle(data.mShareType,
+                                                            aVideoInfo->mSurfaceTexture,
+                                                            gl::GLContext::SurfaceTexture);
 
   // The logic below for Honeycomb is just a guess, but seems to work. We don't have a separate
   // inverted flag for video.
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 38b26722f416..5188d4411157 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -90,11 +90,6 @@ public:
         ForceSingleTile  = 0x4
     };
 
-    enum TextureShareType {
-        ThreadShared     = 0x0,
-        ProcessShared    = 0x1
-    };
-
     typedef gfxASurface::gfxContentType ContentType;
 
     virtual ~TextureImage() {}
@@ -912,6 +907,12 @@ public:
         return IsExtensionSupported(EXT_framebuffer_blit) || IsExtensionSupported(ANGLE_framebuffer_blit);
     }
 
+
+    enum SharedTextureShareType {
+        SameProcess = 0,
+        CrossProcess
+    };
+
     enum SharedTextureBufferType {
         TextureID
 #ifdef MOZ_WIDGET_ANDROID
@@ -922,23 +923,26 @@ public:
     /**
      * Create new shared GLContext content handle, must be released by ReleaseSharedHandle.
      */
-    virtual SharedTextureHandle CreateSharedHandle(TextureImage::TextureShareType aType) { return 0; }
+    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType)
+    { return 0; }
     /*
      * Create a new shared GLContext content handle, using the passed buffer as a source.
      * Must be released by ReleaseSharedHandle. UpdateSharedHandle will have no effect
      * on handles created with this method, as the caller owns the source (the passed buffer)
      * and is responsible for updating it accordingly.
      */
-    virtual SharedTextureHandle CreateSharedHandle(TextureImage::TextureShareType aType,
-                                                   void* aBuffer,
-                                                   SharedTextureBufferType aBufferType) { return 0; }
+    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType,
+                                                   void* buffer,
+                                                   SharedTextureBufferType bufferType)
+    { return 0; }
     /**
      * Publish GLContext content to intermediate buffer attached to shared handle.
      * Shared handle content is ready to be used after call returns, and no need extra Flush/Finish are required.
      * GLContext must be current before this call
      */
-    virtual void UpdateSharedHandle(TextureImage::TextureShareType aType,
-                                    SharedTextureHandle aSharedHandle) { }
+    virtual void UpdateSharedHandle(SharedTextureShareType shareType,
+                                    SharedTextureHandle sharedHandle)
+    { }
     /**
      * - It is better to call ReleaseSharedHandle before original GLContext destroyed,
      *     otherwise warning will be thrown on attempt to destroy Texture associated with SharedHandle, depends on backend implementation.
@@ -952,8 +956,9 @@ public:
      * SharedHandle (currently EGLImage) does not require GLContext because it is EGL call, and can be destroyed
      *   at any time, unless EGLImage have siblings (which are not expected with current API).
      */
-    virtual void ReleaseSharedHandle(TextureImage::TextureShareType aType,
-                                     SharedTextureHandle aSharedHandle) { }
+    virtual void ReleaseSharedHandle(SharedTextureShareType shareType,
+                                     SharedTextureHandle sharedHandle)
+    { }
 
 
     typedef struct {
@@ -966,21 +971,24 @@ public:
      * Returns information necessary for rendering a shared handle.
      * These values change depending on what sharing mechanism is in use
      */
-    virtual bool GetSharedHandleDetails(TextureImage::TextureShareType aType,
-                                        SharedTextureHandle aSharedHandle,
-                                        SharedHandleDetails& aDetails) { return false; }
+    virtual bool GetSharedHandleDetails(SharedTextureShareType shareType,
+                                        SharedTextureHandle sharedHandle,
+                                        SharedHandleDetails& details)
+    { return false; }
     /**
      * Attach Shared GL Handle to GL_TEXTURE_2D target
      * GLContext must be current before this call
      */
-    virtual bool AttachSharedHandle(TextureImage::TextureShareType aType,
-                                    SharedTextureHandle aSharedHandle) { return false; }
+    virtual bool AttachSharedHandle(SharedTextureShareType shareType,
+                                    SharedTextureHandle sharedHandle)
+    { return false; }
 
     /**
      * Detach Shared GL Handle from GL_TEXTURE_2D target
      */
-    virtual void DetachSharedHandle(TextureImage::TextureShareType aType,
-                                    SharedTextureHandle aSharedHandle) { return; }
+    virtual void DetachSharedHandle(SharedTextureShareType shareType,
+                                    SharedTextureHandle sharedHandle)
+    { }
 
 private:
     GLuint mUserBoundDrawFBO;
diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index e080cb10159b..29ba4d74707c 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -646,19 +646,19 @@ public:
         return sEGLLibrary.HasKHRLockSurface();
     }
 
-    virtual SharedTextureHandle CreateSharedHandle(TextureImage::TextureShareType aType);
-    virtual SharedTextureHandle CreateSharedHandle(TextureImage::TextureShareType aType,
-                                                   void* aBuffer,
-                                                   SharedTextureBufferType aBufferType);
-    virtual void UpdateSharedHandle(TextureImage::TextureShareType aType,
-                                    SharedTextureHandle aSharedHandle);
-    virtual void ReleaseSharedHandle(TextureImage::TextureShareType aType,
-                                     SharedTextureHandle aSharedHandle);
-    virtual bool GetSharedHandleDetails(TextureImage::TextureShareType aType,
-                                        SharedTextureHandle aSharedHandle,
-                                        SharedHandleDetails& aDetails);
-    virtual bool AttachSharedHandle(TextureImage::TextureShareType aType,
-                                    SharedTextureHandle aSharedHandle);
+    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType);
+    virtual SharedTextureHandle CreateSharedHandle(SharedTextureShareType shareType,
+                                                   void* buffer,
+                                                   SharedTextureBufferType bufferType);
+    virtual void UpdateSharedHandle(SharedTextureShareType shareType,
+                                    SharedTextureHandle sharedHandle);
+    virtual void ReleaseSharedHandle(SharedTextureShareType shareType,
+                                     SharedTextureHandle sharedHandle);
+    virtual bool GetSharedHandleDetails(SharedTextureShareType shareType,
+                                        SharedTextureHandle sharedHandle,
+                                        SharedHandleDetails& details);
+    virtual bool AttachSharedHandle(SharedTextureShareType shareType,
+                                    SharedTextureHandle sharedHandle);
 protected:
     friend class GLContextProviderEGL;
 
@@ -854,15 +854,15 @@ private:
 };
 
 void
-GLContextEGL::UpdateSharedHandle(TextureImage::TextureShareType aType,
-                                 SharedTextureHandle aSharedHandle)
+GLContextEGL::UpdateSharedHandle(SharedTextureShareType shareType,
+                                 SharedTextureHandle sharedHandle)
 {
-    if (aType != TextureImage::ThreadShared) {
+    if (shareType != SameProcess) {
         NS_ERROR("Implementation not available for this sharing type");
         return;
     }
 
-    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(aSharedHandle);
+    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(sharedHandle);
 
     NS_ASSERTION(wrapper->Type() == SharedHandleType::Image, "Expected EGLImage shared handle");
     NS_ASSERTION(mShareWithEGLImage, "EGLImage not supported or disabled in runtime");
@@ -895,9 +895,9 @@ GLContextEGL::UpdateSharedHandle(TextureImage::TextureShareType aType,
 }
 
 SharedTextureHandle
-GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType)
+GLContextEGL::CreateSharedHandle(SharedTextureShareType shareType)
 {
-    if (aType != TextureImage::ThreadShared)
+    if (shareType != SameProcess)
         return 0;
 
     if (!mShareWithEGLImage)
@@ -914,7 +914,7 @@ GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType)
 
     if (!ok) {
         NS_ERROR("EGLImage creation for EGLTextureWrapper failed");
-        ReleaseSharedHandle(aType, (SharedTextureHandle)tex);
+        ReleaseSharedHandle(shareType, (SharedTextureHandle)tex);
         return 0;
     }
 
@@ -923,16 +923,16 @@ GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType)
 }
 
 SharedTextureHandle
-GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType,
-                                 void* aBuffer,
-                                 SharedTextureBufferType aBufferType)
+GLContextEGL::CreateSharedHandle(SharedTextureShareType shareType,
+                                 void* buffer,
+                                 SharedTextureBufferType bufferType)
 {
     // Both EGLImage and SurfaceTexture only support ThreadShared currently, but
     // it's possible to make SurfaceTexture work across processes. We should do that.
-    if (aType != TextureImage::ThreadShared)
+    if (shareType != SameProcess)
         return 0;
 
-    switch (aBufferType) {
+    switch (bufferType) {
 #ifdef MOZ_WIDGET_ANDROID
     case SharedTextureBufferType::SurfaceTexture:
         if (!IsExtensionSupported(GLContext::OES_EGL_image_external)) {
@@ -940,13 +940,13 @@ GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType,
             return 0;
         }
 
-        return (SharedTextureHandle) new SurfaceTextureWrapper(reinterpret_cast<nsSurfaceTexture*>(aBuffer));
+        return (SharedTextureHandle) new SurfaceTextureWrapper(reinterpret_cast<nsSurfaceTexture*>(buffer));
 #endif
     case SharedTextureBufferType::TextureID: {
         if (!mShareWithEGLImage)
             return 0;
 
-        GLuint texture = (uintptr_t)aBuffer;
+        GLuint texture = (uintptr_t)buffer;
         EGLTextureWrapper* tex = new EGLTextureWrapper();
         if (!tex->CreateEGLImage(this, texture)) {
             NS_ERROR("EGLImage creation for EGLTextureWrapper failed");
@@ -962,15 +962,15 @@ GLContextEGL::CreateSharedHandle(TextureImage::TextureShareType aType,
     }
 }
 
-void GLContextEGL::ReleaseSharedHandle(TextureImage::TextureShareType aType,
-                                       SharedTextureHandle aSharedHandle)
+void GLContextEGL::ReleaseSharedHandle(SharedTextureShareType shareType,
+                                       SharedTextureHandle sharedHandle)
 {
-    if (aType != TextureImage::ThreadShared) {
+    if (shareType != SameProcess) {
         NS_ERROR("Implementation not available for this sharing type");
         return;
     }
 
-    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(aSharedHandle);
+    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(sharedHandle);
 
     switch (wrapper->Type()) {
 #ifdef MOZ_WIDGET_ANDROID
@@ -982,40 +982,41 @@ void GLContextEGL::ReleaseSharedHandle(TextureImage::TextureShareType aType,
     case SharedHandleType::Image: {
         NS_ASSERTION(mShareWithEGLImage, "EGLImage not supported or disabled in runtime");
 
-        EGLTextureWrapper* wrap = (EGLTextureWrapper*)aSharedHandle;
+        EGLTextureWrapper* wrap = (EGLTextureWrapper*)sharedHandle;
         delete wrap;
         break;
     }
 
     default:
         NS_ERROR("Unknown shared handle type");
+        return;
     }
 }
 
-bool GLContextEGL::GetSharedHandleDetails(TextureImage::TextureShareType aType,
-                                          SharedTextureHandle aSharedHandle,
-                                          SharedHandleDetails& aDetails)
+bool GLContextEGL::GetSharedHandleDetails(SharedTextureShareType shareType,
+                                          SharedTextureHandle sharedHandle,
+                                          SharedHandleDetails& details)
 {
-    if (aType != TextureImage::ThreadShared)
+    if (shareType != SameProcess)
         return false;
 
-    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(aSharedHandle);
+    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(sharedHandle);
 
     switch (wrapper->Type()) {
 #ifdef MOZ_WIDGET_ANDROID
     case SharedHandleType::SurfaceTexture: {
         SurfaceTextureWrapper* surfaceWrapper = reinterpret_cast<SurfaceTextureWrapper*>(wrapper);
 
-        aDetails.mTarget = LOCAL_GL_TEXTURE_EXTERNAL;
-        aDetails.mProgramType = RGBALayerExternalProgramType;
-        surfaceWrapper->SurfaceTexture()->GetTransformMatrix(aDetails.mTextureTransform);
+        details.mTarget = LOCAL_GL_TEXTURE_EXTERNAL;
+        details.mProgramType = RGBALayerExternalProgramType;
+        surfaceWrapper->SurfaceTexture()->GetTransformMatrix(details.mTextureTransform);
         break;
     }
 #endif
 
     case SharedHandleType::Image:
-        aDetails.mTarget = LOCAL_GL_TEXTURE_2D;
-        aDetails.mProgramType = RGBALayerProgramType;
+        details.mTarget = LOCAL_GL_TEXTURE_2D;
+        details.mProgramType = RGBALayerProgramType;
         break;
 
     default:
@@ -1026,13 +1027,13 @@ bool GLContextEGL::GetSharedHandleDetails(TextureImage::TextureShareType aType,
     return true;
 }
 
-bool GLContextEGL::AttachSharedHandle(TextureImage::TextureShareType aType,
-                                      SharedTextureHandle aSharedHandle)
+bool GLContextEGL::AttachSharedHandle(SharedTextureShareType shareType,
+                                      SharedTextureHandle sharedHandle)
 {
-    if (aType != TextureImage::ThreadShared)
+    if (shareType != SameProcess)
         return false;
 
-    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(aSharedHandle);
+    SharedTextureHandleWrapper* wrapper = reinterpret_cast<SharedTextureHandleWrapper*>(sharedHandle);
 
     switch (wrapper->Type()) {
 #ifdef MOZ_WIDGET_ANDROID
@@ -1057,7 +1058,7 @@ bool GLContextEGL::AttachSharedHandle(TextureImage::TextureShareType aType,
     case SharedHandleType::Image: {
         NS_ASSERTION(mShareWithEGLImage, "EGLImage not supported or disabled in runtime");
 
-        EGLTextureWrapper* wrap = (EGLTextureWrapper*)aSharedHandle;
+        EGLTextureWrapper* wrap = (EGLTextureWrapper*)sharedHandle;
         wrap->WaitSync();
         fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, wrap->GetEGLImage());
         break;
diff --git a/gfx/layers/SharedTextureImage.h b/gfx/layers/SharedTextureImage.h
index 3f0732023954..2a42154cfcf6 100644
--- a/gfx/layers/SharedTextureImage.h
+++ b/gfx/layers/SharedTextureImage.h
@@ -20,7 +20,7 @@ class THEBES_API SharedTextureImage : public Image {
 public:
   struct Data {
     gl::SharedTextureHandle mHandle;
-    gl::TextureImage::TextureShareType mShareType;
+    gl::GLContext::SharedTextureShareType mShareType;
     gfxIntSize mSize;
     bool mInverted;
   };
@@ -41,4 +41,4 @@ private:
 } // layers
 } // mozilla
 
-#endif // GFX_SHAREDTEXTUREIMAGE_H
\ No newline at end of file
+#endif // GFX_SHAREDTEXTUREIMAGE_H
diff --git a/gfx/layers/basic/BasicCanvasLayer.cpp b/gfx/layers/basic/BasicCanvasLayer.cpp
index fdc133d38747..e028468f29b1 100644
--- a/gfx/layers/basic/BasicCanvasLayer.cpp
+++ b/gfx/layers/basic/BasicCanvasLayer.cpp
@@ -387,24 +387,25 @@ BasicShadowableCanvasLayer::Paint(gfxContext* aContext, Layer* aMaskLayer)
 
   if (mGLContext &&
       !mForceReadback &&
-      BasicManager()->GetParentBackendType() == mozilla::layers::LAYERS_OPENGL) {
-    TextureImage::TextureShareType flags;
+      BasicManager()->GetParentBackendType() == mozilla::layers::LAYERS_OPENGL)
+  {
+    GLContext::SharedTextureShareType shareType;
     // if process type is default, then it is single-process (non-e10s)
     if (XRE_GetProcessType() == GeckoProcessType_Default)
-      flags = TextureImage::ThreadShared;
+      shareType = GLContext::SameProcess;
     else
-      flags = TextureImage::ProcessShared;
+      shareType = GLContext::CrossProcess;
 
     SharedTextureHandle handle = GetSharedBackBufferHandle();
     if (!handle) {
-      handle = mGLContext->CreateSharedHandle(flags);
+      handle = mGLContext->CreateSharedHandle(shareType);
       if (handle) {
-        mBackBuffer = SharedTextureDescriptor(flags, handle, mBounds.Size(), false);
+        mBackBuffer = SharedTextureDescriptor(shareType, handle, mBounds.Size(), false);
       }
     }
     if (handle) {
       mGLContext->MakeCurrent();
-      mGLContext->UpdateSharedHandle(flags, handle);
+      mGLContext->UpdateSharedHandle(shareType, handle);
       // call Painted() to reset our dirty 'bit'
       Painted();
       FireDidTransactionCallback();
diff --git a/gfx/layers/ipc/LayersSurfaces.ipdlh b/gfx/layers/ipc/LayersSurfaces.ipdlh
index 39db98123782..2d8e763f05b8 100644
--- a/gfx/layers/ipc/LayersSurfaces.ipdlh
+++ b/gfx/layers/ipc/LayersSurfaces.ipdlh
@@ -22,7 +22,7 @@ using mozilla::layers::SurfaceDescriptorX11;
 using mozilla::null_t;
 using mozilla::WindowsHandle;
 using mozilla::gl::SharedTextureHandle;
-using mozilla::gl::TextureImage::TextureShareType;
+using mozilla::gl::GLContext::SharedTextureShareType;
 
 namespace mozilla {
 namespace layers {
@@ -37,7 +37,7 @@ struct SurfaceDescriptorD3D10 {
 };
 
 struct SharedTextureDescriptor {
-  TextureShareType shareType;
+  SharedTextureShareType shareType;
   SharedTextureHandle handle;
   nsIntSize size;
   bool inverted;
diff --git a/gfx/layers/ipc/ShadowLayerUtils.h b/gfx/layers/ipc/ShadowLayerUtils.h
index 4d66cef624bd..b7eaa1d4d191 100644
--- a/gfx/layers/ipc/ShadowLayerUtils.h
+++ b/gfx/layers/ipc/ShadowLayerUtils.h
@@ -52,9 +52,9 @@ struct ParamTraits<mozilla::layers::SurfaceDescriptorX11> {
 #endif  // !defined(MOZ_HAVE_XSURFACEDESCRIPTORX11)
 
 template<>
-struct ParamTraits<mozilla::gl::TextureImage::TextureShareType>
+struct ParamTraits<mozilla::gl::GLContext::SharedTextureShareType>
 {
-  typedef mozilla::gl::TextureImage::TextureShareType paramType;
+  typedef mozilla::gl::GLContext::SharedTextureShareType paramType;
 
   static void Write(Message* msg, const paramType& param)
   {
diff --git a/gfx/layers/opengl/CanvasLayerOGL.cpp b/gfx/layers/opengl/CanvasLayerOGL.cpp
index 3bd9e578b40e..6616fb9fde05 100644
--- a/gfx/layers/opengl/CanvasLayerOGL.cpp
+++ b/gfx/layers/opengl/CanvasLayerOGL.cpp
@@ -420,7 +420,10 @@ ShadowCanvasLayerOGL::Swap(const CanvasSurface& aNewFront,
   } else if (IsValidSharedTexDescriptor(aNewFront)) {
     MakeTextureIfNeeded(gl(), mTexture);
     if (!IsValidSharedTexDescriptor(mFrontBufferDescriptor)) {
-      mFrontBufferDescriptor = SharedTextureDescriptor(TextureImage::ThreadShared, 0, nsIntSize(0, 0), false);
+      mFrontBufferDescriptor = SharedTextureDescriptor(GLContext::SameProcess,
+                                                       0,
+                                                       nsIntSize(0, 0),
+                                                       false);
     }
     *aNewBack = mFrontBufferDescriptor;
     mFrontBufferDescriptor = aNewFront;
diff --git a/gfx/layers/opengl/ImageLayerOGL.h b/gfx/layers/opengl/ImageLayerOGL.h
index 5db8b6e9c897..5995c12ef7c9 100644
--- a/gfx/layers/opengl/ImageLayerOGL.h
+++ b/gfx/layers/opengl/ImageLayerOGL.h
@@ -194,7 +194,7 @@ private:
 
   // For SharedTextureHandle
   gl::SharedTextureHandle mSharedHandle;
-  gl::TextureImage::TextureShareType mShareType;
+  gl::GLContext::SharedTextureShareType mShareType;
   bool mInverted;
   GLuint mTexture;
 

From a9a0fc4866dc76e7debaf71d43c2927d86ba0461 Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Mon, 26 Nov 2012 14:23:27 -0800
Subject: [PATCH 053/160] Bug 811958 - Move TextureImage into its own files -
 r=bgirard

---
 gfx/gl/GLContext.cpp            | 555 +------------------------------
 gfx/gl/GLContext.h              | 370 +--------------------
 gfx/gl/GLContextProviderEGL.cpp |   1 +
 gfx/gl/GLTextureImage.cpp       | 573 ++++++++++++++++++++++++++++++++
 gfx/gl/GLTextureImage.h         | 385 +++++++++++++++++++++
 gfx/gl/Makefile.in              |   2 +
 widget/cocoa/nsChildView.mm     |  10 +-
 7 files changed, 984 insertions(+), 912 deletions(-)
 create mode 100644 gfx/gl/GLTextureImage.cpp
 create mode 100644 gfx/gl/GLTextureImage.h

diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 8f183eae5afb..17197535c857 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -23,6 +23,8 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/Util.h" // for DebugOnly
 
+#include "GLTextureImage.h"
+
 using namespace mozilla::gfx;
 
 namespace mozilla {
@@ -738,6 +740,19 @@ GLContext::CreateTextureImage(const nsIntSize& aSize,
     return CreateBasicTextureImage(texture, aSize, aWrapMode, aContentType, this, aFlags);
 }
 
+already_AddRefed<TextureImage>
+GLContext::CreateBasicTextureImage(GLuint aTexture,
+                        const nsIntSize& aSize,
+                        GLenum aWrapMode,
+                        TextureImage::ContentType aContentType,
+                        GLContext* aContext,
+                        TextureImage::Flags aFlags)
+{
+    nsRefPtr<BasicTextureImage> teximage(
+        new BasicTextureImage(aTexture, aSize, aWrapMode, aContentType, aContext, aFlags));
+    return teximage.forget();
+}
+
 void GLContext::ApplyFilterToBoundTexture(gfxPattern::GraphicsFilter aFilter)
 {
     ApplyFilterToBoundTexture(LOCAL_GL_TEXTURE_2D, aFilter);
@@ -755,546 +770,6 @@ void GLContext::ApplyFilterToBoundTexture(GLuint aTarget,
     }
 }
 
-BasicTextureImage::~BasicTextureImage()
-{
-    GLContext *ctx = mGLContext;
-    if (ctx->IsDestroyed() || !ctx->IsOwningThreadCurrent()) {
-        ctx = ctx->GetSharedContext();
-    }
-
-    // If we have a context, then we need to delete the texture;
-    // if we don't have a context (either real or shared),
-    // then they went away when the contex was deleted, because it
-    // was the only one that had access to it.
-    if (ctx && !ctx->IsDestroyed()) {
-        mGLContext->MakeCurrent();
-        mGLContext->fDeleteTextures(1, &mTexture);
-    }
-}
-
-gfxASurface*
-BasicTextureImage::BeginUpdate(nsIntRegion& aRegion)
-{
-    NS_ASSERTION(!mUpdateSurface, "BeginUpdate() without EndUpdate()?");
-
-    // determine the region the client will need to repaint
-    if (mGLContext->CanUploadSubTextures()) {
-        GetUpdateRegion(aRegion);
-    } else {
-        aRegion = nsIntRect(nsIntPoint(0, 0), mSize);
-    }
-
-    mUpdateRegion = aRegion;
-
-    nsIntRect rgnSize = mUpdateRegion.GetBounds();
-    if (!nsIntRect(nsIntPoint(0, 0), mSize).Contains(rgnSize)) {
-        NS_ERROR("update outside of image");
-        return NULL;
-    }
-
-    ImageFormat format =
-        (GetContentType() == gfxASurface::CONTENT_COLOR) ?
-        gfxASurface::ImageFormatRGB24 : gfxASurface::ImageFormatARGB32;
-    mUpdateSurface =
-        GetSurfaceForUpdate(gfxIntSize(rgnSize.width, rgnSize.height), format);
-
-    if (!mUpdateSurface || mUpdateSurface->CairoStatus()) {
-        mUpdateSurface = NULL;
-        return NULL;
-    }
-
-    mUpdateSurface->SetDeviceOffset(gfxPoint(-rgnSize.x, -rgnSize.y));
-
-    return mUpdateSurface;
-}
-
-void
-BasicTextureImage::GetUpdateRegion(nsIntRegion& aForRegion)
-{
-  // if the texture hasn't been initialized yet, or something important
-  // changed, we need to recreate our backing surface and force the
-  // client to paint everything
-  if (mTextureState != Valid)
-      aForRegion = nsIntRect(nsIntPoint(0, 0), mSize);
-}
-
-void
-BasicTextureImage::EndUpdate()
-{
-    NS_ASSERTION(!!mUpdateSurface, "EndUpdate() without BeginUpdate()?");
-
-    // FIXME: this is the slow boat.  Make me fast (with GLXPixmap?).
-
-    // Undo the device offset that BeginUpdate set; doesn't much matter for us here,
-    // but important if we ever do anything directly with the surface.
-    mUpdateSurface->SetDeviceOffset(gfxPoint(0, 0));
-
-    bool relative = FinishedSurfaceUpdate();
-
-    mShaderType =
-        mGLContext->UploadSurfaceToTexture(mUpdateSurface,
-                                           mUpdateRegion,
-                                           mTexture,
-                                           mTextureState == Created,
-                                           mUpdateOffset,
-                                           relative);
-    FinishedSurfaceUpload();
-
-    mUpdateSurface = nullptr;
-    mTextureState = Valid;
-}
-
-void
-BasicTextureImage::BindTexture(GLenum aTextureUnit)
-{
-    mGLContext->fActiveTexture(aTextureUnit);
-    mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
-    mGLContext->fActiveTexture(LOCAL_GL_TEXTURE0);
-}
-
-void
-BasicTextureImage::ApplyFilter()
-{
-  mGLContext->ApplyFilterToBoundTexture(mFilter);
-}
-
-
-already_AddRefed<gfxASurface>
-BasicTextureImage::GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt)
-{
-    return gfxPlatform::GetPlatform()->
-        CreateOffscreenSurface(aSize, gfxASurface::ContentFromFormat(aFmt));
-}
-
-bool
-BasicTextureImage::FinishedSurfaceUpdate()
-{
-    return false;
-}
-
-void
-BasicTextureImage::FinishedSurfaceUpload()
-{
-}
-
-bool 
-BasicTextureImage::DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom /* = nsIntPoint(0, 0) */)
-{
-    nsIntRect bounds = aRegion.GetBounds();
-    nsIntRegion region;
-    if (mTextureState != Valid) {
-        bounds = nsIntRect(0, 0, mSize.width, mSize.height);
-        region = nsIntRegion(bounds);
-    } else {
-        region = aRegion;
-    }
-
-    mShaderType =
-        mGLContext->UploadSurfaceToTexture(aSurf,
-                                           region,
-                                           mTexture,
-                                           mTextureState == Created,
-                                           bounds.TopLeft() + aFrom,
-                                           false);
-    mTextureState = Valid;
-    return true;
-}
-
-void
-BasicTextureImage::Resize(const nsIntSize& aSize)
-{
-    NS_ASSERTION(!mUpdateSurface, "Resize() while in update?");
-
-    mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
-
-    mGLContext->fTexImage2D(LOCAL_GL_TEXTURE_2D,
-                            0,
-                            LOCAL_GL_RGBA,
-                            aSize.width,
-                            aSize.height,
-                            0,
-                            LOCAL_GL_RGBA,
-                            LOCAL_GL_UNSIGNED_BYTE,
-                            NULL);
-
-    mTextureState = Allocated;
-    mSize = aSize;
-}
-
-TiledTextureImage::TiledTextureImage(GLContext* aGL,
-                                     nsIntSize aSize,
-                                     TextureImage::ContentType aContentType,
-                                     TextureImage::Flags aFlags)
-    : TextureImage(aSize, LOCAL_GL_CLAMP_TO_EDGE, aContentType, aFlags)
-    , mCurrentImage(0)
-    , mIterationCallback(nullptr)
-    , mInUpdate(false)
-    , mRows(0)
-    , mColumns(0)
-    , mGL(aGL)
-    , mTextureState(Created)
-{
-    mTileSize = (!(aFlags & TextureImage::ForceSingleTile) && mGL->WantsSmallTiles())
-        ? 256 : mGL->GetMaxTextureSize();
-    if (aSize != nsIntSize(0,0)) {
-        Resize(aSize);
-    }
-}
-
-TiledTextureImage::~TiledTextureImage()
-{
-}
-
-bool 
-TiledTextureImage::DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom /* = nsIntPoint(0, 0) */)
-{
-    nsIntRegion region;
-
-    if (mTextureState != Valid) {
-        nsIntRect bounds = nsIntRect(0, 0, mSize.width, mSize.height);
-        region = nsIntRegion(bounds);
-    } else {
-        region = aRegion;
-    }
-
-    bool result = true;
-    int oldCurrentImage = mCurrentImage;
-    BeginTileIteration();
-    do {
-        nsIntRect tileRect = GetSrcTileRect();
-        int xPos = tileRect.x;
-        int yPos = tileRect.y;
-
-        nsIntRegion tileRegion;
-        tileRegion.And(region, tileRect); // intersect with tile
-
-        if (tileRegion.IsEmpty())
-            continue;
-
-        if (mGL->CanUploadSubTextures()) {
-          tileRegion.MoveBy(-xPos, -yPos); // translate into tile local space
-        } else {
-          // If sub-textures are unsupported, expand to tile boundaries
-          tileRect.x = tileRect.y = 0;
-          tileRegion = nsIntRegion(tileRect);
-        }
-
-        result &= mImages[mCurrentImage]->
-          DirectUpdate(aSurf, tileRegion, aFrom + nsIntPoint(xPos, yPos));
-
-        if (mCurrentImage == mImages.Length() - 1) {
-            // We know we're done, but we still need to ensure that the callback
-            // gets called (e.g. to update the uploaded region).
-            NextTile();
-            break;
-        }
-        // Override a callback cancelling iteration if the texture wasn't valid.
-        // We need to force the update in that situation, or we may end up
-        // showing invalid/out-of-date texture data.
-    } while (NextTile() || (mTextureState != Valid));
-    mCurrentImage = oldCurrentImage;
-
-    mShaderType = mImages[0]->GetShaderProgramType();
-    mTextureState = Valid;
-    return result;
-}
-
-void
-TiledTextureImage::GetUpdateRegion(nsIntRegion& aForRegion)
-{
-    if (mTextureState != Valid) {
-        // if the texture hasn't been initialized yet, or something important
-        // changed, we need to recreate our backing surface and force the
-        // client to paint everything
-        aForRegion = nsIntRect(nsIntPoint(0, 0), mSize);
-        return;
-    }
-
-    nsIntRegion newRegion;
-
-    // We need to query each texture with the region it will be drawing and
-    // set aForRegion to be the combination of all of these regions
-    for (unsigned i = 0; i < mImages.Length(); i++) {
-        int xPos = (i % mColumns) * mTileSize;
-        int yPos = (i / mColumns) * mTileSize;
-        nsIntRect imageRect = nsIntRect(nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize()));
-
-        if (aForRegion.Intersects(imageRect)) {
-            // Make a copy of the region
-            nsIntRegion subRegion;
-            subRegion.And(aForRegion, imageRect);
-            // Translate it into tile-space
-            subRegion.MoveBy(-xPos, -yPos);
-            // Query region
-            mImages[i]->GetUpdateRegion(subRegion);
-            // Translate back
-            subRegion.MoveBy(xPos, yPos);
-            // Add to the accumulated region
-            newRegion.Or(newRegion, subRegion);
-        }
-    }
-
-    aForRegion = newRegion;
-}
-
-gfxASurface*
-TiledTextureImage::BeginUpdate(nsIntRegion& aRegion)
-{
-    NS_ASSERTION(!mInUpdate, "nested update");
-    mInUpdate = true;
-
-    // Note, we don't call GetUpdateRegion here as if the updated region is
-    // fully contained in a single tile, we get to avoid iterating through
-    // the tiles again (and a little copying).
-    if (mTextureState != Valid)
-    {
-        // if the texture hasn't been initialized yet, or something important
-        // changed, we need to recreate our backing surface and force the
-        // client to paint everything
-        aRegion = nsIntRect(nsIntPoint(0, 0), mSize);
-    }
-
-    nsIntRect bounds = aRegion.GetBounds();
-
-    for (unsigned i = 0; i < mImages.Length(); i++) {
-        int xPos = (i % mColumns) * mTileSize;
-        int yPos = (i / mColumns) * mTileSize;
-        nsIntRegion imageRegion = nsIntRegion(nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize()));
-
-        // a single Image can handle this update request
-        if (imageRegion.Contains(aRegion)) {
-            // adjust for tile offset
-            aRegion.MoveBy(-xPos, -yPos);
-            // forward the actual call
-            nsRefPtr<gfxASurface> surface = mImages[i]->BeginUpdate(aRegion);
-            // caller expects container space
-            aRegion.MoveBy(xPos, yPos);
-            // Correct the device offset
-            gfxPoint offset = surface->GetDeviceOffset();
-            surface->SetDeviceOffset(gfxPoint(offset.x - xPos,
-                                              offset.y - yPos));
-            // we don't have a temp surface
-            mUpdateSurface = nullptr;
-            // remember which image to EndUpdate
-            mCurrentImage = i;
-            return surface.get();
-        }
-    }
-
-    // Get the real updated region, taking into account the capabilities of
-    // each TextureImage tile
-    GetUpdateRegion(aRegion);
-    mUpdateRegion = aRegion;
-    bounds = aRegion.GetBounds();
-
-    // update covers multiple Images - create a temp surface to paint in
-    gfxASurface::gfxImageFormat format =
-        (GetContentType() == gfxASurface::CONTENT_COLOR) ?
-        gfxASurface::ImageFormatRGB24 : gfxASurface::ImageFormatARGB32;
-    mUpdateSurface = gfxPlatform::GetPlatform()->
-        CreateOffscreenSurface(gfxIntSize(bounds.width, bounds.height), gfxASurface::ContentFromFormat(format));
-    mUpdateSurface->SetDeviceOffset(gfxPoint(-bounds.x, -bounds.y));
-
-    return mUpdateSurface;
-}
-
-void
-TiledTextureImage::EndUpdate()
-{
-    NS_ASSERTION(mInUpdate, "EndUpdate not in update");
-    if (!mUpdateSurface) { // update was to a single TextureImage
-        mImages[mCurrentImage]->EndUpdate();
-        mInUpdate = false;
-        mTextureState = Valid;
-        mShaderType = mImages[mCurrentImage]->GetShaderProgramType();
-        return;
-    }
-
-    // upload tiles from temp surface
-    for (unsigned i = 0; i < mImages.Length(); i++) {
-        int xPos = (i % mColumns) * mTileSize;
-        int yPos = (i / mColumns) * mTileSize;
-        nsIntRect imageRect = nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize());
-
-        nsIntRegion subregion;
-        subregion.And(mUpdateRegion, imageRect);
-        if (subregion.IsEmpty())
-            continue;
-        subregion.MoveBy(-xPos, -yPos); // Tile-local space
-        // copy tile from temp surface
-        gfxASurface* surf = mImages[i]->BeginUpdate(subregion);
-        nsRefPtr<gfxContext> ctx = new gfxContext(surf);
-        gfxUtils::ClipToRegion(ctx, subregion);
-        ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
-        ctx->SetSource(mUpdateSurface, gfxPoint(-xPos, -yPos));
-        ctx->Paint();
-        mImages[i]->EndUpdate();
-    }
-
-    mUpdateSurface = nullptr;
-    mInUpdate = false;
-    mShaderType = mImages[0]->GetShaderProgramType();
-    mTextureState = Valid;
-}
-
-void TiledTextureImage::BeginTileIteration()
-{
-    mCurrentImage = 0;
-}
-
-bool TiledTextureImage::NextTile()
-{
-    bool continueIteration = true;
-
-    if (mIterationCallback)
-        continueIteration = mIterationCallback(this, mCurrentImage,
-                                               mIterationCallbackData);
-
-    if (mCurrentImage + 1 < mImages.Length()) {
-        mCurrentImage++;
-        return continueIteration;
-    }
-    return false;
-}
-
-void TiledTextureImage::SetIterationCallback(TileIterationCallback aCallback,
-                                             void* aCallbackData)
-{
-    mIterationCallback = aCallback;
-    mIterationCallbackData = aCallbackData;
-}
-
-nsIntRect TiledTextureImage::GetTileRect()
-{
-    nsIntRect rect = mImages[mCurrentImage]->GetTileRect();
-    unsigned int xPos = (mCurrentImage % mColumns) * mTileSize;
-    unsigned int yPos = (mCurrentImage / mColumns) * mTileSize;
-    rect.MoveBy(xPos, yPos);
-    return rect;
-}
-
-nsIntRect TiledTextureImage::GetSrcTileRect()
-{
-    nsIntRect rect = GetTileRect();
-    unsigned int srcY = mFlags & NeedsYFlip
-                        ? mSize.height - rect.height - rect.y
-                        : rect.y;
-    return nsIntRect(rect.x, srcY, rect.width, rect.height);
-}
-
-void
-TiledTextureImage::BindTexture(GLenum aTextureUnit)
-{
-    mImages[mCurrentImage]->BindTexture(aTextureUnit);
-}
-
-void
-TiledTextureImage::ApplyFilter()
-{
-   mGL->ApplyFilterToBoundTexture(mFilter);
-}
-
-/*
- * Resize, trying to reuse tiles. The reuse strategy is to decide on reuse per
- * column. A tile on a column is reused if it hasn't changed size, otherwise it
- * is discarded/replaced. Extra tiles on a column are pruned after iterating
- * each column, and extra rows are pruned after iteration over the entire image
- * finishes.
- */
-void TiledTextureImage::Resize(const nsIntSize& aSize)
-{
-    if (mSize == aSize && mTextureState != Created) {
-        return;
-    }
-
-    // calculate rows and columns, rounding up
-    unsigned int columns = (aSize.width  + mTileSize - 1) / mTileSize;
-    unsigned int rows = (aSize.height + mTileSize - 1) / mTileSize;
-
-    // Iterate over old tile-store and insert/remove tiles as necessary
-    int row;
-    unsigned int i = 0;
-    for (row = 0; row < (int)rows; row++) {
-        // If we've gone beyond how many rows there were before, set mColumns to
-        // zero so that we only create new tiles.
-        if (row >= (int)mRows)
-            mColumns = 0;
-
-        // Similarly, if we're on the last row of old tiles and the height has
-        // changed, discard all tiles in that row.
-        // This will cause the pruning of columns not to work, but we don't need
-        // to worry about that, as no more tiles will be reused past this point
-        // anyway.
-        if ((row == (int)mRows - 1) && (aSize.height != mSize.height))
-            mColumns = 0;
-
-        int col;
-        for (col = 0; col < (int)columns; col++) {
-            nsIntSize size( // use tilesize first, then the remainder
-                    (col+1) * mTileSize > (unsigned int)aSize.width  ? aSize.width  % mTileSize : mTileSize,
-                    (row+1) * mTileSize > (unsigned int)aSize.height ? aSize.height % mTileSize : mTileSize);
-
-            bool replace = false;
-
-            // Check if we can re-use old tiles.
-            if (col < (int)mColumns) {
-                // Reuse an existing tile. If the tile is an end-tile and the
-                // width differs, replace it instead.
-                if (mSize.width != aSize.width) {
-                    if (col == (int)mColumns - 1) {
-                        // Tile at the end of the old column, replace it with
-                        // a new one.
-                        replace = true;
-                    } else if (col == (int)columns - 1) {
-                        // Tile at the end of the new column, create a new one.
-                    } else {
-                        // Before the last column on both the old and new sizes,
-                        // reuse existing tile.
-                        i++;
-                        continue;
-                    }
-                } else {
-                    // Width hasn't changed, reuse existing tile.
-                    i++;
-                    continue;
-                }
-            }
-
-            // Create a new tile.
-            nsRefPtr<TextureImage> teximg =
-                    mGL->TileGenFunc(size, mContentType, mFlags);
-            if (replace)
-                mImages.ReplaceElementAt(i, teximg.forget());
-            else
-                mImages.InsertElementAt(i, teximg.forget());
-            i++;
-        }
-
-        // Prune any unused tiles on the end of the column.
-        if (row < (int)mRows) {
-            for (col = (int)mColumns - col; col > 0; col--) {
-                mImages.RemoveElementAt(i);
-            }
-        }
-    }
-
-    // Prune any unused tiles at the end of the store.
-    unsigned int length = mImages.Length();
-    for (; i < length; i++)
-      mImages.RemoveElementAt(mImages.Length()-1);
-
-    // Reset tile-store properties.
-    mRows = rows;
-    mColumns = columns;
-    mSize = aSize;
-    mTextureState = Allocated;
-    mCurrentImage = 0;
-}
-
-uint32_t TiledTextureImage::GetTileCount()
-{
-    return mImages.Length();
-}
 
 GLContext::GLFormats
 GLContext::ChooseGLFormats(ContextFormat& aCF, ColorByteOrder aByteOrder)
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 5188d4411157..d8a327b26d41 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -33,6 +33,7 @@
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
 #include "GLContextTypes.h"
+#include "GLTextureImage.h"
 
 typedef char realGLboolean;
 
@@ -56,368 +57,6 @@ class GLContext;
 
 typedef uintptr_t SharedTextureHandle;
 
-/**
- * A TextureImage encapsulates a surface that can be drawn to by a
- * Thebes gfxContext and (hopefully efficiently!) synchronized to a
- * texture in the server.  TextureImages are associated with one and
- * only one GLContext.
- *
- * Implementation note: TextureImages attempt to unify two categories
- * of backends
- *
- *  (1) proxy to server-side object that can be bound to a texture;
- *      e.g. Pixmap on X11.
- *
- *  (2) efficient manager of texture memory; e.g. by having clients draw
- *      into a scratch buffer which is then uploaded with
- *      glTexSubImage2D().
- */
-class TextureImage
-{
-    NS_INLINE_DECL_REFCOUNTING(TextureImage)
-public:
-    enum TextureState
-    {
-      Created, // Texture created, but has not had glTexImage called to initialize it.
-      Allocated,  // Texture memory exists, but contents are invalid.
-      Valid  // Texture fully ready to use.
-    };
-
-    enum Flags {
-        NoFlags          = 0x0,
-        UseNearestFilter = 0x1,
-        NeedsYFlip       = 0x2,
-        ForceSingleTile  = 0x4
-    };
-
-    typedef gfxASurface::gfxContentType ContentType;
-
-    virtual ~TextureImage() {}
-
-    /**
-     * Returns a gfxASurface for updating |aRegion| of the client's
-     * image if successul, NULL if not.  |aRegion|'s bounds must fit
-     * within Size(); its coordinate space (if any) is ignored.  If
-     * the update begins successfully, the returned gfxASurface is
-     * owned by this.  Otherwise, NULL is returned.
-     *
-     * |aRegion| is an inout param: the returned region is what the
-     * client must repaint.  Category (1) regions above can
-     * efficiently handle repaints to "scattered" regions, while (2)
-     * can only efficiently handle repaints to rects.
-     *
-     * Painting the returned surface outside of |aRegion| results 
-     * in undefined behavior.
-     *
-     * BeginUpdate() calls cannot be "nested", and each successful
-     * BeginUpdate() must be followed by exactly one EndUpdate() (see
-     * below).  Failure to do so can leave this in a possibly
-     * inconsistent state.  Unsuccessful BeginUpdate()s must not be
-     * followed by EndUpdate().
-     */
-    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion) = 0;
-    /**
-     * Retrieves the region that will require updating, given a
-     * region that needs to be updated. This can be used for
-     * making decisions about updating before calling BeginUpdate().
-     *
-     * |aRegion| is an inout param.
-     */
-    virtual void GetUpdateRegion(nsIntRegion& aForRegion) {
-    }
-    /**
-     * Finish the active update and synchronize with the server, if
-     * necessary.
-     *
-     * BeginUpdate() must have been called exactly once before
-     * EndUpdate().
-     */
-    virtual void EndUpdate() = 0;
-
-    /**
-     * The Image may contain several textures for different regions (tiles).
-     * These functions iterate over each sub texture image tile.
-     */
-    virtual void BeginTileIteration() {
-    }
-
-    virtual bool NextTile() {
-        return false;
-    }
-
-    // Function prototype for a tile iteration callback. Returning false will
-    // cause iteration to be interrupted (i.e. the corresponding NextTile call
-    // will return false).
-    typedef bool (* TileIterationCallback)(TextureImage* aImage,
-                                           int aTileNumber,
-                                           void* aCallbackData);
-
-    // Sets a callback to be called every time NextTile is called.
-    virtual void SetIterationCallback(TileIterationCallback aCallback,
-                                      void* aCallbackData) {
-    }
-
-    virtual nsIntRect GetTileRect() {
-        return nsIntRect(nsIntPoint(0,0), mSize);
-    }
-
-    virtual GLuint GetTextureID() = 0;
-
-    virtual uint32_t GetTileCount() {
-        return 1;
-    }
-
-    /**
-     * Set this TextureImage's size, and ensure a texture has been
-     * allocated.  Must not be called between BeginUpdate and EndUpdate.
-     * After a resize, the contents are undefined.
-     *
-     * If this isn't implemented by a subclass, it will just perform
-     * a dummy BeginUpdate/EndUpdate pair.
-     */
-    virtual void Resize(const nsIntSize& aSize) {
-        mSize = aSize;
-        nsIntRegion r(nsIntRect(0, 0, aSize.width, aSize.height));
-        BeginUpdate(r);
-        EndUpdate();
-    }
-
-    /**
-     * Mark this texture as having valid contents. Call this after modifying
-     * the texture contents externally.
-     */
-    virtual void MarkValid() {}
-
-    /**
-     * aSurf - the source surface to update from
-     * aRegion - the region in this image to update
-     * aFrom - offset in the source to update from
-     */
-    virtual bool DirectUpdate(gfxASurface *aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0)) = 0;
-
-    virtual void BindTexture(GLenum aTextureUnit) = 0;
-    virtual void ReleaseTexture() {}
-
-    void BindTextureAndApplyFilter(GLenum aTextureUnit) {
-        BindTexture(aTextureUnit);
-        ApplyFilter();
-    }
-
-    class ScopedBindTexture
-    {
-    public:
-        ScopedBindTexture(TextureImage *aTexture, GLenum aTextureUnit) :
-          mTexture(aTexture)
-        {
-            if (mTexture) {
-                mTexture->BindTexture(aTextureUnit);
-            }
-        }
-
-        ~ScopedBindTexture()
-        {
-            if (mTexture) {
-                mTexture->ReleaseTexture();
-            }       
-        }
-
-    protected:
-        TextureImage *mTexture;
-    };
-
-    class ScopedBindTextureAndApplyFilter
-        : public ScopedBindTexture
-    {
-    public:
-        ScopedBindTextureAndApplyFilter(TextureImage *aTexture, GLenum aTextureUnit) :
-          ScopedBindTexture(aTexture, aTextureUnit)
-        {
-            if (mTexture) {
-                mTexture->ApplyFilter();
-            }
-        }
-    };
-
-    /**
-     * Returns the shader program type that should be used to render
-     * this texture. Only valid after a matching BeginUpdate/EndUpdate
-     * pair have been called.
-     */
-    virtual ShaderProgramType GetShaderProgramType()
-    {
-         return mShaderType;
-    }
-
-    /** Can be called safely at any time. */
-
-    /**
-     * If this TextureImage has a permanent gfxASurface backing,
-     * return it.  Otherwise return NULL.
-     */
-    virtual already_AddRefed<gfxASurface> GetBackingSurface()
-    { return NULL; }
-
-    const nsIntSize& GetSize() const { return mSize; }
-    ContentType GetContentType() const { return mContentType; }
-    virtual bool InUpdate() const = 0;
-    GLenum GetWrapMode() const { return mWrapMode; }
-
-    void SetFilter(gfxPattern::GraphicsFilter aFilter) { mFilter = aFilter; }
-
-    /**
-     * Applies this TextureImage's filter, assuming that its texture is
-     * the currently bound texture.
-     */
-    virtual void ApplyFilter() = 0;
-
-protected:
-    friend class GLContext;
-
-    /**
-     * After the ctor, the TextureImage is invalid.  Implementations
-     * must allocate resources successfully before returning the new
-     * TextureImage from GLContext::CreateTextureImage().  That is,
-     * clients must not be given partially-constructed TextureImages.
-     */
-    TextureImage(const nsIntSize& aSize,
-                 GLenum aWrapMode, ContentType aContentType,
-                 Flags aFlags = NoFlags)
-        : mSize(aSize)
-        , mWrapMode(aWrapMode)
-        , mContentType(aContentType)
-        , mFilter(gfxPattern::FILTER_GOOD)
-        , mFlags(aFlags)
-    {}
-
-    virtual nsIntRect GetSrcTileRect() {
-        return nsIntRect(nsIntPoint(0,0), mSize);
-    }
-
-    nsIntSize mSize;
-    GLenum mWrapMode;
-    ContentType mContentType;
-    ShaderProgramType mShaderType;
-    gfxPattern::GraphicsFilter mFilter;
-    Flags mFlags;
-};
-
-/**
- * BasicTextureImage is the baseline TextureImage implementation ---
- * it updates its texture by allocating a scratch buffer for the
- * client to draw into, then using glTexSubImage2D() to upload the new
- * pixels.  Platforms must provide the code to create a new surface
- * into which the updated pixels will be drawn, and the code to
- * convert the update surface's pixels into an image on which we can
- * glTexSubImage2D().
- */
-class BasicTextureImage
-    : public TextureImage
-{
-public:
-    typedef gfxASurface::gfxImageFormat ImageFormat;
-    virtual ~BasicTextureImage();
-
-    BasicTextureImage(GLuint aTexture,
-                      const nsIntSize& aSize,
-                      GLenum aWrapMode,
-                      ContentType aContentType,
-                      GLContext* aContext,
-                      TextureImage::Flags aFlags = TextureImage::NoFlags)
-        : TextureImage(aSize, aWrapMode, aContentType, aFlags)
-        , mTexture(aTexture)
-        , mTextureState(Created)
-        , mGLContext(aContext)
-        , mUpdateOffset(0, 0)
-    {}
-
-    virtual void BindTexture(GLenum aTextureUnit);
-
-    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion);
-    virtual void GetUpdateRegion(nsIntRegion& aForRegion);
-    virtual void EndUpdate();
-    virtual bool DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0));
-    virtual GLuint GetTextureID() { return mTexture; }
-    // Returns a surface to draw into
-    virtual already_AddRefed<gfxASurface>
-      GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt);
-
-    virtual void MarkValid() { mTextureState = Valid; }
-
-    // Call when drawing into the update surface is complete.
-    // Returns true if textures should be upload with a relative 
-    // offset - See UploadSurfaceToTexture.
-    virtual bool FinishedSurfaceUpdate();
-
-    // Call after surface data has been uploaded to a texture.
-    virtual void FinishedSurfaceUpload();
-
-    virtual bool InUpdate() const { return !!mUpdateSurface; }
-
-    virtual void Resize(const nsIntSize& aSize);
-
-    virtual void ApplyFilter();
-protected:
-
-    GLuint mTexture;
-    TextureState mTextureState;
-    GLContext* mGLContext;
-    nsRefPtr<gfxASurface> mUpdateSurface;
-    nsIntRegion mUpdateRegion;
-
-    // The offset into the update surface at which the update rect is located.
-    nsIntPoint mUpdateOffset;
-};
-
-/**
- * A container class that complements many sub TextureImages into a big TextureImage.
- * Aims to behave just like the real thing.
- */
-
-class TiledTextureImage
-    : public TextureImage
-{
-public:
-    TiledTextureImage(GLContext* aGL, nsIntSize aSize,
-        TextureImage::ContentType, TextureImage::Flags aFlags = TextureImage::NoFlags);
-    ~TiledTextureImage();
-    void DumpDiv();
-    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion);
-    virtual void GetUpdateRegion(nsIntRegion& aForRegion);
-    virtual void EndUpdate();
-    virtual void Resize(const nsIntSize& aSize);
-    virtual uint32_t GetTileCount();
-    virtual void BeginTileIteration();
-    virtual bool NextTile();
-    virtual void SetIterationCallback(TileIterationCallback aCallback,
-                                      void* aCallbackData);
-    virtual nsIntRect GetTileRect();
-    virtual GLuint GetTextureID() {
-        return mImages[mCurrentImage]->GetTextureID();
-    }
-    virtual bool DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0));
-    virtual bool InUpdate() const { return mInUpdate; }
-    virtual void BindTexture(GLenum);
-    virtual void ApplyFilter();
-
-protected:
-    virtual nsIntRect GetSrcTileRect();
-
-    unsigned int mCurrentImage;
-    TileIterationCallback mIterationCallback;
-    void* mIterationCallbackData;
-    nsTArray< nsRefPtr<TextureImage> > mImages;
-    bool mInUpdate;
-    nsIntSize mSize;
-    unsigned int mTileSize;
-    unsigned int mRows, mColumns;
-    GLContext* mGL;
-    // A temporary surface to faciliate cross-tile updates.
-    nsRefPtr<gfxASurface> mUpdateSurface;
-    // The region of update requested
-    nsIntRegion mUpdateRegion;
-    TextureState mTextureState;
-};
-
 struct THEBES_API ContextFormat
 {
     static const ContextFormat BasicRGBA32Format;
@@ -1927,12 +1566,7 @@ protected:
                             GLenum aWrapMode,
                             TextureImage::ContentType aContentType,
                             GLContext* aContext,
-                            TextureImage::Flags aFlags = TextureImage::NoFlags)
-    {
-        nsRefPtr<BasicTextureImage> teximage(
-            new BasicTextureImage(aTexture, aSize, aWrapMode, aContentType, aContext, aFlags));
-        return teximage.forget();
-    }
+                            TextureImage::Flags aFlags = TextureImage::NoFlags);
 
     bool IsOffscreenSizeAllowed(const gfxIntSize& aSize) const {
         int32_t biggerDimension = NS_MAX(aSize.width, aSize.height);
diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index 29ba4d74707c..34d64afb6e25 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -1072,6 +1072,7 @@ bool GLContextEGL::AttachSharedHandle(SharedTextureShareType shareType,
     return true;
 }
 
+
 bool
 GLContextEGL::BindTex2DOffscreen(GLContext *aOffscreen)
 {
diff --git a/gfx/gl/GLTextureImage.cpp b/gfx/gl/GLTextureImage.cpp
new file mode 100644
index 000000000000..fbfef04fa4e6
--- /dev/null
+++ b/gfx/gl/GLTextureImage.cpp
@@ -0,0 +1,573 @@
+/* -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40; -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "GLTextureImage.h"
+#include "GLContext.h"
+#include "gfxContext.h"
+#include "gfxPlatform.h"
+#include "gfxUtils.h"
+
+using namespace mozilla::gl;
+
+already_AddRefed<TextureImage>
+TextureImage::Create(GLContext* gl,
+                     const nsIntSize& size,
+                     TextureImage::ContentType contentType,
+                     GLenum wrapMode,
+                     TextureImage::Flags flags)
+{
+    return gl->CreateTextureImage(size, contentType, wrapMode, flags);
+}
+
+BasicTextureImage::~BasicTextureImage()
+{
+    GLContext *ctx = mGLContext;
+    if (ctx->IsDestroyed() || !ctx->IsOwningThreadCurrent()) {
+        ctx = ctx->GetSharedContext();
+    }
+
+    // If we have a context, then we need to delete the texture;
+    // if we don't have a context (either real or shared),
+    // then they went away when the contex was deleted, because it
+    // was the only one that had access to it.
+    if (ctx && !ctx->IsDestroyed()) {
+        mGLContext->MakeCurrent();
+        mGLContext->fDeleteTextures(1, &mTexture);
+    }
+}
+
+gfxASurface*
+BasicTextureImage::BeginUpdate(nsIntRegion& aRegion)
+{
+    NS_ASSERTION(!mUpdateSurface, "BeginUpdate() without EndUpdate()?");
+
+    // determine the region the client will need to repaint
+    if (mGLContext->CanUploadSubTextures()) {
+        GetUpdateRegion(aRegion);
+    } else {
+        aRegion = nsIntRect(nsIntPoint(0, 0), mSize);
+    }
+
+    mUpdateRegion = aRegion;
+
+    nsIntRect rgnSize = mUpdateRegion.GetBounds();
+    if (!nsIntRect(nsIntPoint(0, 0), mSize).Contains(rgnSize)) {
+        NS_ERROR("update outside of image");
+        return NULL;
+    }
+
+    ImageFormat format =
+        (GetContentType() == gfxASurface::CONTENT_COLOR) ?
+        gfxASurface::ImageFormatRGB24 : gfxASurface::ImageFormatARGB32;
+    mUpdateSurface =
+        GetSurfaceForUpdate(gfxIntSize(rgnSize.width, rgnSize.height), format);
+
+    if (!mUpdateSurface || mUpdateSurface->CairoStatus()) {
+        mUpdateSurface = NULL;
+        return NULL;
+    }
+
+    mUpdateSurface->SetDeviceOffset(gfxPoint(-rgnSize.x, -rgnSize.y));
+
+    return mUpdateSurface;
+}
+
+void
+BasicTextureImage::GetUpdateRegion(nsIntRegion& aForRegion)
+{
+  // if the texture hasn't been initialized yet, or something important
+  // changed, we need to recreate our backing surface and force the
+  // client to paint everything
+  if (mTextureState != Valid)
+      aForRegion = nsIntRect(nsIntPoint(0, 0), mSize);
+}
+
+void
+BasicTextureImage::EndUpdate()
+{
+    NS_ASSERTION(!!mUpdateSurface, "EndUpdate() without BeginUpdate()?");
+
+    // FIXME: this is the slow boat.  Make me fast (with GLXPixmap?).
+
+    // Undo the device offset that BeginUpdate set; doesn't much matter for us here,
+    // but important if we ever do anything directly with the surface.
+    mUpdateSurface->SetDeviceOffset(gfxPoint(0, 0));
+
+    bool relative = FinishedSurfaceUpdate();
+
+    mShaderType =
+        mGLContext->UploadSurfaceToTexture(mUpdateSurface,
+                                           mUpdateRegion,
+                                           mTexture,
+                                           mTextureState == Created,
+                                           mUpdateOffset,
+                                           relative);
+    FinishedSurfaceUpload();
+
+    mUpdateSurface = nullptr;
+    mTextureState = Valid;
+}
+
+void
+BasicTextureImage::BindTexture(GLenum aTextureUnit)
+{
+    mGLContext->fActiveTexture(aTextureUnit);
+    mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
+    mGLContext->fActiveTexture(LOCAL_GL_TEXTURE0);
+}
+
+void
+BasicTextureImage::ApplyFilter()
+{
+  mGLContext->ApplyFilterToBoundTexture(mFilter);
+}
+
+
+already_AddRefed<gfxASurface>
+BasicTextureImage::GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt)
+{
+    return gfxPlatform::GetPlatform()->
+        CreateOffscreenSurface(aSize, gfxASurface::ContentFromFormat(aFmt));
+}
+
+bool
+BasicTextureImage::FinishedSurfaceUpdate()
+{
+    return false;
+}
+
+void
+BasicTextureImage::FinishedSurfaceUpload()
+{
+}
+
+bool
+BasicTextureImage::DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom /* = nsIntPoint(0, 0) */)
+{
+    nsIntRect bounds = aRegion.GetBounds();
+    nsIntRegion region;
+    if (mTextureState != Valid) {
+        bounds = nsIntRect(0, 0, mSize.width, mSize.height);
+        region = nsIntRegion(bounds);
+    } else {
+        region = aRegion;
+    }
+
+    mShaderType =
+        mGLContext->UploadSurfaceToTexture(aSurf,
+                                           region,
+                                           mTexture,
+                                           mTextureState == Created,
+                                           bounds.TopLeft() + aFrom,
+                                           false);
+    mTextureState = Valid;
+    return true;
+}
+
+void
+BasicTextureImage::Resize(const nsIntSize& aSize)
+{
+    NS_ASSERTION(!mUpdateSurface, "Resize() while in update?");
+
+    mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
+
+    mGLContext->fTexImage2D(LOCAL_GL_TEXTURE_2D,
+                            0,
+                            LOCAL_GL_RGBA,
+                            aSize.width,
+                            aSize.height,
+                            0,
+                            LOCAL_GL_RGBA,
+                            LOCAL_GL_UNSIGNED_BYTE,
+                            NULL);
+
+    mTextureState = Allocated;
+    mSize = aSize;
+}
+
+TiledTextureImage::TiledTextureImage(GLContext* aGL,
+                                     nsIntSize aSize,
+                                     TextureImage::ContentType aContentType,
+                                     TextureImage::Flags aFlags)
+    : TextureImage(aSize, LOCAL_GL_CLAMP_TO_EDGE, aContentType, aFlags)
+    , mCurrentImage(0)
+    , mIterationCallback(nullptr)
+    , mInUpdate(false)
+    , mRows(0)
+    , mColumns(0)
+    , mGL(aGL)
+    , mTextureState(Created)
+{
+    mTileSize = (!(aFlags & TextureImage::ForceSingleTile) && mGL->WantsSmallTiles())
+        ? 256 : mGL->GetMaxTextureSize();
+    if (aSize != nsIntSize(0,0)) {
+        Resize(aSize);
+    }
+}
+
+TiledTextureImage::~TiledTextureImage()
+{
+}
+
+bool
+TiledTextureImage::DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom /* = nsIntPoint(0, 0) */)
+{
+    nsIntRegion region;
+
+    if (mTextureState != Valid) {
+        nsIntRect bounds = nsIntRect(0, 0, mSize.width, mSize.height);
+        region = nsIntRegion(bounds);
+    } else {
+        region = aRegion;
+    }
+
+    bool result = true;
+    int oldCurrentImage = mCurrentImage;
+    BeginTileIteration();
+    do {
+        nsIntRect tileRect = GetSrcTileRect();
+        int xPos = tileRect.x;
+        int yPos = tileRect.y;
+
+        nsIntRegion tileRegion;
+        tileRegion.And(region, tileRect); // intersect with tile
+
+        if (tileRegion.IsEmpty())
+            continue;
+
+        if (mGL->CanUploadSubTextures()) {
+          tileRegion.MoveBy(-xPos, -yPos); // translate into tile local space
+        } else {
+          // If sub-textures are unsupported, expand to tile boundaries
+          tileRect.x = tileRect.y = 0;
+          tileRegion = nsIntRegion(tileRect);
+        }
+
+        result &= mImages[mCurrentImage]->
+          DirectUpdate(aSurf, tileRegion, aFrom + nsIntPoint(xPos, yPos));
+
+        if (mCurrentImage == mImages.Length() - 1) {
+            // We know we're done, but we still need to ensure that the callback
+            // gets called (e.g. to update the uploaded region).
+            NextTile();
+            break;
+        }
+        // Override a callback cancelling iteration if the texture wasn't valid.
+        // We need to force the update in that situation, or we may end up
+        // showing invalid/out-of-date texture data.
+    } while (NextTile() || (mTextureState != Valid));
+    mCurrentImage = oldCurrentImage;
+
+    mShaderType = mImages[0]->GetShaderProgramType();
+    mTextureState = Valid;
+    return result;
+}
+
+void
+TiledTextureImage::GetUpdateRegion(nsIntRegion& aForRegion)
+{
+    if (mTextureState != Valid) {
+        // if the texture hasn't been initialized yet, or something important
+        // changed, we need to recreate our backing surface and force the
+        // client to paint everything
+        aForRegion = nsIntRect(nsIntPoint(0, 0), mSize);
+        return;
+    }
+
+    nsIntRegion newRegion;
+
+    // We need to query each texture with the region it will be drawing and
+    // set aForRegion to be the combination of all of these regions
+    for (unsigned i = 0; i < mImages.Length(); i++) {
+        int xPos = (i % mColumns) * mTileSize;
+        int yPos = (i / mColumns) * mTileSize;
+        nsIntRect imageRect = nsIntRect(nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize()));
+
+        if (aForRegion.Intersects(imageRect)) {
+            // Make a copy of the region
+            nsIntRegion subRegion;
+            subRegion.And(aForRegion, imageRect);
+            // Translate it into tile-space
+            subRegion.MoveBy(-xPos, -yPos);
+            // Query region
+            mImages[i]->GetUpdateRegion(subRegion);
+            // Translate back
+            subRegion.MoveBy(xPos, yPos);
+            // Add to the accumulated region
+            newRegion.Or(newRegion, subRegion);
+        }
+    }
+
+    aForRegion = newRegion;
+}
+
+gfxASurface*
+TiledTextureImage::BeginUpdate(nsIntRegion& aRegion)
+{
+    NS_ASSERTION(!mInUpdate, "nested update");
+    mInUpdate = true;
+
+    // Note, we don't call GetUpdateRegion here as if the updated region is
+    // fully contained in a single tile, we get to avoid iterating through
+    // the tiles again (and a little copying).
+    if (mTextureState != Valid)
+    {
+        // if the texture hasn't been initialized yet, or something important
+        // changed, we need to recreate our backing surface and force the
+        // client to paint everything
+        aRegion = nsIntRect(nsIntPoint(0, 0), mSize);
+    }
+
+    nsIntRect bounds = aRegion.GetBounds();
+
+    for (unsigned i = 0; i < mImages.Length(); i++) {
+        int xPos = (i % mColumns) * mTileSize;
+        int yPos = (i / mColumns) * mTileSize;
+        nsIntRegion imageRegion = nsIntRegion(nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize()));
+
+        // a single Image can handle this update request
+        if (imageRegion.Contains(aRegion)) {
+            // adjust for tile offset
+            aRegion.MoveBy(-xPos, -yPos);
+            // forward the actual call
+            nsRefPtr<gfxASurface> surface = mImages[i]->BeginUpdate(aRegion);
+            // caller expects container space
+            aRegion.MoveBy(xPos, yPos);
+            // Correct the device offset
+            gfxPoint offset = surface->GetDeviceOffset();
+            surface->SetDeviceOffset(gfxPoint(offset.x - xPos,
+                                              offset.y - yPos));
+            // we don't have a temp surface
+            mUpdateSurface = nullptr;
+            // remember which image to EndUpdate
+            mCurrentImage = i;
+            return surface.get();
+        }
+    }
+
+    // Get the real updated region, taking into account the capabilities of
+    // each TextureImage tile
+    GetUpdateRegion(aRegion);
+    mUpdateRegion = aRegion;
+    bounds = aRegion.GetBounds();
+
+    // update covers multiple Images - create a temp surface to paint in
+    gfxASurface::gfxImageFormat format =
+        (GetContentType() == gfxASurface::CONTENT_COLOR) ?
+        gfxASurface::ImageFormatRGB24 : gfxASurface::ImageFormatARGB32;
+    mUpdateSurface = gfxPlatform::GetPlatform()->
+        CreateOffscreenSurface(gfxIntSize(bounds.width, bounds.height), gfxASurface::ContentFromFormat(format));
+    mUpdateSurface->SetDeviceOffset(gfxPoint(-bounds.x, -bounds.y));
+
+    return mUpdateSurface;
+}
+
+void
+TiledTextureImage::EndUpdate()
+{
+    NS_ASSERTION(mInUpdate, "EndUpdate not in update");
+    if (!mUpdateSurface) { // update was to a single TextureImage
+        mImages[mCurrentImage]->EndUpdate();
+        mInUpdate = false;
+        mTextureState = Valid;
+        mShaderType = mImages[mCurrentImage]->GetShaderProgramType();
+        return;
+    }
+
+    // upload tiles from temp surface
+    for (unsigned i = 0; i < mImages.Length(); i++) {
+        int xPos = (i % mColumns) * mTileSize;
+        int yPos = (i / mColumns) * mTileSize;
+        nsIntRect imageRect = nsIntRect(nsIntPoint(xPos,yPos), mImages[i]->GetSize());
+
+        nsIntRegion subregion;
+        subregion.And(mUpdateRegion, imageRect);
+        if (subregion.IsEmpty())
+            continue;
+        subregion.MoveBy(-xPos, -yPos); // Tile-local space
+        // copy tile from temp surface
+        gfxASurface* surf = mImages[i]->BeginUpdate(subregion);
+        nsRefPtr<gfxContext> ctx = new gfxContext(surf);
+        gfxUtils::ClipToRegion(ctx, subregion);
+        ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
+        ctx->SetSource(mUpdateSurface, gfxPoint(-xPos, -yPos));
+        ctx->Paint();
+        mImages[i]->EndUpdate();
+    }
+
+    mUpdateSurface = nullptr;
+    mInUpdate = false;
+    mShaderType = mImages[0]->GetShaderProgramType();
+    mTextureState = Valid;
+}
+
+void TiledTextureImage::BeginTileIteration()
+{
+    mCurrentImage = 0;
+}
+
+bool TiledTextureImage::NextTile()
+{
+    bool continueIteration = true;
+
+    if (mIterationCallback)
+        continueIteration = mIterationCallback(this, mCurrentImage,
+                                               mIterationCallbackData);
+
+    if (mCurrentImage + 1 < mImages.Length()) {
+        mCurrentImage++;
+        return continueIteration;
+    }
+    return false;
+}
+
+void TiledTextureImage::SetIterationCallback(TileIterationCallback aCallback,
+                                             void* aCallbackData)
+{
+    mIterationCallback = aCallback;
+    mIterationCallbackData = aCallbackData;
+}
+
+nsIntRect TiledTextureImage::GetTileRect()
+{
+    nsIntRect rect = mImages[mCurrentImage]->GetTileRect();
+    unsigned int xPos = (mCurrentImage % mColumns) * mTileSize;
+    unsigned int yPos = (mCurrentImage / mColumns) * mTileSize;
+    rect.MoveBy(xPos, yPos);
+    return rect;
+}
+
+nsIntRect TiledTextureImage::GetSrcTileRect()
+{
+    nsIntRect rect = GetTileRect();
+    unsigned int srcY = mFlags & NeedsYFlip
+                        ? mSize.height - rect.height - rect.y
+                        : rect.y;
+    return nsIntRect(rect.x, srcY, rect.width, rect.height);
+}
+
+void
+TiledTextureImage::BindTexture(GLenum aTextureUnit)
+{
+    mImages[mCurrentImage]->BindTexture(aTextureUnit);
+}
+
+void
+TiledTextureImage::ApplyFilter()
+{
+   mGL->ApplyFilterToBoundTexture(mFilter);
+}
+
+/*
+ * Resize, trying to reuse tiles. The reuse strategy is to decide on reuse per
+ * column. A tile on a column is reused if it hasn't changed size, otherwise it
+ * is discarded/replaced. Extra tiles on a column are pruned after iterating
+ * each column, and extra rows are pruned after iteration over the entire image
+ * finishes.
+ */
+void TiledTextureImage::Resize(const nsIntSize& aSize)
+{
+    if (mSize == aSize && mTextureState != Created) {
+        return;
+    }
+
+    // calculate rows and columns, rounding up
+    unsigned int columns = (aSize.width  + mTileSize - 1) / mTileSize;
+    unsigned int rows = (aSize.height + mTileSize - 1) / mTileSize;
+
+    // Iterate over old tile-store and insert/remove tiles as necessary
+    int row;
+    unsigned int i = 0;
+    for (row = 0; row < (int)rows; row++) {
+        // If we've gone beyond how many rows there were before, set mColumns to
+        // zero so that we only create new tiles.
+        if (row >= (int)mRows)
+            mColumns = 0;
+
+        // Similarly, if we're on the last row of old tiles and the height has
+        // changed, discard all tiles in that row.
+        // This will cause the pruning of columns not to work, but we don't need
+        // to worry about that, as no more tiles will be reused past this point
+        // anyway.
+        if ((row == (int)mRows - 1) && (aSize.height != mSize.height))
+            mColumns = 0;
+
+        int col;
+        for (col = 0; col < (int)columns; col++) {
+            nsIntSize size( // use tilesize first, then the remainder
+                    (col+1) * mTileSize > (unsigned int)aSize.width  ? aSize.width  % mTileSize : mTileSize,
+                    (row+1) * mTileSize > (unsigned int)aSize.height ? aSize.height % mTileSize : mTileSize);
+
+            bool replace = false;
+
+            // Check if we can re-use old tiles.
+            if (col < (int)mColumns) {
+                // Reuse an existing tile. If the tile is an end-tile and the
+                // width differs, replace it instead.
+                if (mSize.width != aSize.width) {
+                    if (col == (int)mColumns - 1) {
+                        // Tile at the end of the old column, replace it with
+                        // a new one.
+                        replace = true;
+                    } else if (col == (int)columns - 1) {
+                        // Tile at the end of the new column, create a new one.
+                    } else {
+                        // Before the last column on both the old and new sizes,
+                        // reuse existing tile.
+                        i++;
+                        continue;
+                    }
+                } else {
+                    // Width hasn't changed, reuse existing tile.
+                    i++;
+                    continue;
+                }
+            }
+
+            // Create a new tile.
+            nsRefPtr<TextureImage> teximg =
+                    mGL->TileGenFunc(size, mContentType, mFlags);
+            if (replace)
+                mImages.ReplaceElementAt(i, teximg.forget());
+            else
+                mImages.InsertElementAt(i, teximg.forget());
+            i++;
+        }
+
+        // Prune any unused tiles on the end of the column.
+        if (row < (int)mRows) {
+            for (col = (int)mColumns - col; col > 0; col--) {
+                mImages.RemoveElementAt(i);
+            }
+        }
+    }
+
+    // Prune any unused tiles at the end of the store.
+    unsigned int length = mImages.Length();
+    for (; i < length; i++)
+      mImages.RemoveElementAt(mImages.Length()-1);
+
+    // Reset tile-store properties.
+    mRows = rows;
+    mColumns = columns;
+    mSize = aSize;
+    mTextureState = Allocated;
+    mCurrentImage = 0;
+}
+
+uint32_t TiledTextureImage::GetTileCount()
+{
+    return mImages.Length();
+}
+
+TextureImage::ScopedBindTexture::ScopedBindTexture(TextureImage* aTexture,
+                                                   GLenum aTextureUnit)
+    : mTexture(aTexture)
+{
+    if (mTexture) {
+        MOZ_ASSERT(aTextureUnit >= LOCAL_GL_TEXTURE0);
+        mTexture->BindTexture(aTextureUnit);
+    }
+}
diff --git a/gfx/gl/GLTextureImage.h b/gfx/gl/GLTextureImage.h
new file mode 100644
index 000000000000..4217778fb0ef
--- /dev/null
+++ b/gfx/gl/GLTextureImage.h
@@ -0,0 +1,385 @@
+/* -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40; -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 GLTEXTUREIMAGE_H_
+#define GLTEXTUREIMAGE_H_
+
+#include "nsAutoPtr.h"
+#include "nsRegion.h"
+#include "gfxASurface.h"
+#include "GLContextTypes.h"
+#include "gfxPattern.h"
+
+namespace mozilla {
+namespace gl {
+class GLContext;
+
+/**
+ * A TextureImage encapsulates a surface that can be drawn to by a
+ * Thebes gfxContext and (hopefully efficiently!) synchronized to a
+ * texture in the server.  TextureImages are associated with one and
+ * only one GLContext.
+ *
+ * Implementation note: TextureImages attempt to unify two categories
+ * of backends
+ *
+ *  (1) proxy to server-side object that can be bound to a texture;
+ *      e.g. Pixmap on X11.
+ *
+ *  (2) efficient manager of texture memory; e.g. by having clients draw
+ *      into a scratch buffer which is then uploaded with
+ *      glTexSubImage2D().
+ */
+class TextureImage
+{
+    NS_INLINE_DECL_REFCOUNTING(TextureImage)
+public:
+    enum TextureState
+    {
+      Created, // Texture created, but has not had glTexImage called to initialize it.
+      Allocated,  // Texture memory exists, but contents are invalid.
+      Valid  // Texture fully ready to use.
+    };
+
+    enum Flags {
+        NoFlags          = 0x0,
+        UseNearestFilter = 0x1,
+        NeedsYFlip       = 0x2,
+        ForceSingleTile  = 0x4
+    };
+
+    typedef gfxASurface::gfxContentType ContentType;
+
+    static already_AddRefed<TextureImage> Create(
+                       GLContext* gl,
+                       const nsIntSize& aSize,
+                       TextureImage::ContentType aContentType,
+                       GLenum aWrapMode,
+                       TextureImage::Flags aFlags = TextureImage::NoFlags);
+
+    virtual ~TextureImage() {}
+
+    /**
+     * Returns a gfxASurface for updating |aRegion| of the client's
+     * image if successul, NULL if not.  |aRegion|'s bounds must fit
+     * within Size(); its coordinate space (if any) is ignored.  If
+     * the update begins successfully, the returned gfxASurface is
+     * owned by this.  Otherwise, NULL is returned.
+     *
+     * |aRegion| is an inout param: the returned region is what the
+     * client must repaint.  Category (1) regions above can
+     * efficiently handle repaints to "scattered" regions, while (2)
+     * can only efficiently handle repaints to rects.
+     *
+     * Painting the returned surface outside of |aRegion| results
+     * in undefined behavior.
+     *
+     * BeginUpdate() calls cannot be "nested", and each successful
+     * BeginUpdate() must be followed by exactly one EndUpdate() (see
+     * below).  Failure to do so can leave this in a possibly
+     * inconsistent state.  Unsuccessful BeginUpdate()s must not be
+     * followed by EndUpdate().
+     */
+    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion) = 0;
+    /**
+     * Retrieves the region that will require updating, given a
+     * region that needs to be updated. This can be used for
+     * making decisions about updating before calling BeginUpdate().
+     *
+     * |aRegion| is an inout param.
+     */
+    virtual void GetUpdateRegion(nsIntRegion& aForRegion) {
+    }
+    /**
+     * Finish the active update and synchronize with the server, if
+     * necessary.
+     *
+     * BeginUpdate() must have been called exactly once before
+     * EndUpdate().
+     */
+    virtual void EndUpdate() = 0;
+
+    /**
+     * The Image may contain several textures for different regions (tiles).
+     * These functions iterate over each sub texture image tile.
+     */
+    virtual void BeginTileIteration() {
+    }
+
+    virtual bool NextTile() {
+        return false;
+    }
+
+    // Function prototype for a tile iteration callback. Returning false will
+    // cause iteration to be interrupted (i.e. the corresponding NextTile call
+    // will return false).
+    typedef bool (* TileIterationCallback)(TextureImage* aImage,
+                                           int aTileNumber,
+                                           void* aCallbackData);
+
+    // Sets a callback to be called every time NextTile is called.
+    virtual void SetIterationCallback(TileIterationCallback aCallback,
+                                      void* aCallbackData) {
+    }
+
+    virtual nsIntRect GetTileRect() {
+        return nsIntRect(nsIntPoint(0,0), mSize);
+    }
+
+    virtual GLuint GetTextureID() = 0;
+
+    virtual uint32_t GetTileCount() {
+        return 1;
+    }
+
+    /**
+     * Set this TextureImage's size, and ensure a texture has been
+     * allocated.  Must not be called between BeginUpdate and EndUpdate.
+     * After a resize, the contents are undefined.
+     *
+     * If this isn't implemented by a subclass, it will just perform
+     * a dummy BeginUpdate/EndUpdate pair.
+     */
+    virtual void Resize(const nsIntSize& aSize) {
+        mSize = aSize;
+        nsIntRegion r(nsIntRect(0, 0, aSize.width, aSize.height));
+        BeginUpdate(r);
+        EndUpdate();
+    }
+
+    /**
+     * Mark this texture as having valid contents. Call this after modifying
+     * the texture contents externally.
+     */
+    virtual void MarkValid() {}
+
+    /**
+     * aSurf - the source surface to update from
+     * aRegion - the region in this image to update
+     * aFrom - offset in the source to update from
+     */
+    virtual bool DirectUpdate(gfxASurface *aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0)) = 0;
+
+    virtual void BindTexture(GLenum aTextureUnit) = 0;
+    virtual void ReleaseTexture() {}
+
+    void BindTextureAndApplyFilter(GLenum aTextureUnit) {
+        BindTexture(aTextureUnit);
+        ApplyFilter();
+    }
+
+    class ScopedBindTexture
+    {
+    public:
+        ScopedBindTexture(TextureImage *aTexture, GLenum aTextureUnit);
+
+        ~ScopedBindTexture()
+        {
+            if (mTexture) {
+                mTexture->ReleaseTexture();
+            }
+        }
+
+    protected:
+        TextureImage *mTexture;
+    };
+
+    class ScopedBindTextureAndApplyFilter
+        : public ScopedBindTexture
+    {
+    public:
+        ScopedBindTextureAndApplyFilter(TextureImage *aTexture, GLenum aTextureUnit) :
+          ScopedBindTexture(aTexture, aTextureUnit)
+        {
+            if (mTexture) {
+                mTexture->ApplyFilter();
+            }
+        }
+    };
+
+    /**
+     * Returns the shader program type that should be used to render
+     * this texture. Only valid after a matching BeginUpdate/EndUpdate
+     * pair have been called.
+     */
+    virtual ShaderProgramType GetShaderProgramType()
+    {
+         return mShaderType;
+    }
+
+    /** Can be called safely at any time. */
+
+    /**
+     * If this TextureImage has a permanent gfxASurface backing,
+     * return it.  Otherwise return NULL.
+     */
+    virtual already_AddRefed<gfxASurface> GetBackingSurface()
+    { return NULL; }
+
+    const nsIntSize& GetSize() const { return mSize; }
+    ContentType GetContentType() const { return mContentType; }
+    virtual bool InUpdate() const = 0;
+    GLenum GetWrapMode() const { return mWrapMode; }
+
+    void SetFilter(gfxPattern::GraphicsFilter aFilter) { mFilter = aFilter; }
+
+    /**
+     * Applies this TextureImage's filter, assuming that its texture is
+     * the currently bound texture.
+     */
+    virtual void ApplyFilter() = 0;
+
+protected:
+    friend class GLContext;
+
+    /**
+     * After the ctor, the TextureImage is invalid.  Implementations
+     * must allocate resources successfully before returning the new
+     * TextureImage from GLContext::CreateTextureImage().  That is,
+     * clients must not be given partially-constructed TextureImages.
+     */
+    TextureImage(const nsIntSize& aSize,
+                 GLenum aWrapMode, ContentType aContentType,
+                 Flags aFlags = NoFlags)
+        : mSize(aSize)
+        , mWrapMode(aWrapMode)
+        , mContentType(aContentType)
+        , mFilter(gfxPattern::FILTER_GOOD)
+        , mFlags(aFlags)
+    {}
+
+    virtual nsIntRect GetSrcTileRect() {
+        return nsIntRect(nsIntPoint(0,0), mSize);
+    }
+
+    nsIntSize mSize;
+    GLenum mWrapMode;
+    ContentType mContentType;
+    ShaderProgramType mShaderType;
+    gfxPattern::GraphicsFilter mFilter;
+    Flags mFlags;
+};
+
+/**
+ * BasicTextureImage is the baseline TextureImage implementation ---
+ * it updates its texture by allocating a scratch buffer for the
+ * client to draw into, then using glTexSubImage2D() to upload the new
+ * pixels.  Platforms must provide the code to create a new surface
+ * into which the updated pixels will be drawn, and the code to
+ * convert the update surface's pixels into an image on which we can
+ * glTexSubImage2D().
+ */
+class BasicTextureImage
+    : public TextureImage
+{
+public:
+    typedef gfxASurface::gfxImageFormat ImageFormat;
+    virtual ~BasicTextureImage();
+
+    BasicTextureImage(GLuint aTexture,
+                      const nsIntSize& aSize,
+                      GLenum aWrapMode,
+                      ContentType aContentType,
+                      GLContext* aContext,
+                      TextureImage::Flags aFlags = TextureImage::NoFlags)
+        : TextureImage(aSize, aWrapMode, aContentType, aFlags)
+        , mTexture(aTexture)
+        , mTextureState(Created)
+        , mGLContext(aContext)
+        , mUpdateOffset(0, 0)
+    {}
+
+    virtual void BindTexture(GLenum aTextureUnit);
+
+    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion);
+    virtual void GetUpdateRegion(nsIntRegion& aForRegion);
+    virtual void EndUpdate();
+    virtual bool DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0));
+    virtual GLuint GetTextureID() { return mTexture; }
+    // Returns a surface to draw into
+    virtual already_AddRefed<gfxASurface>
+      GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt);
+
+    virtual void MarkValid() { mTextureState = Valid; }
+
+    // Call when drawing into the update surface is complete.
+    // Returns true if textures should be upload with a relative
+    // offset - See UploadSurfaceToTexture.
+    virtual bool FinishedSurfaceUpdate();
+
+    // Call after surface data has been uploaded to a texture.
+    virtual void FinishedSurfaceUpload();
+
+    virtual bool InUpdate() const { return !!mUpdateSurface; }
+
+    virtual void Resize(const nsIntSize& aSize);
+
+    virtual void ApplyFilter();
+protected:
+
+    GLuint mTexture;
+    TextureState mTextureState;
+    GLContext* mGLContext;
+    nsRefPtr<gfxASurface> mUpdateSurface;
+    nsIntRegion mUpdateRegion;
+
+    // The offset into the update surface at which the update rect is located.
+    nsIntPoint mUpdateOffset;
+};
+
+/**
+ * A container class that complements many sub TextureImages into a big TextureImage.
+ * Aims to behave just like the real thing.
+ */
+
+class TiledTextureImage
+    : public TextureImage
+{
+public:
+    TiledTextureImage(GLContext* aGL, nsIntSize aSize,
+        TextureImage::ContentType, TextureImage::Flags aFlags = TextureImage::NoFlags);
+    ~TiledTextureImage();
+    void DumpDiv();
+    virtual gfxASurface* BeginUpdate(nsIntRegion& aRegion);
+    virtual void GetUpdateRegion(nsIntRegion& aForRegion);
+    virtual void EndUpdate();
+    virtual void Resize(const nsIntSize& aSize);
+    virtual uint32_t GetTileCount();
+    virtual void BeginTileIteration();
+    virtual bool NextTile();
+    virtual void SetIterationCallback(TileIterationCallback aCallback,
+                                      void* aCallbackData);
+    virtual nsIntRect GetTileRect();
+    virtual GLuint GetTextureID() {
+        return mImages[mCurrentImage]->GetTextureID();
+    }
+    virtual bool DirectUpdate(gfxASurface* aSurf, const nsIntRegion& aRegion, const nsIntPoint& aFrom = nsIntPoint(0,0));
+    virtual bool InUpdate() const { return mInUpdate; }
+    virtual void BindTexture(GLenum);
+    virtual void ApplyFilter();
+
+protected:
+    virtual nsIntRect GetSrcTileRect();
+
+    unsigned int mCurrentImage;
+    TileIterationCallback mIterationCallback;
+    void* mIterationCallbackData;
+    nsTArray< nsRefPtr<TextureImage> > mImages;
+    bool mInUpdate;
+    nsIntSize mSize;
+    unsigned int mTileSize;
+    unsigned int mRows, mColumns;
+    GLContext* mGL;
+    // A temporary surface to faciliate cross-tile updates.
+    nsRefPtr<gfxASurface> mUpdateSurface;
+    // The region of update requested
+    nsIntRegion mUpdateRegion;
+    TextureState mTextureState;
+};
+
+} // namespace gl
+} // namespace mozilla
+
+#endif /* GLTEXTUREIMAGE_H_ */
diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in
index e3729a278007..8f1cde8fe9de 100644
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -24,6 +24,7 @@ EXPORTS	= \
 	GLContextProviderImpl.h \
 	GLLibraryLoader.h \
 	ForceDiscreteGPUHelperCGL.h \
+	GLTextureImage.h \
 	$(NULL)
 
 ifdef MOZ_X11
@@ -48,6 +49,7 @@ CPPSRCS	= \
 	GLContext.cpp \
 	GLContextUtils.cpp \
 	GLLibraryLoader.cpp \
+	GLTextureImage.cpp \
 	$(NULL)
 
 GL_PROVIDER = Null
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 0d6f08572e48..7eeb314933b4 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -51,6 +51,7 @@
 #include "nsRegion.h"
 #include "Layers.h"
 #include "LayerManagerOGL.h"
+#include "GLTextureImage.h"
 #include "mozilla/layers/CompositorCocoaWidgetHelper.h"
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"
@@ -1754,10 +1755,11 @@ nsChildView::DrawWindowOverlay(LayerManager* aManager, nsIntRect aRect)
   }
 
   if (!mResizerImage) {
-    mResizerImage = manager->gl()->CreateTextureImage(nsIntSize(15, 15),
-                                                      gfxASurface::CONTENT_COLOR_ALPHA,
-                                                      LOCAL_GL_CLAMP_TO_EDGE,
-                                                      TextureImage::UseNearestFilter);
+    mResizerImage = TextureImage::Create(manager->gl(),
+                                         nsIntSize(15, 15),
+                                         gfxASurface::CONTENT_COLOR_ALPHA,
+                                         LOCAL_GL_CLAMP_TO_EDGE,
+                                         TextureImage::UseNearestFilter);
 
     // Creation of texture images can fail.
     if (!mResizerImage)

From 38a35ea5a73ec280207934b709d4b9e0e161d2c4 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Mon, 26 Nov 2012 14:41:55 -0800
Subject: [PATCH 054/160] Bug 811784: Account for subscripts when figuring out
 what object to stick properties on. r=mrbkap

---
 js/xpconnect/loader/mozJSComponentLoader.cpp | 10 +++
 js/xpconnect/loader/mozJSComponentLoader.h   |  2 +
 js/xpconnect/loader/mozJSSubScriptLoader.cpp | 69 +++++++++++++++-----
 js/xpconnect/loader/mozJSSubScriptLoader.h   |  3 +-
 4 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp
index f05442fea00f..fcbe40320a9d 100644
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
@@ -625,6 +625,16 @@ mozJSComponentLoader::FindTargetObject(JSContext* aCx,
     return NS_OK;
 }
 
+void
+mozJSComponentLoader::NoteSubScript(JSScript* aScript, JSObject* aThisObject)
+{
+  if (!mInitialized && NS_FAILED(ReallyInit())) {
+      MOZ_NOT_REACHED();
+  }
+
+  mThisObjects.Put(aScript, aThisObject);
+}
+
 // Some stack based classes for cleaning up on early return
 #ifdef HAVE_PR_MEMMAP
 class FileAutoCloser
diff --git a/js/xpconnect/loader/mozJSComponentLoader.h b/js/xpconnect/loader/mozJSComponentLoader.h
index d8bdcd1af425..61dbc461c3c7 100644
--- a/js/xpconnect/loader/mozJSComponentLoader.h
+++ b/js/xpconnect/loader/mozJSComponentLoader.h
@@ -54,6 +54,8 @@ class mozJSComponentLoader : public mozilla::ModuleLoader,
 
     static mozJSComponentLoader* Get() { return sSelf; }
 
+    void NoteSubScript(JSScript* aScript, JSObject* aThisObject);
+
  protected:
     static mozJSComponentLoader* sSelf;
 
diff --git a/js/xpconnect/loader/mozJSSubScriptLoader.cpp b/js/xpconnect/loader/mozJSSubScriptLoader.cpp
index 999302a41f0c..3969036d093b 100644
--- a/js/xpconnect/loader/mozJSSubScriptLoader.cpp
+++ b/js/xpconnect/loader/mozJSSubScriptLoader.cpp
@@ -31,6 +31,7 @@
 
 #include "mozilla/scache/StartupCache.h"
 #include "mozilla/scache/StartupCacheUtils.h"
+#include "mozilla/Preferences.h"
 
 using namespace mozilla::scache;
 
@@ -77,12 +78,16 @@ nsresult
 mozJSSubScriptLoader::ReadScript(nsIURI *uri, JSContext *cx, JSObject *target_obj,
                                  const nsAString& charset, const char *uriStr,
                                  nsIIOService *serv, nsIPrincipal *principal,
-                                 JSScript **scriptp)
+                                 bool reuseGlobal, JSScript **scriptp,
+                                 JSFunction **functionp)
 {
     nsCOMPtr<nsIChannel>     chan;
     nsCOMPtr<nsIInputStream> instream;
     JSErrorReporter  er;
 
+    *scriptp = nullptr;
+    *functionp = nullptr;
+
     nsresult rv;
     // Instead of calling NS_OpenURI, we create the channel ourselves and call
     // SetContentType, to avoid expensive MIME type lookups (bug 632490).
@@ -130,13 +135,27 @@ mozJSSubScriptLoader::ReadScript(nsIURI *uri, JSContext *cx, JSObject *target_ob
             return ReportError(cx, LOAD_ERROR_BADCHARSET);
         }
 
-        *scriptp = JS::Compile(cx, target_obj_root, options,
-                               reinterpret_cast<const jschar*>(script.get()), script.Length());
+        if (!reuseGlobal) {
+            *scriptp = JS::Compile(cx, target_obj_root, options,
+                                   reinterpret_cast<const jschar*>(script.get()),
+                                   script.Length());
+        } else {
+            *functionp = JS::CompileFunction(cx, target_obj_root, options,
+                                             nullptr, 0, nullptr,
+                                             reinterpret_cast<const jschar*>(script.get()),
+                                             script.Length());
+        }
     } else {
         // We only use LAZY_SOURCE when no special encoding is specified because
         // the lazy source loader doesn't know the encoding.
-        options.setSourcePolicy(JS::CompileOptions::LAZY_SOURCE);
-        *scriptp = JS::Compile(cx, target_obj_root, options, buf.get(), len);
+        if (!reuseGlobal) {
+            options.setSourcePolicy(JS::CompileOptions::LAZY_SOURCE);
+            *scriptp = JS::Compile(cx, target_obj_root, options, buf.get(), len);
+        } else {
+            *functionp = JS::CompileFunction(cx, target_obj_root, options,
+                                             nullptr, 0, nullptr, buf.get(),
+                                             len);
+        }
     }
 
     /* repent for our evil deeds */
@@ -180,16 +199,20 @@ mozJSSubScriptLoader::LoadSubScript(const nsAString& url,
     JSAutoRequest ar(cx);
 
     JSObject* targetObj;
-    if (!JS_ValueToObject(cx, target, &targetObj))
+    mozJSComponentLoader* loader = mozJSComponentLoader::Get();
+    rv = loader->FindTargetObject(cx, &targetObj);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    bool reusingGlobal = !JS_IsGlobalObject(targetObj);
+
+    // We base reusingGlobal off of what the loader told us, but we may not
+    // actually be using that object.
+    JSObject* passedObj;
+    if (!JS_ValueToObject(cx, target, &passedObj))
         return NS_ERROR_ILLEGAL_VALUE;
 
-
-    if (!targetObj) {
-        // If the user didn't provide an object to eval onto, find one.
-        mozJSComponentLoader* loader = mozJSComponentLoader::Get();
-        rv = loader->FindTargetObject(cx, &targetObj);
-        NS_ENSURE_SUCCESS(rv, rv);
-    }
+    if (passedObj)
+        targetObj = passedObj;
 
     // Remember an object out of the calling compartment so that we
     // can properly wrap the result later.
@@ -274,20 +297,32 @@ mozJSSubScriptLoader::LoadSubScript(const nsAString& url,
     cachePath.AppendPrintf("jssubloader/%d", version);
     PathifyURI(uri, cachePath);
 
+    JSFunction* function = nullptr;
     script = nullptr;
     if (cache)
         rv = ReadCachedScript(cache, cachePath, cx, mSystemPrincipal, &script);
     if (!script) {
         rv = ReadScript(uri, cx, targetObj, charset,
                         static_cast<const char*>(uriStr.get()), serv,
-                        principal, &script);
-        writeScript = true;
+                        principal, reusingGlobal, &script, &function);
+        writeScript = !!script;
     }
 
-    if (NS_FAILED(rv) || !script)
+    if (NS_FAILED(rv) || (!script && !function))
         return rv;
 
-    bool ok = JS_ExecuteScriptVersion(cx, targetObj, script, retval, version);
+    if (function) {
+        script = JS_GetFunctionScript(cx, function);
+    }
+
+    loader->NoteSubScript(script, targetObj);
+
+    bool ok = false;
+    if (function) {
+        ok = JS_CallFunction(cx, targetObj, function, 0, nullptr, retval);
+    } else {
+        ok = JS_ExecuteScriptVersion(cx, targetObj, script, retval, version);
+    }
 
     if (ok) {
         JSAutoCompartment rac(cx, result_obj);
diff --git a/js/xpconnect/loader/mozJSSubScriptLoader.h b/js/xpconnect/loader/mozJSSubScriptLoader.h
index 4d7b7b5a33ab..ab384df9e5d8 100644
--- a/js/xpconnect/loader/mozJSSubScriptLoader.h
+++ b/js/xpconnect/loader/mozJSSubScriptLoader.h
@@ -33,7 +33,8 @@ private:
     nsresult ReadScript(nsIURI *uri, JSContext *cx, JSObject *target_obj,
                         const nsAString& charset, const char *uriStr,
                         nsIIOService *serv, nsIPrincipal *principal,
-                        JSScript **scriptp);
+                        bool reuseGlobal, JSScript **scriptp,
+                        JSFunction **functionp);
 
     nsCOMPtr<nsIPrincipal> mSystemPrincipal;
 };

From 81804a45748a222855aab4158ef609182acbf031 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Mon, 26 Nov 2012 14:41:59 -0800
Subject: [PATCH 055/160] Bug 814102: Make the 'this' object used when
 compartment sharing a FakeBackstagePass. r=mrbkap

---
 js/xpconnect/loader/mozJSComponentLoader.cpp | 21 ++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp
index fcbe40320a9d..12bfc1e7e8d0 100644
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
@@ -72,6 +72,22 @@ using namespace mozilla;
 using namespace mozilla::scache;
 using namespace xpc;
 
+// This JSClass exists to trick silly code that expects toString()ing the
+// global in a component scope to return something with "BackstagePass" in it
+// to continue working.
+static JSClass kFakeBackstagePassJSClass =
+{
+    "FakeBackstagePass",
+    0,
+    JS_PropertyStub,
+    JS_PropertyStub,
+    JS_PropertyStub,
+    JS_StrictPropertyStub,
+    JS_EnumerateStub,
+    JS_ResolveStub,
+    JS_ConvertStub
+};
+
 static const char kJSRuntimeServiceContractID[] = "@mozilla.org/js/xpc/RuntimeService;1";
 static const char kXPConnectServiceContractID[] = "@mozilla.org/js/xpc/XPConnect;1";
 static const char kObserverServiceContractID[] = "@mozilla.org/observer-service;1";
@@ -472,7 +488,7 @@ mozJSComponentLoader::LoadModule(FileLocation &aFile)
 
     ModuleEntry* mod;
     if (mModules.Get(spec, &mod))
-	return mod;
+    return mod;
 
     nsAutoPtr<ModuleEntry> entry(new ModuleEntry);
 
@@ -717,7 +733,8 @@ mozJSComponentLoader::PrepareObjectForLocation(JSCLContextHelper& aCx,
     if (aReuseLoaderGlobal) {
         // If we're reusing the loader global, we don't actually use the
         // global, but rather we use a different object as the 'this' object.
-        JSObject* newObj = JS_NewObject(aCx, nullptr, nullptr, nullptr);
+        JSObject* newObj = JS_NewObject(aCx, &kFakeBackstagePassJSClass,
+                                        nullptr, nullptr);
         NS_ENSURE_TRUE(newObj, nullptr);
 
         obj = newObj;

From 6cb2fce1f04a4ae4974bb9fb9db45ec7fd1bae5c Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Mon, 26 Nov 2012 14:48:11 -0800
Subject: [PATCH 056/160] Bug 775142 - Use placeholder format strings for
 localization. r=mfinkle,Pike

---
 .../android/base/locales/en-US/android_strings.dtd  | 13 +++++--------
 mobile/android/base/strings.xml.in                  |  9 +++++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index d137e0bd8254..745e9f31142c 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -56,9 +56,9 @@
 <!ENTITY close_tab "Close Tab">
 <!ENTITY new_tab "New Tab">
 <!ENTITY one_tab "1 tab">
-<!-- Localization note (num_tabs) : Number of tabs is always more than one.
+<!-- Localization note (num_tabs2) : Number of tabs is always more than one.
      We can't use android plural forms, sadly. See bug #753859. -->
-<!ENTITY num_tabs "&#037;d tabs">
+<!ENTITY num_tabs2 "&formatD; tabs">
 <!ENTITY new_tab_opened "New tab opened">
 
 <!ENTITY settings "Settings">
@@ -156,8 +156,6 @@ size. -->
 <!ENTITY contextmenu_copyurl "Copy Address">
 <!ENTITY contextmenu_edit_bookmark "Edit">
 
-<!-- Localization note (history_removed) : Shown in a toast notificaion
-	 after a page is removed from browser history. -->
 <!ENTITY history_removed "Page removed">
 
 <!ENTITY bookmark_edit_title "Edit Bookmark">
@@ -240,10 +238,9 @@ just addresses the organization to follow, e.g. "This site is run by " -->
                                          from Android">
 <!ENTITY bookmarkhistory_import_wait "Please wait...">
 
-<!-- Localization note (suggestions_prompt): The placeholder (&#037;s) should
-     be kept in the string; this will be replaced with the name of the search
-     engine. -->
-<!ENTITY suggestions_prompt "Would you like to turn on &#037;s search suggestions?">
+<!-- Localization note (suggestions_prompt2): The placeholder &formatS; will be
+     replaced with the name of the search engine. -->
+<!ENTITY suggestions_prompt2 "Would you like to turn on &formatS; search suggestions?">
 
 <!ENTITY webapp_generic_name "App">
 
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index b76a71ee5e72..5972c13054d5 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -8,7 +8,12 @@
 #includesubst @BRANDPATH@
 #includesubst @STRINGSPATH@
 #includesubst @SYNCSTRINGSPATH@
+
+<!-- C-style format strings. -->
+<!ENTITY formatS "&#037;s">
+<!ENTITY formatD "&#037;d">
 ]>
+
 #includesubst @BOOKMARKSPATH@
 <resources>
   <string name="moz_app_displayname">@MOZ_APP_DISPLAYNAME@</string>
@@ -129,7 +134,7 @@
   <string name="new_tab">&new_tab;</string>
   <string name="new_tab_opened">&new_tab_opened;</string>
   <string name="one_tab">&one_tab;</string>
-  <string name="num_tabs">&num_tabs;</string>
+  <string name="num_tabs">&num_tabs2;</string>
   <string name="addons">&addons;</string>
   <string name="downloads">&downloads;</string>
   <string name="apps">&apps;</string>
@@ -243,6 +248,6 @@
   <string name="updater_apply_select">&updater_apply_select2;</string>
 
   <!-- Search suggestions opt-in -->
-  <string name="suggestions_prompt">&suggestions_prompt;</string>
+  <string name="suggestions_prompt">&suggestions_prompt2;</string>
 
 </resources>

From a200a3bb380269615bf4d92870196f8ac800fe3f Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Mon, 26 Nov 2012 14:57:11 -0800
Subject: [PATCH 057/160] Bug 813677 - Only send about:home telemetry pings
 when showing about:home. r=mfinkle

---
 mobile/android/base/BrowserApp.java | 11 ++++++++---
 mobile/android/base/GeckoApp.java   |  2 --
 mobile/android/base/Telemetry.java  |  6 ++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 8600cae01cdd..b561cf0b3121 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -58,6 +58,7 @@ abstract public class BrowserApp extends GeckoApp
     public static BrowserToolbar mBrowserToolbar;
     private AboutHomeContent mAboutHomeContent;
     private Boolean mAboutHomeShowing = null;
+    protected Telemetry.Timer mAboutHomeStartupTimer = null;
 
     private static final int ADDON_MENU_OFFSET = 1000;
     private class MenuItemInfo {
@@ -202,6 +203,8 @@ abstract public class BrowserApp extends GeckoApp
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        mAboutHomeStartupTimer = new Telemetry.Timer("FENNEC_STARTUP_TIME_ABOUTHOME");
+
         super.onCreate(savedInstanceState);
 
         LinearLayout actionBar = (LinearLayout) getActionBarLayout();
@@ -271,10 +274,12 @@ abstract public class BrowserApp extends GeckoApp
                 Tab tab = Tabs.getInstance().loadUrl("about:home", Tabs.LOADURL_NEW_TAB);
             } else {
                 hideAboutHome();
+                mAboutHomeStartupTimer.cancel();
             }
         } else {
             int flags = Tabs.LOADURL_NEW_TAB | Tabs.LOADURL_USER_ENTERED;
             Tabs.getInstance().loadUrl(uri, flags);
+            mAboutHomeStartupTimer.cancel();
         }
     }
 
@@ -670,9 +675,9 @@ abstract public class BrowserApp extends GeckoApp
                         }
                     });
                     mAboutHomeContent.setLoadCompleteCallback(new AboutHomeContent.VoidCallback() {
-                         public void callback() {
-                             mAboutHomeStartupTimer.stop();
-                         }
+                        public void callback() {
+                            mAboutHomeStartupTimer.stop();
+                        }
                     });
                 } else {
                     mAboutHomeContent.update(EnumSet.of(AboutHomeContent.UpdateFlags.TOP_SITES,
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index d9a344b631a5..5ab49fd438b8 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -190,7 +190,6 @@ abstract public class GeckoApp
 
     protected int mRestoreMode = RESTORE_NONE;
     protected boolean mInitialized = false;
-    protected Telemetry.Timer mAboutHomeStartupTimer;
     private Telemetry.Timer mJavaUiStartupTimer;
     private Telemetry.Timer mGeckoReadyStartupTimer;
 
@@ -1470,7 +1469,6 @@ abstract public class GeckoApp
 
         // The clock starts...now. Better hurry!
         mJavaUiStartupTimer = new Telemetry.Timer("FENNEC_STARTUP_TIME_JAVAUI");
-        mAboutHomeStartupTimer = new Telemetry.Timer("FENNEC_STARTUP_TIME_ABOUTHOME");
         mGeckoReadyStartupTimer = new Telemetry.Timer("FENNEC_STARTUP_TIME_GECKOREADY");
 
         ((GeckoApplication)getApplication()).initialize();
diff --git a/mobile/android/base/Telemetry.java b/mobile/android/base/Telemetry.java
index 9245fd8301fa..256f418f61a1 100644
--- a/mobile/android/base/Telemetry.java
+++ b/mobile/android/base/Telemetry.java
@@ -27,8 +27,6 @@ public class Telemetry {
             GeckoEvent event =
                 GeckoEvent.createBroadcastEvent("Telemetry:Add", jsonData.toString());
             GeckoAppShell.sendEventToGecko(event);
-
-            Log.v(LOGTAG, "Sending telemetry: " + jsonData.toString());
         } catch (JSONException e) {
             Log.e(LOGTAG, "JSON exception: ", e);
         }
@@ -45,6 +43,10 @@ public class Telemetry {
             mHasFinished = false;
         }
 
+        public void cancel() {
+            mHasFinished = true;
+        }
+
         public void stop() {
             // Only the first stop counts.
             if (mHasFinished) {

From 3f615fa66094be06254cff74c65f0698c0a612a1 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Thu, 22 Nov 2012 18:33:33 +1300
Subject: [PATCH 058/160] Bug 810592 - Make nsSubDocumentFrames that are
 actively scrolling build their own layer. r=roc

---
 content/test/reftest/bug559996-ref.html               | 11 ++++++++++-
 content/test/reftest/bug559996.html                   | 11 ++++++++++-
 layout/generic/nsSubDocumentFrame.cpp                 |  5 ++++-
 .../reftests/scrolling/iframe-border-radius-ref.html  |  8 +++++---
 layout/reftests/scrolling/iframe-border-radius.html   |  2 +-
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/content/test/reftest/bug559996-ref.html b/content/test/reftest/bug559996-ref.html
index 4133bf0c6f24..05178cbf8d6e 100644
--- a/content/test/reftest/bug559996-ref.html
+++ b/content/test/reftest/bug559996-ref.html
@@ -1,7 +1,16 @@
-<html>
+<html class="reftest-wait">
 <body>
 
 <iframe src="bug559996-ref-iframe.html#down" style="height: 200px; width: 200px"></iframe>
+<script>
+function endTest() {
+  document.documentElement.removeAttribute("class");
+}
+function waitForInactivity() {
+  setTimeout(endTest, 1000);
+}
+document.addEventListener("MozReftestInvalidate", waitForInactivity, false);
+</script>
 
 </body>
 </html>
diff --git a/content/test/reftest/bug559996.html b/content/test/reftest/bug559996.html
index 766bb7bfdbe8..e6dda8df9119 100644
--- a/content/test/reftest/bug559996.html
+++ b/content/test/reftest/bug559996.html
@@ -1,7 +1,16 @@
-<html>
+<html class="reftest-wait">
 <body>
 
 <iframe src="bug559996-iframe.html#down" style="height: 200px; width: 200px"></iframe>
+<script>
+function endTest() {
+  document.documentElement.removeAttribute("class");
+}
+function waitForInactivity() {
+  setTimeout(endTest, 1000);
+}
+document.addEventListener("MozReftestInvalidate", waitForInactivity, false);
+</script>
 
 </body>
 </html>
diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index 66fcd6a98710..51c8a2acab5a 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -414,7 +414,10 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
     childItems.AppendToTop(zoomItem);
   }
 
-  if (!addedLayer && presContext->IsRootContentDocument()) {
+  nsIScrollableFrame *sf = presShell->GetRootScrollFrameAsScrollable();
+  if (!addedLayer &&
+      (presContext->IsRootContentDocument() ||
+       (sf && sf->IsScrollingActive()))) {
     // We always want top level content documents to be in their own layer.
     nsDisplayOwnLayer* layerItem = new (aBuilder) nsDisplayOwnLayer(
       aBuilder, subdocRootFrame ? subdocRootFrame : this, 
diff --git a/layout/reftests/scrolling/iframe-border-radius-ref.html b/layout/reftests/scrolling/iframe-border-radius-ref.html
index c2f8ae9f8a33..de5f611c1798 100644
--- a/layout/reftests/scrolling/iframe-border-radius-ref.html
+++ b/layout/reftests/scrolling/iframe-border-radius-ref.html
@@ -1,13 +1,15 @@
 <!DOCTYPE HTML>
-<html>
-<body onload="doTest()">
-<iframe src="data:text/html,<body style='font-size:100px; overflow:hidden'><p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty"
+<html class="reftest-wait">
+<body>
+<iframe src="data:text/html,<body style='font-size:100px; overflow:hidden; background:white;'><p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty"
         id="f" style="width:500px; height:500px; border-radius:100px; border:none;"></iframe>
 <script>
 var f = document.getElementById("f");
 function doTest() {
   f.contentWindow.scrollTo(0, 80);
+  document.documentElement.removeAttribute('class');
 }
+document.addEventListener("MozReftestInvalidate", doTest, false);
 </script>
 </body>
 </html>
diff --git a/layout/reftests/scrolling/iframe-border-radius.html b/layout/reftests/scrolling/iframe-border-radius.html
index d6c00a635473..1901bc5dc43f 100644
--- a/layout/reftests/scrolling/iframe-border-radius.html
+++ b/layout/reftests/scrolling/iframe-border-radius.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html class="reftest-wait">
 <body>
-<iframe src="data:text/html,<body style='font-size:100px; overflow:hidden'><p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty"
+<iframe src="data:text/html,<body style='font-size:100px; overflow:hidden; background:white;'><p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty<p>Hello<p>Kitty"
         id="f" style="width:500px; height:500px; border-radius:100px; border:none;"></iframe>
 <script>
 var f = document.getElementById("f");

From 75c7dc24ce2b72ac85e14d51c79225c6cd073434 Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Wed, 21 Nov 2012 17:08:11 -0800
Subject: [PATCH 059/160] Bug 814139 - Send state vars to frame scripts after
 switching frames, r=mdas

---
 testing/marionette/marionette-actors.js   |  5 ++++-
 testing/marionette/marionette-listener.js | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/testing/marionette/marionette-actors.js b/testing/marionette/marionette-actors.js
index 552bbee7fd63..08ac21d500a2 100644
--- a/testing/marionette/marionette-actors.js
+++ b/testing/marionette/marionette-actors.js
@@ -1685,8 +1685,11 @@ MarionetteDriverActor.prototype = {
           // we'll acknowledge the switchToFrame message here.
           // XXX: Should have a better way of determining that this message
           // is from a remote frame.
-          this.sendOk();
           this.currentRemoteFrame.targetFrameId = this.generateFrameId(message.json.value);
+          this.sendAsync(
+              "setState",
+              {scriptTimeout: this.scriptTimeout,
+               searchTimeout: this.curBrowser.elementManager.searchTimeout});
         }
 
         let browserType;
diff --git a/testing/marionette/marionette-listener.js b/testing/marionette/marionette-listener.js
index 4b5a0cbf4442..02a762cbad19 100644
--- a/testing/marionette/marionette-listener.js
+++ b/testing/marionette/marionette-listener.js
@@ -121,6 +121,7 @@ function startListeners() {
   addMessageListenerId("Marionette:importScript", importScript);
   addMessageListenerId("Marionette:getAppCacheStatus", getAppCacheStatus);
   addMessageListenerId("Marionette:setTestName", setTestName);
+  addMessageListenerId("Marionette:setState", setState);
 }
 
 /**
@@ -142,6 +143,21 @@ function sleepSession(msg) {
   addMessageListener("Marionette:restart", restart);
 }
 
+/**
+ * Sets script-wide state variables; used after frame switching.
+ */
+function setState(msg) {
+  marionetteTimeout = msg.json.scriptTimeout;
+  try {
+    elementManager.setSearchTimeout(msg.json.searchTimeout);
+  }
+  catch (e) {
+    sendError(e.message, e.code, e.stack);
+    return;
+  }
+  sendOk();
+}
+
 /**
  * Restarts all our listeners after this listener was put to sleep
  */
@@ -186,6 +202,7 @@ function deleteSession(msg) {
   removeMessageListenerId("Marionette:importScript", importScript);
   removeMessageListenerId("Marionette:getAppCacheStatus", getAppCacheStatus);
   removeMessageListenerId("Marionette:setTestName", setTestName);
+  removeMessageListenerId("Marionette:setState", setState);
   this.elementManager.reset();
   // reset frame to the top-most frame
   curWindow = content;

From c23c76ee37eea5b8c2033ef939fea840eb5912e8 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Mon, 26 Nov 2012 14:56:46 -0500
Subject: [PATCH 060/160] Bug 768887 - Remove redundant method. r=bnicholson

---
 mobile/android/base/BrowserApp.java     | 2 +-
 mobile/android/base/BrowserToolbar.java | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index efb1c4705301..8600cae01cdd 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -296,7 +296,7 @@ abstract public class BrowserApp extends GeckoApp
     void focusChrome() {
         mMainHandler.post(new Runnable() {
             public void run() {
-                mBrowserToolbar.setVisibility(View.VISIBLE);
+                mBrowserToolbar.show();
                 mBrowserToolbar.requestFocusFromTouch();
             }
         });
diff --git a/mobile/android/base/BrowserToolbar.java b/mobile/android/base/BrowserToolbar.java
index c30d10f121a2..307626f397fc 100644
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -726,10 +726,6 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
         setPageActionVisibility(mStop.getVisibility() == View.VISIBLE);
     }
 
-    public void setVisibility(int visibility) {
-        mLayout.setVisibility(visibility);
-    }
-
     public void requestFocusFromTouch() {
         mLayout.requestFocusFromTouch();
     }

From 5ce4bee8ceee7409f7a62133776b0d49b8498386 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Mon, 26 Nov 2012 14:57:13 -0500
Subject: [PATCH 061/160] Bug 768887 - Ensure that the toolbar remains hidden
 on rotation in full-screen mode. r=bnicholson

---
 mobile/android/base/BrowserToolbar.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mobile/android/base/BrowserToolbar.java b/mobile/android/base/BrowserToolbar.java
index 307626f397fc..9c2ee450dcaa 100644
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -113,6 +113,10 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
     }
 
     public void from(LinearLayout layout) {
+        if (mLayout != null) {
+            // make sure we retain the visibility property on rotation
+            layout.setVisibility(mLayout.getVisibility());
+        }
         mLayout = layout;
 
         mShowSiteSecurity = false;

From 24ea37cef93b98f85d680b532285f9c2102cdf0f Mon Sep 17 00:00:00 2001
From: Ravisankar Sivasubramaniam <rasivasu@gmail.com>
Date: Thu, 22 Nov 2012 21:54:09 +0530
Subject: [PATCH 062/160] Bug 803078: Added code to hide the cursor if the
 windows change. r=margaret

---
 mobile/android/chrome/content/browser.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 831405a6bc20..1683ea7e578b 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -1664,6 +1664,9 @@ var SelectionHandler = {
           // Knowing when the page is done drawing is hard, so let's just cancel
           // the selection when the window changes. We should fix this later.
           this.endSelection();
+        } else if (this._activeType == this.TYPE_CURSOR) {
+          //  Hide the cursor if the window changes
+          this.hideThumb();
         }
         break;
       }

From 4152b3d26251ebf2592b66603a75f0b617b6bf63 Mon Sep 17 00:00:00 2001
From: EKR <ekr@rtfm.com>
Date: Thu, 22 Nov 2012 10:57:37 -0800
Subject: [PATCH 063/160] Bug 805662, Crash in mediaconduit_unittest. r=jesup

---
 media/webrtc/signaling/test/mediaconduit_unittests.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media/webrtc/signaling/test/mediaconduit_unittests.cpp b/media/webrtc/signaling/test/mediaconduit_unittests.cpp
index 87e2d17e94a7..318a0959a065 100644
--- a/media/webrtc/signaling/test/mediaconduit_unittests.cpp
+++ b/media/webrtc/signaling/test/mediaconduit_unittests.cpp
@@ -113,7 +113,7 @@ class AudioSendAndReceive
 {
 public:
   static const unsigned int PLAYOUT_SAMPLE_FREQUENCY; //default is 16000
-  static const unsigned int PLAYOUT_SAMPLE_LENGTH; //default is 160
+  static const unsigned int PLAYOUT_SAMPLE_LENGTH; //default is 160000
 
   AudioSendAndReceive()
   {
@@ -150,7 +150,7 @@ private:
 };
 
 const unsigned int AudioSendAndReceive::PLAYOUT_SAMPLE_FREQUENCY = 16000;
-const unsigned int AudioSendAndReceive::PLAYOUT_SAMPLE_LENGTH  = 160;
+const unsigned int AudioSendAndReceive::PLAYOUT_SAMPLE_LENGTH  = 160000;
 
 int AudioSendAndReceive::WriteWaveHeader(int rate, int channels, FILE* outFile)
 {
@@ -271,7 +271,7 @@ void AudioSendAndReceive::GenerateAndReadSamples()
    int16_t audioOutput[PLAYOUT_SAMPLE_LENGTH];
    short* inbuf;
    int sampleLengthDecoded = 0;
-   int SAMPLES = (PLAYOUT_SAMPLE_FREQUENCY * 10)/1000; //10 milliseconds
+   int SAMPLES = (PLAYOUT_SAMPLE_FREQUENCY * 10); //10 seconds
    int CHANNELS = 1; //mono audio
    int sampleLengthInBytes = sizeof(audioInput);
    //generated audio buffer
@@ -329,7 +329,7 @@ void AudioSendAndReceive::GenerateAndReadSamples()
       cerr << "Couldn't Write " << sampleLengthInBytes << "bytes" << endl;
       break;
     }
-   }while(numSamplesReadFromInput <= (SAMPLES));
+   }while(numSamplesReadFromInput < SAMPLES);
 
    FinishWaveHeader(outFile);
    fclose(outFile);

From e9233b286418ac928db78c776e9638086099e32b Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Thu, 22 Nov 2012 21:35:19 +0000
Subject: [PATCH 064/160] =?UTF-8?q?Bug=20788977=20-=20[toolbox]=20Land=20t?=
 =?UTF-8?q?he=20developer=20tools=20window;=20r=3Dharth,jwalker,mikeratcli?=
 =?UTF-8?q?ffe,paul,d=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 browser/app/profile/firefox.js                |   28 +-
 browser/base/content/browser-appmenu.inc      |   33 +-
 browser/base/content/browser-doctype.inc      |    2 -
 browser/base/content/browser-menubar.inc      |   40 +-
 browser/base/content/browser-sets.inc         |   87 +-
 browser/base/content/browser.css              |   14 +-
 browser/base/content/browser.js               |  105 +-
 browser/base/content/browser.xul              |  106 +-
 browser/base/content/highlighter.css          |   71 +-
 browser/base/content/nsContextMenu.js         |   16 +-
 browser/devtools/Makefile.in                  |    3 +-
 browser/devtools/commandline/CmdBreak.jsm     |   48 +-
 browser/devtools/commandline/CmdCalllog.jsm   |   12 +-
 .../devtools/commandline/CmdCalllogChrome.jsm |   11 +-
 browser/devtools/commandline/CmdConsole.jsm   |   14 +-
 browser/devtools/commandline/CmdDbg.jsm       |   66 +-
 browser/devtools/commandline/Commands.jsm     |    1 +
 .../commandline/test/browser_dbg_cmd.js       |  111 +-
 .../commandline/test/browser_dbg_cmd_break.js |  136 +-
 browser/devtools/debugger/DebuggerPanel.jsm   |  144 +
 .../devtools/debugger/debugger-controller.js  |   49 +-
 browser/devtools/debugger/debugger-toolbar.js |   15 -
 browser/devtools/debugger/debugger.xul        |   10 -
 browser/devtools/debugger/test/Makefile.in    |    8 +-
 .../debugger/test/browser_dbg_bfcache.js      |    2 +-
 .../test/browser_dbg_breakpoint-new-script.js |    2 +-
 ...rowser_dbg_bug723069_editor-breakpoints.js |   12 +-
 ...r_dbg_bug723071_editor-breakpoints-pane.js |   10 +-
 ...wser_dbg_bug727429_watch-expressions-01.js |    2 +-
 ...wser_dbg_bug727429_watch-expressions-02.js |    2 +-
 ...rowser_dbg_bug731394_editor-contextmenu.js |    2 +-
 ...er_dbg_bug737803_editor_actual_location.js |   10 +-
 ...bg_bug740825_conditional-breakpoints-01.js |    4 +-
 ...bg_bug740825_conditional-breakpoints-02.js |    4 +-
 .../browser_dbg_bug786070_hide_nonenums.js    |    2 +-
 .../debugger/test/browser_dbg_clean-exit.js   |    2 +-
 .../debugger/test/browser_dbg_createRemote.js |    2 +-
 .../debugger/test/browser_dbg_displayName.js  |    2 +-
 .../debugger/test/browser_dbg_iframes.js      |    5 +-
 .../debugger/test/browser_dbg_leaktest.js     |    2 +-
 .../browser_dbg_location-changes-blank.js     |    2 +-
 .../test/browser_dbg_location-changes-new.js  |    2 +-
 .../test/browser_dbg_location-changes.js      |    2 +-
 .../test/browser_dbg_pane-collapse.js         |    2 +-
 .../test/browser_dbg_panesize-inner.js        |   97 +-
 .../debugger/test/browser_dbg_panesize.js     |   55 -
 .../test/browser_dbg_pause-exceptions.js      |    8 +-
 .../debugger/test/browser_dbg_pause-resume.js |    2 +-
 .../test/browser_dbg_progress-listener-bug.js |    2 +-
 .../test/browser_dbg_propertyview-01.js       |    2 +-
 .../test/browser_dbg_propertyview-02.js       |    2 +-
 .../test/browser_dbg_propertyview-03.js       |    2 +-
 .../test/browser_dbg_propertyview-04.js       |    2 +-
 .../test/browser_dbg_propertyview-05.js       |    2 +-
 .../test/browser_dbg_propertyview-06.js       |    2 +-
 .../test/browser_dbg_propertyview-07.js       |    2 +-
 .../test/browser_dbg_propertyview-08.js       |    2 +-
 .../test/browser_dbg_propertyview-09.js       |    2 +-
 .../test/browser_dbg_propertyview-10.js       |    2 +-
 .../test/browser_dbg_propertyview-data.js     |    2 +-
 .../test/browser_dbg_propertyview-edit.js     |    2 +-
 .../browser_dbg_propertyview-filter-01.js     |    2 +-
 .../browser_dbg_propertyview-filter-02.js     |    2 +-
 .../browser_dbg_propertyview-filter-03.js     |    2 +-
 .../browser_dbg_propertyview-filter-04.js     |    2 +-
 .../browser_dbg_propertyview-filter-05.js     |    2 +-
 .../browser_dbg_propertyview-filter-06.js     |    2 +-
 .../browser_dbg_propertyview-filter-07.js     |    2 +-
 .../browser_dbg_propertyview-filter-08.js     |    2 +-
 .../test/browser_dbg_propertyview-reexpand.js |    2 +-
 .../test/browser_dbg_reload-same-script.js    |    2 +-
 .../test/browser_dbg_script-switching.js      |    2 +-
 .../test/browser_dbg_scripts-searching-01.js  |    2 +-
 .../test/browser_dbg_scripts-searching-02.js  |    2 +-
 .../test/browser_dbg_scripts-searching-03.js  |    2 +-
 .../test/browser_dbg_scripts-searching-04.js  |    2 +-
 .../test/browser_dbg_scripts-searching-05.js  |    2 +-
 .../test/browser_dbg_scripts-searching-06.js  |    2 +-
 .../test/browser_dbg_scripts-searching-07.js  |    2 +-
 .../test/browser_dbg_scripts-searching-08.js  |    2 +-
 .../browser_dbg_scripts-searching-popup.js    |    2 +-
 .../test/browser_dbg_scripts-sorting.js       |    2 +-
 .../debugger/test/browser_dbg_select-line.js  |    2 +-
 .../debugger/test/browser_dbg_stack-01.js     |    2 +-
 .../debugger/test/browser_dbg_stack-02.js     |    2 +-
 .../debugger/test/browser_dbg_stack-03.js     |    2 +-
 .../debugger/test/browser_dbg_stack-04.js     |    2 +-
 .../debugger/test/browser_dbg_stack-05.js     |    2 +-
 .../test/browser_dbg_update-editor-mode.js    |    2 +-
 browser/devtools/debugger/test/head.js        |   92 +-
 .../{highlighter => framework}/Makefile.in    |   10 +-
 browser/devtools/framework/Sidebar.jsm        |  191 ++
 browser/devtools/framework/Target.jsm         |  385 +++
 .../devtools/framework/ToolDefinitions.jsm    |   19 +
 browser/devtools/framework/Toolbox.jsm        |  523 ++++
 browser/devtools/framework/ToolboxHosts.jsm   |  208 ++
 .../devtools/framework/connect/connect.css    |   87 +
 browser/devtools/framework/connect/connect.js |  100 +
 .../devtools/framework/connect/connect.xhtml  |   45 +
 browser/devtools/framework/gDevTools.jsm      |  543 ++++
 browser/devtools/framework/test/Makefile.in   |   26 +
 .../framework/test/browser_devtools_api.js    |  137 +
 .../test/browser_new_activation_workflow.js   |   64 +
 .../framework/test/browser_target_events.js   |   58 +
 .../browser_toolbox_dynamic_registration.js   |  112 +
 .../framework/test/browser_toolbox_hosts.js   |  135 +
 .../framework/test/browser_toolbox_ready.js   |   56 +
 .../test/browser_toolbox_select_event.js      |   97 +
 .../framework/test/browser_toolbox_sidebar.js |  132 +
 .../test/browser_toolbox_tool_ready.js        |   72 +
 browser/devtools/framework/test/head.js       |   36 +
 browser/devtools/framework/toolbox-window.xul |   33 +
 browser/devtools/framework/toolbox.css        |   10 +
 browser/devtools/framework/toolbox.xul        |   27 +
 browser/devtools/highlighter/CmdInspect.jsm   |   29 -
 browser/devtools/highlighter/inspector.jsm    | 2414 -----------------
 ...r_inspector_bug_566084_location_changed.js |  120 -
 .../test/browser_inspector_bug_690361.js      |  107 -
 ..._inspector_bug_699308_iframe_navigation.js |   77 -
 .../test/browser_inspector_changes.js         |  124 -
 .../browser_inspector_highlighter_autohide.js |   59 -
 .../test/browser_inspector_initialization.js  |  191 --
 .../test/browser_inspector_invalidate.js      |   56 -
 .../test/browser_inspector_keybindings.js     |   78 -
 .../browser_inspector_pseudoClass_menu.js     |   87 -
 .../test/browser_inspector_ruleviewstore.js   |  105 -
 .../test/browser_inspector_sidebarstate.js    |   73 -
 .../test/browser_inspector_tab_switch.js      |  247 --
 .../test/browser_inspector_treeSelection.js   |   84 -
 browser/devtools/inspector/Breadcrumbs.jsm    |  593 ++++
 browser/devtools/inspector/CmdInspect.jsm     |   48 +
 .../Highlighter.jsm}                          |  433 ++-
 .../inspector/InspectorDefinition.jsm         |   45 +
 browser/devtools/inspector/InspectorPanel.jsm |  536 ++++
 browser/devtools/inspector/Makefile.in        |   18 +
 browser/devtools/inspector/Selection.jsm      |  230 ++
 browser/devtools/inspector/inspector.css      |   11 +
 browser/devtools/inspector/inspector.xul      |   71 +
 .../test/Makefile.in                          |   25 +-
 .../test/browser_inspector_breadcrumbs.html   |    0
 .../test/browser_inspector_breadcrumbs.js     |   37 +-
 ...r_inspector_bug_566084_location_changed.js |  131 +
 .../test/browser_inspector_bug_665880.js      |   28 +-
 ...inspector_bug_672902_keyboard_shortcuts.js |   55 +-
 .../test/browser_inspector_bug_674871.js      |   32 +-
 ..._inspector_bug_699308_iframe_navigation.js |   65 +
 .../test/browser_inspector_changes.js         |  112 +
 .../test/browser_inspector_cmd_inspect.html   |    0
 .../test/browser_inspector_cmd_inspect.js     |    2 +-
 .../browser_inspector_destroyselection.html   |    0
 .../browser_inspector_destroyselection.js     |   30 +-
 .../test/browser_inspector_highlighter.js     |   48 +-
 .../browser_inspector_highlighter_autohide.js |   46 +
 .../test/browser_inspector_iframeTest.js      |   33 +-
 .../test/browser_inspector_infobar.js         |   35 +-
 .../test/browser_inspector_initialization.js  |  147 +
 .../test/browser_inspector_invalidate.js      |   50 +
 .../test/browser_inspector_menu.js            |   43 +-
 .../browser_inspector_pseudoClass_menu.js     |   71 +
 .../browser_inspector_pseudoclass_lock.js     |   87 +-
 .../test/browser_inspector_scrolling.js       |   26 +-
 .../test/browser_inspector_sidebarstate.js    |   77 +
 .../test/browser_inspector_tree_height.js     |    0
 .../{highlighter => inspector}/test/head.js   |   39 +-
 .../test/helpers.js                           |    0
 browser/devtools/jar.mn                       |   13 +-
 browser/devtools/layoutview/LayoutView.jsm    |  368 ---
 browser/devtools/layoutview/Makefile.in       |    3 -
 .../layoutview/test/browser_layoutview.js     |   55 +-
 browser/devtools/layoutview/view.css          |    4 -
 browser/devtools/layoutview/view.js           |  248 ++
 browser/devtools/layoutview/view.xhtml        |   18 +-
 browser/devtools/markupview/MarkupView.jsm    |   61 +-
 .../test/browser_inspector_markup_edit.js     |  262 +-
 .../test/browser_inspector_markup_mutation.js |   28 +-
 .../browser_inspector_markup_navigation.html  |    4 +-
 .../browser_inspector_markup_navigation.js    |   35 +-
 browser/devtools/markupview/test/head.js      |    6 +
 .../devtools/responsivedesign/CmdResize.jsm   |    2 +
 .../responsivedesign/responsivedesign.jsm     |   14 +-
 .../test/browser_responsivecomputedview.js    |   27 +-
 .../test/browser_responsiveruleview.js        |   27 +-
 .../devtools/responsivedesign/test/head.js    |   21 +
 browser/devtools/scratchpad/CmdScratchpad.jsm |   21 +
 browser/devtools/scratchpad/scratchpad.js     |    7 +-
 browser/devtools/scratchpad/scratchpad.xul    |    4 -
 browser/devtools/shared/DeveloperToolbar.jsm  |  100 +-
 browser/devtools/shared/EventEmitter.jsm      |   25 +-
 .../shared/test/browser_eventemitter_basic.js |   18 +-
 .../shared/test/browser_toolbar_basic.js      |  111 +-
 ...browser_toolbar_webconsole_errors_count.js |   17 +-
 browser/devtools/shared/test/head.js          |    6 +
 browser/devtools/shared/test/leakhunt.js      |  155 +-
 browser/devtools/styleeditor/StyleEditor.jsm  |  137 +-
 .../styleeditor/StyleEditorChrome.jsm         |   63 +-
 .../styleeditor/StyleEditorDefinition.jsm     |   56 +
 .../devtools/styleeditor/StyleEditorPanel.jsm |  109 +
 browser/devtools/styleeditor/styleeditor.xul  |  188 +-
 browser/devtools/styleeditor/test/Makefile.in |    4 +-
 .../test/browser_styleeditor_init.js          |    8 -
 .../test/browser_styleeditor_loading.js       |   41 +-
 .../test/browser_styleeditor_passedinsheet.js |   83 +-
 .../test/browser_styleeditor_private.js       |   32 +-
 .../test/browser_styleeditor_reopen.js        |  189 +-
 browser/devtools/styleeditor/test/head.js     |   35 +-
 .../devtools/styleinspector/CssHtmlTree.jsm   |  141 +-
 .../styleinspector/StyleInspector.jsm         |  232 +-
 .../devtools/styleinspector/csshtmltree.xul   |   15 +-
 .../devtools/styleinspector/cssruleview.xul   |   14 +-
 .../devtools/styleinspector/test/Makefile.in  |   12 +-
 .../test/browser_bug589375_keybindings.js     |   47 +-
 .../styleinspector/test/browser_bug683672.js  |   47 +-
 ...r_bug722196_property_view_media_queries.js |   24 +-
 .../test/browser_bug_692400_element_style.js  |   27 +-
 ...r_computedview_734259_style_editor_link.js |   80 +-
 ...mputedview_bug_703643_context_menu_copy.js |   52 +-
 ...owser_ruleview_734259_style_editor_link.js |   92 +-
 ...r_ruleview_bug_703643_context_menu_copy.js |   74 +-
 .../test/browser_ruleview_focus.js            |   40 +-
 .../test/browser_styleinspector.js            |   32 +-
 ...styleinspector_bug_672744_search_filter.js |   54 +-
 ...tyleinspector_bug_672746_default_styles.js |   39 +-
 ...ector_bug_689759_no_results_placeholder.js |   52 +-
 browser/devtools/styleinspector/test/head.js  |  289 +-
 browser/devtools/tilt/CmdTilt.jsm             |   56 +-
 browser/devtools/tilt/Tilt.jsm                |  165 +-
 browser/devtools/tilt/TiltVisualizer.jsm      |  171 +-
 browser/devtools/tilt/test/Makefile.in        |    1 -
 .../tilt/test/browser_tilt_03_tab_switch.js   |   77 -
 .../browser_tilt_04_initialization-key.js     |   82 -
 .../test/browser_tilt_04_initialization.js    |    4 -
 .../test/browser_tilt_05_destruction-esc.js   |    3 -
 .../tilt/test/browser_tilt_05_destruction.js  |    2 +-
 .../browser_tilt_arcball-reset-typeahead.js   |    2 +-
 .../tilt/test/browser_tilt_arcball-reset.js   |    2 +-
 .../tilt/test/browser_tilt_picking.js         |    2 +-
 .../tilt/test/browser_tilt_picking_delete.js  |    2 +-
 .../browser_tilt_picking_highlight01-offs.js  |    2 +-
 .../test/browser_tilt_picking_highlight01.js  |    2 +-
 .../test/browser_tilt_picking_highlight02.js  |    2 +-
 .../test/browser_tilt_picking_highlight03.js  |    2 +-
 .../tilt/test/browser_tilt_picking_miv.js     |    2 +-
 .../tilt/test/browser_tilt_visualizer.js      |    3 +-
 .../devtools/tilt/test/browser_tilt_zoom.js   |   10 +-
 browser/devtools/tilt/test/head.js            |   50 +-
 browser/devtools/webconsole/HUDService.jsm    |  567 +---
 browser/devtools/webconsole/Makefile.in       |    1 +
 .../devtools/webconsole/WebConsolePanel.jsm   |  102 +
 browser/devtools/webconsole/test/Makefile.in  |   18 +-
 ...wser_webconsole_bug_581231_close_button.js |   37 -
 ...eactivateHUDForContext_unfocused_window.js |   20 +-
 ...r_webconsole_bug_601909_remember_height.js |  107 -
 ...bconsole_bug_602572_log_bodies_checkbox.js |    2 -
 ...ebconsole_bug_622303_persistent_filters.js |    9 +-
 ...e_bug_653531_highlighter_console_helper.js |   34 +-
 ...owser_webconsole_bug_660806_history_nav.js |    8 +-
 ...owser_webconsole_bug_663443_panel_title.js |   57 -
 ...le_bug_782653_CSS_links_in_Style_Editor.js |  140 +-
 .../test/browser_webconsole_menustatus.js     |   33 -
 .../test/browser_webconsole_position_ui.js    |  207 --
 .../test/browser_webconsole_window_zombie.js  |   42 -
 browser/devtools/webconsole/test/head.js      |   80 +-
 browser/devtools/webconsole/webconsole.js     |  135 +-
 browser/devtools/webconsole/webconsole.xul    |   25 -
 .../locales/en-US/chrome/browser/browser.dtd  |   48 +-
 .../browser/devtools/connection-screen.dtd    |   15 +
 .../browser/devtools/debugger.properties      |   13 +
 .../chrome/browser/devtools/inspector.dtd     |   10 +
 .../browser/devtools/inspector.properties     |   32 +-
 .../chrome/browser/devtools/layoutview.dtd    |    1 +
 .../chrome/browser/devtools/scratchpad.dtd    |    6 -
 .../browser/devtools/styleeditor.properties   |   12 +
 .../browser/devtools/styleinspector.dtd       |    4 +
 .../devtools/styleinspector.properties        |   13 -
 .../en-US/chrome/browser/devtools/toolbox.dtd |    7 +
 .../chrome/browser/devtools/webConsole.dtd    |   21 -
 .../browser/devtools/webconsole.properties    |    8 +
 browser/locales/jar.mn                        |    3 +
 browser/makefiles.sh                          |    4 +-
 browser/themes/gnomestripe/browser.css        |  344 +--
 .../devtools/command-responsivemode.png       |  Bin 0 -> 1083 bytes
 .../devtools/command-scratchpad.png           |  Bin 0 -> 584 bytes
 .../gnomestripe/devtools/command-tilt.png     |  Bin 0 -> 1668 bytes
 .../themes/gnomestripe/devtools/common.css    |   59 +
 .../gnomestripe/devtools/dock-bottom.png      |  Bin 0 -> 487 bytes
 .../themes/gnomestripe/devtools/dock-side.png |  Bin 0 -> 536 bytes
 .../gnomestripe/devtools/dock-window.png      |  Bin 0 -> 806 bytes
 .../themes/gnomestripe/devtools/inspector.css |  214 ++
 .../devtools/layout-background.png            |  Bin 981 -> 0 bytes
 .../gnomestripe/devtools/layout-buttons.png   |  Bin 447 -> 0 bytes
 .../gnomestripe/devtools/layoutview.css       |   16 +-
 .../themes/gnomestripe/devtools/toolbox.css   |   99 +
 .../gnomestripe/devtools/treepanel-button.png |  Bin 805 -> 0 bytes
 browser/themes/gnomestripe/jar.mn             |   11 +-
 browser/themes/pinstripe/browser.css          |  341 +--
 .../devtools/command-responsivemode.png       |  Bin 0 -> 1083 bytes
 .../pinstripe/devtools/command-scratchpad.png |  Bin 0 -> 584 bytes
 .../pinstripe/devtools/command-tilt.png       |  Bin 0 -> 1668 bytes
 browser/themes/pinstripe/devtools/common.css  |   54 +
 .../themes/pinstripe/devtools/dock-bottom.png |  Bin 0 -> 487 bytes
 .../themes/pinstripe/devtools/dock-side.png   |  Bin 0 -> 536 bytes
 .../themes/pinstripe/devtools/dock-window.png |  Bin 0 -> 806 bytes
 .../themes/pinstripe/devtools/inspector.css   |  229 ++
 .../pinstripe/devtools/layout-background.png  |  Bin 981 -> 0 bytes
 .../pinstripe/devtools/layout-buttons.png     |  Bin 447 -> 0 bytes
 .../themes/pinstripe/devtools/layoutview.css  |   16 +-
 browser/themes/pinstripe/devtools/toolbox.css |   99 +
 .../pinstripe/devtools/treepanel-button.png   |  Bin 805 -> 0 bytes
 browser/themes/pinstripe/jar.mn               |   11 +-
 browser/themes/winstripe/browser.css          |  343 +--
 .../devtools/command-responsivemode.png       |  Bin 0 -> 1083 bytes
 .../winstripe/devtools/command-scratchpad.png |  Bin 0 -> 584 bytes
 .../winstripe/devtools/command-tilt.png       |  Bin 0 -> 1668 bytes
 browser/themes/winstripe/devtools/common.css  |   59 +
 .../themes/winstripe/devtools/dock-bottom.png |  Bin 0 -> 487 bytes
 .../themes/winstripe/devtools/dock-side.png   |  Bin 0 -> 536 bytes
 .../themes/winstripe/devtools/dock-window.png |  Bin 0 -> 806 bytes
 .../themes/winstripe/devtools/inspector.css   |  218 ++
 .../winstripe/devtools/layout-background.png  |  Bin 981 -> 0 bytes
 .../winstripe/devtools/layout-buttons.png     |  Bin 447 -> 0 bytes
 .../themes/winstripe/devtools/layoutview.css  |   16 +-
 browser/themes/winstripe/devtools/toolbox.css |  103 +
 .../winstripe/devtools/treepanel-button.png   |  Bin 805 -> 0 bytes
 browser/themes/winstripe/jar.mn               |   26 +-
 .../devtools/webconsole/WebConsoleUtils.jsm   |   13 +-
 325 files changed, 10297 insertions(+), 10105 deletions(-)
 create mode 100644 browser/devtools/debugger/DebuggerPanel.jsm
 delete mode 100644 browser/devtools/debugger/test/browser_dbg_panesize.js
 rename browser/devtools/{highlighter => framework}/Makefile.in (68%)
 create mode 100644 browser/devtools/framework/Sidebar.jsm
 create mode 100644 browser/devtools/framework/Target.jsm
 create mode 100644 browser/devtools/framework/ToolDefinitions.jsm
 create mode 100644 browser/devtools/framework/Toolbox.jsm
 create mode 100644 browser/devtools/framework/ToolboxHosts.jsm
 create mode 100644 browser/devtools/framework/connect/connect.css
 create mode 100644 browser/devtools/framework/connect/connect.js
 create mode 100644 browser/devtools/framework/connect/connect.xhtml
 create mode 100644 browser/devtools/framework/gDevTools.jsm
 create mode 100644 browser/devtools/framework/test/Makefile.in
 create mode 100644 browser/devtools/framework/test/browser_devtools_api.js
 create mode 100644 browser/devtools/framework/test/browser_new_activation_workflow.js
 create mode 100644 browser/devtools/framework/test/browser_target_events.js
 create mode 100644 browser/devtools/framework/test/browser_toolbox_dynamic_registration.js
 create mode 100644 browser/devtools/framework/test/browser_toolbox_hosts.js
 create mode 100644 browser/devtools/framework/test/browser_toolbox_ready.js
 create mode 100644 browser/devtools/framework/test/browser_toolbox_select_event.js
 create mode 100644 browser/devtools/framework/test/browser_toolbox_sidebar.js
 create mode 100644 browser/devtools/framework/test/browser_toolbox_tool_ready.js
 create mode 100644 browser/devtools/framework/test/head.js
 create mode 100644 browser/devtools/framework/toolbox-window.xul
 create mode 100644 browser/devtools/framework/toolbox.css
 create mode 100644 browser/devtools/framework/toolbox.xul
 delete mode 100644 browser/devtools/highlighter/CmdInspect.jsm
 delete mode 100644 browser/devtools/highlighter/inspector.jsm
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_bug_566084_location_changed.js
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_bug_690361.js
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_bug_699308_iframe_navigation.js
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_changes.js
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_highlighter_autohide.js
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_initialization.js
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_invalidate.js
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_keybindings.js
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_pseudoClass_menu.js
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_ruleviewstore.js
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_sidebarstate.js
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_tab_switch.js
 delete mode 100644 browser/devtools/highlighter/test/browser_inspector_treeSelection.js
 create mode 100644 browser/devtools/inspector/Breadcrumbs.jsm
 create mode 100644 browser/devtools/inspector/CmdInspect.jsm
 rename browser/devtools/{highlighter/highlighter.jsm => inspector/Highlighter.jsm} (64%)
 create mode 100644 browser/devtools/inspector/InspectorDefinition.jsm
 create mode 100644 browser/devtools/inspector/InspectorPanel.jsm
 create mode 100644 browser/devtools/inspector/Makefile.in
 create mode 100644 browser/devtools/inspector/Selection.jsm
 create mode 100644 browser/devtools/inspector/inspector.css
 create mode 100644 browser/devtools/inspector/inspector.xul
 rename browser/devtools/{highlighter => inspector}/test/Makefile.in (88%)
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_breadcrumbs.html (100%)
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_breadcrumbs.js (68%)
 create mode 100644 browser/devtools/inspector/test/browser_inspector_bug_566084_location_changed.js
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_bug_665880.js (52%)
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_bug_672902_keyboard_shortcuts.js (51%)
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_bug_674871.js (68%)
 create mode 100644 browser/devtools/inspector/test/browser_inspector_bug_699308_iframe_navigation.js
 create mode 100644 browser/devtools/inspector/test/browser_inspector_changes.js
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_cmd_inspect.html (100%)
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_cmd_inspect.js (97%)
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_destroyselection.html (100%)
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_destroyselection.js (55%)
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_highlighter.js (78%)
 create mode 100644 browser/devtools/inspector/test/browser_inspector_highlighter_autohide.js
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_iframeTest.js (72%)
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_infobar.js (72%)
 create mode 100644 browser/devtools/inspector/test/browser_inspector_initialization.js
 create mode 100644 browser/devtools/inspector/test/browser_inspector_invalidate.js
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_menu.js (62%)
 create mode 100644 browser/devtools/inspector/test/browser_inspector_pseudoClass_menu.js
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_pseudoclass_lock.js (59%)
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_scrolling.js (76%)
 create mode 100644 browser/devtools/inspector/test/browser_inspector_sidebarstate.js
 rename browser/devtools/{highlighter => inspector}/test/browser_inspector_tree_height.js (100%)
 rename browser/devtools/{highlighter => inspector}/test/head.js (64%)
 rename browser/devtools/{highlighter => inspector}/test/helpers.js (100%)
 delete mode 100644 browser/devtools/layoutview/LayoutView.jsm
 create mode 100644 browser/devtools/layoutview/view.js
 create mode 100644 browser/devtools/scratchpad/CmdScratchpad.jsm
 create mode 100644 browser/devtools/styleeditor/StyleEditorDefinition.jsm
 create mode 100644 browser/devtools/styleeditor/StyleEditorPanel.jsm
 delete mode 100644 browser/devtools/tilt/test/browser_tilt_04_initialization-key.js
 create mode 100644 browser/devtools/webconsole/WebConsolePanel.jsm
 delete mode 100644 browser/devtools/webconsole/test/browser_webconsole_bug_581231_close_button.js
 delete mode 100644 browser/devtools/webconsole/test/browser_webconsole_bug_601909_remember_height.js
 delete mode 100644 browser/devtools/webconsole/test/browser_webconsole_bug_663443_panel_title.js
 delete mode 100644 browser/devtools/webconsole/test/browser_webconsole_menustatus.js
 delete mode 100644 browser/devtools/webconsole/test/browser_webconsole_position_ui.js
 delete mode 100644 browser/devtools/webconsole/test/browser_webconsole_window_zombie.js
 create mode 100644 browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd
 create mode 100644 browser/locales/en-US/chrome/browser/devtools/inspector.dtd
 create mode 100644 browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
 create mode 100644 browser/themes/gnomestripe/devtools/command-responsivemode.png
 create mode 100644 browser/themes/gnomestripe/devtools/command-scratchpad.png
 create mode 100644 browser/themes/gnomestripe/devtools/command-tilt.png
 create mode 100644 browser/themes/gnomestripe/devtools/dock-bottom.png
 create mode 100644 browser/themes/gnomestripe/devtools/dock-side.png
 create mode 100644 browser/themes/gnomestripe/devtools/dock-window.png
 create mode 100644 browser/themes/gnomestripe/devtools/inspector.css
 delete mode 100644 browser/themes/gnomestripe/devtools/layout-background.png
 delete mode 100644 browser/themes/gnomestripe/devtools/layout-buttons.png
 create mode 100644 browser/themes/gnomestripe/devtools/toolbox.css
 delete mode 100644 browser/themes/gnomestripe/devtools/treepanel-button.png
 create mode 100644 browser/themes/pinstripe/devtools/command-responsivemode.png
 create mode 100644 browser/themes/pinstripe/devtools/command-scratchpad.png
 create mode 100644 browser/themes/pinstripe/devtools/command-tilt.png
 create mode 100644 browser/themes/pinstripe/devtools/dock-bottom.png
 create mode 100644 browser/themes/pinstripe/devtools/dock-side.png
 create mode 100644 browser/themes/pinstripe/devtools/dock-window.png
 create mode 100644 browser/themes/pinstripe/devtools/inspector.css
 delete mode 100644 browser/themes/pinstripe/devtools/layout-background.png
 delete mode 100644 browser/themes/pinstripe/devtools/layout-buttons.png
 create mode 100644 browser/themes/pinstripe/devtools/toolbox.css
 delete mode 100644 browser/themes/pinstripe/devtools/treepanel-button.png
 create mode 100644 browser/themes/winstripe/devtools/command-responsivemode.png
 create mode 100644 browser/themes/winstripe/devtools/command-scratchpad.png
 create mode 100644 browser/themes/winstripe/devtools/command-tilt.png
 create mode 100644 browser/themes/winstripe/devtools/dock-bottom.png
 create mode 100644 browser/themes/winstripe/devtools/dock-side.png
 create mode 100644 browser/themes/winstripe/devtools/dock-window.png
 create mode 100644 browser/themes/winstripe/devtools/inspector.css
 delete mode 100644 browser/themes/winstripe/devtools/layout-background.png
 delete mode 100644 browser/themes/winstripe/devtools/layout-buttons.png
 create mode 100644 browser/themes/winstripe/devtools/toolbox.css
 delete mode 100644 browser/themes/winstripe/devtools/treepanel-button.png

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 677e9637829f..e84052b863c6 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1010,11 +1010,16 @@ pref("devtools.toolbar.visible", false);
 pref("devtools.gcli.allowSet", false);
 pref("devtools.commands.dir", "");
 
+// Toolbox preferences
+pref("devtools.toolbox.footer.height", 250);
+pref("devtools.toolbox.sidebar.width", 500);
+pref("devtools.toolbox.host", "bottom");
+pref("devtools.toolbox.selectedTool", "webconsole");
+pref("devtools.toolbox.toolbarSpec", '["tilt toggle","scratchpad","resize toggle"]');
+pref("devtools.toolbox.sideEnabled", false);
+
 // Enable the Inspector
 pref("devtools.inspector.enabled", true);
-pref("devtools.inspector.htmlHeight", 112);
-pref("devtools.inspector.htmlPanelOpen", false);
-pref("devtools.inspector.sidebarOpen", false);
 pref("devtools.inspector.activeSidebar", "ruleview");
 pref("devtools.inspector.markupPreview", false);
 
@@ -1046,17 +1051,11 @@ pref("devtools.debugger.ui.variables-sorting-enabled", true);
 pref("devtools.debugger.ui.variables-non-enum-visible", true);
 pref("devtools.debugger.ui.variables-searchbox-visible", false);
 
-// Enable the style inspector
-pref("devtools.styleinspector.enabled", true);
-
 // Enable the Tilt inspector
 pref("devtools.tilt.enabled", true);
 pref("devtools.tilt.intro_transition", true);
 pref("devtools.tilt.outro_transition", true);
 
-// Enable the rules view
-pref("devtools.ruleview.enabled", true);
-
 // Enable the Scratchpad tool.
 pref("devtools.scratchpad.enabled", true);
 
@@ -1081,17 +1080,6 @@ pref("devtools.gcli.eagerHelper", 2);
 // Do we allow the 'pref set' command
 pref("devtools.gcli.allowSet", false);
 
-// The last Web Console height. This is initially 0 which means that the Web
-// Console will use the default height next time it shows.
-// Change to -1 if you do not want the Web Console to remember its last height.
-pref("devtools.hud.height", 0);
-
-// Remember the Web Console position. Possible values:
-//   above - above the web page,
-//   below - below the web page,
-//   window - in a separate window/popup panel.
-pref("devtools.webconsole.position", "below");
-
 // Remember the Web Console filters
 pref("devtools.webconsole.filter.network", true);
 pref("devtools.webconsole.filter.networkinfo", true);
diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
index a195f1808381..479b542941d2 100644
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -150,20 +150,27 @@
       <menu id="appmenu_webDeveloper"
             label="&appMenuWebDeveloper.label;">
         <menupopup id="appmenu_webDeveloper_popup">
-          <menuitem id="appmenu_devToolbar" observes="devtoolsMenuBroadcaster_DevToolbar"/>
-          <menuitem id="appmenu_webConsole" observes="devtoolsMenuBroadcaster_WebConsole"/>
-          <menuitem id="appmenu_remoteWebConsole" observes="devtoolsMenuBroadcaster_RemoteWebConsole"/>
-          <menuitem id="appmenu_pageinspect" observes="devtoolsMenuBroadcaster_Inspect"/>
-          <menuitem id="appmenu_responsiveUI" observes="devtoolsMenuBroadcaster_ResponsiveUI"/>
-          <menuitem id="appmenu_debugger" observes="devtoolsMenuBroadcaster_Debugger"/>
-          <menuitem id="appmenu_remoteDebugger" observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
-          <menuitem id="appmenu_chromeDebugger" observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
-          <menuitem id="appmenu_scratchpad" observes="devtoolsMenuBroadcaster_Scratchpad"/>
-          <menuitem id="appmenu_styleeditor" observes="devtoolsMenuBroadcaster_StyleEditor"/>
-          <menuitem id="appmenu_pageSource" observes="devtoolsMenuBroadcaster_PageSource"/>
-          <menuitem id="appmenu_errorConsole" observes="devtoolsMenuBroadcaster_ErrorConsole"/>
+          <menuitem id="appmenu_devToolbox"
+                    observes="devtoolsMenuBroadcaster_DevToolbox"/>
+          <menuseparator id="appmenu_devtools_separator"/>
+          <menuitem id="appmenu_devToolbar"
+                    observes="devtoolsMenuBroadcaster_DevToolbar"/>
+          <menuitem id="appmenu_remoteWebConsole"
+                    observes="devtoolsMenuBroadcaster_RemoteWebConsole"/>
+          <menuitem id="appmenu_responsiveUI"
+                    observes="devtoolsMenuBroadcaster_ResponsiveUI"/>
+          <menuitem id="appmenu_scratchpad"
+                    observes="devtoolsMenuBroadcaster_Scratchpad"/>
+          <menuitem id="appmenu_pageSource"
+                    observes="devtoolsMenuBroadcaster_PageSource"/>
+          <menuitem id="appmenu_errorConsole"
+                    observes="devtoolsMenuBroadcaster_ErrorConsole"/>
+          <menuseparator id="appmenu_devToolsConnectSeparator"/>
+          <menuitem id="appmenu_devtools_connect"
+                    observes="devtoolsMenuBroadcaster_connect"/>
           <menuseparator id="appmenu_devToolsEndSeparator"/>
-          <menuitem id="appmenu_getMoreDevtools" observes="devtoolsMenuBroadcaster_GetMoreTools"/>
+          <menuitem id="appmenu_getMoreDevtools"
+                    observes="devtoolsMenuBroadcaster_GetMoreTools"/>
           <menuseparator/>
 #define ID_PREFIX appmenu_developer_
 #define OMIT_ACCESSKEYS
diff --git a/browser/base/content/browser-doctype.inc b/browser/base/content/browser-doctype.inc
index 17c1e45f9823..cacd4d3a58c3 100644
--- a/browser/base/content/browser-doctype.inc
+++ b/browser/base/content/browser-doctype.inc
@@ -19,7 +19,5 @@
 #endif
 <!ENTITY % aboutHomeDTD SYSTEM "chrome://browser/locale/aboutHome.dtd">
 %aboutHomeDTD;
-<!ENTITY % debuggerDTD SYSTEM "chrome://browser/locale/devtools/debugger.dtd">
-%debuggerDTD;
 ]>
 
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index a57e55c7ff74..3c968849df17 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -557,20 +557,34 @@
                     label="&webDeveloperMenu.label;"
                     accesskey="&webDeveloperMenu.accesskey;">
                 <menupopup id="menuWebDeveloperPopup">
-                  <menuitem id="menu_devToolbar" observes="devtoolsMenuBroadcaster_DevToolbar" accesskey="&devToolbarMenu.accesskey;"/>
-                  <menuitem id="webConsole" observes="devtoolsMenuBroadcaster_WebConsole" accesskey="&webConsoleCmd.accesskey;"/>
-                  <menuitem id="menu_remoteWebConsole" observes="devtoolsMenuBroadcaster_RemoteWebConsole"/>
-                  <menuitem id="menu_pageinspect" observes="devtoolsMenuBroadcaster_Inspect" accesskey="&inspectMenu.accesskey;"/>
-                  <menuitem id="menu_responsiveUI" observes="devtoolsMenuBroadcaster_ResponsiveUI" accesskey="&responsiveDesignTool.accesskey;"/>
-                  <menuitem id="menu_debugger" observes="devtoolsMenuBroadcaster_Debugger" accesskey="&debuggerMenu.accesskey;"/>
-                  <menuitem id="menu_remoteDebugger" observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
-                  <menuitem id="menu_chromeDebugger" observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
-                  <menuitem id="menu_scratchpad" observes="devtoolsMenuBroadcaster_Scratchpad" accesskey="&scratchpad.accesskey;"/>
-                  <menuitem id="menu_styleeditor" observes="devtoolsMenuBroadcaster_StyleEditor" accesskey="&styleeditor.accesskey;"/>
-                  <menuitem id="menu_pageSource" observes="devtoolsMenuBroadcaster_PageSource" accesskey="&pageSourceCmd.accesskey;"/>
-                  <menuitem id="javascriptConsole" observes="devtoolsMenuBroadcaster_ErrorConsole" accesskey="&errorConsoleCmd.accesskey;"/>
+                  <menuitem id="menu_devToolbox"
+                            observes="devtoolsMenuBroadcaster_DevToolbox"
+                            accesskey="&devToolbox.accesskey;"/>
+                  <menuseparator id="menu_devtools_separator"/>
+                  <menuitem id="menu_devToolbar"
+                            observes="devtoolsMenuBroadcaster_DevToolbar"
+                            accesskey="&devToolbarMenu.accesskey;"/>
+                  <menuitem id="menu_remoteWebConsole"
+                            observes="devtoolsMenuBroadcaster_RemoteWebConsole"/>
+                  <menuitem id="menu_responsiveUI"
+                            observes="devtoolsMenuBroadcaster_ResponsiveUI"
+                            accesskey="&responsiveDesignTool.accesskey;"/>
+                  <menuitem id="menu_scratchpad"
+                            observes="devtoolsMenuBroadcaster_Scratchpad"
+                            accesskey="&scratchpad.accesskey;"/>
+                  <menuitem id="menu_pageSource"
+                            observes="devtoolsMenuBroadcaster_PageSource"
+                            accesskey="&pageSourceCmd.accesskey;"/>
+                  <menuitem id="javascriptConsole"
+                            observes="devtoolsMenuBroadcaster_ErrorConsole"
+                            accesskey="&errorConsoleCmd.accesskey;"/>
+                  <menuseparator id="menu_devToolsConnectSeparator"/>
+                  <menuitem id="menu_devtools_connect"
+                            observes="devtoolsMenuBroadcaster_connect"/>
                   <menuseparator id="devToolsEndSeparator"/>
-                  <menuitem id="getMoreDevtools" observes="devtoolsMenuBroadcaster_GetMoreTools" accesskey="&getMoreDevtoolsCmd.accesskey;"/>
+                  <menuitem id="getMoreDevtools"
+                            observes="devtoolsMenuBroadcaster_GetMoreTools"
+                            accesskey="&getMoreDevtoolsCmd.accesskey;"/>
                 </menupopup>
               </menu>
               <menuitem id="menu_pageInfo"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 46c6f192df63..ba917712b721 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -88,19 +88,15 @@
 
     <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>
     <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
+    <command id="Tools:DevToolbox" oncommand="gDevTools.toggleToolboxCommand(gBrowser);"/>
     <command id="Tools:DevToolbar" oncommand="DeveloperToolbar.toggle();" disabled="true" hidden="true"/>
     <command id="Tools:DevToolbarFocus" oncommand="DeveloperToolbar.focusToggle();" disabled="true"/>
-    <command id="Tools:WebConsole" oncommand="HUDConsoleUI.toggleHUD();"/>
     <command id="Tools:RemoteWebConsole" oncommand="HUDConsoleUI.toggleRemoteHUD();" disabled="true" hidden="true"/>
-    <command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();"/>
-    <command id="Tools:Debugger" oncommand="DebuggerUI.toggleDebugger();" disabled="true" hidden="true"/>
-    <command id="Tools:RemoteDebugger" oncommand="DebuggerUI.toggleRemoteDebugger();" disabled="true" hidden="true"/>
-    <command id="Tools:ChromeDebugger" oncommand="DebuggerUI.toggleChromeDebugger();" disabled="true" hidden="true"/>
     <command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();" disabled="true" hidden="true"/>
-    <command id="Tools:StyleEditor" oncommand="StyleEditor.toggle();" disabled="true" hidden="true"/>
     <command id="Tools:ResponsiveUI" oncommand="ResponsiveUI.toggle();" disabled="true" hidden="true"/>
     <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
     <command id="Tools:ErrorConsole" oncommand="toJavaScriptConsole()" disabled="true" hidden="true"/>
+    <command id="Tools:DevToolsConnect" oncommand="DevToolsXULCommands.openConnectScreen(gBrowser)"/>
     <command id="Tools:Sanitize"
      oncommand="Cc['@mozilla.org/browser/browserglue;1'].getService(Ci.nsIBrowserGlue).sanitize(window);"/>
     <command id="Tools:PrivateBrowsing"
@@ -127,27 +123,6 @@
              oncommand="PlacesCommandHook.showPlacesOrganizer('History');"/>
   </commandset>
 
-  <commandset id="inspectorCommands">
-    <command id="Inspector:Inspect"
-             oncommand="InspectorUI.toggleInspection();"/>
-    <command id="Inspector:Sidebar"
-             oncommand="InspectorUI.toggleSidebar();"/>
-    <command id="Inspector:Tilt"
-             oncommand="Tilt.initialize();"/>
-    <command id="Inspector:HTMLPanel"
-             oncommand="InspectorUI.toggleHTMLPanel();"/>
-    <command id="Inspector:CopyInner"
-             oncommand="InspectorUI.copyInnerHTML();"/>
-    <command id="Inspector:CopyOuter"
-             oncommand="InspectorUI.copyOuterHTML();"/>
-    <command id="Inspector:DeleteNode"
-             oncommand="InspectorUI.deleteNode();"/>
-    <command id="Inspector:ToggleVeil"
-             oncommand="InspectorUI.toggleVeil();"/>
-    <command id="Inspector:ToggleInfobar"
-             oncommand="InspectorUI.toggleInfobar();"/>
-  </commandset>
-
   <broadcasterset id="mainBroadcasterSet">
     <broadcaster id="viewBookmarksSidebar" autoCheck="false" label="&bookmarksButton.label;"
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/bookmarks/bookmarksPanel.xul"
@@ -195,45 +170,23 @@
     <broadcaster id="socialSidebarBroadcaster" hidden="true"/>
 
     <!-- DevTools broadcasters -->
+    <broadcaster id="devtoolsMenuBroadcaster_DevToolbox"
+                 label="&devToolbarToolsButton.label;"
+                 type="checkbox" autocheck="false"
+                 command="Tools:DevToolbox"/>
     <broadcaster id="devtoolsMenuBroadcaster_DevToolbar"
                  label="&devToolbarMenu.label;"
                  type="checkbox" autocheck="false"
                  command="Tools:DevToolbar"
                  key="key_devToolbar"/>
-    <broadcaster id="devtoolsMenuBroadcaster_WebConsole"
-                 label="&webConsoleCmd.label;"
-                 type="checkbox" autocheck="false"
-                 key="key_webConsole"
-                 command="Tools:WebConsole"/>
     <broadcaster id="devtoolsMenuBroadcaster_RemoteWebConsole"
                  label="&remoteWebConsoleCmd.label;"
                  type="checkbox" autocheck="false"
                  command="Tools:RemoteWebConsole"/>
-    <broadcaster id="devtoolsMenuBroadcaster_Inspect"
-                 label="&inspectMenu.label;"
-                 type="checkbox" autocheck="false"
-                 command="Tools:Inspect"
-                 key="key_inspect"/>
-    <broadcaster id="devtoolsMenuBroadcaster_Debugger"
-                 label="&debuggerMenu.label2;"
-                 type="checkbox" autocheck="false"
-                 command="Tools:Debugger"
-                 key="key_debugger"/>
-    <broadcaster id="devtoolsMenuBroadcaster_RemoteDebugger"
-                 label="&remoteDebuggerMenu.label;"
-                 command="Tools:RemoteDebugger"/>
-    <broadcaster id="devtoolsMenuBroadcaster_ChromeDebugger"
-                 label="&chromeDebuggerMenu.label;"
-                 command="Tools:ChromeDebugger"/>
     <broadcaster id="devtoolsMenuBroadcaster_Scratchpad"
                  label="&scratchpad.label;"
                  command="Tools:Scratchpad"
                  key="key_scratchpad"/>
-    <broadcaster id="devtoolsMenuBroadcaster_StyleEditor"
-                 label="&styleeditor.label;"
-                 type="checkbox" autocheck="false"
-                 command="Tools:StyleEditor"
-                 key="key_styleeditor"/>
     <broadcaster id="devtoolsMenuBroadcaster_ResponsiveUI"
                  label="&responsiveDesignTool.label;"
                  type="checkbox" autocheck="false"
@@ -250,6 +203,9 @@
     <broadcaster id="devtoolsMenuBroadcaster_GetMoreTools"
                  label="&getMoreDevtoolsCmd.label;"
                  oncommand="openUILinkIn('https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/', 'tab');"/>
+    <broadcaster id="devtoolsMenuBroadcaster_connect"
+                 label="&devtoolsConnect.label;"
+                 command="Tools:DevToolsConnect"/>
 
     <!-- SocialAPI broadcasters -->
     <broadcaster id="socialBroadcaster_userDetails"
@@ -271,7 +227,7 @@
 
 #
 # Search Command Key Logic works like this:
-# 
+#
 # Unix: Ctrl+K (cross platform binding)
 #       Ctrl+J (in case of emacs Ctrl-K conflict)
 # Mac:  Cmd+K (cross platform binding)
@@ -303,27 +259,6 @@
     <key id="key_errorConsole" key="&errorConsoleCmd.commandkey;" command="Tools:ErrorConsole" modifiers="accel,shift"/>
     <key id="key_devToolbar" keycode="&devToolbar.keycode;" modifiers="shift"
          keytext="&devToolbar.keytext;" command="Tools:DevToolbarFocus"/>
-    <key id="key_webConsole" key="&webConsoleCmd.commandkey;" oncommand="HUDConsoleUI.toggleHUD();"
-#ifdef XP_MACOSX
-        modifiers="accel,alt"
-#else
-        modifiers="accel,shift"
-#endif
-    />
-    <key id="key_debugger" key="&debuggerMenu.commandkey;" command="Tools:Debugger"
-#ifdef XP_MACOSX
-        modifiers="accel,alt"
-#else
-        modifiers="accel,shift"
-#endif
-    />
-    <key id="key_inspect" key="&inspectMenu.commandkey;" command="Inspector:Inspect"
-#ifdef XP_MACOSX
-        modifiers="accel,alt"
-#else
-        modifiers="accel,shift"
-#endif
-    />
     <key id="key_responsiveUI" key="&responsiveDesignTool.commandkey;" command="Tools:ResponsiveUI"
 #ifdef XP_MACOSX
         modifiers="accel,alt"
@@ -333,8 +268,6 @@
     />
     <key id="key_scratchpad" keycode="&scratchpad.keycode;" modifiers="shift"
          keytext="&scratchpad.keytext;" command="Tools:Scratchpad"/>
-    <key id="key_styleeditor" keycode="&styleeditor.keycode;" modifiers="shift"
-         keytext="&styleeditor.keytext;" command="Tools:StyleEditor"/>
     <key id="openFileKb" key="&openFileCmd.commandkey;" command="Browser:OpenFile"  modifiers="accel"/>
     <key id="key_savePage" key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
     <key id="printKb" key="&printCmd.commandkey;" command="cmd_print"  modifiers="accel"/>
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 1e59706185bc..665216674817 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -562,10 +562,6 @@ statuspanel[inactive][previoustype=overLink] {
   -moz-box-align: end;
 }
 
-.styleInspector {
-  min-width: 350px;
-}
-
 .panel-inner-arrowcontentfooter[footertype="promobox"] {
   -moz-binding: url("chrome://browser/content/urlbarBindings.xml#promobox");
 }
@@ -593,22 +589,16 @@ html|*#gcli-output-frame,
   direction: ltr;
 }
 
-#developer-toolbar-webconsole[error-count] > .toolbarbutton-icon {
+#developer-toolbar-toolbox-button[error-count] > .toolbarbutton-icon {
   display: none;
 }
 
-#developer-toolbar-webconsole[error-count]:before {
+#developer-toolbar-toolbox-button[error-count]:before {
   content: attr(error-count);
   display: -moz-box;
   -moz-box-pack: center;
 }
 
-/* We don't show the Style Editor button in the developer toolbar for now.
-   See bug 771203 */
-#developer-toolbar-styleeditor {
-  display: none;
-}
-
 /* Responsive Mode */
 
 .browserContainer[responsivemode] {
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e34523e7744f..8bc54889932f 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -118,24 +118,6 @@ XPCOMUtils.defineLazyGetter(this, "DeveloperToolbar", function() {
   return new tmp.DeveloperToolbar(window, document.getElementById("developer-toolbar"));
 });
 
-XPCOMUtils.defineLazyGetter(this, "InspectorUI", function() {
-  let tmp = {};
-  Cu.import("resource:///modules/inspector.jsm", tmp);
-  return new tmp.InspectorUI(window);
-});
-
-XPCOMUtils.defineLazyGetter(this, "DebuggerUI", function() {
-  let tmp = {};
-  Cu.import("resource:///modules/devtools/DebuggerUI.jsm", tmp);
-  return new tmp.DebuggerUI(window);
-});
-
-XPCOMUtils.defineLazyGetter(this, "Tilt", function() {
-  let tmp = {};
-  Cu.import("resource:///modules/devtools/Tilt.jsm", tmp);
-  return new tmp.Tilt(window);
-});
-
 XPCOMUtils.defineLazyGetter(this, "Social", function() {
   let tmp = {};
   Cu.import("resource:///modules/Social.jsm", tmp);
@@ -1436,36 +1418,6 @@ var gBrowserInit = {
       }
     }
 
-    // Enable Debugger?
-    let enabled = gPrefService.getBoolPref("devtools.debugger.enabled");
-    if (enabled) {
-      let cmd = document.getElementById("Tools:Debugger");
-      cmd.removeAttribute("disabled");
-      cmd.removeAttribute("hidden");
-    }
-
-    // Enable Remote Debugger?
-    let enabled = gPrefService.getBoolPref("devtools.debugger.remote-enabled");
-    if (enabled) {
-      let cmd = document.getElementById("Tools:RemoteDebugger");
-      cmd.removeAttribute("disabled");
-      cmd.removeAttribute("hidden");
-
-      cmd = document.getElementById("Tools:RemoteWebConsole");
-      cmd.removeAttribute("disabled");
-      cmd.removeAttribute("hidden");
-    }
-
-    // Enable Chrome Debugger?
-    let enabled = gPrefService.getBoolPref("devtools.chrome.enabled") &&
-                  gPrefService.getBoolPref("devtools.debugger.chrome-enabled") &&
-                  gPrefService.getBoolPref("devtools.debugger.remote-enabled");
-    if (enabled) {
-      let cmd = document.getElementById("Tools:ChromeDebugger");
-      cmd.removeAttribute("disabled");
-      cmd.removeAttribute("hidden");
-    }
-
     // Enable Error Console?
     // Temporarily enabled. See bug 798925.
     let consoleEnabled = true || gPrefService.getBoolPref("devtools.errorconsole.enabled") ||
@@ -1484,14 +1436,6 @@ var gBrowserInit = {
       cmd.removeAttribute("hidden");
     }
 
-    // Enable Style Editor?
-    let styleEditorEnabled = gPrefService.getBoolPref(StyleEditor.prefEnabledName);
-    if (styleEditorEnabled) {
-      let cmd = document.getElementById("Tools:StyleEditor");
-      cmd.removeAttribute("disabled");
-      cmd.removeAttribute("hidden");
-    }
-
 #ifdef MENUBAR_CAN_AUTOHIDE
     // If the user (or the locale) hasn't enabled the top-level "Character
     // Encoding" menu via the "browser.menu.showCharacterEncoding" preference,
@@ -1509,6 +1453,9 @@ var gBrowserInit = {
       cmd.removeAttribute("hidden");
     }
 
+    // Add Devtools menuitems and listeners
+    gDevTools.registerBrowserWindow(window);
+
     let appMenuButton = document.getElementById("appmenu-button");
     let appMenuPopup = document.getElementById("appmenu-popup");
     if (appMenuButton && appMenuPopup) {
@@ -1551,8 +1498,7 @@ var gBrowserInit = {
     if (!gStartupRan)
       return;
 
-    if (!__lookupGetter__("InspectorUI"))
-      InspectorUI.destroy();
+    gDevTools.forgetBrowserWindow(window);
 
     // First clean up services initialized in gBrowserInit.onLoad (or those whose
     // uninit methods don't depend on the services having been initialized).
@@ -1650,7 +1596,7 @@ var gBrowserInit = {
                          'viewToolbarsMenu', 'viewSidebarMenuMenu', 'Browser:Reload',
                          'viewFullZoomMenu', 'pageStyleMenu', 'charsetMenu', 'View:PageSource', 'View:FullScreen',
                          'viewHistorySidebar', 'Browser:AddBookmarkAs', 'Browser:BookmarkAllTabs',
-                         'View:PageInfo', 'Tasks:InspectPage', 'Browser:ToggleTabView', 'Browser:ToggleAddonBar'];
+                         'View:PageInfo', 'Browser:ToggleTabView', 'Browser:ToggleAddonBar'];
     var element;
 
     for (let disabledItem of disabledItems) {
@@ -7456,6 +7402,12 @@ var TabContextMenu = {
   }
 };
 
+XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
+                                  "resource:///modules/devtools/gDevTools.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "DevToolsXULCommands",
+                                  "resource:///modules/devtools/gDevTools.jsm");
+
 XPCOMUtils.defineLazyGetter(this, "HUDConsoleUI", function () {
   let tempScope = {};
   Cu.import("resource:///modules/HUDService.jsm", tempScope);
@@ -7551,41 +7503,6 @@ XPCOMUtils.defineLazyGetter(ResponsiveUI, "ResponsiveUIManager", function() {
   return tmp.ResponsiveUIManager;
 });
 
-var StyleEditor = {
-  prefEnabledName: "devtools.styleeditor.enabled",
-  /**
-   * Opens the style editor. If the UI is already open, it will be focused.
-   *
-   * @param {CSSStyleSheet} [aSelectedStyleSheet] default Stylesheet.
-   * @param {Number} [aLine] Line to which the caret should be moved (one-indexed).
-   * @param {Number} [aCol] Column to which the caret should be moved (one-indexed).
-   */
-  openChrome: function SE_openChrome(aSelectedStyleSheet, aLine, aCol)
-  {
-    let contentWindow = gBrowser.selectedBrowser.contentWindow;
-    let win = this.StyleEditorManager.getEditorForWindow(contentWindow);
-    if (win) {
-      this.StyleEditorManager.selectEditor(win);
-      return win;
-    } else {
-      return this.StyleEditorManager.newEditor(contentWindow, window,
-                                               aSelectedStyleSheet, aLine, aCol);
-    }
-  },
-
-  toggle: function SE_toggle()
-  {
-    this.StyleEditorManager.toggleEditor(gBrowser.contentWindow, window);
-  }
-};
-
-XPCOMUtils.defineLazyGetter(StyleEditor, "StyleEditorManager", function() {
-  let tmp = {};
-  Cu.import("resource:///modules/devtools/StyleEditor.jsm", tmp);
-  return new tmp.StyleEditorManager(window);
-});
-
-
 XPCOMUtils.defineLazyGetter(window, "gShowPageResizers", function () {
 #ifdef XP_WIN
   // Only show resizers on Windows 2000 and XP
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 38d9462e5644..e49cf24da6e7 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -278,22 +278,6 @@
            noautofocus="true"
            position="topcenter topright"/>
 
-    <menupopup id="inspector-node-popup">
-      <menuitem id="inspectorHTMLCopyInner"
-                label="&inspectorHTMLCopyInner.label;"
-                accesskey="&inspectorHTMLCopyInner.accesskey;"
-                command="Inspector:CopyInner"/>
-      <menuitem id="inspectorHTMLCopyOuter"
-                label="&inspectorHTMLCopyOuter.label;"
-                accesskey="&inspectorHTMLCopyOuter.accesskey;"
-                command="Inspector:CopyOuter"/>
-      <menuseparator/>
-      <menuitem id="inspectorHTMLDelete"
-                label="&inspectorHTMLDelete.label;"
-                accesskey="&inspectorHTMLDelete.accesskey;"
-                command="Inspector:DeleteNode"/>
-    </menupopup>
-
     <menupopup id="toolbar-context-menu"
                onpopupshowing="onViewToolbarsPopupShowing(event);">
       <menuseparator/>
@@ -1064,19 +1048,6 @@
       <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
       <statuspanel id="statusbar-display" inactive="true"/>
     </vbox>
-    <splitter id="devtools-side-splitter" hidden="true"/>
-    <vbox id="devtools-sidebar-box" hidden="true"
-          style="min-width: 18em; width: 22em; max-width: 42em;" persist="width">
-      <toolbar id="devtools-sidebar-toolbar"
-               class="devtools-toolbar"
-               nowindowdrag="true">
-        <spacer flex="1"/>
-        <toolbarbutton tooltiptext="&inspectSidebarCloseButton.tooltiptext;"
-                       class="devtools-closebutton"
-                       command="Inspector:Sidebar"/>
-      </toolbar>
-      <deck id="devtools-sidebar-deck" flex="1"/>
-    </vbox>
     <splitter id="social-sidebar-splitter"
               class="chromeclass-extrachrome sidebar-splitter"
               observes="socialSidebarBroadcaster"/>
@@ -1115,52 +1086,6 @@
   </hbox>
 
   <vbox id="browser-bottombox" layer="true">
-    <toolbar id="inspector-toolbar"
-             class="devtools-toolbar"
-             nowindowdrag="true"
-             hidden="true">
-#ifdef XP_MACOSX
-      <toolbarbutton id="highlighter-closebutton"
-                     class="devtools-closebutton"
-                     oncommand="InspectorUI.closeInspectorUI(false);"
-                     tooltiptext="&inspectCloseButton.tooltiptext;"/>
-#endif
-      <toolbarbutton id="inspector-inspect-toolbutton"
-                     class="devtools-toolbarbutton"
-                     command="Inspector:Inspect"/>
-      <toolbarbutton id="inspector-treepanel-toolbutton"
-                     class="devtools-toolbarbutton"
-                     tabindex="0"
-                     aria-label="&markupButton.arialabel;"
-                     accesskey="&markupButton.accesskey;"
-                     command="Inspector:HTMLPanel"/>
-      <arrowscrollbox id="inspector-breadcrumbs"
-                      flex="1" orient="horizontal"
-                      clicktoscroll="true"/>
-      <hbox id="inspector-tools">
-        <toolbarbutton id="inspector-3D-button"
-                       class="devtools-toolbarbutton"
-                       hidden="true"
-                       label="&inspect3DViewButton.label;"
-                       accesskey="&inspect3DViewButton.accesskey;"
-                       tabindex="0"
-                       command="Inspector:Tilt"/>
-        <toolbarbutton id="inspector-style-button"
-                       class="devtools-toolbarbutton"
-                       label="&inspectStyleButton.label;"
-                       accesskey="&inspectStyleButton.accesskey;"
-                       tabindex="0"
-                       command="Inspector:Sidebar"/>
-        <!-- registered tools go here -->
-      </hbox>
-#ifndef XP_MACOSX
-      <toolbarbutton id="highlighter-closebutton"
-                     class="devtools-closebutton"
-                     oncommand="InspectorUI.closeInspectorUI(false);"
-                     tooltiptext="&inspectCloseButton.tooltiptext;"/>
-#endif
-    </toolbar>
-
     <toolbar id="developer-toolbar"
              class="devtools-toolbar"
              hidden="true">
@@ -1177,36 +1102,9 @@
             <hbox class="gclitoolbar-complete-node"/>
             <textbox class="gclitoolbar-input-node" rows="1"/>
           </stack>
-          <toolbarbutton id="developer-toolbar-webconsole"
+          <toolbarbutton id="developer-toolbar-toolbox-button"
                          class="developer-toolbar-button"
-                         observes="devtoolsMenuBroadcaster_WebConsole"/>
-          <toolbarbutton id="developer-toolbar-inspector"
-                         class="developer-toolbar-button"
-                         observes="devtoolsMenuBroadcaster_Inspect"/>
-          <toolbarbutton id="developer-toolbar-styleeditor"
-                         class="developer-toolbar-button"
-                         observes="devtoolsMenuBroadcaster_StyleEditor"/>
-          <toolbarbutton id="developer-toolbar-debugger"
-                         class="developer-toolbar-button"
-                         observes="devtoolsMenuBroadcaster_Debugger"/>
-          <toolbarbutton id="developer-toolbar-other-tools"
-                         type="menu"
-                         class="developer-toolbar-button"
-                         label="&devToolbarOtherToolsButton.label;">
-            <menupopup position="before_end">
-               <menuitem observes="devtoolsMenuBroadcaster_DevToolbar"/>
-               <menuitem observes="devtoolsMenuBroadcaster_ResponsiveUI"/>
-               <menuitem observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
-               <menuitem observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
-               <menuitem observes="devtoolsMenuBroadcaster_Scratchpad"/>
-               <menuitem observes="devtoolsMenuBroadcaster_StyleEditor"/>
-               <menuitem observes="devtoolsMenuBroadcaster_PageSource"/>
-               <menuitem observes="devtoolsMenuBroadcaster_ErrorConsole"/>
-               <menuseparator/>
-               <menuitem observes="devtoolsMenuBroadcaster_GetMoreTools"/>
-            </menupopup>
-          </toolbarbutton>
-
+                         observes="devtoolsMenuBroadcaster_DevToolbox"/>
 #ifndef XP_MACOSX
           <toolbarbutton id="developer-toolbar-closebutton"
                          class="devtools-closebutton"
diff --git a/browser/base/content/highlighter.css b/browser/base/content/highlighter.css
index 574060d5ca32..0992a877a5b7 100644
--- a/browser/base/content/highlighter.css
+++ b/browser/base/content/highlighter.css
@@ -2,64 +2,60 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
-#highlighter-container {
+.highlighter-container {
   pointer-events: none;
 }
 
-#highlighter-controls {
+.highlighter-controls {
   position: absolute;
   top: 0;
   left: 0;
 }
 
-#highlighter-outline-container {
+.highlighter-outline-container {
   overflow: hidden;
   position: relative;
 }
 
-#highlighter-outline {
+.highlighter-outline {
   position: absolute;
 }
 
-#highlighter-outline[hidden] {
+.highlighter-outline[hidden] {
   opacity: 0;
   pointer-events: none;
   display: -moz-box;
 }
 
-#highlighter-outline:not([disable-transitions]) {
+.highlighter-outline:not([disable-transitions]) {
   transition-property: opacity, top, left, width, height;
   transition-duration: 0.1s;
   transition-timing-function: linear;
 }
 
-.inspector-breadcrumbs-button {
-  direction: ltr;
-}
-
 /*
  * Node Infobar
  */
 
-#highlighter-nodeinfobar-container {
+.highlighter-nodeinfobar-container {
   position: absolute;
   max-width: 95%;
 }
 
-#highlighter-nodeinfobar-container[hidden] {
+.highlighter-nodeinfobar-container[hidden] {
   opacity: 0;
   pointer-events: none;
   display: -moz-box;
 }
 
-#highlighter-nodeinfobar-container:not([disable-transitions]),
-#highlighter-nodeinfobar-container[disable-transitions][force-transitions] {
+.highlighter-nodeinfobar-container:not([disable-transitions]),
+.highlighter-nodeinfobar-container[disable-transitions][force-transitions] {
   transition-property: transform, opacity, top, left;
   transition-duration: 0.1s;
   transition-timing-function: linear;
 }
 
-#highlighter-nodeinfobar-text {
+.highlighter-nodeinfobar-text {
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -70,19 +66,19 @@
   display: none;
 }
 
-#highlighter-nodeinfobar-container:not([locked]):not(:hover) > #highlighter-nodeinfobar > .highlighter-nodeinfobar-button {
+.highlighter-nodeinfobar-container:not([locked]):not(:hover) > .highlighter-nodeinfobar > .highlighter-nodeinfobar-button {
   visibility: hidden;
 }
 
-#highlighter-nodeinfobar-container[locked] > #highlighter-nodeinfobar,
-#highlighter-nodeinfobar-container:not([locked]):hover > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[locked] > .highlighter-nodeinfobar,
+.highlighter-nodeinfobar-container:not([locked]):hover > .highlighter-nodeinfobar {
   pointer-events: auto;
 }
 
-html|*#highlighter-nodeinfobar-id,
-html|*#highlighter-nodeinfobar-classes,
-html|*#highlighter-nodeinfobar-pseudo-classes,
-html|*#highlighter-nodeinfobar-tagname {
+html|*.highlighter-nodeinfobar-id,
+html|*.highlighter-nodeinfobar-classes,
+html|*.highlighter-nodeinfobar-pseudo-classes,
+html|*.highlighter-nodeinfobar-tagname {
   -moz-user-select: text;
   cursor: text;
 }
@@ -91,41 +87,18 @@ html|*#highlighter-nodeinfobar-tagname {
   display: none;
 }
 
-#highlighter-nodeinfobar-container[position="top"]:not([hide-arrow]) > #highlighter-nodeinfobar-arrow-bottom {
+.highlighter-nodeinfobar-container[position="top"]:not([hide-arrow]) > .highlighter-nodeinfobar-arrow-bottom {
   display: block;
 }
 
-#highlighter-nodeinfobar-container[position="bottom"]:not([hide-arrow]) > #highlighter-nodeinfobar-arrow-top {
+.highlighter-nodeinfobar-container[position="bottom"]:not([hide-arrow]) > .highlighter-nodeinfobar-arrow-top {
   display: block;
 }
 
-#highlighter-nodeinfobar-container[disabled] {
+.highlighter-nodeinfobar-container[disabled] {
   visibility: hidden;
 }
 
-html|*#highlighter-nodeinfobar-tagname {
+html|*.highlighter-nodeinfobar-tagname {
   text-transform: lowercase;
 }
-
-.devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
-  display: none;
-}
-
-#inspector-option-toolbarbutton > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
-#inspector-layoutview-container > iframe {
-  /* header size */
-  height: 28px;
-}
-
-#inspector-layoutview-container:not([disable-transitions]) > iframe {
-  transition-property: height;
-  transition-duration: 0.2s;
-}
-
-#inspector-layoutview-container > iframe[open] {
-  /* header size + layout view size: 28px + 145px */
-  height: 173px;
-}
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 397aad3bd1f6..29c015ed16d4 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -412,11 +412,19 @@ nsContextMenu.prototype = {
   },
 
   inspectNode: function CM_inspectNode() {
-    if (InspectorUI.isTreePanelOpen) {
-      InspectorUI.inspectNode(this.target);
-      InspectorUI.stopInspecting();
+    let gBrowser = this.browser.ownerDocument.defaultView.gBrowser;
+    let imported = {};
+    Cu.import("resource:///modules/devtools/Target.jsm", imported);
+    var target = imported.TargetFactory.forTab(gBrowser.selectedTab);
+    let inspector = gDevTools.getPanelForTarget("inspector", target);
+    if (inspector && inspector.isReady) {
+      inspector.selection.setNode(this.target);
     } else {
-      InspectorUI.openInspectorUI(this.target);
+      let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+      toolbox.once("inspector-ready", function(event, panel) {
+        let inspector = gDevTools.getPanelForTarget("inspector", target);
+        inspector.selection.setNode(this.target, "browser-context-menu");
+      }.bind(this));
     }
   },
 
diff --git a/browser/devtools/Makefile.in b/browser/devtools/Makefile.in
index 5a40eafa26a7..9823172f2f6b 100644
--- a/browser/devtools/Makefile.in
+++ b/browser/devtools/Makefile.in
@@ -13,7 +13,7 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 DIRS = \
-  highlighter \
+  inspector \
   markupview \
   webconsole \
   commandline \
@@ -26,6 +26,7 @@ DIRS = \
   layoutview \
   shared \
   responsivedesign \
+  framework \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/commandline/CmdBreak.jsm b/browser/devtools/commandline/CmdBreak.jsm
index 819e7002b255..e132ec25913d 100644
--- a/browser/devtools/commandline/CmdBreak.jsm
+++ b/browser/devtools/commandline/CmdBreak.jsm
@@ -12,6 +12,12 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "HUDService",
                                   "resource:///modules/HUDService.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
+                                  "resource:///modules/devtools/Target.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
+                                  "resource:///modules/devtools/gDevTools.jsm");
+
 /**
  * 'break' command
  */
@@ -30,12 +36,15 @@ gcli.addCommand({
   description: gcli.lookup("breaklistDesc"),
   returnType: "html",
   exec: function(args, context) {
-    let win = HUDService.currentContext();
-    let dbg = win.DebuggerUI.getDebugger();
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+
     if (!dbg) {
       return gcli.lookup("breakaddDebuggerStopped");
     }
-    let breakpoints = dbg.breakpoints;
+
+    let breakpoints = dbg.getAllBreakpoints();
 
     if (Object.keys(breakpoints).length === 0) {
       return gcli.lookup("breaklistNone");
@@ -76,11 +85,13 @@ gcli.addCommand({
       type: {
         name: "selection",
         data: function() {
-          let win = HUDService.currentContext();
-          let dbg = win.DebuggerUI.getDebugger();
+          let gBrowser = HUDService.currentContext().gBrowser;
+          let target = TargetFactory.forTab(gBrowser.selectedTab);
+          let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+
           let files = [];
           if (dbg) {
-            let sourcesView = dbg.contentWindow.DebuggerView.Sources;
+            let sourcesView = dbg.panelWin.DebuggerView.Sources;
             for (let item in sourcesView) {
               files.push(item.value);
             }
@@ -99,8 +110,11 @@ gcli.addCommand({
   returnType: "html",
   exec: function(args, context) {
     args.type = "line";
-    let win = HUDService.currentContext();
-    let dbg = win.DebuggerUI.getDebugger();
+
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+
     if (!dbg) {
       return gcli.lookup("breakaddDebuggerStopped");
     }
@@ -131,12 +145,14 @@ gcli.addCommand({
         name: "number",
         min: 0,
         max: function() {
-          let win = HUDService.currentContext();
-          let dbg = win.DebuggerUI.getDebugger();
+          let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+          let target = TargetFactory.forTab(gBrowser.selectedTab);
+          let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+
           if (!dbg) {
             return gcli.lookup("breakaddDebuggerStopped");
           }
-          return Object.keys(dbg.breakpoints).length - 1;
+          return Object.keys(dbg.getAllBreakpoints()).length - 1;
         },
       },
       description: gcli.lookup("breakdelBreakidDesc")
@@ -144,14 +160,16 @@ gcli.addCommand({
   ],
   returnType: "html",
   exec: function(args, context) {
-    let win = HUDService.currentContext();
-    let dbg = win.DebuggerUI.getDebugger();
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+
     if (!dbg) {
       return gcli.lookup("breakaddDebuggerStopped");
     }
 
-    let breakpoints = dbg.breakpoints;
-    let id = Object.keys(dbg.breakpoints)[args.breakid];
+    let breakpoints = dbg.getAllBreakpoints();
+    let id = Object.keys(breakpoints)[args.breakid];
     if (!id || !(id in breakpoints)) {
       return gcli.lookup("breakNotFound");
     }
diff --git a/browser/devtools/commandline/CmdCalllog.jsm b/browser/devtools/commandline/CmdCalllog.jsm
index d143a4b2a69a..ef60785a72f7 100644
--- a/browser/devtools/commandline/CmdCalllog.jsm
+++ b/browser/devtools/commandline/CmdCalllog.jsm
@@ -9,8 +9,8 @@ this.EXPORTED_SYMBOLS = [ ];
 Cu.import("resource:///modules/devtools/gcli.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "HUDService",
-                                  "resource:///modules/HUDService.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
+                                  "resource:///modules/devtools/gDevTools.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "Debugger", function() {
   let JsDebugger = {};
@@ -22,6 +22,9 @@ XPCOMUtils.defineLazyGetter(this, "Debugger", function() {
   return global.Debugger;
 });
 
+XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
+                                  "resource:///modules/devtools/Target.jsm");
+
 let debuggers = [];
 
 /**
@@ -50,8 +53,9 @@ gcli.addCommand({
 
     debuggers.push(dbg);
 
-    let tab = context.environment.chromeDocument.defaultView.gBrowser.selectedTab;
-    HUDService.activateHUDForContext(tab);
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    gDevTools.openToolboxForTab(target, "webconsole");
 
     return gcli.lookup("calllogStartReply");
   },
diff --git a/browser/devtools/commandline/CmdCalllogChrome.jsm b/browser/devtools/commandline/CmdCalllogChrome.jsm
index 80aa141155ce..60545fe8a1ce 100644
--- a/browser/devtools/commandline/CmdCalllogChrome.jsm
+++ b/browser/devtools/commandline/CmdCalllogChrome.jsm
@@ -10,8 +10,10 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 Cu.import("resource:///modules/devtools/gcli.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "HUDService",
-                                  "resource:///modules/HUDService.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
+                                  "resource:///modules/devtools/gDevTools.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
+                                  "resource:///modules/devtools/Target.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "Debugger", function() {
   let JsDebugger = {};
@@ -108,8 +110,9 @@ gcli.addCommand({
                                 ": " + this.callDescription(frame));
     }.bind(this);
 
-    let tab = context.environment.chromeDocument.defaultView.gBrowser.selectedTab;
-    HUDService.activateHUDForContext(tab);
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    gDevTools.openToolboxForTab(target, "webconsole");
 
     return gcli.lookup("calllogChromeStartReply");
   },
diff --git a/browser/devtools/commandline/CmdConsole.jsm b/browser/devtools/commandline/CmdConsole.jsm
index 391ced0b7be7..4a602b6a4c76 100644
--- a/browser/devtools/commandline/CmdConsole.jsm
+++ b/browser/devtools/commandline/CmdConsole.jsm
@@ -11,6 +11,10 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "HUDService",
                                   "resource:///modules/HUDService.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
+                                  "resource:///modules/devtools/gDevTools.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
+                                  "resource:///modules/devtools/Target.jsm");
 
 /**
  * 'console' command
@@ -44,8 +48,9 @@ gcli.addCommand({
   name: "console close",
   description: gcli.lookup("consolecloseDesc"),
   exec: function Command_consoleClose(args, context) {
-    let tab = context.environment.chromeDocument.defaultView.gBrowser.selectedTab
-    HUDService.deactivateHUDForContext(tab);
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    gDevTools.closeToolbox(target);
   }
 });
 
@@ -56,7 +61,8 @@ gcli.addCommand({
   name: "console open",
   description: gcli.lookup("consoleopenDesc"),
   exec: function Command_consoleOpen(args, context) {
-    let tab = context.environment.chromeDocument.defaultView.gBrowser.selectedTab
-    HUDService.activateHUDForContext(tab);
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    gDevTools.openToolboxForTab(target, "webconsole");
   }
 });
diff --git a/browser/devtools/commandline/CmdDbg.jsm b/browser/devtools/commandline/CmdDbg.jsm
index 257efd2afc2b..c0dc1b30b857 100644
--- a/browser/devtools/commandline/CmdDbg.jsm
+++ b/browser/devtools/commandline/CmdDbg.jsm
@@ -9,6 +9,11 @@ this.EXPORTED_SYMBOLS = [ ];
 Cu.import("resource:///modules/devtools/gcli.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
+                                  "resource:///modules/devtools/gDevTools.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
+                                  "resource:///modules/devtools/Target.jsm");
+
 /**
  * 'dbg' command
  */
@@ -26,19 +31,9 @@ gcli.addCommand({
   description: gcli.lookup("dbgOpen"),
   params: [],
   exec: function (args, context) {
-    let win = context.environment.chromeDocument.defaultView;
-    let tab = win.gBrowser.selectedTab;
-    let dbg = win.DebuggerUI.findDebugger();
-
-    if (dbg) {
-      if (dbg.ownerTab !== tab) {
-        win.DebuggerUI.toggleDebugger();
-      }
-
-      return;
-    }
-
-    win.DebuggerUI.toggleDebugger();
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    gDevTools.openToolboxForTab(target, "jsdebugger");
   }
 });
 
@@ -50,12 +45,12 @@ gcli.addCommand({
   description: gcli.lookup("dbgClose"),
   params: [],
   exec: function (args, context) {
-    let win = context.environment.chromeDocument.defaultView;
-    let tab = win.gBrowser.selectedTab;
-    let dbg = win.DebuggerUI.findDebugger();
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
 
-    if (dbg) {
-      dbg.close();
+    if (dbg /* FIXME: and debugger panel is currently active */) {
+      gDevTools.closeToolbox(target);
     }
   }
 });
@@ -68,11 +63,12 @@ gcli.addCommand({
   description: gcli.lookup("dbgInterrupt"),
   params: [],
   exec: function(args, context) {
-    let win = context.environment.chromeDocument.defaultView;
-    let dbg = win.DebuggerUI.getDebugger();
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
 
     if (dbg) {
-      let controller = dbg.contentWindow.DebuggerController;
+      let controller = dbg._controller;
       let thread = controller.activeThread;
       if (!thread.paused) {
         thread.interrupt();
@@ -89,11 +85,12 @@ gcli.addCommand({
   description: gcli.lookup("dbgContinue"),
   params: [],
   exec: function(args, context) {
-    let win = context.environment.chromeDocument.defaultView;
-    let dbg = win.DebuggerUI.getDebugger();
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
 
     if (dbg) {
-      let controller = dbg.contentWindow.DebuggerController;
+      let controller = dbg._controller;
       let thread = controller.activeThread;
       if (thread.paused) {
         thread.resume();
@@ -121,11 +118,12 @@ gcli.addCommand({
   description: gcli.lookup("dbgStepOverDesc"),
   params: [],
   exec: function(args, context) {
-    let win = context.environment.chromeDocument.defaultView;
-    let dbg = win.DebuggerUI.getDebugger();
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
 
     if (dbg) {
-      let controller = dbg.contentWindow.DebuggerController;
+      let controller = dbg._controller;
       let thread = controller.activeThread;
       if (thread.paused) {
         thread.stepOver();
@@ -142,11 +140,12 @@ gcli.addCommand({
   description: gcli.lookup("dbgStepInDesc"),
   params: [],
   exec: function(args, context) {
-    let win = context.environment.chromeDocument.defaultView;
-    let dbg = win.DebuggerUI.getDebugger();
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
 
     if (dbg) {
-      let controller = dbg.contentWindow.DebuggerController;
+      let controller = dbg._controller;
       let thread = controller.activeThread;
       if (thread.paused) {
         thread.stepIn();
@@ -163,11 +162,12 @@ gcli.addCommand({
   description: gcli.lookup("dbgStepOutDesc"),
   params: [],
   exec: function(args, context) {
-    let win = context.environment.chromeDocument.defaultView;
-    let dbg = win.DebuggerUI.getDebugger();
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
 
     if (dbg) {
-      let controller = dbg.contentWindow.DebuggerController;
+      let controller = dbg._controller;
       let thread = controller.activeThread;
       if (thread.paused) {
         thread.stepOut();
diff --git a/browser/devtools/commandline/Commands.jsm b/browser/devtools/commandline/Commands.jsm
index c1ca7dd0ffac..452f27789124 100644
--- a/browser/devtools/commandline/Commands.jsm
+++ b/browser/devtools/commandline/Commands.jsm
@@ -24,3 +24,4 @@ Cu.import("resource:///modules/devtools/CmdResize.jsm");
 Cu.import("resource:///modules/devtools/CmdRestart.jsm");
 Cu.import("resource:///modules/devtools/CmdScreenshot.jsm");
 Cu.import("resource:///modules/devtools/CmdTilt.jsm");
+Cu.import("resource:///modules/devtools/CmdScratchpad.jsm");
diff --git a/browser/devtools/commandline/test/browser_dbg_cmd.js b/browser/devtools/commandline/test/browser_dbg_cmd.js
index d6e6f4cffc6d..bb950d877609 100644
--- a/browser/devtools/commandline/test/browser_dbg_cmd.js
+++ b/browser/devtools/commandline/test/browser_dbg_cmd.js
@@ -1,3 +1,11 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
 function test() {
   const TEST_URI = "http://example.com/browser/browser/devtools/commandline/" +
                    "test/browser_dbg_cmd.html";
@@ -7,54 +15,40 @@ function test() {
   });
 }
 
-function testDbgCmd() {
-  DeveloperToolbarTest.exec({
-    typed: "dbg open",
-    blankOutput: true
-  });
+function testCommands(dbg, cmd) {
+  // Wait for the initial resume...
+  dbg._controller.activeThread.addOneTimeListener("resumed", function () {
+    info("Starting tests.");
 
-  let pane = DebuggerUI.findDebugger();
-  ok(pane, "Debugger was opened.");
-  let frame = pane._frame;
+    let contentDoc = content.window.document;
+    let output = contentDoc.querySelector("input[type=text]");
+    let btnDoit = contentDoc.querySelector("input[type=button]");
 
-  frame.addEventListener("Debugger:Connected", function dbgConnected(aEvent) {
-    frame.removeEventListener("Debugger:Connected", dbgConnected, true);
-
-    // Wait for the initial resume...
-    aEvent.target.ownerDocument.defaultView.gClient
-        .addOneTimeListener("resumed", function() {
-
-      info("Starting tests.");
-
-      let contentDoc = content.window.document;
-      let output = contentDoc.querySelector("input[type=text]");
-      let btnDoit = contentDoc.querySelector("input[type=button]");
-
-      cmd("dbg interrupt", function() {
-        ok(true, "debugger is paused");
-        pane.contentWindow.gClient.addOneTimeListener("resumed", function() {
-          ok(true, "debugger continued");
-          pane.contentWindow.gClient.addOneTimeListener("paused", function() {
+    cmd("dbg interrupt", function() {
+      ok(true, "debugger is paused");
+      dbg._controller.activeThread.addOneTimeListener("resumed", function () {
+        ok(true, "debugger continued");
+        dbg._controller.activeThread.addOneTimeListener("paused", function() {
+          cmd("dbg step in", function() {
             cmd("dbg step in", function() {
               cmd("dbg step in", function() {
-                cmd("dbg step in", function() {
-                  is(output.value, "step in", "debugger stepped in");
-                  cmd("dbg step over", function() {
-                    is(output.value, "step over", "debugger stepped over");
-                    cmd("dbg step out", function() {
-                      is(output.value, "step out", "debugger stepped out");
+                is(output.value, "step in", "debugger stepped in");
+                cmd("dbg step over", function() {
+                  is(output.value, "step over", "debugger stepped over");
+                  cmd("dbg step out", function() {
+                    is(output.value, "step out", "debugger stepped out");
+                    cmd("dbg continue", function() {
                       cmd("dbg continue", function() {
-                        cmd("dbg continue", function() {
-                          is(output.value, "dbg continue", "debugger continued");
-                          DeveloperToolbarTest.exec({
-                            typed: "dbg close",
-                            blankOutput: true
-                          });
-
-                          let dbg = DebuggerUI.findDebugger();
-                          ok(!dbg, "Debugger was closed.");
-                          finish();
+                        is(output.value, "dbg continue", "debugger continued");
+                        DeveloperToolbarTest.exec({
+                          typed: "dbg close",
+                          blankOutput: true
                         });
+
+                        let target = TargetFactory.forTab(gBrowser.selectedTab);
+                        ok(!gDevTools.getToolboxForTarget(target),
+                          "Debugger was closed.");
+                        finish();
                       });
                     });
                   });
@@ -62,21 +56,42 @@ function testDbgCmd() {
               });
             });
           });
-          EventUtils.sendMouseEvent({type:"click"}, btnDoit);
-        });
-        DeveloperToolbarTest.exec({
-          typed: "dbg continue",
-          blankOutput: true
         });
+        EventUtils.sendMouseEvent({type:"click"}, btnDoit);
+      });
+      DeveloperToolbarTest.exec({
+        typed: "dbg continue",
+        blankOutput: true
       });
     });
+  });
+}
+
+function testDbgCmd() {
+  DeveloperToolbarTest.exec({
+    typed: "dbg open",
+    blankOutput: true
+  });
+
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  let toolbox = gDevTools.getToolboxForTarget(target);
+
+  toolbox.once("jsdebugger-ready", function dbgReady() {
+    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+    ok(dbg, "DebuggerPanel exists");
 
     function cmd(aTyped, aCallback) {
-      pane.contentWindow.gClient.addOneTimeListener("paused", aCallback);
+      dbg._controller.activeThread.addOneTimeListener("paused", aCallback);
       DeveloperToolbarTest.exec({
         typed: aTyped,
         blankOutput: true
       });
     }
+
+    if (dbg._controller.activeThread) {
+      testCommands(dbg, cmd);
+    } else {
+      dbg.once("connected", testCommands.bind(null, dbg, cmd));
+    }
   });
 }
diff --git a/browser/devtools/commandline/test/browser_dbg_cmd_break.js b/browser/devtools/commandline/test/browser_dbg_cmd_break.js
index f3299f4c2e30..9d66767b0349 100644
--- a/browser/devtools/commandline/test/browser_dbg_cmd_break.js
+++ b/browser/devtools/commandline/test/browser_dbg_cmd_break.js
@@ -6,6 +6,10 @@
 const TEST_URI = "http://example.com/browser/browser/devtools/commandline/" +
                  "test/browser_dbg_cmd_break.html";
 
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
 function test() {
   DeveloperToolbarTest.test(TEST_URI, [ testBreakCommands ]);
 }
@@ -35,86 +39,84 @@ function testBreakCommands() {
     status: 'ERROR'
   });
 
-  let pane = DebuggerUI.toggleDebugger();
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  let toolbox = gDevTools.openToolboxForTab(target, "jsdebugger");
+  toolbox.once("jsdebugger-ready", function dbgReady() {
+    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+    ok(dbg, "DebuggerPanel exists");
+    dbg.once("connected", function() {
+      // Wait for the initial resume...
+      dbg.panelWin.gClient.addOneTimeListener("resumed", function() {
+        dbg._view.Variables.lazyEmpty = false;
 
-  var dbgConnected = DeveloperToolbarTest.checkCalled(function() {
-    pane._frame.removeEventListener("Debugger:Connected", dbgConnected, true);
-
-    // Wait for the initial resume.
-    let client = pane.contentWindow.gClient;
-
-    var resumed = DeveloperToolbarTest.checkCalled(function() {
-
-      var framesAdded = DeveloperToolbarTest.checkCalled(function() {
-        helpers.setInput('break add line ' + TEST_URI + ' ' + content.wrappedJSObject.line0);
-        helpers.check({
-          hints: '',
-          status: 'VALID',
-          args: {
-            file: { value: TEST_URI },
-            line: { value: content.wrappedJSObject.line0 },
-          }
-        });
-
-        DeveloperToolbarTest.exec({
-          args: {
-            type: 'line',
-            file: TEST_URI,
-            line: content.wrappedJSObject.line0
-          },
-          completed: false
-        });
-
-        helpers.setInput('break list');
-        helpers.check({
-          input:  'break list',
-          hints:            '',
-          markup: 'VVVVVVVVVV',
-          status: 'VALID'
-        });
-
-        DeveloperToolbarTest.exec();
-
-        var cleanup = DeveloperToolbarTest.checkCalled(function() {
-          helpers.setInput('break del 9');
+        var client = dbg.panelWin.gClient;
+        var framesAdded = DeveloperToolbarTest.checkCalled(function() {
+          helpers.setInput('break add line ' + TEST_URI + ' ' + content.wrappedJSObject.line0);
           helpers.check({
-            input:  'break del 9',
-            hints:             '',
-            markup: 'VVVVVVVVVVE',
-            status: 'ERROR',
-            args: {
-              breakid: { status: 'ERROR', message: '9 is greater than maximum allowed: 0.' },
-            }
-          });
-
-          helpers.setInput('break del 0');
-          helpers.check({
-            input:  'break del 0',
-            hints:             '',
-            markup: 'VVVVVVVVVVV',
+            hints: '',
             status: 'VALID',
             args: {
-              breakid: { value: 0 },
+              file: { value: TEST_URI },
+              line: { value: content.wrappedJSObject.line0 },
             }
           });
 
           DeveloperToolbarTest.exec({
-            args: { breakid: 0 },
+            args: {
+              type: 'line',
+              file: TEST_URI,
+              line: content.wrappedJSObject.line0
+            },
             completed: false
           });
+
+          helpers.setInput('break list');
+          helpers.check({
+            input:  'break list',
+            hints:            '',
+            markup: 'VVVVVVVVVV',
+            status: 'VALID'
+          });
+
+          DeveloperToolbarTest.exec();
+
+          var cleanup = DeveloperToolbarTest.checkCalled(function() {
+            helpers.setInput('break del 9');
+            helpers.check({
+              input:  'break del 9',
+              hints:             '',
+              markup: 'VVVVVVVVVVE',
+              status: 'ERROR',
+              args: {
+                breakid: { status: 'ERROR', message: '9 is greater than maximum allowed: 0.' },
+              }
+            });
+
+            helpers.setInput('break del 0');
+            helpers.check({
+              input:  'break del 0',
+              hints:             '',
+              markup: 'VVVVVVVVVVV',
+              status: 'VALID',
+              args: {
+                breakid: { value: 0 },
+              }
+            });
+
+            DeveloperToolbarTest.exec({
+              args: { breakid: 0 },
+              completed: false
+            });
+          });
+
+          client.activeThread.resume(cleanup);
         });
 
-        client.activeThread.resume(cleanup);
+        client.activeThread.addOneTimeListener("framesadded", framesAdded);
+
+        // Trigger newScript notifications using eval.
+        content.wrappedJSObject.firstCall();
       });
-
-      client.activeThread.addOneTimeListener("framesadded", framesAdded);
-
-      // Trigger newScript notifications using eval.
-      content.wrappedJSObject.firstCall();
     });
-
-    client.addOneTimeListener("resumed", resumed);
   });
-
-  pane._frame.addEventListener("Debugger:Connected", dbgConnected, true);
 }
diff --git a/browser/devtools/debugger/DebuggerPanel.jsm b/browser/devtools/debugger/DebuggerPanel.jsm
new file mode 100644
index 000000000000..ec60045741fe
--- /dev/null
+++ b/browser/devtools/debugger/DebuggerPanel.jsm
@@ -0,0 +1,144 @@
+/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+
+this.EXPORTED_SYMBOLS = ["DebuggerDefinition"];
+
+const STRINGS_URI = "chrome://browser/locale/devtools/debugger.properties";
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "Services",
+                                  "resource://gre/modules/Services.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "EventEmitter",
+                                  "resource:///modules/devtools/EventEmitter.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "DebuggerServer",
+                                  "resource://gre/modules/devtools/dbg-server.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
+                                  "resource:///modules/devtools/gDevTools.jsm");
+XPCOMUtils.defineLazyGetter(this, "_strings",
+  function() Services.strings.createBundle(STRINGS_URI));
+
+XPCOMUtils.defineLazyGetter(this, "osString", function() {
+  return Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
+});
+
+this.DebuggerDefinition = {
+  id: "jsdebugger",
+  key: l10n("open.commandkey"),
+  accesskey: l10n("debuggerMenu.accesskey"),
+  modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
+  ordinal: 1,
+  killswitch: "devtools.debugger.enabled",
+  icon: "chrome://browser/skin/devtools/tools-icons-small.png",
+  url: "chrome://browser/content/debugger.xul",
+  label: l10n("ToolboxDebugger.label"),
+
+  isTargetSupported: function(target) {
+    return true;
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new DebuggerPanel(iframeWindow, toolbox);
+  }
+};
+
+
+function DebuggerPanel(iframeWindow, toolbox) {
+  this._toolbox = toolbox;
+  this._controller = iframeWindow.DebuggerController;
+  this._view = iframeWindow.DebuggerView;
+  this._controller._target = this.target;
+  this._bkp = this._controller.Breakpoints;
+  this.panelWin = iframeWindow;
+
+  this._ensureOnlyOneRunningDebugger();
+  if (!this.target.isRemote) {
+    if (!DebuggerServer.initialized) {
+      DebuggerServer.init();
+      DebuggerServer.addBrowserActors();
+    }
+  }
+
+  let onDebuggerLoaded = function () {
+    iframeWindow.removeEventListener("Debugger:Loaded", onDebuggerLoaded, true);
+    this.setReady();
+  }.bind(this);
+
+  let onDebuggerConnected = function () {
+    iframeWindow.removeEventListener("Debugger:Connected",
+      onDebuggerConnected, true);
+    this.emit("connected");
+  }.bind(this);
+
+  iframeWindow.addEventListener("Debugger:Loaded", onDebuggerLoaded, true);
+  iframeWindow.addEventListener("Debugger:Connected",
+    onDebuggerConnected, true);
+
+  new EventEmitter(this);
+}
+
+DebuggerPanel.prototype = {
+  // DevToolPanel API
+  get target() this._toolbox.target,
+
+  get isReady() this._isReady,
+
+  setReady: function() {
+    this._isReady = true;
+    this.emit("ready");
+  },
+
+  destroy: function() {
+    delete this._toolbox;
+    delete this._target;
+    delete this._controller;
+    delete this._view;
+    delete this._bkp;
+    delete this.panelWin;
+  },
+
+  // DebuggerPanel API
+
+  addBreakpoint: function() {
+    this._bkp.addBreakpoint.apply(this._bkp, arguments);
+  },
+
+  removeBreakpoint: function() {
+    this._bkp.removeBreakpoint.apply(this._bkp, arguments);
+  },
+
+  getBreakpoint: function() {
+    return this._bkp.getBreakpoint.apply(this._bkp, arguments);
+  },
+
+  getAllBreakpoints: function() {
+    return this._bkp.store;
+  },
+
+  // Private
+
+  _ensureOnlyOneRunningDebugger: function() {
+    // FIXME
+  },
+};
+
+/**
+ * Lookup l10n string from a string bundle.
+ * @param {string} aName The key to lookup.
+ * @returns A localized version of the given key.
+ */
+function l10n(aName)
+{
+  try {
+    return _strings.GetStringFromName(aName);
+  } catch (ex) {
+    Services.console.logStringMessage("Error reading '" + aName + "'");
+    throw new Error("l10n error with " + aName);
+  }
+}
diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js
index 110d872834e9..aaa1e18ebe66 100644
--- a/browser/devtools/debugger/debugger-controller.js
+++ b/browser/devtools/debugger/debugger-controller.js
@@ -48,6 +48,7 @@ let DebuggerController = {
       return;
     }
     this._isInitialized = true;
+
     window.removeEventListener("load", this._startupDebugger, true);
 
     DebuggerView.initialize(function() {
@@ -145,14 +146,32 @@ let DebuggerController = {
    * wiring event handlers as necessary.
    */
   _connect: function DC__connect() {
-    if (window._isRemoteDebugger && !this._prepareConnection()) {
+    function callback() {
+      window.dispatchEvent("Debugger:Connected");
+    }
+
+    let client;
+    // Remote debugging gets the debuggee from a RemoteTarget object.
+    if (this._target.isRemote) {
+      client = this.client = this._target.client;
+
+      this._target.on("close", this._onTabDetached);
+      this._target.on("navigate", this._onTabNavigated);
+
+      if (this._target.chrome) {
+        let dbg = this._target.form.chromeDebugger;
+        this._startChromeDebugging(client, dbg, callback);
+      } else {
+        this._startDebuggingTab(client, this._target.form, callback);
+      }
       return;
     }
-    let transport = (window._isChromeDebugger || window._isRemoteDebugger)
-      ? debuggerSocketConnect(Prefs.remoteHost, Prefs.remotePort)
-      : DebuggerServer.connectPipe();
 
-    let client = this.client = new DebuggerClient(transport);
+    // Content debugging can connect directly to the page.
+    // TODO: convert this to use a TabTarget.
+    let transport = DebuggerServer.connectPipe();
+    client = this.client = new DebuggerClient(transport);
+
     client.addListener("tabNavigated", this._onTabNavigated);
     client.addListener("tabDetached", this._onTabDetached);
 
@@ -160,12 +179,11 @@ let DebuggerController = {
       client.listTabs(function(aResponse) {
         if (window._isChromeDebugger) {
           let dbg = aResponse.chromeDebugger;
-          this._startChromeDebugging(client, dbg);
+          this._startChromeDebugging(client, dbg, callback);
         } else {
           let tab = aResponse.tabs[aResponse.selected];
-          this._startDebuggingTab(client, tab);
+          this._startDebuggingTab(client, tab, callback);
         }
-        window.dispatchEvent("Debugger:Connected");
       }.bind(this));
     }.bind(this));
   },
@@ -180,9 +198,12 @@ let DebuggerController = {
     }
     this.client.removeListener("tabNavigated", this._onTabNavigated);
     this.client.removeListener("tabDetached", this._onTabDetached);
-    this.client.close();
 
-    this.client = null;
+    if (!this._target.isRemote) {
+      this.client.close();
+      this.client = null;
+    }
+
     this.tabClient = null;
     this.activeThread = null;
   },
@@ -212,7 +233,8 @@ let DebuggerController = {
    * @param object aTabGrip
    *        The remote protocol grip of the tab.
    */
-  _startDebuggingTab: function DC__startDebuggingTab(aClient, aTabGrip) {
+  _startDebuggingTab: function DC__startDebuggingTab
+      (aClient, aTabGrip, aCallback=function(){}) {
     if (!aClient) {
       Cu.reportError("No client found!");
       return;
@@ -238,6 +260,7 @@ let DebuggerController = {
         this.SourceScripts.connect();
         aThreadClient.resume();
 
+        aCallback();
       }.bind(this));
     }.bind(this));
   },
@@ -250,7 +273,8 @@ let DebuggerController = {
    * @param object aChromeDebugger
    *        The remote protocol grip of the chrome debugger.
    */
-  _startChromeDebugging: function DC__startChromeDebugging(aClient, aChromeDebugger) {
+  _startChromeDebugging: function DC__startChromeDebugging
+      (aClient, aChromeDebugger, aCallback=function(){}) {
     if (!aClient) {
       Cu.reportError("No client found!");
       return;
@@ -269,6 +293,7 @@ let DebuggerController = {
       this.SourceScripts.connect();
       aThreadClient.resume();
 
+      aCallback();
     }.bind(this));
   },
 
diff --git a/browser/devtools/debugger/debugger-toolbar.js b/browser/devtools/debugger/debugger-toolbar.js
index 8f0341a6a4b1..547eae695ca9 100644
--- a/browser/devtools/debugger/debugger-toolbar.js
+++ b/browser/devtools/debugger/debugger-toolbar.js
@@ -25,7 +25,6 @@ ToolbarView.prototype = {
    */
   initialize: function DVT_initialize() {
     dumpn("Initializing the ToolbarView");
-    this._closeButton = document.getElementById("close");
     this._togglePanesButton = document.getElementById("toggle-panes");
     this._resumeButton = document.getElementById("resume");
     this._stepOverButton = document.getElementById("step-over");
@@ -44,7 +43,6 @@ ToolbarView.prototype = {
     this._stepInTooltip = L10N.getFormatStr("stepInTooltip", [stepInKey]);
     this._stepOutTooltip = L10N.getFormatStr("stepOutTooltip", [stepOutKey]);
 
-    this._closeButton.addEventListener("click", this._onCloseClick, false);
     this._togglePanesButton.addEventListener("mousedown", this._onTogglePanesPressed, false);
     this._resumeButton.addEventListener("mousedown", this._onResumePressed, false);
     this._stepOverButton.addEventListener("mousedown", this._onStepOverPressed, false);
@@ -55,7 +53,6 @@ ToolbarView.prototype = {
     this._stepInButton.setAttribute("tooltiptext", this._stepInTooltip);
     this._stepOutButton.setAttribute("tooltiptext", this._stepOutTooltip);
 
-    this.toggleCloseButton(!window._isRemoteDebugger && !window._isChromeDebugger);
     // TODO: bug 806775
     // this.toggleChromeGlobalsContainer(window._isChromeDebugger);
   },
@@ -65,7 +62,6 @@ ToolbarView.prototype = {
    */
   destroy: function DVT_destroy() {
     dumpn("Destroying the ToolbarView");
-    this._closeButton.removeEventListener("click", this._onCloseClick, false);
     this._togglePanesButton.removeEventListener("mousedown", this._onTogglePanesPressed, false);
     this._resumeButton.removeEventListener("mousedown", this._onResumePressed, false);
     this._stepOverButton.removeEventListener("mousedown", this._onStepOverPressed, false);
@@ -73,16 +69,6 @@ ToolbarView.prototype = {
     this._stepOutButton.removeEventListener("mousedown", this._onStepOutPressed, false);
   },
 
-  /**
-   * Sets the close button hidden or visible. It's hidden by default.
-   *
-   * @param boolean aVisibleFlag
-   *        Specifies the intended visibility.
-   */
-  toggleCloseButton: function DVT_toggleCloseButton(aVisibleFlag) {
-    this._closeButton.setAttribute("hidden", !aVisibleFlag);
-  },
-
   /**
    * Sets the resume button state based on the debugger active thread.
    *
@@ -177,7 +163,6 @@ ToolbarView.prototype = {
     }
   },
 
-  _closeButton: null,
   _togglePanesButton: null,
   _resumeButton: null,
   _stepOverButton: null,
diff --git a/browser/devtools/debugger/debugger.xul b/browser/devtools/debugger/debugger.xul
index c63b714650d7..db84ee6797c8 100644
--- a/browser/devtools/debugger/debugger.xul
+++ b/browser/devtools/debugger/debugger.xul
@@ -153,11 +153,6 @@
 
   <vbox id="body" flex="1">
     <toolbar id="dbg-toolbar" class="devtools-toolbar">
-#ifdef XP_MACOSX
-      <toolbarbutton id="close"
-                     class="devtools-closebutton"
-                     tooltiptext="&debuggerUI.closeButton.tooltip;"/>
-#endif
       <hbox id="debugger-controls">
         <toolbarbutton id="resume"
                        class="devtools-toolbarbutton"
@@ -186,11 +181,6 @@
                      class="devtools-option-toolbarbutton"
                      tooltiptext="&debuggerUI.optsButton.tooltip;"
                      popup="debuggerPrefsContextMenu"/>
-#ifndef XP_MACOSX
-      <toolbarbutton id="close"
-                     class="devtools-closebutton"
-                     tooltiptext="&debuggerUI.closeButton.tooltip;"/>
-#endif
     </toolbar>
 
     <panel id="searchbox-panel"
diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in
index 0918e802d399..df30cdce8ced 100644
--- a/browser/devtools/debugger/test/Makefile.in
+++ b/browser/devtools/debugger/test/Makefile.in
@@ -12,9 +12,9 @@ include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_leaktest.js \
-	browser_dbg_createChrome.js \
-	browser_dbg_debugger-tab-switch.js \
-	browser_dbg_debugger-tab-switch-window.js \
+	$(warning browser_dbg_createChrome.js disabled until issue 156 is fixed) \
+	$(browser_dbg_debugger-tab-switch.js disabled until issues 106, 40 are fixed) \
+	$(browser_dbg_debugger-tab-switch-window.js disabled until issues 106, 40 are fixed) \
 	browser_dbg_debuggerstatement.js \
 	browser_dbg_listtabs.js \
 	browser_dbg_tabactor-01.js \
@@ -45,7 +45,6 @@ MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_propertyview-reexpand.js \
 	browser_dbg_reload-same-script.js \
 	browser_dbg_pane-collapse.js \
-	browser_dbg_panesize.js \
 	browser_dbg_panesize-inner.js \
 	browser_dbg_stack-01.js \
 	browser_dbg_stack-02.js \
@@ -82,7 +81,6 @@ MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_iframes.js \
 	browser_dbg_pause-exceptions.js \
 	browser_dbg_multiple-windows.js \
-	browser_dbg_menustatus.js \
 	browser_dbg_bfcache.js \
 	browser_dbg_breakpoint-new-script.js \
 	browser_dbg_bug737803_editor_actual_location.js \
diff --git a/browser/devtools/debugger/test/browser_dbg_bfcache.js b/browser/devtools/debugger/test/browser_dbg_bfcache.js
index c430ebcb7507..a008a179b745 100644
--- a/browser/devtools/debugger/test/browser_dbg_bfcache.js
+++ b/browser/devtools/debugger/test/browser_dbg_bfcache.js
@@ -20,7 +20,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testInitialLoad();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_breakpoint-new-script.js b/browser/devtools/debugger/test/browser_dbg_breakpoint-new-script.js
index c7e865a4596a..63d180b95a2d 100644
--- a/browser/devtools/debugger/test/browser_dbg_breakpoint-new-script.js
+++ b/browser/devtools/debugger/test/browser_dbg_breakpoint-new-script.js
@@ -17,7 +17,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebuggee = aDebuggee;
 
     testAddBreakpoint();
diff --git a/browser/devtools/debugger/test/browser_dbg_bug723069_editor-breakpoints.js b/browser/devtools/debugger/test/browser_dbg_bug723069_editor-breakpoints.js
index ee38ccc3c765..e440239ccf99 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug723069_editor-breakpoints.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug723069_editor-breakpoints.js
@@ -31,9 +31,11 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     resumed = true;
 
+    gDebugger.addEventListener("Debugger:SourceShown", onScriptShown);
+
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
       executeSoon(startTest);
@@ -50,12 +52,10 @@ function test()
     executeSoon(startTest);
   }
 
-  window.addEventListener("Debugger:SourceShown", onScriptShown);
-
   function startTest()
   {
     if (scriptShown && framesAdded && resumed && !testStarted) {
-      window.removeEventListener("Debugger:SourceShown", onScriptShown);
+      gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown);
       testStarted = true;
       Services.tm.currentThread.dispatch({ run: performTest }, 0);
     }
@@ -77,7 +77,7 @@ function test()
     isnot(gScripts.selectedValue, gScripts.values[0],
           "the correct script is selected");
 
-    gBreakpoints = gPane.breakpoints;
+    gBreakpoints = gPane.getAllBreakpoints();
     is(Object.keys(gBreakpoints), 0, "no breakpoints");
     ok(!gPane.getBreakpoint("foo", 3), "getBreakpoint('foo', 3) returns falsey");
 
@@ -127,7 +127,7 @@ function test()
       is(Object.keys(gBreakpoints).length, 1,
          "the list of debugger breakpoints holds only one breakpoint");
       is(gPane.getBreakpoint(gScripts.selectedValue, 6), aBreakpointClient,
-         "getBreakpoint(selectedScript, 2) returns the correct breakpoint");
+         "getBreakpoint returns the correct breakpoint");
 
       info("remove the first breakpoint");
       gEditor.addEventListener(SourceEditor.EVENTS.BREAKPOINT_CHANGE,
diff --git a/browser/devtools/debugger/test/browser_dbg_bug723071_editor-breakpoints-pane.js b/browser/devtools/debugger/test/browser_dbg_bug723071_editor-breakpoints-pane.js
index a923bf3c0b87..b6144947fda6 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug723071_editor-breakpoints-pane.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug723071_editor-breakpoints-pane.js
@@ -29,9 +29,11 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     resumed = true;
 
+    gDebugger.addEventListener("Debugger:SourceShown", onScriptShown);
+
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
       executeSoon(startTest);
@@ -48,12 +50,10 @@ function test()
     executeSoon(startTest);
   }
 
-  window.addEventListener("Debugger:SourceShown", onScriptShown);
-
   function startTest()
   {
     if (scriptShown && framesAdded && resumed && !testStarted) {
-      window.removeEventListener("Debugger:SourceShown", onScriptShown);
+      gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown);
       testStarted = true;
       Services.tm.currentThread.dispatch({ run: performTest }, 0);
     }
@@ -79,7 +79,7 @@ function test()
     isnot(gScripts.selectedValue, gScripts.values[0],
           "the correct script is selected");
 
-    gBreakpoints = gPane.breakpoints;
+    gBreakpoints = gPane.getAllBreakpoints();
     is(Object.keys(gBreakpoints), 0, "no breakpoints");
     ok(!gPane.getBreakpoint("chocolate", 3), "getBreakpoint('chocolate', 3) returns falsey");
 
diff --git a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js
index 9e938e2f510c..d9491b120369 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js
@@ -19,7 +19,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gWatch = gDebugger.DebuggerView.WatchExpressions;
 
     gDebugger.DebuggerView.togglePanes({ visible: true, animated: false });
diff --git a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-02.js b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-02.js
index 53f9a22031b7..5f596654c1c4 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-02.js
@@ -20,7 +20,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gWatch = gDebugger.DebuggerView.WatchExpressions;
     gVars = gDebugger.DebuggerView.Variables;
 
diff --git a/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js b/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
index 9ac7911df420..d8e4d7017980 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
@@ -28,7 +28,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     resumed = true;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_bug737803_editor_actual_location.js b/browser/devtools/debugger/test/browser_dbg_bug737803_editor_actual_location.js
index 4a32b2428f16..90325b241375 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug737803_editor_actual_location.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug737803_editor_actual_location.js
@@ -30,9 +30,11 @@ function test() {
     gTab = aTab;
     gPane = aPane;
     gDebuggee = aDebuggee;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     resumed = true;
 
+    gDebugger.addEventListener("Debugger:SourceShown", onScriptShown);
+
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function () {
       framesAdded = true;
       executeSoon(startTest);
@@ -48,11 +50,9 @@ function test() {
     executeSoon(startTest);
   }
 
-  window.addEventListener("Debugger:SourceShown", onScriptShown);
-
   function startTest() {
     if (scriptShown && framesAdded && resumed && !testStarted) {
-      window.removeEventListener("Debugger:SourceShown", onScriptShown);
+      gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown);
       testStarted = true;
       Services.tm.currentThread.dispatch({ run: performTest }, 0);
     }
@@ -61,7 +61,7 @@ function test() {
   function performTest() {
     gScripts = gDebugger.DebuggerView.Sources;
     gEditor = gDebugger.editor;
-    gBreakpoints = gPane.breakpoints;
+    gBreakpoints = gPane.getAllBreakpoints();
     is(Object.keys(gBreakpoints), 0, "There are no breakpoints");
 
     gEditor.addEventListener(SourceEditor.EVENTS.BREAKPOINT_CHANGE,
diff --git a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js
index d1d3ca2f4ad0..8061fc8c3c3c 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js
@@ -29,7 +29,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gBreakpoints = gDebugger.DebuggerController.Breakpoints;
     gBreakpointsPane = gDebugger.DebuggerView.Breakpoints;
 
@@ -79,7 +79,7 @@ function test()
     is(gScripts.selectedValue, gScripts.values[0],
           "The correct script is selected");
 
-    gBreakpoints = gPane.breakpoints;
+    gBreakpoints = gPane.getAllBreakpoints();
     is(Object.keys(gBreakpoints).length, 13, "thirteen breakpoints");
     ok(!gPane.getBreakpoint("foo", 3), "getBreakpoint('foo', 3) returns falsey");
 
diff --git a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-02.js b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-02.js
index e7206d1576af..a8d15758e1cc 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-02.js
@@ -33,7 +33,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gBreakpoints = gDebugger.DebuggerController.Breakpoints;
     gBreakpointsPane = gDebugger.DebuggerView.Breakpoints;
 
@@ -83,7 +83,7 @@ function test()
     is(gScripts.selectedValue, gScripts.values[0],
           "The correct script is selected");
 
-    gBreakpoints = gPane.breakpoints;
+    gBreakpoints = gPane.getAllBreakpoints();
     is(Object.keys(gBreakpoints), 0, "no breakpoints");
     ok(!gPane.getBreakpoint("foo", 3), "getBreakpoint('foo', 3) returns falsey");
 
diff --git a/browser/devtools/debugger/test/browser_dbg_bug786070_hide_nonenums.js b/browser/devtools/debugger/test/browser_dbg_bug786070_hide_nonenums.js
index cf68ee5ca7be..d0cb74a16a5d 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug786070_hide_nonenums.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug786070_hide_nonenums.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testNonEnumProperties();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_clean-exit.js b/browser/devtools/debugger/test/browser_dbg_clean-exit.js
index 2530328b84e3..fe0a496f2dc4 100644
--- a/browser/devtools/debugger/test/browser_dbg_clean-exit.js
+++ b/browser/devtools/debugger/test/browser_dbg_clean-exit.js
@@ -15,7 +15,7 @@ function test() {
   debug_tab_pane(DEBUGGER_TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testCleanExit();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_createRemote.js b/browser/devtools/debugger/test/browser_dbg_createRemote.js
index 4abcd7561a6d..ff4f5bb6b7a0 100644
--- a/browser/devtools/debugger/test/browser_dbg_createRemote.js
+++ b/browser/devtools/debugger/test/browser_dbg_createRemote.js
@@ -18,7 +18,7 @@ function test() {
   debug_remote(TEST_URL, function(aTab, aDebuggee, aWindow) {
     gTab = aTab;
     gWindow = aWindow;
-    let gDebugger = gWindow.contentWindow;
+    let gDebugger = gWindow.panelWin;
 
     info("Current remote window x: " +
       Services.prefs.getIntPref("devtools.debugger.ui.win-x"));
diff --git a/browser/devtools/debugger/test/browser_dbg_displayName.js b/browser/devtools/debugger/test/browser_dbg_displayName.js
index 40afa0837692..785fc0fabe83 100644
--- a/browser/devtools/debugger/test/browser_dbg_displayName.js
+++ b/browser/devtools/debugger/test/browser_dbg_displayName.js
@@ -18,7 +18,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testAnonCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_iframes.js b/browser/devtools/debugger/test/browser_dbg_iframes.js
index 3411df6adb0a..78f3c28d7a5a 100644
--- a/browser/devtools/debugger/test/browser_dbg_iframes.js
+++ b/browser/devtools/debugger/test/browser_dbg_iframes.js
@@ -14,10 +14,7 @@ function test() {
   debug_tab_pane(TEST_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    let gDebugger = gPane.contentWindow;
-
-    is(gDebugger.document.getElementById("close").getAttribute("hidden"), "false",
-      "The close button should be visible in a normal content debugger.");
+    let gDebugger = gPane.panelWin;
 
     is(gDebugger.DebuggerController.activeThread.paused, false,
       "Should be running after debug_tab_pane.");
diff --git a/browser/devtools/debugger/test/browser_dbg_leaktest.js b/browser/devtools/debugger/test/browser_dbg_leaktest.js
index 8cd601145bfc..3b4e0993c944 100644
--- a/browser/devtools/debugger/test/browser_dbg_leaktest.js
+++ b/browser/devtools/debugger/test/browser_dbg_leaktest.js
@@ -24,7 +24,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     resumed = true;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js b/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js
index b631cac16398..3e90fb754a47 100644
--- a/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js
+++ b/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js
@@ -20,7 +20,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes-new.js b/browser/devtools/debugger/test/browser_dbg_location-changes-new.js
index cfad4119c06b..7df75c656159 100644
--- a/browser/devtools/debugger/test/browser_dbg_location-changes-new.js
+++ b/browser/devtools/debugger/test/browser_dbg_location-changes-new.js
@@ -20,7 +20,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes.js b/browser/devtools/debugger/test/browser_dbg_location-changes.js
index 8ccb8b6451d4..586e754e3dc1 100644
--- a/browser/devtools/debugger/test/browser_dbg_location-changes.js
+++ b/browser/devtools/debugger/test/browser_dbg_location-changes.js
@@ -17,7 +17,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_pane-collapse.js b/browser/devtools/debugger/test/browser_dbg_pane-collapse.js
index 96c3a3f23375..39f644816610 100644
--- a/browser/devtools/debugger/test/browser_dbg_pane-collapse.js
+++ b/browser/devtools/debugger/test/browser_dbg_pane-collapse.js
@@ -16,7 +16,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gView = gDebugger.DebuggerView;
 
     testPanesState();
diff --git a/browser/devtools/debugger/test/browser_dbg_panesize-inner.js b/browser/devtools/debugger/test/browser_dbg_panesize-inner.js
index d7d9c73ee17e..440363d4a830 100644
--- a/browser/devtools/debugger/test/browser_dbg_panesize-inner.js
+++ b/browser/devtools/debugger/test/browser_dbg_panesize-inner.js
@@ -7,65 +7,70 @@
 function test() {
   var tab1 = addTab(TAB1_URL, function() {
     gBrowser.selectedTab = tab1;
+    let target1 = TargetFactory.forTab(tab1);
 
-    ok(!DebuggerUI.getDebugger(),
-      "Shouldn't have a debugger pane for this tab yet.");
+    ok(!gDevTools.getPanelForTarget("jsdebugger", target1),
+      "Shouldn't have a debugger panel for this tab yet.");
 
-    let pane = DebuggerUI.toggleDebugger();
-    ok(pane, "toggleDebugger() should return a pane.");
+    let toolbox = gDevTools.openToolboxForTab(target1, "jsdebugger");
+    toolbox.once("jsdebugger-ready", function dbgReady() {
+      let dbg = gDevTools.getPanelForTarget("jsdebugger", target1);
+      ok(dbg, "We should have a debugger panel.");
 
-    let preferredSfw = Services.prefs.getIntPref("devtools.debugger.ui.stackframes-width");
-    let preferredBpw = Services.prefs.getIntPref("devtools.debugger.ui.variables-width");
-    let someWidth1, someWidth2;
+      let preferredSfw = Services.prefs.getIntPref("devtools.debugger.ui.stackframes-width");
+      let preferredBpw = Services.prefs.getIntPref("devtools.debugger.ui.variables-width");
+      let someWidth1, someWidth2;
 
-    do {
-      someWidth1 = parseInt(Math.random() * 200) + 100;
-      someWidth2 = parseInt(Math.random() * 200) + 100;
-    } while (someWidth1 == preferredSfw ||
-             someWidth2 == preferredBpw)
+      do {
+        someWidth1 = parseInt(Math.random() * 200) + 100;
+        someWidth2 = parseInt(Math.random() * 200) + 100;
+      } while (someWidth1 == preferredSfw ||
+               someWidth2 == preferredBpw)
 
-    info("Preferred stackframes width: " + preferredSfw);
-    info("Preferred variables width: " + preferredBpw);
-    info("Generated stackframes width: " + someWidth1);
-    info("Generated variables width: " + someWidth2);
+      let someWidth1 = parseInt(Math.random() * 200) + 100;
+      let someWidth2 = parseInt(Math.random() * 200) + 100;
 
-    is(DebuggerUI.getDebugger(), pane,
-      "getDebugger() should return the same pane as toggleDebugger().");
+      info("Preferred stackframes width: " + preferredSfw);
+      info("Preferred variables width: " + preferredBpw);
+      info("Generated stackframes width: " + someWidth1);
+      info("Generated variables width: " + someWidth2);
 
-    let content = pane.contentWindow;
-    let stackframes;
-    let variables;
+      let content = dbg.panelWin;
+      let stackframes;
+      let variables;
 
-    wait_for_connect_and_resume(function() {
-      ok(content.Prefs.stackframesWidth,
-        "The debugger preferences should have a saved stackframesWidth value.");
-      ok(content.Prefs.variablesWidth,
-        "The debugger preferences should have a saved variablesWidth value.");
+      wait_for_connect_and_resume(function() {
+        ok(content.Prefs.stackframesWidth,
+          "The debugger preferences should have a saved stackframesWidth value.");
+        ok(content.Prefs.variablesWidth,
+          "The debugger preferences should have a saved variablesWidth value.");
 
-      stackframes = content.document.getElementById("stackframes+breakpoints");
-      variables = content.document.getElementById("variables+expressions");
+        stackframes = content.document.getElementById("stackframes+breakpoints");
+        variables = content.document.getElementById("variables+expressions");
 
-      is(content.Prefs.stackframesWidth, stackframes.getAttribute("width"),
-        "The stackframes pane width should be the same as the preferred value.");
-      is(content.Prefs.variablesWidth, variables.getAttribute("width"),
-        "The variables pane width should be the same as the preferred value.");
+        is(content.Prefs.stackframesWidth, stackframes.getAttribute("width"),
+          "The stackframes pane width should be the same as the preferred value.");
+        is(content.Prefs.variablesWidth, variables.getAttribute("width"),
+          "The variables pane width should be the same as the preferred value.");
 
-      stackframes.setAttribute("width", someWidth1);
-      variables.setAttribute("width", someWidth2);
+        stackframes.setAttribute("width", someWidth1);
+        variables.setAttribute("width", someWidth2);
 
-      removeTab(tab1);
+        removeTab(tab1);
+      }, tab1);
+
+      window.addEventListener("Debugger:Shutdown", function dbgShutdown() {
+        window.removeEventListener("Debugger:Shutdown", dbgShutdown, true);
+
+        is(content.Prefs.stackframesWidth, stackframes.getAttribute("width"),
+          "The stackframes pane width should have been saved by now.");
+        is(content.Prefs.variablesWidth, variables.getAttribute("width"),
+          "The variables pane width should have been saved by now.");
+
+        finish();
+
+      }, true);
     });
 
-    window.addEventListener("Debugger:Shutdown", function dbgShutdown() {
-      window.removeEventListener("Debugger:Shutdown", dbgShutdown, true);
-
-      is(content.Prefs.stackframesWidth, stackframes.getAttribute("width"),
-        "The stackframes pane width should have been saved by now.");
-      is(content.Prefs.variablesWidth, variables.getAttribute("width"),
-        "The variables pane width should have been saved by now.");
-
-      finish();
-
-    }, true);
   });
 }
diff --git a/browser/devtools/debugger/test/browser_dbg_panesize.js b/browser/devtools/debugger/test/browser_dbg_panesize.js
deleted file mode 100644
index 754f489e2e19..000000000000
--- a/browser/devtools/debugger/test/browser_dbg_panesize.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-function test() {
-  var tab1 = addTab(TAB1_URL, function() {
-    gBrowser.selectedTab = tab1;
-
-    ok(!DebuggerUI.getDebugger(),
-      "Shouldn't have a debugger pane for this tab yet.");
-
-    let pane = DebuggerUI.toggleDebugger();
-    ok(pane, "toggleDebugger() should return a pane.");
-
-    let preferredHeight = Services.prefs.getIntPref("devtools.debugger.ui.height");
-    let someHeight;
-
-    do {
-      someHeight = parseInt(Math.random() * 200) + 200;
-    } while (someHeight == preferredHeight)
-
-    info("Preferred pane height: " + preferredHeight);
-    info("Generated pane height: " + someHeight);
-
-    is(DebuggerUI.getDebugger(), pane,
-      "getDebugger() should return the same pane as toggleDebugger().");
-
-    ok(DebuggerUI.preferences.height,
-      "The debugger preferences should have a saved height value.");
-
-    is(DebuggerUI.preferences.height, pane._frame.height,
-      "The debugger pane height should be the same as the preferred value.");
-
-    pane._frame.height = someHeight;
-
-    ok(DebuggerUI.preferences.height !== someHeight,
-      "Height preferences shouldn't have been updated yet.");
-
-    wait_for_connect_and_resume(function() {
-      removeTab(tab1);
-    });
-
-    window.addEventListener("Debugger:Shutdown", function dbgShutdown() {
-      window.removeEventListener("Debugger:Shutdown", dbgShutdown, true);
-
-      is(DebuggerUI.preferences.height, someHeight,
-        "Height preferences should have been updated by now.");
-
-      finish();
-
-    }, true);
-  });
-}
diff --git a/browser/devtools/debugger/test/browser_dbg_pause-exceptions.js b/browser/devtools/debugger/test/browser_dbg_pause-exceptions.js
index 5067c9f06391..aafa987086ba 100644
--- a/browser/devtools/debugger/test/browser_dbg_pause-exceptions.js
+++ b/browser/devtools/debugger/test/browser_dbg_pause-exceptions.js
@@ -20,7 +20,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
     gDebugger.DebuggerView.Variables.nonEnumVisible = false;
@@ -30,7 +30,7 @@ function test()
 
 function testWithFrame()
 {
-  gPane.contentWindow.gClient.addOneTimeListener("paused", function() {
+  gPane.panelWin.gClient.addOneTimeListener("paused", function() {
     gDebugger.addEventListener("Debugger:FetchedVariables", function testA() {
       // We expect 2 Debugger:FetchedVariables events, one from the global object
       // scope and the regular one.
@@ -48,7 +48,7 @@ function testWithFrame()
       gDebugger.DebuggerView.Options._togglePauseOnExceptions();
 
       gCount = 0;
-      gPane.contentWindow.gClient.addOneTimeListener("resumed", function() {
+      gPane.panelWin.gClient.addOneTimeListener("resumed", function() {
         gDebugger.addEventListener("Debugger:FetchedVariables", function testB() {
           // We expect 2 Debugger:FetchedVariables events, one from the global object
           // scope and the regular one.
@@ -96,7 +96,7 @@ function testWithFrame()
 }
 
 function resumeAndFinish() {
-  gPane.contentWindow.gClient.addOneTimeListener("resumed", function() {
+  gPane.panelWin.gClient.addOneTimeListener("resumed", function() {
     Services.tm.currentThread.dispatch({ run: function() {
 
       closeDebuggerAndFinish(false);
diff --git a/browser/devtools/debugger/test/browser_dbg_pause-resume.js b/browser/devtools/debugger/test/browser_dbg_pause-resume.js
index 476aaa9b6a26..4922acf217db 100644
--- a/browser/devtools/debugger/test/browser_dbg_pause-resume.js
+++ b/browser/devtools/debugger/test/browser_dbg_pause-resume.js
@@ -15,7 +15,7 @@ function test() {
   debug_tab_pane(STACK_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gView = gDebugger.DebuggerView;
     gLH = gDebugger.LayoutHelpers;
     gL10N = gDebugger.L10N;
diff --git a/browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js b/browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js
index 73e1ed50fac6..76f934df723a 100644
--- a/browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js
+++ b/browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js
@@ -18,7 +18,7 @@ function test() {
   debug_tab_pane(TEST_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    let gDebugger = gPane.contentWindow;
+    let gDebugger = gPane.panelWin;
 
     is(gDebugger.DebuggerController._isInitialized, true,
       "Controller should be initialized after debug_tab_pane.");
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-01.js b/browser/devtools/debugger/test/browser_dbg_propertyview-01.js
index ff5dcdc1fcef..46a02e4c3445 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-01.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-02.js b/browser/devtools/debugger/test/browser_dbg_propertyview-02.js
index b24e2a2ea4d3..ac7c1ced3780 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-02.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-03.js b/browser/devtools/debugger/test/browser_dbg_propertyview-03.js
index 6fe0d9388a19..06e1b8b5372c 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-03.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-03.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-04.js b/browser/devtools/debugger/test/browser_dbg_propertyview-04.js
index 2b1bfd0edef3..3a80ef5c6eaf 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-04.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-04.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-05.js b/browser/devtools/debugger/test/browser_dbg_propertyview-05.js
index e56bfa67e4b6..ad887d324983 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-05.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-05.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-06.js b/browser/devtools/debugger/test/browser_dbg_propertyview-06.js
index 06c908fabfe5..194160c9dbc6 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-06.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-06.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-07.js b/browser/devtools/debugger/test/browser_dbg_propertyview-07.js
index c7c77f2808d7..23d242115bb0 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-07.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-07.js
@@ -17,7 +17,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testFrameParameters();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-08.js b/browser/devtools/debugger/test/browser_dbg_propertyview-08.js
index 7c43b7e76410..b822d77bed8d 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-08.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-08.js
@@ -17,7 +17,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testFrameParameters();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-09.js b/browser/devtools/debugger/test/browser_dbg_propertyview-09.js
index d89c0c29080b..b9c6a4aad377 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-09.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-09.js
@@ -19,7 +19,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
     gDebugger.DebuggerView.Variables.nonEnumVisible = false;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-10.js b/browser/devtools/debugger/test/browser_dbg_propertyview-10.js
index 811f8f881551..c3cb4c45e04a 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-10.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-10.js
@@ -19,7 +19,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
     gDebugger.DebuggerView.Variables.nonEnumVisible = false;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-data.js b/browser/devtools/debugger/test/browser_dbg_propertyview-data.js
index 456a39f22c0c..9c67c7461494 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-data.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-data.js
@@ -18,7 +18,7 @@ function test()
   debug_tab_pane(TAB1_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gVariablesView = gDebugger.DebuggerView.Variables;
 
     testVariablesView();
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js b/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js
index f3ae5f48a649..6b7ca2c5594e 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js
@@ -18,7 +18,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
     gDebugger.DebuggerView.Variables.nonEnumVisible = false;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js
index 9a4d10e93701..8838f2f49f5c 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js
@@ -21,7 +21,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebuggee = aDebuggee;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js
index 9f6ff6a95a58..9c6927712460 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js
@@ -21,7 +21,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebuggee = aDebuggee;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-03.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-03.js
index c183b6382c63..596e2b920e5e 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-03.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-03.js
@@ -24,7 +24,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebuggee = aDebuggee;
 
     testSearchbox();
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-04.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-04.js
index bfc6808c533e..8fd71d0b8588 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-04.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-04.js
@@ -24,7 +24,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebuggee = aDebuggee;
 
     testSearchbox();
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js
index 6f3f449ed6b6..ab129663e5a0 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js
@@ -21,7 +21,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebuggee = aDebuggee;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-06.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-06.js
index 29d8b18336b1..715edec78a7a 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-06.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-06.js
@@ -21,7 +21,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebuggee = aDebuggee;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = false;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js
index 83c3ec878534..5be8fcf096d7 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js
@@ -21,7 +21,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebuggee = aDebuggee;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js
index b70a7ed9fa51..3927394b085e 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js
@@ -21,7 +21,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebuggee = aDebuggee;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-reexpand.js b/browser/devtools/debugger/test/browser_dbg_propertyview-reexpand.js
index 2f2fbcee28b6..7f63689cb08c 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-reexpand.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-reexpand.js
@@ -20,7 +20,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebuggee = aDebuggee;
 
     addBreakpoint();
diff --git a/browser/devtools/debugger/test/browser_dbg_reload-same-script.js b/browser/devtools/debugger/test/browser_dbg_reload-same-script.js
index 7d3bd91a418a..4878978d307e 100644
--- a/browser/devtools/debugger/test/browser_dbg_reload-same-script.js
+++ b/browser/devtools/debugger/test/browser_dbg_reload-same-script.js
@@ -28,7 +28,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gView = gDebugger.DebuggerView;
     resumed = true;
 
diff --git a/browser/devtools/debugger/test/browser_dbg_script-switching.js b/browser/devtools/debugger/test/browser_dbg_script-switching.js
index 56e1d988e87e..cc794044e92a 100644
--- a/browser/devtools/debugger/test/browser_dbg_script-switching.js
+++ b/browser/devtools/debugger/test/browser_dbg_script-switching.js
@@ -25,7 +25,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     resumed = true;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js
index cb54d0379214..328328e3bfd9 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js
@@ -24,7 +24,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js
index 39b8ee2a72e9..18c045e7a36c 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js
@@ -26,7 +26,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-03.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-03.js
index e7f58a302a16..41d5936cab51 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-03.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-03.js
@@ -27,7 +27,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-04.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-04.js
index a938d6ee4ff5..a885e39e86b8 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-04.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-04.js
@@ -27,7 +27,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js
index eaa7b9287c8c..297b906f5a8c 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js
@@ -27,7 +27,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-06.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-06.js
index 4191b16b0d11..022b7f4b6900 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-06.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-06.js
@@ -27,7 +27,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-07.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-07.js
index 33ca5cdbf7c8..89f60d54a6d9 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-07.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-07.js
@@ -28,7 +28,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-08.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-08.js
index 44c05d6b66b2..afd1b4107abd 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-08.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-08.js
@@ -27,7 +27,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-popup.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-popup.js
index 3e07f69fe5a2..3fa523e70365 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-popup.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-popup.js
@@ -18,7 +18,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       runTest();
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-sorting.js b/browser/devtools/debugger/test/browser_dbg_scripts-sorting.js
index 1fdcf0071896..cd3d523e8416 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-sorting.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-sorting.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_select-line.js b/browser/devtools/debugger/test/browser_dbg_select-line.js
index bc9a9e586553..cbe3116cc64f 100644
--- a/browser/devtools/debugger/test/browser_dbg_select-line.js
+++ b/browser/devtools/debugger/test/browser_dbg_select-line.js
@@ -24,7 +24,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testSelectLine();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_stack-01.js b/browser/devtools/debugger/test/browser_dbg_stack-01.js
index d6ad154864c1..340f4442939b 100644
--- a/browser/devtools/debugger/test/browser_dbg_stack-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_stack-01.js
@@ -14,7 +14,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_stack-02.js b/browser/devtools/debugger/test/browser_dbg_stack-02.js
index 14067e835a26..7dd6f7379dac 100644
--- a/browser/devtools/debugger/test/browser_dbg_stack-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_stack-02.js
@@ -14,7 +14,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testEvalCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_stack-03.js b/browser/devtools/debugger/test/browser_dbg_stack-03.js
index dc11eff6800e..028ecf9e7cb4 100644
--- a/browser/devtools/debugger/test/browser_dbg_stack-03.js
+++ b/browser/devtools/debugger/test/browser_dbg_stack-03.js
@@ -14,7 +14,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testRecurse();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_stack-04.js b/browser/devtools/debugger/test/browser_dbg_stack-04.js
index ce5fc209f268..d65708b5b37e 100644
--- a/browser/devtools/debugger/test/browser_dbg_stack-04.js
+++ b/browser/devtools/debugger/test/browser_dbg_stack-04.js
@@ -14,7 +14,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     testEvalCallResume();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_stack-05.js b/browser/devtools/debugger/test/browser_dbg_stack-05.js
index 515bfcaf6f40..efa211f7559c 100644
--- a/browser/devtools/debugger/test/browser_dbg_stack-05.js
+++ b/browser/devtools/debugger/test/browser_dbg_stack-05.js
@@ -22,7 +22,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js b/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js
index acb4100b4038..3e163206a7a8 100644
--- a/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js
+++ b/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js
@@ -29,7 +29,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.contentWindow;
+    gDebugger = gPane.panelWin;
     gScripts = gDebugger.DebuggerView.Sources._container;
     resumed = true;
 
diff --git a/browser/devtools/debugger/test/head.js b/browser/devtools/debugger/test/head.js
index f71d21a8e9d2..e643521080e3 100644
--- a/browser/devtools/debugger/test/head.js
+++ b/browser/devtools/debugger/test/head.js
@@ -14,6 +14,10 @@ let DebuggerServer = tempScope.DebuggerServer;
 let DebuggerTransport = tempScope.DebuggerTransport;
 let DebuggerClient = tempScope.DebuggerClient;
 let Services = tempScope.Services;
+Cu.import("resource:///modules/devtools/gDevTools.jsm", tempScope);
+let gDevTools = tempScope.gDevTools;
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
 
 const EXAMPLE_URL = "http://example.com/browser/browser/devtools/debugger/test/";
 const TAB1_URL = EXAMPLE_URL + "browser_dbg_tab1.html";
@@ -86,11 +90,25 @@ function removeTab(aTab, aWindow) {
 }
 
 function closeDebuggerAndFinish(aRemoteFlag, aCallback, aWindow) {
-  let targetWindow = aWindow || window;
-  let debuggerUI = targetWindow.DebuggerUI;
-
   let debuggerClosed = false;
   let debuggerDisconnected = false;
+  // let targetWindow = aWindow || window;
+  ok(gTab, "There is a gTab to use for getting a toolbox reference");
+  let target = TargetFactory.forTab(gTab);
+
+  // let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+  window.addEventListener("Debugger:Shutdown", function cleanup() {
+    window.removeEventListener("Debugger:Shutdown", cleanup, false);
+    debuggerDisconnected = true;
+    _maybeFinish();
+  }, false);
+
+  let toolbox = gDevTools.getToolboxForTarget(target);
+  toolbox.once("destroyed", function() {
+    debuggerClosed = true;
+    _maybeFinish();
+  });
+  toolbox.destroy();
 
   function _maybeFinish() {
     if (debuggerClosed && debuggerDisconnected) {
@@ -100,20 +118,15 @@ function closeDebuggerAndFinish(aRemoteFlag, aCallback, aWindow) {
     }
   }
 
-  debuggerUI.chromeWindow.addEventListener("Debugger:Shutdown", function cleanup() {
-    debuggerUI.chromeWindow.removeEventListener("Debugger:Shutdown", cleanup, false);
-    debuggerDisconnected = true;
-    _maybeFinish();
-  }, false);
-  if (!aRemoteFlag) {
-    debuggerUI.getDebugger().close(function() {
-      debuggerClosed = true;
-      _maybeFinish();
-    });
-  } else {
-    debuggerClosed = true;
-    debuggerUI.getRemoteDebugger().close();
-  }
+  // if (!aRemoteFlag) {
+  //   dbg.getDebugger().close(function() {
+  //     debuggerClosed = true;
+  //     _maybeFinish();
+  //   });
+  // } else {
+  //   debuggerClosed = true;
+  //   dbg.getRemoteDebugger().close();
+  // }
 }
 
 function get_tab_actor_for_url(aClient, aURL, aCallback) {
@@ -129,7 +142,7 @@ function get_tab_actor_for_url(aClient, aURL, aCallback) {
 
 function attach_tab_actor_for_url(aClient, aURL, aCallback) {
   get_tab_actor_for_url(aClient, aURL, function(actor) {
-    aClient.request({ to: actor.actor, type: "attach" }, function(aResponse) {
+    aClient.attachTab(actor.actor, function(aResponse) {
       aCallback(actor, aResponse);
     });
   });
@@ -137,45 +150,44 @@ function attach_tab_actor_for_url(aClient, aURL, aCallback) {
 
 function attach_thread_actor_for_url(aClient, aURL, aCallback) {
   attach_tab_actor_for_url(aClient, aURL, function(aTabActor, aResponse) {
-    aClient.request({ "to": actor.threadActor, "type": "attach" }, function(aResponse) {
+    aClient.attachThread(actor.threadActor, function(aResponse, aThreadClient) {
       // We don't care about the pause right now (use
       // get_actor_for_url() if you do), so resume it.
-      aClient.request({ to: actor.threadActor, type: "resume" }, function(aResponse) {
+      aThreadClient.resume(function(aResponse) {
         aCallback(actor);
       });
     });
   });
 }
 
-function wait_for_connect_and_resume(aOnDebugging, aWindow) {
-  let targetWindow = aWindow || window;
-  let targetDocument = targetWindow.document;
-
-  targetDocument.addEventListener("Debugger:Connected", function dbgConnected(aEvent) {
-    targetDocument.removeEventListener("Debugger:Connected", dbgConnected, true);
-
+function wait_for_connect_and_resume(aOnDebugging, aTab) {
+  let target = TargetFactory.forTab(aTab);
+  let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+  dbg.once("connected", function dbgConnected() {
     // Wait for the initial resume...
-    aEvent.target.ownerDocument.defaultView.gClient.addOneTimeListener("resumed", function() {
+    dbg.panelWin.gClient.addOneTimeListener("resumed", function() {
       aOnDebugging();
     });
-  }, true);
+  });
 }
 
 function debug_tab_pane(aURL, aOnDebugging) {
   let tab = addTab(aURL, function() {
     gBrowser.selectedTab = gTab;
-    let debuggee = tab.linkedBrowser.contentWindow.wrappedJSObject;
+    let debuggee = gBrowser.selectedTab.linkedBrowser.contentWindow.wrappedJSObject;
 
-    let pane = DebuggerUI.toggleDebugger();
-    pane._frame.addEventListener("Debugger:Connected", function dbgConnected() {
-      pane._frame.removeEventListener("Debugger:Connected", dbgConnected, true);
-
-      // Wait for the initial resume...
-      pane.contentWindow.gClient.addOneTimeListener("resumed", function() {
-        pane.contentWindow.DebuggerView.Variables.lazyEmpty = false;
-        aOnDebugging(tab, debuggee, pane);
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let toolbox = gDevTools.openToolboxForTab(target, "jsdebugger");
+    toolbox.once("jsdebugger-ready", function dbgReady() {
+      let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+      dbg.once("connected", function() {
+        // Wait for the initial resume...
+        dbg.panelWin.gClient.addOneTimeListener("resumed", function() {
+          dbg._view.Variables.lazyEmpty = false;
+          aOnDebugging(tab, debuggee, dbg);
+        });
       });
-    }, true);
+    });
   });
 }
 
@@ -192,7 +204,7 @@ function debug_remote(aURL, aOnDebugging, aBeforeTabAdded) {
       win._dbgwin.removeEventListener("Debugger:Connected", dbgConnected, true);
 
       // Wait for the initial resume...
-      win.contentWindow.gClient.addOneTimeListener("resumed", function() {
+      win.panelWin.gClient.addOneTimeListener("resumed", function() {
         win._dbgwin.DebuggerView.Variables.lazyEmpty = false;
         aOnDebugging(tab, debuggee, win);
       });
diff --git a/browser/devtools/highlighter/Makefile.in b/browser/devtools/framework/Makefile.in
similarity index 68%
rename from browser/devtools/highlighter/Makefile.in
rename to browser/devtools/framework/Makefile.in
index 8187267f5b74..df206dadd999 100644
--- a/browser/devtools/highlighter/Makefile.in
+++ b/browser/devtools/framework/Makefile.in
@@ -10,17 +10,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = \
-	highlighter.jsm \
-	$(NULL)
-
-EXTRA_PP_JS_MODULES = \
-	inspector.jsm \
-	$(NULL)
-
 TEST_DIRS += test
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
-	$(NSINSTALL) $(srcdir)/CmdInspect.jsm $(FINAL_TARGET)/modules/devtools
+	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
diff --git a/browser/devtools/framework/Sidebar.jsm b/browser/devtools/framework/Sidebar.jsm
new file mode 100644
index 000000000000..ad77f3462172
--- /dev/null
+++ b/browser/devtools/framework/Sidebar.jsm
@@ -0,0 +1,191 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const Cc = Components.classes;
+const Cu = Components.utils;
+const Ci = Components.interfaces;
+
+this.EXPORTED_SYMBOLS = ["ToolSidebar"];
+
+Cu.import("resource:///modules/devtools/EventEmitter.jsm");
+
+const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+/**
+ * ToolSidebar provides methods to register tabs in the sidebar.
+ * It's assumed that the sidebar contains a xul:tabbox.
+ *
+ * @param {Node} tabbox
+ *  <tabbox> node;
+ * @param {ToolPanel} panel
+ *  Related ToolPanel instance;
+ * @param {Boolean} showTabstripe
+ *  Show the tabs.
+ */
+this.ToolSidebar = function ToolSidebar(tabbox, panel, showTabstripe=true)
+{
+  new EventEmitter(this);
+
+  this._tabbox = tabbox;
+  this._panelDoc = this._tabbox.ownerDocument;
+  this._toolPanel = panel;
+
+  this._tabbox.tabpanels.addEventListener("select", this, true);
+
+  this._tabs = new Map();
+
+  if (!showTabstripe) {
+    this._tabbox.setAttribute("hidetabs", "true");
+  }
+}
+
+ToolSidebar.prototype = {
+  /**
+   * Register a tab. A tab is a document.
+   * The document must have a title, which will be used as the name of the tab.
+   *
+   * @param {string} tab uniq id
+   * @param {string} url
+   */
+  addTab: function ToolSidebar_addTab(id, url, selected=false) {
+    let iframe = this._panelDoc.createElementNS(XULNS, "iframe");
+    iframe.className = "iframe-" + id;
+    iframe.setAttribute("flex", "1");
+    iframe.setAttribute("src", url);
+
+    let tab = this._tabbox.tabs.appendItem();
+
+    let onIFrameLoaded = function() {
+      tab.setAttribute("label", iframe.contentDocument.title);
+      iframe.removeEventListener("DOMContentLoaded", onIFrameLoaded, true);
+      if ("setPanel" in iframe.contentWindow) {
+        iframe.contentWindow.setPanel(this._toolPanel, iframe);
+      }
+      this.emit(id + "-ready");
+    }.bind(this);
+
+    iframe.addEventListener("DOMContentLoaded", onIFrameLoaded, true);
+
+    let tabpanel = this._panelDoc.createElementNS(XULNS, "tabpanel");
+    tabpanel.setAttribute("id", "sidebar-panel-" + id);
+    tabpanel.appendChild(iframe);
+    this._tabbox.tabpanels.appendChild(tabpanel);
+
+    tab.linkedPanel = "sidebar-panel-" + id;
+
+    // We store the index of this tab.
+    this._tabs.set(id, tab);
+
+    if (selected) {
+      // For some reason I don't understand, if we call this.select in this
+      // event loop (after inserting the tab), the tab will never get the
+      // the "selected" attribute set to true.
+      this._panelDoc.defaultView.setTimeout(function() {
+        this.select(id);
+      }.bind(this), 0);
+    }
+
+    this.emit("new-tab-registered", id);
+  },
+
+  /**
+   * Select a specific tab.
+   */
+  select: function ToolSidebar_select(id) {
+    let tab = this._tabs.get(id);
+    if (tab) {
+      this._tabbox.selectedTab = tab;
+    }
+  },
+
+  /**
+   * Return the id of the selected tab.
+   */
+  getCurrentTabID: function ToolSidebar_getCurrentTabID() {
+    let currentID = null;
+    for (let [id, tab] of this._tabs) {
+      if (this._tabbox.tabs.selectedItem == tab) {
+        currentID = id;
+        break;
+      }
+    }
+    return currentID;
+  },
+
+  /**
+   * Event handler.
+   */
+  handleEvent: function ToolSidebar_eventHandler(event) {
+    if (event.type == "select") {
+      let previousTool = this._currentTool;
+      this._currentTool = this.getCurrentTabID();
+      if (previousTool) {
+        this.emit(previousTool + "-unselected");
+      }
+
+      this.emit(this._currentTool + "-selected");
+      this.emit("select", this._currentTool);
+    }
+  },
+
+
+  /**
+   * Toggle sidebar's visibility state.
+   */
+  toggle: function ToolSidebar_toggle() {
+    if (this._tabbox.hasAttribute("hidden")) {
+      this.show();
+    } else {
+      this.hide();
+    }
+  },
+
+  /**
+   * Show the sidebar.
+   */
+  show: function ToolSidebar_show() {
+    this._tabbox.removeAttribute("hidden");
+  },
+
+  /**
+   * Show the sidebar.
+   */
+  hide: function ToolSidebar_hide() {
+    this._tabbox.setAttribute("hidden", "true");
+  },
+
+  /**
+   * Return the window containing the tab content.
+   */
+  getWindowForTab: function ToolSidebar_getWindowForTab(id) {
+    if (!this._tabs.has(id)) {
+      return null;
+    }
+
+    let panel = this._panelDoc.getElementById(this._tabs.get(id).linkedPanel);
+    return panel.firstChild.contentWindow;
+  },
+
+  /**
+   * Clean-up.
+   */
+  destroy: function ToolSidebar_destroy() {
+    this._tabbox.removeEventListener("select", this, true);
+
+    while (this._tabbox.tabpanels.hasChildNodes()) {
+      this._tabbox.tabpanels.removeChild(this._tabbox.tabpanels.firstChild);
+    }
+
+    while (this._tabbox.tabs.hasChildNodes()) {
+      this._tabbox.tabs.removeChild(this._tabbox.tabs.firstChild);
+    }
+
+    this._tabs = null;
+    this._tabbox = null;
+    this._panelDoc = null;
+    this._toolPanel = null;
+  },
+}
diff --git a/browser/devtools/framework/Target.jsm b/browser/devtools/framework/Target.jsm
new file mode 100644
index 000000000000..2438a16b94ea
--- /dev/null
+++ b/browser/devtools/framework/Target.jsm
@@ -0,0 +1,385 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = [ "TargetFactory" ];
+
+const Cu = Components.utils;
+const Ci = Components.interfaces;
+Cu.import("resource:///modules/devtools/EventEmitter.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+
+const targets = new WeakMap();
+
+/**
+ * Functions for creating Targets
+ */
+this.TargetFactory = {
+  /**
+   * Construct a Target
+   * @param {XULTab} tab
+   *        The tab to use in creating a new target
+   * @return A target object
+   */
+  forTab: function TF_forTab(tab) {
+    let target = targets.get(tab);
+    if (target == null) {
+      target = new TabTarget(tab);
+      targets.set(tab, target);
+    }
+    return target;
+  },
+
+  /**
+   * Creating a target for a tab that is being closed is a problem because it
+   * allows a leak as a result of coming after the close event which normally
+   * clears things up. This function allows us to ask if there is a known
+   * target for a tab without creating a target
+   * @return true/false
+   */
+  isKnownTab: function TF_isKnownTab(tab) {
+    return targets.has(tab);
+  },
+
+  /**
+   * Construct a Target
+   * @param {nsIDOMWindow} window
+   *        The chromeWindow to use in creating a new target
+   * @return A target object
+   */
+  forWindow: function TF_forWindow(window) {
+    let target = targets.get(window);
+    if (target == null) {
+      target = new WindowTarget(window);
+      targets.set(window, target);
+    }
+    return target;
+  },
+
+  /**
+   * Construct a Target for a remote global
+   * @param {Object} form
+   *        The serialized form of a debugging protocol actor.
+   * @param {DebuggerClient} client
+   *        The debuger client instance to communicate with the server.
+   * @param {boolean} chrome
+   *        A flag denoting that the debugging target is the remote process as a
+   *        whole and not a single tab.
+   * @return A target object
+   */
+  forRemote: function TF_forRemote(form, client, chrome) {
+    let target = targets.get(form);
+    if (target == null) {
+      target = new RemoteTarget(form, client, chrome);
+      targets.set(form, target);
+    }
+    return target;
+  },
+
+  /**
+   * Get all of the targets known to some browser instance (local if null)
+   * @return An array of target objects
+   */
+  allTargets: function TF_allTargets() {
+    let windows = [];
+    let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                       .getService(Components.interfaces.nsIWindowMediator);
+    let en = wm.getXULWindowEnumerator(null);
+    while (en.hasMoreElements()) {
+      windows.push(en.getNext());
+    }
+
+    return windows.map(function(window) {
+      return TargetFactory.forWindow(window);
+    });
+  },
+};
+
+/**
+ * The 'version' property allows the developer tools equivalent of browser
+ * detection. Browser detection is evil, however while we don't know what we
+ * will need to detect in the future, it is an easy way to postpone work.
+ * We should be looking to use 'supports()' in place of version where
+ * possible.
+ */
+function getVersion() {
+  // FIXME: return something better
+  return 20;
+}
+
+/**
+ * A better way to support feature detection, but we're not yet at a place
+ * where we have the features well enough defined for this to make lots of
+ * sense.
+ */
+function supports(feature) {
+  // FIXME: return something better
+  return false;
+};
+
+/**
+ * A Target represents something that we can debug. Targets are generally
+ * read-only. Any changes that you wish to make to a target should be done via
+ * a Tool that attaches to the target. i.e. a Target is just a pointer saying
+ * "the thing to debug is over there".
+ *
+ * Providing a generalized abstraction of a web-page or web-browser (available
+ * either locally or remotely) is beyond the scope of this class (and maybe
+ * also beyond the scope of this universe) However Target does attempt to
+ * abstract some common events and read-only properties common to many Tools.
+ *
+ * Supported read-only properties:
+ * - name, isRemote, url
+ *
+ * Target extends EventEmitter and provides support for the following events:
+ * - close: The target window has been closed. All tools attached to this
+ *     target should close. This event is not currently cancelable.
+ * - navigate: The target window has navigated to a different URL
+ *
+ * Optional events:
+ * - will-navigate: The target window will navigate to a different URL
+ * - hidden: The target is not visible anymore (for TargetTab, another tab is selected)
+ * - visible: The target is visible (for TargetTab, tab is selected)
+ *
+ * Target also supports 2 functions to help allow 2 different versions of
+ * Firefox debug each other. The 'version' property is the equivalent of
+ * browser detection - simple and easy to implement but gets fragile when things
+ * are not quite what they seem. The 'supports' property is the equivalent of
+ * feature detection - harder to setup, but more robust long-term.
+ *
+ * Comparing Targets: 2 instances of a Target object can point at the same
+ * thing, so t1 !== t2 and t1 != t2 even when they represent the same object.
+ * To compare to targets use 't1.equals(t2)'.
+ */
+function Target() {
+  throw new Error("Use TargetFactory.newXXX or Target.getXXX to create a Target in place of 'new Target()'");
+}
+
+Object.defineProperty(Target.prototype, "version", {
+  get: getVersion,
+  enumerable: true
+});
+
+
+/**
+ * A TabTarget represents a page living in a browser tab. Generally these will
+ * be web pages served over http(s), but they don't have to be.
+ */
+function TabTarget(tab) {
+  new EventEmitter(this);
+  this._tab = tab;
+  this._setupListeners();
+}
+
+TabTarget.prototype = {
+  _webProgressListener: null,
+
+  supports: supports,
+  get version() { return getVersion(); },
+
+  get tab() {
+    return this._tab;
+  },
+
+  get name() {
+    return this._tab.linkedBrowser.contentDocument.title;
+  },
+
+  get url() {
+    return this._tab.linkedBrowser.contentDocument.location.href;
+  },
+
+  get isRemote() {
+    return false;
+  },
+
+  /**
+   * Listen to the different tabs events.
+   */
+  _setupListeners: function TabTarget__setupListeners() {
+    this._webProgressListener = new TabWebProgressListener(this);
+    this.tab.linkedBrowser.addProgressListener(this._webProgressListener);
+    this.tab.addEventListener("TabClose", this);
+    this.tab.parentNode.addEventListener("TabSelect", this);
+  },
+
+  /**
+   * Handle tabs events.
+   */
+  handleEvent: function (event) {
+    switch (event.type) {
+      case "TabClose":
+        this.destroy();
+        break;
+      case "TabSelect":
+        if (this.tab.selected) {
+          this.emit("visible", event);
+        } else {
+          this.emit("hidden", event);
+        }
+        break;
+    }
+  },
+
+
+  /**
+   * Target is not alive anymore.
+   */
+  destroy: function() {
+    if (this._destroyed) {
+      return;
+    }
+    this.tab.linkedBrowser.removeProgressListener(this._webProgressListener)
+    this._webProgressListener.target = null;
+    this._webProgressListener = null;
+    this.tab.removeEventListener("TabClose", this);
+    this.tab.parentNode.removeEventListener("TabSelect", this);
+    this._destroyed = true;
+    this.emit("close");
+
+    targets.delete(this._tab);
+    this._tab = null;
+  },
+
+  toString: function() {
+    return 'TabTarget:' + this.tab;
+  },
+};
+
+
+/**
+ * WebProgressListener for TabTarget.
+ *
+ * @param object aTarget
+ *        The TabTarget instance to work with.
+ */
+function TabWebProgressListener(aTarget) {
+  this.target = aTarget;
+}
+
+TabWebProgressListener.prototype = {
+  target: null,
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener, Ci.nsISupportsWeakReference]),
+
+  onStateChange: function TWPL_onStateChange(progress, request, flag, status) {
+    let isStart = flag & Ci.nsIWebProgressListener.STATE_START;
+    let isDocument = flag & Ci.nsIWebProgressListener.STATE_IS_DOCUMENT;
+    let isNetwork = flag & Ci.nsIWebProgressListener.STATE_IS_NETWORK;
+    let isRequest = flag & Ci.nsIWebProgressListener.STATE_IS_REQUEST;
+
+    // Skip non-interesting states.
+    if (!isStart || !isDocument || !isRequest || !isNetwork) {
+      return;
+    }
+
+    if (this.target) {
+      this.target.emit("will-navigate", request);
+    }
+  },
+
+  onProgressChange: function() {},
+  onSecurityChange: function() {},
+  onStatusChange: function() {},
+
+  onLocationChange: function TwPL_onLocationChange(webProgress) {
+    let window = webProgress.DOMWindow;
+    if (this.target) {
+      this.target.emit("navigate", window);
+    }
+  },
+};
+
+
+/**
+ * A WindowTarget represents a page living in a xul window or panel. Generally
+ * these will have a chrome: URL
+ */
+function WindowTarget(window) {
+  new EventEmitter(this);
+  this._window = window;
+}
+
+WindowTarget.prototype = {
+  supports: supports,
+  get version() { return getVersion(); },
+
+  get window() {
+    return this._window;
+  },
+
+  get name() {
+    return this._window.document.title;
+  },
+
+  get url() {
+    return this._window.document.location.href;
+  },
+
+  get isRemote() {
+    return false;
+  },
+
+  toString: function() {
+    return 'WindowTarget:' + this.window;
+  },
+};
+
+/**
+ * A RemoteTarget represents a page living in a remote Firefox instance.
+ */
+function RemoteTarget(form, client, chrome) {
+  new EventEmitter(this);
+  this._client = client;
+  this._form = form;
+  this._chrome = chrome;
+
+  this.destroy = this.destroy.bind(this);
+  this.client.addListener("tabDetached", this.destroy);
+
+  this._onTabNavigated = function onRemoteTabNavigated() {
+    this.emit("navigate");
+  }.bind(this);
+  this.client.addListener("tabNavigated", this._onTabNavigated);
+}
+
+RemoteTarget.prototype = {
+  supports: supports,
+  get version() getVersion(),
+
+  get isRemote() true,
+
+  get chrome() this._chrome,
+
+  get name() this._form._title,
+
+  get url() this._form._url,
+
+  get client() this._client,
+
+  get form() this._form,
+
+  /**
+   * Target is not alive anymore.
+   */
+  destroy: function RT_destroy() {
+    if (this._destroyed) {
+      return;
+    }
+    this.client.removeListener("tabNavigated", this._onTabNavigated);
+    this.client.removeListener("tabDetached", this.destroy);
+
+    this._client.close(function onClosed() {
+      this._client = null;
+      this._destroyed = true;
+      this.emit("close");
+    }.bind(this));
+  },
+
+  toString: function() {
+    return 'RemoteTarget:' + this.form.actor;
+  },
+};
diff --git a/browser/devtools/framework/ToolDefinitions.jsm b/browser/devtools/framework/ToolDefinitions.jsm
new file mode 100644
index 000000000000..ef794b4a548c
--- /dev/null
+++ b/browser/devtools/framework/ToolDefinitions.jsm
@@ -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/. */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = [ "defaultTools" ];
+
+Components.utils.import("resource:///modules/WebConsolePanel.jsm");
+Components.utils.import("resource:///modules/devtools/DebuggerPanel.jsm");
+Components.utils.import("resource:///modules/devtools/StyleEditorDefinition.jsm");
+Components.utils.import("resource:///modules/devtools/InspectorDefinition.jsm");
+
+this.defaultTools = [
+  StyleEditorDefinition,
+  WebConsoleDefinition,
+  DebuggerDefinition,
+  InspectorDefinition,
+];
diff --git a/browser/devtools/framework/Toolbox.jsm b/browser/devtools/framework/Toolbox.jsm
new file mode 100644
index 000000000000..db5ed26b7b55
--- /dev/null
+++ b/browser/devtools/framework/Toolbox.jsm
@@ -0,0 +1,523 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource:///modules/devtools/EventEmitter.jsm");
+Cu.import("resource:///modules/devtools/ToolboxHosts.jsm");
+Cu.import("resource:///modules/devtools/gcli.jsm");
+Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+
+XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
+                                  "resource:///modules/devtools/gDevTools.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "CommandUtils",
+                                  "resource:///modules/devtools/DeveloperToolbar.jsm");
+
+Components.utils.import("resource://gre/modules/devtools/Require.jsm");
+
+let Requisition = require('gcli/cli').Requisition;
+let CommandOutputManager = require('gcli/canon').CommandOutputManager;
+
+this.EXPORTED_SYMBOLS = [ "Toolbox" ];
+
+/**
+ * A "Toolbox" is the component that holds all the tools for one specific
+ * target. Visually, it's a document that includes the tools tabs and all
+ * the iframes where the tool panels will be living in.
+ *
+ * @param {object} target
+ *        The object the toolbox is debugging.
+ * @param {Toolbox.HostType} hostType
+ *        Type of host that will host the toolbox (e.g. sidebar, window)
+ * @param {string} selectedTool
+ *        Tool to select initially
+ */
+this.Toolbox = function Toolbox(target, hostType, selectedTool) {
+  this._target = target;
+  this._toolPanels = new Map();
+
+  this._onLoad = this._onLoad.bind(this);
+  this._toolRegistered = this._toolRegistered.bind(this);
+  this._toolUnregistered = this._toolUnregistered.bind(this);
+  this.destroy = this.destroy.bind(this);
+
+  this._target.once("close", this.destroy);
+
+  if (!hostType) {
+    hostType = Services.prefs.getCharPref(this._prefs.LAST_HOST);
+  }
+  if (!selectedTool) {
+    selectedTool = Services.prefs.getCharPref(this._prefs.LAST_TOOL);
+  }
+  let definitions = gDevTools.getToolDefinitions();
+  if (!definitions.get(selectedTool)) {
+    selectedTool = "webconsole";
+  }
+  this._defaultToolId = selectedTool;
+
+  this._host = this._createHost(hostType);
+
+  new EventEmitter(this);
+
+  gDevTools.on("tool-registered", this._toolRegistered);
+  gDevTools.on("tool-unregistered", this._toolUnregistered);
+}
+
+/**
+ * The toolbox can be 'hosted' either embedded in a browser window
+ * or in a separate window.
+ */
+Toolbox.HostType = {
+  BOTTOM: "bottom",
+  SIDE: "side",
+  WINDOW: "window"
+}
+
+Toolbox.prototype = {
+  _URL: "chrome://browser/content/devtools/framework/toolbox.xul",
+
+  _prefs: {
+    LAST_HOST: "devtools.toolbox.host",
+    LAST_TOOL: "devtools.toolbox.selectedTool",
+    SIDE_ENABLED: "devtools.toolbox.sideEnabled"
+  },
+
+  HostType: Toolbox.HostType,
+
+  /**
+   * Returns a *copy* of the _toolPanels collection.
+   *
+   * @return {Map} panels
+   *         All the running panels in the toolbox
+   */
+  getToolPanels: function TB_getToolPanels() {
+    let panels = new Map();
+
+    for (let [key, value] of this._toolPanels) {
+      panels.set(key, value);
+    }
+    return panels;
+  },
+
+  /**
+   * Get/alter the target of a Toolbox so we're debugging something different.
+   * See Target.jsm for more details.
+   * TODO: Do we allow |toolbox.target = null;| ?
+   */
+  get target() {
+    return this._target;
+  },
+
+  set target(value) {
+    this._target = value;
+  },
+
+  /**
+   * Get/alter the host of a Toolbox, i.e. is it in browser or in a separate
+   * tab. See HostType for more details.
+   */
+  get hostType() {
+    return this._host.type;
+  },
+
+  set hostType(value) {
+    this._switchToHost(value);
+  },
+
+  /**
+   * Get/alter the currently displayed tool.
+   */
+  get currentToolId() {
+    return this._currentToolId;
+  },
+
+  set currentToolId(value) {
+    this._currentToolId = value;
+  },
+
+  /**
+   * Get the iframe containing the toolbox UI.
+   */
+  get frame() {
+    return this._host.frame;
+  },
+
+  /**
+   * Shortcut to the document containing the toolbox UI
+   */
+  get doc() {
+    return this.frame.contentDocument;
+  },
+
+  /**
+   * Open the toolbox
+   */
+  open: function TBOX_open() {
+    this._host.once("ready", function(event, iframe) {
+      iframe.addEventListener("DOMContentLoaded", this._onLoad, true);
+      iframe.setAttribute("src", this._URL);
+    }.bind(this));
+
+    this._host.open();
+  },
+
+  /**
+   * Build the buttons for changing hosts. Called every time
+   * the host changes.
+   */
+  _buildDockButtons: function TBOX_createDockButtons() {
+    let dockBox = this.doc.getElementById("toolbox-dock-buttons");
+
+    while (dockBox.firstChild) {
+      dockBox.removeChild(dockBox.firstChild);
+    }
+
+    let sideEnabled = Services.prefs.getBoolPref(this._prefs.SIDE_ENABLED);
+
+    for each (let position in this.HostType) {
+      if (position == this.hostType ||
+         (!sideEnabled && position == this.HostType.SIDE)) {
+        continue;
+      }
+
+      let button = this.doc.createElement("toolbarbutton");
+      button.id = "toolbox-dock-" + position;
+      button.className = "toolbox-dock-button";
+      button.addEventListener("command", function(position) {
+        this.hostType = position;
+      }.bind(this, position));
+
+      dockBox.appendChild(button);
+    }
+  },
+
+  /**
+   * Onload handler for the toolbox's iframe
+   */
+  _onLoad: function TBOX_onLoad() {
+    this.frame.removeEventListener("DOMContentLoaded", this._onLoad, true);
+    this.isReady = true;
+
+    let closeButton = this.doc.getElementById("toolbox-close");
+    closeButton.addEventListener("command", this.destroy, true);
+
+    this._buildDockButtons();
+
+    this._buildTabs();
+    this._buildButtons(this.frame);
+
+    this.selectTool(this._defaultToolId);
+
+    this.emit("ready");
+  },
+
+  /**
+   * Add tabs to the toolbox UI for registered tools
+   */
+  _buildTabs: function TBOX_buildTabs() {
+    for (let [id, definition] of gDevTools.getToolDefinitions()) {
+      this._buildTabForTool(definition);
+    }
+  },
+
+  /**
+   * Add buttons to the UI as specified in the devtools.window.toolbarSpec pref
+   *
+   * @param {iframe} frame
+   *        The iframe to contain the buttons
+   */
+  _buildButtons: function TBOX_buildButtons(frame) {
+    let toolbarSpec = CommandUtils.getCommandbarSpec("devtools.toolbox.toolbarSpec");
+    let environment = { chromeDocument: frame.ownerDocument };
+    let requisition = new Requisition(environment);
+    requisition.commandOutputManager = new CommandOutputManager();
+
+    let buttons = CommandUtils.createButtons(toolbarSpec, this.doc, requisition);
+
+    let container = this.doc.getElementById("toolbox-buttons");
+    buttons.forEach(function(button) {
+      container.appendChild(button);
+    }.bind(this));
+  },
+
+  /**
+   * Build a tab for one tool definition and add to the toolbox
+   *
+   * @param {string} toolDefinition
+   *        Tool definition of the tool to build a tab for.
+   */
+  _buildTabForTool: function TBOX_buildTabForTool(toolDefinition) {
+    const MAX_ORDINAL = 99;
+    if (!toolDefinition.isTargetSupported(this._target)) {
+      return;
+    }
+
+    let tabs = this.doc.getElementById("toolbox-tabs");
+    let deck = this.doc.getElementById("toolbox-deck");
+
+    let id = toolDefinition.id;
+
+    let radio = this.doc.createElement("radio");
+    radio.setAttribute("label", toolDefinition.label);
+    radio.className = "toolbox-tab devtools-tab";
+    radio.id = "toolbox-tab-" + id;
+    radio.setAttribute("toolid", id);
+
+    let ordinal = (typeof toolDefinition.ordinal == "number") ?
+                  toolDefinition.ordinal : MAX_ORDINAL;
+    radio.setAttribute("ordinal", ordinal);
+
+    radio.addEventListener("command", function(id) {
+      this.selectTool(id);
+    }.bind(this, id));
+
+    let vbox = this.doc.createElement("vbox");
+    vbox.className = "toolbox-panel";
+    vbox.id = "toolbox-panel-" + id;
+
+    tabs.appendChild(radio);
+    deck.appendChild(vbox);
+  },
+
+  /**
+   * Switch to the tool with the given id
+   *
+   * @param {string} id
+   *        The id of the tool to switch to
+   */
+  selectTool: function TBOX_selectTool(id) {
+    if (!this.isReady) {
+      throw new Error("Can't select tool, wait for toolbox 'ready' event");
+    }
+    let tab = this.doc.getElementById("toolbox-tab-" + id);
+
+    if (!tab) {
+      throw new Error("No tool found");
+    }
+
+    let tabstrip = this.doc.getElementById("toolbox-tabs");
+
+    // select the right tab
+    let index = -1;
+    let tabs = tabstrip.childNodes;
+    for (let i = 0; i < tabs.length; i++) {
+      if (tabs[i] === tab) {
+        index = i;
+        break;
+      }
+    }
+    tabstrip.selectedIndex = index;
+
+    // and select the right iframe
+    let deck = this.doc.getElementById("toolbox-deck");
+    deck.selectedIndex = index;
+
+    let definition = gDevTools.getToolDefinitions().get(id);
+
+    let iframe = this.doc.getElementById("toolbox-panel-iframe-" + id);
+    if (!iframe) {
+      iframe = this.doc.createElement("iframe");
+      iframe.className = "toolbox-panel-iframe";
+      iframe.id = "toolbox-panel-iframe-" + id;
+      iframe.setAttribute("flex", 1);
+
+      let vbox = this.doc.getElementById("toolbox-panel-" + id);
+      vbox.appendChild(iframe);
+
+      let boundLoad = function() {
+        iframe.removeEventListener("DOMContentLoaded", boundLoad, true);
+        let panel = definition.build(iframe.contentWindow, this);
+        this._toolPanels.set(id, panel);
+
+        let panelReady = function() {
+          this.emit(id + "-ready", panel);
+          this.emit("select", id);
+          this.emit(id + "-selected", panel);
+          gDevTools.emit(id + "-ready", this, panel);
+        }.bind(this);
+
+        if (panel.isReady) {
+          panelReady();
+        } else {
+          panel.once("ready", panelReady);
+        }
+      }.bind(this);
+
+      iframe.addEventListener("DOMContentLoaded", boundLoad, true);
+      iframe.setAttribute("src", definition.url);
+    } else {
+      let panel = this._toolPanels.get(id);
+      // only emit 'select' event if the iframe has been loaded
+      if (panel) {
+        this.emit("select", id);
+        this.emit(id + "-selected", panel);
+      }
+    }
+
+    Services.prefs.setCharPref(this._prefs.LAST_TOOL, id);
+
+    this._currentToolId = id;
+  },
+
+  /**
+   * Create a host object based on the given host type.
+   *
+   * @param {string} hostType
+   *        The host type of the new host object
+   *
+   * @return {Host} host
+   *        The created host object
+   */
+  _createHost: function TBOX_createHost(hostType) {
+    let hostTab = this._getHostTab();
+    if (!Hosts[hostType]) {
+      throw new Error('Unknown hostType: '+ hostType);
+    }
+    let newHost = new Hosts[hostType](hostTab);
+
+    // clean up the toolbox if its window is closed
+    newHost.on("window-closed", this.destroy);
+
+    return newHost;
+  },
+
+  /**
+   * Switch to a new host for the toolbox UI. E.g.
+   * bottom, sidebar, separate window.
+   *
+   * @param {string} hostType
+   *        The host type of the new host object
+   */
+  _switchToHost: function TBOX_switchToHost(hostType) {
+    if (hostType == this._host.type) {
+      return;
+    }
+
+    let newHost = this._createHost(hostType);
+
+    newHost.once("ready", function(event, iframe) {
+      // change toolbox document's parent to the new host
+      iframe.QueryInterface(Components.interfaces.nsIFrameLoaderOwner);
+      iframe.swapFrameLoaders(this.frame);
+
+      this._host.off("window-closed", this.destroy);
+      this._host.destroy();
+
+      this._host = newHost;
+
+      Services.prefs.setCharPref(this._prefs.LAST_HOST, this._host.type);
+
+      this._buildDockButtons();
+
+      this.emit("host-changed");
+    }.bind(this));
+
+    newHost.open();
+  },
+
+  /**
+   * Get the most appropriate host tab, either the target or the current tab
+   */
+  _getHostTab: function TBOX_getHostTab() {
+    if (!this._target.isRemote && !this._target.isChrome) {
+      return this._target.tab;
+    } else {
+      let win = Services.wm.getMostRecentWindow("navigator:browser");
+      return win.gBrowser.selectedTab;
+    }
+  },
+
+  /**
+   * Handler for the tool-registered event.
+   * @param  {string} event
+   *         Name of the event ("tool-registered")
+   * @param  {string} toolId
+   *         Id of the tool that was registered
+   */
+  _toolRegistered: function TBOX_toolRegistered(event, toolId) {
+    let defs = gDevTools.getToolDefinitions();
+    let tool = defs.get(toolId);
+
+    this._buildTabForTool(tool);
+  },
+
+  /**
+   * Handler for the tool-unregistered event.
+   * @param  {string} event
+   *         Name of the event ("tool-unregistered")
+   * @param  {string} toolId
+   *         Id of the tool that was unregistered
+   */
+  _toolUnregistered: function TBOX_toolUnregistered(event, toolId) {
+    let radio = this.doc.getElementById("toolbox-tab-" + toolId);
+    let panel = this.doc.getElementById("toolbox-panel-" + toolId);
+
+    if (this._currentToolId == toolId) {
+      let nextToolName = null;
+      if (radio.nextSibling) {
+        nextToolName = radio.nextSibling.getAttribute("toolid");
+      }
+      if (radio.previousSibling) {
+        nextToolName = radio.previousSibling.getAttribute("toolid");
+      }
+      if (nextToolName) {
+        this.selectTool(nextToolName);
+      }
+    }
+
+    if (radio) {
+      radio.parentNode.removeChild(radio);
+    }
+
+    if (panel) {
+      panel.parentNode.removeChild(panel);
+    }
+
+    if (this._toolPanels.has(toolId)) {
+      let instance = this._toolPanels.get(toolId);
+      instance.destroy();
+      this._toolPanels.delete(toolId);
+    }
+  },
+
+
+  /**
+   * Get the toolbox's notification box
+   *
+   * @return The notification box element.
+   */
+  getNotificationBox: function TBOX_getNotificationBox() {
+    return this.doc.getElementById("toolbox-notificationbox");
+  },
+
+  /**
+   * Remove all UI elements, detach from target and clear up
+   */
+  destroy: function TBOX_destroy() {
+    if (this._destroyed) {
+      return;
+    }
+
+    // Remote targets need to be notified that the toolbox is being torn down.
+    if (this._target && this._target.isRemote) {
+      this._target.destroy();
+    }
+    this._target = null;
+
+    for (let [id, panel] of this._toolPanels) {
+      panel.destroy();
+    }
+
+    this._host.destroy();
+
+    gDevTools.off("tool-registered", this._toolRegistered);
+    gDevTools.off("tool-unregistered", this._toolUnregistered);
+
+    this._destroyed = true;
+    this.emit("destroyed");
+  }
+};
diff --git a/browser/devtools/framework/ToolboxHosts.jsm b/browser/devtools/framework/ToolboxHosts.jsm
new file mode 100644
index 000000000000..23371c950e95
--- /dev/null
+++ b/browser/devtools/framework/ToolboxHosts.jsm
@@ -0,0 +1,208 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource:///modules/devtools/EventEmitter.jsm");
+
+this.EXPORTED_SYMBOLS = [ "Hosts" ];
+
+/**
+ * A toolbox host represents an object that contains a toolbox (e.g. the
+ * sidebar or a separate window). Any host object should implement the
+ * following functions:
+ *
+ * open() - create the UI and emit a 'ready' event when the UI is ready to use
+ * destroy() - destroy the host's UI
+ */
+
+this.Hosts = {
+  "bottom": BottomHost,
+  "side": SidebarHost,
+  "window": WindowHost
+}
+
+/**
+ * Host object for the dock on the bottom of the browser
+ */
+function BottomHost(hostTab) {
+  this.hostTab = hostTab;
+
+  new EventEmitter(this);
+}
+
+BottomHost.prototype = {
+  type: "bottom",
+
+  heightPref: "devtools.toolbox.footer.height",
+
+  /**
+   * Create a box at the bottom of the host tab.
+   */
+  open: function BH_open() {
+    let gBrowser = this.hostTab.ownerDocument.defaultView.gBrowser;
+    let ownerDocument = gBrowser.ownerDocument;
+
+    this._splitter = ownerDocument.createElement("splitter");
+    this._splitter.setAttribute("class", "devtools-horizontal-splitter");
+
+    this.frame = ownerDocument.createElement("iframe");
+    this.frame.id = "devtools-toolbox-bottom-iframe";
+    this.frame.height = Services.prefs.getIntPref(this.heightPref);
+
+    this._nbox = gBrowser.getNotificationBox(this.hostTab.linkedBrowser);
+    this._nbox.appendChild(this._splitter);
+    this._nbox.appendChild(this.frame);
+
+    let frameLoad = function() {
+      this.frame.removeEventListener("DOMContentLoaded", frameLoad, true);
+      this.emit("ready", this.frame);
+    }.bind(this);
+
+    this.frame.addEventListener("DOMContentLoaded", frameLoad, true);
+
+    // we have to load something so we can switch documents if we have to
+    this.frame.setAttribute("src", "about:blank");
+
+    focusTab(this.hostTab);
+  },
+
+  /**
+   * Destroy the bottom dock.
+   */
+  destroy: function BH_destroy() {
+    if (this._destroyed) {
+      return;
+    }
+    this._destroyed = true;
+    Services.prefs.setIntPref(this.heightPref, this.frame.height);
+
+    this._nbox.removeChild(this._splitter);
+    this._nbox.removeChild(this.frame);
+  }
+}
+
+
+/**
+ * Host object for the in-browser sidebar
+ */
+function SidebarHost(hostTab) {
+  this.hostTab = hostTab;
+
+  new EventEmitter(this);
+}
+
+SidebarHost.prototype = {
+  type: "side",
+
+  widthPref: "devtools.toolbox.sidebar.width",
+
+  /**
+   * Create a box in the sidebar of the host tab.
+   */
+  open: function RH_open() {
+    let gBrowser = this.hostTab.ownerDocument.defaultView.gBrowser;
+    let ownerDocument = gBrowser.ownerDocument;
+
+    this._splitter = ownerDocument.createElement("splitter");
+    this._splitter.setAttribute("class", "devtools-side-splitter");
+
+    this.frame = ownerDocument.createElement("iframe");
+    this.frame.id = "devtools-toolbox-side-iframe";
+    this.frame.width = Services.prefs.getIntPref(this.widthPref);
+
+    this._sidebar = gBrowser.getSidebarContainer(this.hostTab.linkedBrowser);
+    this._sidebar.appendChild(this._splitter);
+    this._sidebar.appendChild(this.frame);
+
+    let frameLoad = function() {
+      this.frame.removeEventListener("DOMContentLoaded", frameLoad, true);
+      this.emit("ready", this.frame);
+    }.bind(this);
+
+    this.frame.addEventListener("DOMContentLoaded", frameLoad, true);
+    this.frame.setAttribute("src", "about:blank");
+
+    focusTab(this.hostTab);
+  },
+
+  /**
+   * Destroy the sidebar.
+   */
+  destroy: function RH_destroy() {
+    Services.prefs.setIntPref(this.widthPref, this.frame.width);
+
+    this._sidebar.removeChild(this._splitter);
+    this._sidebar.removeChild(this.frame);
+  }
+}
+
+/**
+ * Host object for the toolbox in a separate window
+ */
+function WindowHost() {
+  this._boundUnload = this._boundUnload.bind(this);
+
+  new EventEmitter(this);
+}
+
+WindowHost.prototype = {
+  type: "window",
+
+  WINDOW_URL: "chrome://browser/content/devtools/framework/toolbox-window.xul",
+
+  /**
+   * Create a new xul window to contain the toolbox.
+   */
+  open: function WH_open() {
+    let flags = "chrome,centerscreen,resizable,dialog=no";
+    let win = Services.ww.openWindow(null, this.WINDOW_URL, "_blank",
+                                     flags, null);
+
+    let frameLoad = function(event) {
+      win.removeEventListener("load", frameLoad, true);
+      this.frame = win.document.getElementById("toolbox-iframe");
+      this.emit("ready", this.frame);
+    }.bind(this);
+
+    win.addEventListener("load", frameLoad, true);
+    win.addEventListener("unload", this._boundUnload);
+
+    win.focus();
+
+    this._window = win;
+  },
+
+  /**
+   * Catch the user closing the window.
+   */
+  _boundUnload: function(event) {
+    if (event.target.location != this.WINDOW_URL) {
+      return;
+    }
+    this._window.removeEventListener("unload", this._boundUnload);
+
+    this.emit("window-closed");
+  },
+
+  /**
+   * Destroy the window.
+   */
+  destroy: function WH_destroy() {
+    this._window.removeEventListener("unload", this._boundUnload);
+    this._window.close();
+  }
+}
+
+/**
+ *  Switch to the given tab in a browser and focus the browser window
+ */
+function focusTab(tab) {
+  let browserWindow = tab.ownerDocument.defaultView;
+  browserWindow.focus();
+  browserWindow.gBrowser.selectedTab = tab;
+}
diff --git a/browser/devtools/framework/connect/connect.css b/browser/devtools/framework/connect/connect.css
new file mode 100644
index 000000000000..a7acc39936e9
--- /dev/null
+++ b/browser/devtools/framework/connect/connect.css
@@ -0,0 +1,87 @@
+html {
+  background: url("chrome://browser/skin/newtab/noise.png");
+}
+
+body {
+  font-family: Arial;
+  padding: 20px;
+  border-radius: 3px;
+  max-width: 600px;
+  min-height: 400px;
+  margin: 10px auto 0;
+}
+
+label {
+  display: block;
+  margin: 10px;
+  font-size: 0;
+}
+
+label > span {
+  display: inline-block;
+  min-width: 150px;
+  font-size: 0.8rem;
+  text-align: right;
+  margin-right: 10px;
+}
+
+#submit {
+  margin-left: 160px;
+}
+
+
+#actors, #connection-form {
+  margin: 20px;
+}
+
+input {
+  border: 1px solid grey;
+}
+
+#connection-form,
+#connecting,
+#actors-list {
+  display: none;
+}
+
+body:not(.actors-mode):not(.connecting) > #connection-form {
+  display: block;
+}
+
+body.actors-mode > #actors-list {
+  display: block;
+}
+
+body.connecting > #connecting {
+  display: block;
+}
+
+#connecting {
+  text-align: center;
+}
+
+#throbber {
+  height: 7px; width: 7px;
+  border-radius: 50%;
+  background: black;
+  display: inline-block;
+  animation-duration: 0.6s;
+  animation-name: anim;
+  animation-direction: alternate;
+  animation-iteration-count: infinite;
+  animation-timing-function: linear;
+}
+@keyframes anim {to {
+    transform: scale(0.5) rotate(0.1deg);
+}}
+
+#actors {
+  padding-left: 0;
+  font-size: 0.9rem;
+}
+
+#actors > a {
+  display: block;
+  margin: 5px;
+  padding: 5px;
+}
diff --git a/browser/devtools/framework/connect/connect.js b/browser/devtools/framework/connect/connect.js
new file mode 100644
index 000000000000..169e57ec0e80
--- /dev/null
+++ b/browser/devtools/framework/connect/connect.js
@@ -0,0 +1,100 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const Cu = Components.utils;
+Cu.import("resource:///modules/devtools/Target.jsm");
+Cu.import("resource:///modules/devtools/Toolbox.jsm");
+Cu.import("resource:///modules/devtools/gDevTools.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+
+let gClient;
+
+function submit() {
+  document.body.classList.add("connecting");
+
+  let host = document.getElementById("host").value;
+  let port = document.getElementById("port").value;
+  if (!host) {
+    host = Services.prefs.getCharPref("devtools.debugger.remote-host");
+  } else {
+    Services.prefs.setCharPref("devtools.debugger.remote-host", host);
+  }
+  if (!port) {
+    port = Services.prefs.getIntPref("devtools.debugger.remote-port");
+  } else {
+    Services.prefs.setIntPref("devtools.debugger.remote-port", port);
+  }
+
+  let transport = debuggerSocketConnect(host, port);
+  let client = gClient = new DebuggerClient(transport);
+
+  client.connect(function(aType, aTraits) {
+    client.listTabs(function(aResponse) {
+      document.body.classList.remove("connecting");
+      document.body.classList.add("actors-mode");
+
+      let parent = document.getElementById("actors");
+      let focusSet = false;
+
+      // Add Global Process debugging...
+      let globals = JSON.parse(JSON.stringify(aResponse));
+      delete globals.tabs;
+      delete globals.selected;
+      // ...only if there are appropriate actors (a 'from' property will always
+      // be there).
+      if (Object.keys(globals).length > 1) {
+        let a = document.createElement("a");
+        a.onclick = function() {
+          connect(globals, true);
+        }
+
+        a.title = a.textContent = "Remote process";
+        a.href = "#";
+
+        parent.appendChild(a);
+      }
+
+      // Add one entry for each open tab.
+      if (aResponse.tabs.length > 0) {
+        let header = document.createElement("div");
+        header.innerHTML = "Tabs:";
+        parent.appendChild(header);
+      }
+      for (let i = 0; i < aResponse.tabs.length; i++) {
+        let tab = aResponse.tabs[i];
+
+        let a = document.createElement("a");
+        a.onclick = function() {
+          connect(tab);
+        }
+
+        a.title = a.textContent = tab.title;
+        a.href = "#";
+
+        if (i == aResponse.selected) {
+          a.title += " [*]";
+          a.textContent = a.title;
+        }
+
+        parent.appendChild(a);
+
+        if (!focusSet) {
+          a.focus();
+          focusSet = true;
+        }
+      }
+    });
+  });
+}
+
+function connect(form, chrome=false) {
+  let target = TargetFactory.forRemote(form, gClient, chrome);
+  gDevTools.openToolbox(target, Toolbox.HostType.WINDOW, "webconsole");
+  window.close();
+}
diff --git a/browser/devtools/framework/connect/connect.xhtml b/browser/devtools/framework/connect/connect.xhtml
new file mode 100644
index 000000000000..466170d07de9
--- /dev/null
+++ b/browser/devtools/framework/connect/connect.xhtml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!DOCTYPE html [
+<!ENTITY % connectionDTD SYSTEM "chrome://browser/locale/devtools/connection-screen.dtd" >
+ %connectionDTD;
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <head>
+    <title>&title;</title>
+    <link rel="stylesheet" href="chrome://browser/content/devtools/connect.css" type="text/css"/>
+    <script type="application/javascript;version=1.8" src="connect.js"></script>
+  </head>
+  <body>
+    <p>
+    </p>
+    <section id="connection-form">
+      <form onsubmit="window.submit()" action="#">
+        <label>
+          <span>&host;</span>
+          <input id="host" type="text" placeholder="localhost"></input>
+        </label>
+        <label>
+          <span>&port;</span>
+          <input id="port" type="number" placeholder="6000"></input>
+        </label>
+        <label>
+          <input id="submit" type="submit" value="&connect;"></input>
+        </label>
+      </form>
+    </section>
+    <section id="actors-list">
+      <p>&availability;</p>
+      <ul id="actors"></ul>
+    </section>
+    <section id="connecting">
+      <p>&connecting;</p>
+      <div id="throbber"></div>
+    </section>
+  </body>
+</html>
diff --git a/browser/devtools/framework/gDevTools.jsm b/browser/devtools/framework/gDevTools.jsm
new file mode 100644
index 000000000000..6c22ebdf3847
--- /dev/null
+++ b/browser/devtools/framework/gDevTools.jsm
@@ -0,0 +1,543 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = [ "gDevTools", "DevTools", "DevToolsXULCommands" ];
+
+const Cu = Components.utils;
+const Ci = Components.interfaces;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource:///modules/devtools/EventEmitter.jsm");
+Cu.import("resource:///modules/devtools/ToolDefinitions.jsm");
+Cu.import("resource:///modules/devtools/Toolbox.jsm");
+Cu.import("resource:///modules/devtools/Target.jsm");
+
+const FORBIDDEN_IDS = new Set("toolbox", "");
+
+/**
+ * DevTools is a class that represents a set of developer tools, it holds a
+ * set of tools and keeps track of open toolboxes in the browser.
+ */
+this.DevTools = function DevTools() {
+  this._tools = new Map();
+  this._toolboxes = new Map();
+
+  // destroy() is an observer's handler so we need to preserve context.
+  this.destroy = this.destroy.bind(this);
+
+  this._trackedBrowserWindows = new Set();
+
+  // Bind _updateMenuCheckbox() to preserve context.
+  this._updateMenuCheckbox = this._updateMenuCheckbox.bind(this);
+
+  new EventEmitter(this);
+
+  Services.obs.addObserver(this.destroy, "quit-application", false);
+
+  /**
+   * Register the set of default tools
+   */
+  for (let definition of defaultTools) {
+    this.registerTool(definition);
+  }
+}
+
+DevTools.prototype = {
+  /**
+   * Register a new developer tool.
+   *
+   * A definition is a light object that holds different information about a
+   * developer tool. This object is not supposed to have any operational code.
+   * See it as a "manifest".
+   * The only actual code lives in the build() function, which will be used to
+   * start an instance of this tool.
+   *
+   * Each toolDefinition has the following properties:
+   * - id: Unique identifier for this tool (string|required)
+   * - killswitch: Property name to allow us to turn this tool on/off globally
+   *               (string|required) (TODO: default to devtools.{id}.enabled?)
+   * - icon: URL pointing to a graphic which will be used as the src for an
+   *         16x16 img tag (string|required)
+   * - url: URL pointing to a XUL/XHTML document containing the user interface
+   *        (string|required)
+   * - label: Localized name for the tool to be displayed to the user
+   *          (string|required)
+   * - build: Function that takes an iframe, which has been populated with the
+   *          markup from |url|, and also the toolbox containing the panel.
+   *          And returns an instance of ToolPanel (function|required)
+   */
+  registerTool: function DT_registerTool(toolDefinition) {
+    let toolId = toolDefinition.id;
+
+    if (!toolId || FORBIDDEN_IDS.has(toolId)) {
+      throw new Error("Invalid definition.id");
+    }
+
+    toolDefinition.killswitch = toolDefinition.killswitch ||
+      "devtools." + toolId + ".enabled";
+    this._tools.set(toolId, toolDefinition);
+
+    this._addToolToWindows(toolDefinition);
+
+    this.emit("tool-registered", toolId);
+  },
+
+  /**
+   * Removes all tools that match the given |toolId|
+   * Needed so that add-ons can remove themselves when they are deactivated
+   *
+   * @param {string} toolId
+   *        id of the tool to unregister
+   */
+  unregisterTool: function DT_unregisterTool(toolId) {
+    this._tools.delete(toolId);
+
+    this._removeToolFromWindows(toolId);
+
+    this.emit("tool-unregistered", toolId);
+  },
+
+  /**
+   * Allow ToolBoxes to get at the list of tools that they should populate
+   * themselves with.
+   *
+   * @return {Map} tools
+   *         A map of the the tool definitions registered in this instance
+   */
+  getToolDefinitions: function DT_getToolDefinitions() {
+    let tools = new Map();
+
+    for (let [key, value] of this._tools) {
+      let enabled;
+
+      try {
+        enabled = Services.prefs.getBoolPref(value.killswitch);
+      } catch(e) {
+        enabled = true;
+      }
+
+      if (enabled) {
+        tools.set(key, value);
+      }
+    }
+    return tools;
+  },
+
+  /**
+   * Create a toolbox to debug |target| using a window displayed in |hostType|
+   * (optionally with |defaultToolId| opened)
+   *
+   * @param {Target} target
+   *         The target the toolbox will debug
+   * @param {Toolbox.HostType} hostType
+   *        The type of host (bottom, top, side)
+   * @param {string} defaultToolId
+   *        The id of the initial tool to show
+   *
+   * @return {Toolbox} toolbox
+   *        The toolbox that was opened
+   */
+  openToolbox: function DT_openToolbox(target, hostType, defaultToolId) {
+    if (this._toolboxes.has(target)) {
+      // only allow one toolbox per target
+      return this._toolboxes.get(target);
+    }
+
+    let tb = new Toolbox(target, hostType, defaultToolId);
+
+    this._toolboxes.set(target, tb);
+    tb.once("destroyed", function() {
+      this._toolboxes.delete(target);
+      this._updateMenuCheckbox();
+      this.emit("toolbox-destroyed", target);
+    }.bind(this));
+
+    tb.once("ready", function() {
+      this.emit("toolbox-ready", tb);
+      this._updateMenuCheckbox();
+    }.bind(this));
+
+    tb.open();
+
+    return tb;
+  },
+
+  /**
+   * Close the toolbox for a given target
+   */
+  closeToolbox: function DT_closeToolbox(target) {
+    let toolbox = this._toolboxes.get(target);
+    if (toolbox == null) {
+      return;
+    }
+    toolbox.destroy();
+  },
+
+  /**
+   * Open the toolbox for a specific target (not tab).
+   * FIXME: We should probably merge this function and openToolbox
+   *
+   * @param  {Target} target
+   *         The target that the toolbox should be debugging
+   * @param  {String} toolId
+   *         The id of the tool to open
+   *
+   * @return {Toolbox} toolbox
+   *         The toolbox that has been opened
+   */
+  openToolboxForTab: function DT_openToolboxForTab(target, toolId) {
+    let tb = this.getToolboxForTarget(target);
+
+    if (tb) {
+      tb.selectTool(toolId);
+    } else {
+      tb = this.openToolbox(target, null, toolId);
+    }
+    return tb;
+  },
+
+  /**
+   * This function is for the benefit of command#Tools:DevToolbox in
+   * browser/base/content/browser-sets.inc and should not be used outside
+   * of there
+   */
+  toggleToolboxCommand: function(gBrowser, toolId=null) {
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    this.toggleToolboxForTarget(target, toolId);
+  },
+
+  /**
+   * Toggle a toolbox for the given target.
+   *
+   * @param  {Target} target
+   *         The target the toolbox is debugging
+   * @param  {string} toolId
+   *         The id of the tool to show in the toolbox, if it's to be opened.
+   */
+  toggleToolboxForTarget: function DT_toggleToolboxForTarget(target, toolId) {
+    let tb = this.getToolboxForTarget(target);
+
+    if (tb /* FIXME: && tool is showing */ ) {
+      tb.destroy();
+    } else {
+      this.openToolboxForTab(target, toolId);
+    }
+  },
+
+  /**
+   * Return the toolbox for a given target.
+   *
+   * @param  {object} target
+   *         Target value e.g. the target that owns this toolbox
+   *
+   * @return {Toolbox} toolbox
+   *         The toobox that is debugging the given target
+   */
+  getToolboxForTarget: function DT_getToolboxForTarget(target) {
+    return this._toolboxes.get(target);
+  },
+
+  /**
+   * Return a tool panel for a given tool and target.
+   *
+   * @param  {String} toolId
+   *         The id of the tool to open.
+   * @param  {object} target
+   *         The toolbox's target.
+   *
+   * @return {ToolPanel} panel
+   *         Panel for the tool with the toolid
+   */
+  getPanelForTarget: function DT_getPanelForTarget(toolId, target) {
+    let toolbox = this.getToolboxForTarget(target);
+    if (!toolbox) {
+      return undefined;
+    }
+    return toolbox.getToolPanels().get(toolId);
+  },
+
+  /**
+   * Add this DevTools's presence to a browser window's document
+   *
+   * @param  {XULDocument} doc
+   *         The document to which menuitems and handlers are to be added
+   */
+  registerBrowserWindow: function DT_registerBrowserWindow(win) {
+    this._trackedBrowserWindows.add(win);
+    this._addAllToolsToMenu(win.document);
+
+    let tabContainer = win.document.getElementById("tabbrowser-tabs")
+    tabContainer.addEventListener("TabSelect", this._updateMenuCheckbox, false);
+  },
+
+  /**
+   * Add the menuitem for a tool to all open browser windows.
+   *
+   * @param {object} toolDefinition
+   *        properties of the tool to add
+   */
+  _addToolToWindows: function DT_addToolToWindows(toolDefinition) {
+    for (let win of this._trackedBrowserWindows) {
+      this._addToolToMenu(toolDefinition, win.document);
+    }
+  },
+
+  /**
+   * Add all tools to the developer tools menu of a window.
+   *
+   * @param {XULDocument} doc
+   *        The document to which the tool items are to be added.
+   */
+  _addAllToolsToMenu: function DT_addAllToolsToMenu(doc) {
+    let fragCommands = doc.createDocumentFragment();
+    let fragKeys = doc.createDocumentFragment();
+    let fragBroadcasters = doc.createDocumentFragment();
+    let fragAppMenuItems = doc.createDocumentFragment();
+    let fragMenuItems = doc.createDocumentFragment();
+
+    for (let [key, toolDefinition] of this._tools) {
+      let frags = this._addToolToMenu(toolDefinition, doc, true);
+
+      if (!frags) {
+        return;
+      }
+
+      let [cmd, key, bc, appmenuitem, menuitem] = frags;
+
+      fragCommands.appendChild(cmd);
+      if (key) {
+        fragKeys.appendChild(key);
+      }
+      fragBroadcasters.appendChild(bc);
+      fragAppMenuItems.appendChild(appmenuitem);
+      fragMenuItems.appendChild(menuitem);
+    }
+
+    let mcs = doc.getElementById("mainCommandSet");
+    mcs.appendChild(fragCommands);
+
+    let mks = doc.getElementById("mainKeyset");
+    mks.appendChild(fragKeys);
+
+    let mbs = doc.getElementById("mainBroadcasterSet");
+    mbs.appendChild(fragBroadcasters);
+
+    let amp = doc.getElementById("appmenu_webDeveloper_popup");
+    if (amp) {
+      let amps = doc.getElementById("appmenu_devtools_separator");
+      amp.insertBefore(fragAppMenuItems, amps);
+    }
+
+    let mp = doc.getElementById("menuWebDeveloperPopup");
+    let mps = doc.getElementById("menu_devtools_separator");
+    mp.insertBefore(fragMenuItems, mps);
+  },
+
+  /**
+   * Add a menu entry for a tool definition
+   *
+   * @param {string} toolDefinition
+   *        Tool definition of the tool to add a menu entry.
+   * @param {XULDocument} doc
+   *        The document to which the tool menu item is to be added.
+   * @param {Boolean} [noAppend]
+   *        Return an array of elements instead of appending them to the
+   *        document. Default is false.
+   */
+  _addToolToMenu: function DT_addToolToMenu(toolDefinition, doc, noAppend) {
+    let id = toolDefinition.id;
+
+    // Prevent multiple entries for the same tool.
+    if (doc.getElementById("Tools:" + id)) {
+      return;
+    }
+
+    let cmd = doc.createElement("command");
+    cmd.id = "Tools:" + id;
+    cmd.setAttribute("oncommand",
+        'gDevTools.toggleToolboxCommand(gBrowser, "' + id + '");');
+
+    let key = null;
+    if (toolDefinition.key) {
+      key = doc.createElement("key");
+      key.id = "key_" + id;
+
+      if (toolDefinition.key.startsWith("VK_")) {
+        key.setAttribute("keycode", toolDefinition.key);
+      } else {
+        key.setAttribute("key", toolDefinition.key);
+      }
+
+      key.setAttribute("oncommand",
+          'gDevTools.toggleToolboxCommand(gBrowser, "' + id + '");');
+      key.setAttribute("modifiers", toolDefinition.modifiers);
+    }
+
+    let bc = doc.createElement("broadcaster");
+    bc.id = "devtoolsMenuBroadcaster_" + id;
+    bc.setAttribute("label", toolDefinition.label);
+    bc.setAttribute("command", "Tools:" + id);
+
+    if (key) {
+      bc.setAttribute("key", "key_" + id);
+    }
+
+    let appmenuitem = doc.createElement("menuitem");
+    appmenuitem.id = "appmenuitem_" + id;
+    appmenuitem.setAttribute("observes", "devtoolsMenuBroadcaster_" + id);
+
+    let menuitem = doc.createElement("menuitem");
+    menuitem.id = "menuitem_" + id;
+    menuitem.setAttribute("observes", "devtoolsMenuBroadcaster_" + id);
+
+    if (toolDefinition.accesskey) {
+      menuitem.setAttribute("accesskey", toolDefinition.accesskey);
+    }
+
+    if (noAppend) {
+      return [cmd, key, bc, appmenuitem, menuitem];
+    } else {
+      let mcs = doc.getElementById("mainCommandSet");
+      mcs.appendChild(cmd);
+
+      if (key) {
+        let mks = doc.getElementById("mainKeyset");
+        mks.appendChild(key);
+      }
+
+      let mbs = doc.getElementById("mainBroadcasterSet");
+      mbs.appendChild(bc);
+
+      let amp = doc.getElementById("appmenu_webDeveloper_popup");
+      if (amp) {
+        let amps = doc.getElementById("appmenu_devtools_separator");
+        amp.insertBefore(appmenuitem, amps);
+      }
+
+      let mp = doc.getElementById("menuWebDeveloperPopup");
+      let mps = doc.getElementById("menu_devtools_separator");
+      mp.insertBefore(menuitem, mps);
+    }
+  },
+
+  /**
+   * Update the "Toggle Toolbox" checkbox in the developer tools menu. This is
+   * called when a toolbox is created or destroyed.
+   */
+  _updateMenuCheckbox: function DT_updateMenuCheckbox() {
+    for (let win of this._trackedBrowserWindows) {
+
+      let hasToolbox = false;
+      if (TargetFactory.isKnownTab(win.gBrowser.selectedTab)) {
+        let target = TargetFactory.forTab(win.gBrowser.selectedTab);
+        if (this._toolboxes.has(target)) {
+          hasToolbox = true;
+        }
+      }
+
+      let broadcaster = win.document.getElementById("devtoolsMenuBroadcaster_DevToolbox");
+      if (hasToolbox) {
+        broadcaster.setAttribute("checked", "true");
+      } else {
+        broadcaster.removeAttribute("checked");
+      }
+    }
+  },
+
+  /**
+   * Remove the menuitem for a tool to all open browser windows.
+   *
+   * @param {object} toolId
+   *        id of the tool to remove
+   */
+  _removeToolFromWindows: function DT_removeToolFromWindows(toolId) {
+    for (let win of this._trackedBrowserWindows) {
+      this._removeToolFromMenu(toolId, win.document);
+    }
+  },
+
+  /**
+   * Remove a tool's menuitem from a window
+   *
+   * @param {string} toolId
+   *        Id of the tool to add a menu entry for
+   * @param {XULDocument} doc
+   *        The document to which the tool menu item is to be removed from
+   */
+  _removeToolFromMenu: function DT_removeToolFromMenu(toolId, doc) {
+    let command = doc.getElementById("Tools:" + toolId);
+    command.parentNode.removeChild(command);
+
+    let key = doc.getElementById("key_" + toolId);
+    if (key) {
+      key.parentNode.removeChild(key);
+    }
+
+    let bc = doc.getElementById("devtoolsMenuBroadcaster_" + toolId);
+    bc.parentNode.removeChild(bc);
+
+    /*
+    // FIXME: item is null in testing. This is the only place to use
+    // "appmenu_devToolbar" + toolId, so it seems clear that this is wrong
+    let item = doc.getElementById("appmenu_devToolbar" + toolId);
+    item.parentNode.removeChild(item);
+    */
+  },
+
+  /**
+   * Called on browser unload to remove menu entries, toolboxes and event
+   * listeners from the closed browser window.
+   *
+   * @param  {XULWindow} win
+   *         The window containing the menu entry
+   */
+  forgetBrowserWindow: function DT_forgetBrowserWindow(win) {
+    if (!this._tools) {
+      return;
+    }
+
+    this._trackedBrowserWindows.delete(win);
+
+    // Destroy toolboxes for closed window
+    for (let [target, toolbox] of this._toolboxes) {
+      if (toolbox.frame.ownerDocument.defaultView == win) {
+        toolbox.destroy();
+      }
+    }
+
+    let tabContainer = win.document.getElementById("tabbrowser-tabs")
+    tabContainer.removeEventListener("TabSelect",
+                                     this._updateMenuCheckbox, false);
+  },
+
+  /**
+   * All browser windows have been closed, tidy up remaining objects.
+   */
+  destroy: function() {
+    Services.obs.removeObserver(this.destroy, "quit-application");
+
+    delete this._trackedBrowserWindows;
+    delete this._tools;
+    delete this._toolboxes;
+  },
+};
+
+/**
+ * gDevTools is a singleton that controls the Firefox Developer Tools.
+ *
+ * It is an instance of a DevTools class that holds a set of tools. It has the
+ * same lifetime as the browser.
+ */
+this.gDevTools = new DevTools();
+
+/**
+ * DevToolsXULCommands exposes methods used by browser's <command>s.
+ */
+this.DevToolsXULCommands = {
+  openConnectScreen: function(gBrowser) {
+    gBrowser.selectedTab = gBrowser.addTab("chrome://browser/content/devtools/connect.xhtml");
+  },
+}
diff --git a/browser/devtools/framework/test/Makefile.in b/browser/devtools/framework/test/Makefile.in
new file mode 100644
index 000000000000..618e044c4929
--- /dev/null
+++ b/browser/devtools/framework/test/Makefile.in
@@ -0,0 +1,26 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEPTH			= @DEPTH@
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH			= @srcdir@
+relativesrcdir  = @relativesrcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MOCHITEST_BROWSER_FILES = \
+		head.js \
+		browser_devtools_api.js \
+		browser_new_activation_workflow.js \
+		browser_toolbox_dynamic_registration.js \
+		browser_toolbox_hosts.js \
+		browser_toolbox_ready.js \
+		browser_toolbox_select_event.js \
+		browser_target_events.js \
+		browser_toolbox_tool_ready.js \
+		browser_toolbox_sidebar.js \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/framework/test/browser_devtools_api.js b/browser/devtools/framework/test/browser_devtools_api.js
new file mode 100644
index 000000000000..205a26808ab5
--- /dev/null
+++ b/browser/devtools/framework/test/browser_devtools_api.js
@@ -0,0 +1,137 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests devtools API
+
+const Cu = Components.utils;
+const toolId = "test-tool";
+
+let tempScope = {};
+Cu.import("resource:///modules/devtools/EventEmitter.jsm", tempScope);
+let EventEmitter = tempScope.EventEmitter;
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
+function test() {
+  addTab("about:blank", function(aBrowser, aTab) {
+    runTests(aTab);
+  });
+}
+
+function runTests(aTab) {
+  let toolDefinition = {
+    id: toolId,
+    isTargetSupported: function() true,
+    killswitch: "devtools.test-tool.enabled",
+    url: "about:blank",
+    label: "someLabel",
+    build: function(iframeWindow, toolbox) {
+      let panel = new DevToolPanel(iframeWindow, toolbox);
+      return panel;
+    },
+  };
+
+  ok(gDevTools, "gDevTools exists");
+  is(gDevTools.getToolDefinitions().has(toolId), false,
+    "The tool is not registered");
+
+  gDevTools.registerTool(toolDefinition);
+  is(gDevTools.getToolDefinitions().has(toolId), true,
+    "The tool is registered");
+
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  function onNewToolbox(event, toolboxFromEvent) {
+    let toolBoxes = gDevTools._toolboxes;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let tb = toolBoxes.get(target);
+    is(toolboxFromEvent, tb, "'toolbox-ready' event fired. Correct toolbox value.");
+    is(tb.target, target, "toolbox target is correct");
+    is(tb._host.hostTab, gBrowser.selectedTab, "toolbox host is correct");
+    gDevTools.once(toolId + "-ready", continueTests);
+  }
+
+  function onToolboxClosed(event, targetFromEvent) {
+    is(targetFromEvent, target, "'toolbox-destroyed' event fired. Correct tab value.");
+    finishUp();
+  }
+
+
+  gDevTools.once("toolbox-ready", onNewToolbox);
+  gDevTools.once("toolbox-destroyed", onToolboxClosed);
+
+  executeSoon(function() {
+    gDevTools.openToolbox(target, "bottom", toolId);
+  });
+}
+
+function continueTests(event, toolbox, panel) {
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  is(toolbox, gDevTools._toolboxes.get(target), "{toolId}-ready event received, with correct toolbox value");
+  is(panel, toolbox.getToolPanels().get(toolId), "panel value is correct");
+
+  is(toolbox.currentToolId, toolId, "toolbox _currentToolId is correct");
+
+  let toolDefinitions = gDevTools.getToolDefinitions();
+  is(toolDefinitions.has(toolId), true, "The tool is in gDevTools");
+
+  let toolDefinition = toolDefinitions.get(toolId);
+  is(toolDefinition.id, toolId, "toolDefinition id is correct");
+
+  gDevTools.unregisterTool(toolId);
+  is(gDevTools.getToolDefinitions().has(toolId), false,
+    "The tool is no longer registered");
+
+  toolbox.destroy();
+}
+
+function finishUp() {
+  tempScope = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+/**
+* When a Toolbox is started it creates a DevToolPanel for each of the tools
+* by calling toolDefinition.build(). The returned object should
+* at least implement these functions. They will be used by the ToolBox.
+*
+* There may be no benefit in doing this as an abstract type, but if nothing
+* else gives us a place to write documentation.
+*/
+function DevToolPanel(iframeWindow, toolbox) {
+  new EventEmitter(this);
+
+  this._toolbox = toolbox;
+
+  /*let doc = iframeWindow.document
+  let label = doc.createElement("label");
+  let textNode = doc.createTextNode("Some Tool");
+
+  label.appendChild(textNode);
+  doc.body.appendChild(label);*/
+
+  executeSoon(function() {
+    this.setReady();
+  }.bind(this));
+}
+
+DevToolPanel.prototype = {
+  get target() this._toolbox.target,
+
+  get toolbox() this._toolbox,
+
+  get isReady() this._isReady,
+
+  _isReady: false,
+
+  setReady: function() {
+    this._isReady = true;
+    this.emit("ready");
+  },
+
+  destroy: function DTI_destroy()
+  {
+
+  },
+};
diff --git a/browser/devtools/framework/test/browser_new_activation_workflow.js b/browser/devtools/framework/test/browser_new_activation_workflow.js
new file mode 100644
index 000000000000..242b725dcc5b
--- /dev/null
+++ b/browser/devtools/framework/test/browser_new_activation_workflow.js
@@ -0,0 +1,64 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests devtools API
+
+const Cu = Components.utils;
+
+let toolbox;
+
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
+function test() {
+  addTab("about:blank", function(aBrowser, aTab) {
+    loadWebConsole(aTab);
+  });
+}
+
+function loadWebConsole(aTab) {
+  ok(gDevTools, "gDevTools exists");
+
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  toolbox = gDevTools.openToolbox(target, "bottom", "webconsole");
+  toolbox.once("webconsole-ready", checkToolLoading);
+}
+
+function checkToolLoading() {
+  is(toolbox.currentToolId, "webconsole", "The web console is selected");
+  selectAndCheckById("jsdebugger");
+  selectAndCheckById("styleeditor");
+  testToggle();
+}
+
+function selectAndCheckById(id) {
+  let doc = toolbox.frame.contentDocument;
+
+  toolbox.selectTool(id);
+  let tab = doc.getElementById("toolbox-tab-" + id);
+  is(tab.selected, true, "The " + id + " tab is selected");
+}
+
+function testToggle() {
+  toolbox.once("destroyed", function() {
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    toolbox = gDevTools.openToolbox(target, "bottom", "styleeditor");
+    toolbox.once("styleeditor-ready", checkStyleEditorLoaded);
+  }.bind(this));
+
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  gDevTools.toggleToolboxForTarget(target);
+}
+
+function checkStyleEditorLoaded() {
+  is(toolbox.currentToolId, "styleeditor", "The style editor is selected");
+  finishUp();
+}
+
+function finishUp() {
+  toolbox.destroy();
+  toolbox = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/devtools/framework/test/browser_target_events.js b/browser/devtools/framework/test/browser_target_events.js
new file mode 100644
index 000000000000..56496fea2d64
--- /dev/null
+++ b/browser/devtools/framework/test/browser_target_events.js
@@ -0,0 +1,58 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+var tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+var TargetFactory = tempScope.TargetFactory;
+
+var target;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", onLoad, true);
+}
+
+function onLoad(evt) {
+  gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
+
+  target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  is(target.tab, gBrowser.selectedTab, "Target linked to the right tab.");
+
+  target.once("hidden", onHidden);
+  gBrowser.selectedTab = gBrowser.addTab();
+}
+
+function onHidden() {
+  ok(true, "Hidden event received");
+  target.once("visible", onVisible);
+  gBrowser.removeCurrentTab();
+}
+
+function onVisible() {
+  ok(true, "Visible event received");
+  target.once("will-navigate", onWillNavigate);
+  gBrowser.contentWindow.location = "data:text/html,test navigation";
+}
+
+function onWillNavigate(event, request) {
+  ok(true, "will-navigate event received");
+  target.once("navigate", onNavigate);
+}
+
+function onNavigate() {
+  ok(true, "navigate event received");
+  target.once("close", onClose);
+  gBrowser.removeCurrentTab();
+}
+
+function onClose() {
+  ok(true, "close event received");
+
+  target = null;
+  finish();
+}
diff --git a/browser/devtools/framework/test/browser_toolbox_dynamic_registration.js b/browser/devtools/framework/test/browser_toolbox_dynamic_registration.js
new file mode 100644
index 000000000000..848dbef8aac0
--- /dev/null
+++ b/browser/devtools/framework/test/browser_toolbox_dynamic_registration.js
@@ -0,0 +1,112 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let toolbox;
+
+let temp = {};
+Cu.import("resource:///modules/devtools/Target.jsm", temp);
+let TargetFactory = temp.TargetFactory;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
+    openToolbox();
+  }, true);
+
+  content.location = "data:text/html,test for dynamically registering and unregistering tools";
+}
+
+function openToolbox()
+{
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  toolbox = gDevTools.openToolbox(target);
+
+  toolbox.once("ready", testRegister);
+}
+
+
+function testRegister()
+{
+  gDevTools.once("tool-registered", toolRegistered);
+
+  gDevTools.registerTool({
+    id: "test-tool",
+    label: "Test Tool",
+    isTargetSupported: function() true,
+    build: function() {}
+  });
+}
+
+function toolRegistered(event, toolId)
+{
+  is(toolId, "test-tool", "tool-registered event handler sent tool id");
+
+  ok(gDevTools.getToolDefinitions().has(toolId), "tool added to map");
+
+  // test that it appeared in the UI
+  let doc = toolbox.frame.contentDocument;
+  let tab = doc.getElementById("toolbox-tab-" + toolId);
+  ok(tab, "new tool's tab exists in toolbox UI");
+
+  let panel = doc.getElementById("toolbox-panel-" + toolId);
+  ok(panel, "new tool's panel exists in toolbox UI");
+
+  for (let win of getAllBrowserWindows()) {
+    let command = win.document.getElementById("Tools:" + toolId);
+    ok(command, "command for new tool added to every browser window");
+  }
+
+  // then unregister it
+  testUnregister();
+}
+
+function getAllBrowserWindows() {
+  let wins = [];
+  let enumerator = Services.wm.getEnumerator("navigator:browser");
+  while (enumerator.hasMoreElements()) {
+    wins.push(enumerator.getNext());
+  }
+  return wins;
+}
+
+function testUnregister()
+{
+  gDevTools.once("tool-unregistered", toolUnregistered);
+
+  gDevTools.unregisterTool("test-tool");
+}
+
+function toolUnregistered(event, toolId)
+{
+  is(toolId, "test-tool", "tool-unregistered event handler sent tool id");
+
+  ok(!gDevTools.getToolDefinitions().has(toolId), "tool removed from map");
+
+  // test that it disappeared from the UI
+  let doc = toolbox.frame.contentDocument;
+  let tab = doc.getElementById("toolbox-tab-" + toolId);
+  ok(!tab, "tool's tab was removed from the toolbox UI");
+
+  let panel = doc.getElementById("toolbox-panel-" + toolId);
+  ok(!panel, "tool's panel was removed from toolbox UI");
+
+  for (let win of getAllBrowserWindows()) {
+    let command = win.document.getElementById("Tools:" + toolId);
+    ok(!command, "command removed from every browser window");
+  }
+
+  cleanup();
+}
+
+function cleanup()
+{
+  toolbox.destroy();
+  toolbox = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/devtools/framework/test/browser_toolbox_hosts.js b/browser/devtools/framework/test/browser_toolbox_hosts.js
new file mode 100644
index 000000000000..5edbad6a3278
--- /dev/null
+++ b/browser/devtools/framework/test/browser_toolbox_hosts.js
@@ -0,0 +1,135 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let temp = {}
+Cu.import("resource:///modules/devtools/gDevTools.jsm", temp);
+let DevTools = temp.DevTools;
+
+Cu.import("resource:///modules/devtools/Toolbox.jsm", temp);
+let Toolbox = temp.Toolbox;
+
+Cu.import("resource:///modules/devtools/Target.jsm", temp);
+let TargetFactory = temp.TargetFactory;
+
+let toolbox;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
+    openToolbox(testBottomHost);
+  }, true);
+
+  content.location = "data:text/html,test for opening toolbox in different hosts";
+}
+
+function openToolbox(callback)
+{
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  gDevTools.toggleToolboxForTarget(target);
+
+  toolbox = gDevTools.getToolboxForTarget(target);
+  toolbox.once("ready", callback);
+}
+
+function testBottomHost()
+{
+  checkHostType(Toolbox.HostType.BOTTOM);
+
+  // test UI presence
+  let iframe = document.getElementById("devtools-toolbox-bottom-iframe");
+  ok(iframe, "toolbox bottom iframe exists");
+
+  checkToolboxLoaded(iframe);
+
+  toolbox.once("host-changed", testSidebarHost);
+  toolbox.hostType = Toolbox.HostType.SIDE;
+}
+
+function testSidebarHost()
+{
+  checkHostType(Toolbox.HostType.SIDE);
+
+  // test UI presence
+  let bottom = document.getElementById("devtools-toolbox-bottom-iframe");
+  ok(!bottom, "toolbox bottom iframe doesn't exist");
+
+  let iframe = document.getElementById("devtools-toolbox-side-iframe");
+  ok(iframe, "toolbox side iframe exists");
+
+  checkToolboxLoaded(iframe);
+
+  toolbox.once("host-changed", testWindowHost);
+  toolbox.hostType = Toolbox.HostType.WINDOW;
+}
+
+function testWindowHost()
+{
+  checkHostType(Toolbox.HostType.WINDOW);
+
+  let sidebar = document.getElementById("devtools-toolbox-side-iframe");
+  ok(!sidebar, "toolbox sidebar iframe doesn't exist");
+
+  let win = Services.wm.getMostRecentWindow("devtools:toolbox");
+  ok(win, "toolbox separate window exists");
+
+  let iframe = win.document.getElementById("toolbox-iframe");
+  checkToolboxLoaded(iframe);
+
+  testToolSelect();
+}
+
+function testToolSelect()
+{
+  // make sure we can load a tool after switching hosts
+  toolbox.once("inspector-ready", testDestroy);
+  toolbox.selectTool("inspector");
+}
+
+function testDestroy()
+{
+  toolbox.once("destroyed", function() {
+    openToolbox(testRememberHost);
+  });
+
+  toolbox.destroy();
+}
+
+function testRememberHost()
+{
+  // last host was the window - make sure it's the same when re-opening
+  is(toolbox.hostType, Toolbox.HostType.WINDOW, "host remembered");
+
+  let win = Services.wm.getMostRecentWindow("devtools:toolbox");
+  ok(win, "toolbox separate window exists");
+
+  cleanup();
+}
+
+function checkHostType(hostType)
+{
+  is(toolbox.hostType, hostType, "host type is " + hostType);
+
+  let pref = Services.prefs.getCharPref("devtools.toolbox.host");
+  is(pref, hostType, "host pref is " + hostType);
+}
+
+function checkToolboxLoaded(iframe)
+{
+  let tabs = iframe.contentDocument.getElementById("toolbox-tabs");
+  ok(tabs, "toolbox UI has been loaded into iframe");
+}
+
+function cleanup()
+{
+  Services.prefs.setCharPref("devtools.toolbox.host", Toolbox.HostType.BOTTOM);
+
+  toolbox.destroy();
+  DevTools = Toolbox = toolbox = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/devtools/framework/test/browser_toolbox_ready.js b/browser/devtools/framework/test/browser_toolbox_ready.js
new file mode 100644
index 000000000000..cbf6d89efe22
--- /dev/null
+++ b/browser/devtools/framework/test/browser_toolbox_ready.js
@@ -0,0 +1,56 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
+let toolbox;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
+    openToolbox();
+  }, true);
+
+  content.location = "data:text/html,test for dynamically registering and unregistering tools";
+}
+
+function openToolbox()
+{
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  gDevTools.toggleToolboxForTarget(target);
+
+  toolbox = gDevTools.getToolboxForTarget(target);
+
+  ok(!toolbox.isReady, "toolbox isReady isn't set yet");
+
+  try {
+    toolbox.selectTool("webconsole");
+    ok(false, "Should throw when selectTool() called before toolbox is ready");
+  }
+  catch(error) {
+    is(error.message, "Can't select tool, wait for toolbox 'ready' event")
+  }
+
+  toolbox.once("ready", testReady);
+}
+
+function testReady()
+{
+  ok(toolbox.isReady, "toolbox isReady is set");
+  cleanup();
+}
+
+function cleanup()
+{
+  toolbox.destroy();
+  toolbox = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/devtools/framework/test/browser_toolbox_select_event.js b/browser/devtools/framework/test/browser_toolbox_select_event.js
new file mode 100644
index 000000000000..191bd80896f9
--- /dev/null
+++ b/browser/devtools/framework/test/browser_toolbox_select_event.js
@@ -0,0 +1,97 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let toolbox;
+
+function test() {
+  addTab("about:blank", function() {
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    toolbox = gDevTools.openToolbox(target, "bottom", "webconsole");
+    toolbox.once("ready", testSelect);
+  });
+}
+
+let called = {
+  inspector: false,
+  webconsole: false,
+  styleeditor: false,
+  //jsdebugger: false,
+}
+
+function testSelect() {
+  info("Toolbox fired a `ready` event");
+
+  toolbox.on("select", selectCB);
+
+  toolbox.selectTool("inspector");
+  toolbox.selectTool("webconsole");
+  toolbox.selectTool("styleeditor");
+  //toolbox.selectTool("jsdebugger");
+}
+
+function selectCB(event, id) {
+  called[id] = true;
+  info("toolbox-select event from " + id);
+
+  for (let tool in called) {
+    if (!called[tool]) {
+      return;
+    }
+  }
+
+  ok(true, "All the tools fired a 'select event'");
+  toolbox.off("select", selectCB);
+
+  reselect();
+}
+
+function reselect() {
+  for (let tool in called) {
+    called[tool] = false;
+  }
+
+  toolbox.once("inspector-selected", function() {
+    tidyUpIfAllCalled("inspector");
+  });
+
+  toolbox.once("webconsole-selected", function() {
+    tidyUpIfAllCalled("webconsole");
+  });
+
+  /*
+  toolbox.once("jsdebugger-selected", function() {
+    tidyUpIfAllCalled("jsdebugger");
+  });
+  */
+
+  toolbox.once("styleeditor-selected", function() {
+    tidyUpIfAllCalled("styleeditor");
+  });
+
+  toolbox.selectTool("inspector");
+  toolbox.selectTool("webconsole");
+  toolbox.selectTool("styleeditor");
+  //toolbox.selectTool("jsdebugger");
+}
+
+function tidyUpIfAllCalled(id) {
+  called[id] = true;
+  info("select event from " + id);
+
+  for (let tool in called) {
+    if (!called[tool]) {
+      return;
+    }
+  }
+
+  ok(true, "All the tools fired a {id}-selected event");
+  tidyUp();
+}
+
+function tidyUp() {
+  toolbox.destroy();
+  gBrowser.removeCurrentTab();
+
+  toolbox = null;
+  finish();
+}
diff --git a/browser/devtools/framework/test/browser_toolbox_sidebar.js b/browser/devtools/framework/test/browser_toolbox_sidebar.js
new file mode 100644
index 000000000000..b7c17b04f1c5
--- /dev/null
+++ b/browser/devtools/framework/test/browser_toolbox_sidebar.js
@@ -0,0 +1,132 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+  const Cu = Components.utils;
+  let tempScope = {};
+  Cu.import("resource:///modules/devtools/gDevTools.jsm", tempScope);
+  Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+  Cu.import("resource:///modules/devtools/Sidebar.jsm", tempScope);
+  let {TargetFactory: TargetFactory, gDevTools: gDevTools, ToolSidebar: ToolSidebar} = tempScope;
+
+  const toolURL = "data:text/xml;charset=utf8,<?xml version='1.0'?>" +
+                  "<?xml-stylesheet href='chrome://browser/skin/devtools/common.css' type='text/css'?>" +
+                  "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>" +
+                  "<hbox flex='1'><description flex='1'>foo</description><splitter class='devtools-side-splitter'/>" +
+                  "<tabbox flex='1' id='sidebar' class='devtools-sidebar-tabs'><tabs/><tabpanels flex='1'/></tabbox>" +
+                  "</hbox>" +
+                  "</window>";
+
+  const tab1URL = "data:text/html;charset=utf8,<title>1</title><p>1</p>";
+  const tab2URL = "data:text/html;charset=utf8,<title>2</title><p>2</p>";
+  const tab3URL = "data:text/html;charset=utf8,<title>3</title><p>3</p>";
+
+  let panelDoc;
+
+  let registeredTabs = {};
+  let readyTabs = {};
+
+  let toolDefinition = {
+    id: "fakeTool4242",
+    killswitch: "devtools.fakeTool4242.enabled",
+    url: toolURL,
+    label: "FAKE TOOL!!!",
+    isTargetSupported: function() true,
+    build: function(iframeWindow, toolbox) {
+      let panel = {
+        target: toolbox.target,
+        toolbox: toolbox,
+        isReady: true,
+        destroy: function(){},
+        panelDoc: iframeWindow.document,
+      }
+      return panel;
+    },
+  };
+
+  gDevTools.registerTool(toolDefinition);
+
+  addTab("about:blank", function(aBrowser, aTab) {
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let toolbox = gDevTools.openToolbox(target, "bottom", "fakeTool4242");
+    toolbox.once("fakeTool4242-ready", function(event, panel) {
+      ok(true, "Tool open");
+
+      let tabbox = panel.panelDoc.getElementById("sidebar");
+      panel.sidebar = new ToolSidebar(tabbox, panel, true);
+
+      panel.sidebar.on("new-tab-registered", function(event, id) {
+        registeredTabs[id] = true;
+      });
+
+      panel.sidebar.once("tab1-ready", function(event) {
+        readyTabs.tab1 = true;
+        if (readyTabs.tab1 && readyTabs.tab2 && readyTabs.tab3) {
+          allTabsReady(panel);
+        }
+      });
+
+      panel.sidebar.once("tab2-ready", function(event) {
+        readyTabs.tab2 = true;
+        if (readyTabs.tab1 && readyTabs.tab2 && readyTabs.tab3) {
+          allTabsReady(panel);
+        }
+      });
+
+      panel.sidebar.once("tab3-ready", function(event) {
+        readyTabs.tab3 = true;
+        if (readyTabs.tab1 && readyTabs.tab2 && readyTabs.tab3) {
+          allTabsReady(panel);
+        }
+      });
+
+      panel.sidebar.addTab("tab1", tab1URL, true);
+      panel.sidebar.addTab("tab2", tab2URL);
+      panel.sidebar.addTab("tab3", tab3URL);
+
+      panel.sidebar.show();
+    });
+  });
+
+  function allTabsReady(panel) {
+    ok(registeredTabs.tab1, "tab1 registered");
+    ok(registeredTabs.tab2, "tab2 registered");
+    ok(registeredTabs.tab3, "tab3 registered");
+    ok(readyTabs.tab1, "tab1 ready");
+    ok(readyTabs.tab2, "tab2 ready");
+    ok(readyTabs.tab3, "tab3 ready");
+
+    let tabs = panel.sidebar._tabbox.querySelectorAll("tab");
+    let panels = panel.sidebar._tabbox.querySelectorAll("tabpanel");
+    let label = 1;
+    for (let tab of tabs) {
+      is(tab.getAttribute("label"), label++, "Tab has the right title");
+    }
+    is(label, 4, "Found the right amount of tabs.");
+    is(panel.sidebar._tabbox.selectedPanel, panels[0], "First tab is selected");
+    ok(panel.sidebar.getCurrentTabID(), "tab1", "getCurrentTabID() is correct");
+
+    panel.sidebar.once("tab1-unselected", function() {
+      ok(true, "received 'unselected' event");
+      panel.sidebar.once("tab2-selected", function() {
+        ok(true, "received 'selected' event");
+        panel.sidebar.hide();
+        is(panel.sidebar._tabbox.getAttribute("hidden"), "true", "Sidebar hidden");
+        is(panel.sidebar.getWindowForTab("tab1").location.href, tab1URL, "Window is accessible");
+        finishUp(panel);
+      });
+    });
+
+    panel.sidebar.select("tab2");
+  }
+
+  function finishUp(panel) {
+    panel.sidebar.destroy();
+    gDevTools.unregisterTool(toolDefinition.id);
+
+    executeSoon(function() {
+      gBrowser.removeCurrentTab();
+      finish();
+    });
+  }
+}
diff --git a/browser/devtools/framework/test/browser_toolbox_tool_ready.js b/browser/devtools/framework/test/browser_toolbox_tool_ready.js
new file mode 100644
index 000000000000..98a537f03ca6
--- /dev/null
+++ b/browser/devtools/framework/test/browser_toolbox_tool_ready.js
@@ -0,0 +1,72 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let temp = [];
+Cu.import("resource:///modules/devtools/Target.jsm", temp);
+let TargetFactory = temp.TargetFactory;
+
+function test() {
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
+    openAllTools();
+  }, true);
+
+  function openAllTools() {
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+    let tools = gDevTools.getToolDefinitions();
+    let expectedCallbacksCount = tools.size;
+
+    let firstTool = null;
+    // we transform the map to a [id, eventHasBeenFiredYet] map
+    for (let [id] of tools) {
+      if (!firstTool)
+        firstTool = id;
+      tools.set(id, false);
+    }
+
+    let toolbox = gDevTools.openToolbox(target, undefined, firstTool);
+
+    // We add the event listeners
+    for (let [toolId] of tools) {
+      let id = toolId;
+      info("Registering listener for " + id);
+      tools.set(id, false);
+      toolbox.on(id + "-ready", function(event, panel) {
+        expectedCallbacksCount--;
+        info("Got event "  + event);
+        is(toolbox.getToolPanels().get(id), panel, "Got the right tool panel for " + id);
+        tools.set(id, true);
+        if (expectedCallbacksCount == 0) {
+          // "executeSoon" because we want to let a chance
+          // to falsy code to fire unexpected ready events.
+          executeSoon(theEnd);
+        }
+        if (expectedCallbacksCount < 0) {
+          ok(false, "we are receiving too many events");
+        }
+      });
+    }
+
+    toolbox.once("ready", function() {
+      // We open all the 
+      for (let [id] of tools) {
+        if (id != firstTool) {
+          toolbox.selectTool(id);
+        }
+      }
+    });
+
+    function theEnd() {
+      for (let [id, called] of tools) {
+        ok(called, "Tool " + id + " has fired its ready event");
+      }
+      toolbox.destroy();
+      gBrowser.removeCurrentTab();
+      finish();
+    }
+  }
+}
diff --git a/browser/devtools/framework/test/head.js b/browser/devtools/framework/test/head.js
new file mode 100644
index 000000000000..796a7946c2d0
--- /dev/null
+++ b/browser/devtools/framework/test/head.js
@@ -0,0 +1,36 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let tempScope = {};
+Components.utils.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+Components.utils.import("resource:///modules/devtools/Console.jsm", tempScope);
+let console = tempScope.console;
+
+/**
+ * Open a new tab at a URL and call a callback on load
+ */
+function addTab(aURL, aCallback)
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  content.location = aURL;
+
+  let tab = gBrowser.selectedTab;
+  let browser = gBrowser.getBrowserForTab(tab);
+
+  function onTabLoad() {
+    browser.removeEventListener("load", onTabLoad, true);
+    aCallback(browser, tab, browser.contentDocument);
+  }
+
+  browser.addEventListener("load", onTabLoad, true);
+}
+
+registerCleanupFunction(function tearDown() {
+  while (gBrowser.tabs.length > 1) {
+    gBrowser.removeCurrentTab();
+  }
+});
diff --git a/browser/devtools/framework/toolbox-window.xul b/browser/devtools/framework/toolbox-window.xul
new file mode 100644
index 000000000000..774747b531d9
--- /dev/null
+++ b/browser/devtools/framework/toolbox-window.xul
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!DOCTYPE window [
+<!ENTITY % toolboxDTD SYSTEM "chrome://browser/locale/devtools/toolbox.dtd" >
+ %toolboxDTD;
+]>
+
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="devtools-toolbox-window"
+        title="&window.title;"
+        macanimationtype="document"
+        fullscreenbutton="true"
+        windowtype="devtools:toolbox"
+        width="700" height="320"
+        persist="screenX screenY width height sizemode">
+
+  <commandset id="toolbox-commandset">
+    <command id="toolbox-cmd-close" oncommand="window.close();"/>
+  </commandset>
+
+  <keyset id="toolbox-keyset">
+    <key id="toolbox-key-close"
+         key="&closeCmd.key;"
+         command="toolbox-cmd-close"
+         modifiers="accel"/>
+  </keyset>
+
+  <iframe id="toolbox-iframe" flex="1"></iframe>
+</window>
diff --git a/browser/devtools/framework/toolbox.css b/browser/devtools/framework/toolbox.css
new file mode 100644
index 000000000000..57f18006c237
--- /dev/null
+++ b/browser/devtools/framework/toolbox.css
@@ -0,0 +1,10 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+.devtools-tab > .radio-check,
+.devtools-tab > .radio-check-box1,
+.devtools-tab > .radio-spacer-box {
+  display: none;
+}
+
diff --git a/browser/devtools/framework/toolbox.xul b/browser/devtools/framework/toolbox.xul
new file mode 100644
index 000000000000..744278c12d3e
--- /dev/null
+++ b/browser/devtools/framework/toolbox.xul
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/devtools/shared/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/devtools/framework/toolbox.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/devtools/toolbox.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
+<?xul-overlay href="chrome://browser/content/source-editor-overlay.xul"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <notificationbox id="toolbox-notificationbox" flex="1">
+    <toolbar class="devtools-tabbar">
+      <hbox id="toolbox-controls">
+        <toolbarbutton id="toolbox-close" class="devtools-closebutton"></toolbarbutton>
+        <hbox id="toolbox-dock-buttons"/>
+      </hbox>
+      <radiogroup id="toolbox-tabs" orient="horizontal">
+      </radiogroup>
+      <hbox id="toolbox-buttons" flex="1" pack="end"/>
+    </toolbar>
+    <deck id="toolbox-deck" flex="1">
+    </deck>
+  </notificationbox>
+</window>
diff --git a/browser/devtools/highlighter/CmdInspect.jsm b/browser/devtools/highlighter/CmdInspect.jsm
deleted file mode 100644
index c352c96cb285..000000000000
--- a/browser/devtools/highlighter/CmdInspect.jsm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-this.EXPORTED_SYMBOLS = [ ];
-
-Cu.import("resource:///modules/devtools/gcli.jsm");
-
-/**
- * 'inspect' command
- */
-gcli.addCommand({
-  name: "inspect",
-  description: gcli.lookup("inspectDesc"),
-  manual: gcli.lookup("inspectManual"),
-  params: [
-    {
-      name: "selector",
-      type: "node",
-      description: gcli.lookup("inspectNodeDesc"),
-      manual: gcli.lookup("inspectNodeManual")
-    }
-  ],
-  exec: function Command_inspect(args, context) {
-    let document = context.environment.chromeDocument;
-    document.defaultView.InspectorUI.openInspectorUI(args.selector);
-  }
-});
diff --git a/browser/devtools/highlighter/inspector.jsm b/browser/devtools/highlighter/inspector.jsm
deleted file mode 100644
index 2ffbaf77cec5..000000000000
--- a/browser/devtools/highlighter/inspector.jsm
+++ /dev/null
@@ -1,2414 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const Cc = Components.classes;
-const Cu = Components.utils;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-
-this.EXPORTED_SYMBOLS = ["InspectorUI"];
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/devtools/MarkupView.jsm");
-Cu.import("resource:///modules/highlighter.jsm");
-Cu.import("resource:///modules/devtools/LayoutView.jsm");
-Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
-Cu.import("resource:///modules/devtools/EventEmitter.jsm");
-Cu.import("resource:///modules/devtools/DOMHelpers.jsm");
-
-// Inspector notifications dispatched through the nsIObserverService.
-const INSPECTOR_NOTIFICATIONS = {
-  // Fires once the Inspector completes the initialization and opens up on
-  // screen.
-  OPENED: "inspector-opened",
-
-  // Fires once the Inspector is closed.
-  CLOSED: "inspector-closed",
-
-  // Fires once the Inspector is destroyed. Not fired on tab switch.
-  DESTROYED: "inspector-destroyed",
-
-  // Fires when the Inspector is reopened after tab-switch.
-  STATE_RESTORED: "inspector-state-restored",
-
-  // Fires when the Tree Panel is opened and initialized.
-  TREEPANELREADY: "inspector-treepanel-ready",
-
-  // Event notifications for the attribute-value editor
-  EDITOR_OPENED: "inspector-editor-opened",
-  EDITOR_CLOSED: "inspector-editor-closed",
-  EDITOR_SAVED: "inspector-editor-saved",
-};
-
-const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
-
-// Timer, in milliseconds, between change events fired by
-// things like resize events.
-const LAYOUT_CHANGE_TIMER = 250;
-
-/**
- * Represents an open instance of the Inspector for a tab.
- * This is the object handed out to sidebars and other API consumers.
- *
- * Right now it's a thin layer over InspectorUI, but we will
- * start moving per-tab state into this object soon, eventually
- * replacing the per-winID InspectorStore objects.
- *
- * The lifetime of this object is also not yet correct.  This object
- * is currently destroyed when the inspector is torn down, either by user
- * closing the inspector or by user switching the tab.  This should
- * only be destroyed when user closes the inspector.
- */
-function Inspector(aIUI)
-{
-  this._IUI = aIUI;
-  this._winID = aIUI.winID;
-  this._browser = aIUI.browser;
-  this._eventEmitter = new EventEmitter();
-
-  this._browser.addEventListener("resize", this, true);
-
-  this._markupButton = this._IUI.chromeDoc.getElementById("inspector-treepanel-toolbutton");
-
-  if (Services.prefs.getBoolPref("devtools.inspector.htmlPanelOpen")) {
-    this.openMarkup();
-  } else {
-    this.closeMarkup();
-  }
-
-}
-
-Inspector.prototype = {
-  /**
-   * True if the highlighter is locked on a node.
-   */
-  get locked() {
-    return !this._IUI.inspecting;
-  },
-
-  /**
-   * The currently selected node in the highlighter.
-   */
-  get selection() {
-    return this._IUI.selection;
-  },
-
-  /**
-   * Indicate that a tool has modified the state of the page.  Used to
-   * decide whether to show the "are you sure you want to navigate"
-   * notification.
-   */
-  markDirty: function Inspector_markDirty()
-  {
-    this._IUI.isDirty = true;
-  },
-
-  /**
-   * The chrome window the inspector lives in.
-   */
-  get chromeWindow() {
-    return this._IUI.chromeWin;
-  },
-
-  /**
-   * Notify the inspector that the current selection has changed.
-   *
-   * @param string aContext
-   *        An string that will be passed to the change event.  Allows
-   *        a tool to recognize when it sent a change notification itself
-   *        to avoid unnecessary refresh.
-   */
-  change: function Inspector_change(aContext)
-  {
-    this._cancelLayoutChange();
-    this._IUI.nodeChanged(aContext);
-  },
-
-  /**
-   * Returns true if a given sidebar panel is currently visible.
-   * @param string aPanelName
-   *        The panel name as registered with registerSidebar
-   */
-  isPanelVisible: function Inspector_isPanelVisible(aPanelName)
-  {
-    return this._IUI.sidebar.visible &&
-           this._IUI.sidebar.activePanel === aPanelName;
-  },
-
-  /**
-   * Called by the InspectorUI when the inspector is being destroyed.
-   */
-  _destroy: function Inspector__destroy()
-  {
-    this._cancelLayoutChange();
-    this._destroyMarkup();
-    this._browser.removeEventListener("resize", this, true);
-    delete this._IUI;
-    delete this._eventEmitter;
-  },
-
-  /**
-   * Event handler for DOM events.
-   *
-   * @param DOMEvent aEvent
-   */
-  handleEvent: function Inspector_handleEvent(aEvent)
-  {
-    switch(aEvent.type) {
-      case "resize":
-        this._scheduleLayoutChange();
-    }
-  },
-
-  /**
-   * Schedule a low-priority change event for things like paint
-   * and resize.
-   */
-  _scheduleLayoutChange: function Inspector_scheduleLayoutChange()
-  {
-    if (this._timer) {
-      return null;
-    }
-    this._timer = this._IUI.win.setTimeout(function() {
-      this.change("layout");
-    }.bind(this), LAYOUT_CHANGE_TIMER);
-  },
-
-  /**
-   * Cancel a pending low-priority change event if any is
-   * scheduled.
-   */
-  _cancelLayoutChange: function Inspector_cancelLayoutChange()
-  {
-    if (this._timer) {
-      this._IUI.win.clearTimeout(this._timer);
-      delete this._timer;
-    }
-  },
-
-  toggleMarkup: function Inspector_toggleMarkup()
-  {
-    if (this._markupFrame) {
-      this.closeMarkup();
-      Services.prefs.setBoolPref("devtools.inspector.htmlPanelOpen", false);
-    } else {
-      this.openMarkup(true);
-      Services.prefs.setBoolPref("devtools.inspector.htmlPanelOpen", true);
-    }
-  },
-
-  /**
-   * XXX: The sidebar has an object that exists and is manipulated
-   * separately from its actual loading.  So the public api for
-   * the sidebar looks like:
-   *
-   * if (inspector.sidebar.visible) { inspector.sidebar.close() }
-   *
-   * whereas the markup API looks more like
-   *
-   * if (inspector.markupOpen) { inspector.closeMarkup() }
-   *
-   * Maybe we should add an InspectorMarkup object that presents
-   * the public api for the markup panel?
-   */
-  get markupOpen() {
-    return this._markupOpen;
-  },
-
-  openMarkup: function Inspector_openMarkup(aFocus)
-  {
-    this._markupButton.setAttribute("checked", "true");
-    this._markupOpen = true;
-    if (!this._markupFrame) {
-      this._initMarkup(aFocus);
-    }
-  },
-
-  closeMarkup: function Inspector_closeMarkup()
-  {
-    this._markupButton.removeAttribute("checked");
-    this._markupOpen = false;
-    this._destroyMarkup();
-  },
-
-  _initMarkup: function Inspector_initMarkupPane(aFocus)
-  {
-    let doc = this._IUI.chromeDoc;
-
-    this._markupBox = doc.createElement("vbox");
-    try {
-      this._markupBox.height =
-        Services.prefs.getIntPref("devtools.inspector.htmlHeight");
-    } catch(e) {
-      this._markupBox.height = 112;
-    }
-    this._markupBox.minHeight = 64;
-
-    this._markupSplitter = doc.createElement("splitter");
-    this._markupSplitter.className = "devtools-horizontal-splitter";
-
-    let container = doc.getElementById("appcontent");
-    container.appendChild(this._markupSplitter);
-    container.appendChild(this._markupBox);
-
-    // create tool iframe
-    this._markupFrame = doc.createElement("iframe");
-    this._markupFrame.setAttribute("flex", "1");
-    this._markupFrame.setAttribute("tooltip", "aHTMLTooltip");
-    this._markupFrame.setAttribute("context", "inspector-node-popup");
-
-    // This is needed to enable tooltips inside the iframe document.
-    this._boundMarkupFrameLoad = function Inspector_initMarkupPanel_onload() {
-      if (aFocus) {
-        this._markupFrame.contentWindow.focus();
-      }
-      this._onMarkupFrameLoad();
-    }.bind(this);
-    this._markupFrame.addEventListener("load", this._boundMarkupFrameLoad, true);
-
-    this._markupSplitter.setAttribute("hidden", true);
-    this._markupBox.setAttribute("hidden", true);
-    this._markupBox.appendChild(this._markupFrame);
-    this._markupFrame.setAttribute("src", "chrome://browser/content/devtools/markup-view.xhtml");
-  },
-
-  _onMarkupFrameLoad: function Inspector__onMarkupFrameLoad()
-  {
-    this._markupFrame.removeEventListener("load", this._boundMarkupFrameLoad, true);
-    delete this._boundMarkupFrameLoad;
-
-    this._markupSplitter.removeAttribute("hidden");
-    this._markupBox.removeAttribute("hidden");
-
-    this.markup = new MarkupView(this, this._markupFrame);
-    this.emit("markuploaded");
-  },
-
-  _destroyMarkup: function Inspector__destroyMarkup()
-  {
-    if (this._boundMarkupFrameLoad) {
-      this._markupFrame.removeEventListener("load", this._boundMarkupFrameLoad, true);
-      delete this._boundMarkupFrameLoad;
-    }
-
-    if (this.markup) {
-      this.markup.destroy();
-      delete this.markup;
-    }
-
-    if (this._markupFrame) {
-      delete this._markupFrame;
-    }
-
-    if (this._markupBox) {
-      Services.prefs.setIntPref("devtools.inspector.htmlHeight", this._markupBox.height);
-      this._markupBox.parentNode.removeChild(this._markupBox);
-      delete this._markupBox;
-    }
-
-    if (this._markupSplitter) {
-      this._markupSplitter.parentNode.removeChild(this._markupSplitter);
-      delete this._markupSplitter;
-    }
-  },
-
-  /**
-   * Called by InspectorUI after a tab switch, when the
-   * inspector is no longer the active tab.
-   */
-  _freeze: function Inspector__freeze()
-  {
-    if (this._markupBox) {
-      this._markupSplitter.setAttribute("hidden", true);
-      this._markupBox.setAttribute("hidden", true);
-    }
-    this._cancelLayoutChange();
-    this._browser.removeEventListener("resize", this, true);
-    this._frozen = true;
-  },
-
-  /**
-   * Called by InspectorUI after a tab switch when the
-   * inspector is back to being the active tab.
-   */
-  _thaw: function Inspector__thaw()
-  {
-    if (!this._frozen) {
-      return;
-    }
-
-    if (this._markupOpen && !this._boundMarkupFrameLoad) {
-      this._markupSplitter.removeAttribute("hidden");
-      this._markupBox.removeAttribute("hidden");
-    }
-    this._browser.addEventListener("resize", this, true);
-    delete this._frozen;
-  },
-
-  /// Forward the events related calls to the event emitter.
-
-  /**
-   * Connect a listener to this object.
-   *
-   * @param string aEvent
-   *        The event name to which we're connecting.
-   * @param function aListener
-   *        Called when the event is fired.
-   */
-  on: function Inspector_on(aEvent, aListener)
-  {
-    this._eventEmitter.on(aEvent, aListener);
-  },
-
-  /**
-   * Listen for the next time an event is fired.
-   *
-   * @param string aEvent
-   *        The event name to which we're connecting.
-   * @param function aListener
-   *        Called when the event is fired.  Will be called at most one time.
-   */
-  once: function Inspector_once(aEvent, aListener)
-  {
-    this._eventEmitter.once(aEvent, aListener);
-  },
-
-  /**
-   * Remove a previously-registered event listener.  Works for events
-   * registered with either on or once.
-   *
-   * @param string aEvent
-   *        The event name whose listener we're disconnecting.
-   * @param function aListener
-   *        The listener to remove.
-   */
-  off: function Inspector_removeListener(aEvent, aListener)
-  {
-    this._eventEmitter.off(aEvent, aListener);
-  },
-
-  /**
-   * Emit an event on the inspector.  All arguments to this method will
-   * be sent to listner functions.
-   */
-  emit: function Inspector_emit()
-  {
-    this._eventEmitter.emit.apply(this._eventEmitter, arguments);
-  }
-}
-
-///////////////////////////////////////////////////////////////////////////
-//// InspectorUI
-
-/**
- * Main controller class for the Inspector.
- *
- * @constructor
- * @param nsIDOMWindow aWindow
- *        The chrome window for which the Inspector instance is created.
- */
-this.InspectorUI = function InspectorUI(aWindow)
-{
-  // Let style inspector tools register themselves.
-  let tmp = {};
-  Cu.import("resource:///modules/devtools/StyleInspector.jsm", tmp);
-
-  this.chromeWin = aWindow;
-  this.chromeDoc = aWindow.document;
-  this.tabbrowser = aWindow.gBrowser;
-  this.tools = {};
-  this.toolEvents = {};
-  this.store = new InspectorStore();
-  this.INSPECTOR_NOTIFICATIONS = INSPECTOR_NOTIFICATIONS;
-  this.buildButtonsTooltip();
-}
-
-InspectorUI.prototype = {
-  browser: null,
-  tools: null,
-  toolEvents: null,
-  inspecting: false,
-  ruleViewEnabled: true,
-  isDirty: false,
-  store: null,
-
-  _currentInspector: null,
-  _sidebar: null,
-
-  /**
-   * The Inspector object for the current tab.
-   */
-  get currentInspector() this._currentInspector,
-
-  /**
-   * The InspectorStyleSidebar for the current tab.
-   */
-  get sidebar() this._sidebar,
-
-  /**
-   * Toggle the inspector interface elements on or off.
-   *
-   * @param aEvent
-   *        The event that requested the UI change. Toolbar button or menu.
-   */
-  toggleInspectorUI: function IUI_toggleInspectorUI(aEvent)
-  {
-    if (this.isInspectorOpen) {
-      this.closeInspectorUI();
-    } else {
-      this.openInspectorUI();
-    }
-  },
-
-  /**
-   * Add a tooltip to the Inspect and Markup buttons.
-   * The tooltips include the related keyboard shortcut.
-   */
-  buildButtonsTooltip: function IUI_buildButtonsTooltip()
-  {
-    let keysbundle = Services.strings.createBundle("chrome://global-platform/locale/platformKeys.properties");
-    let separator = keysbundle.GetStringFromName("MODIFIER_SEPARATOR");
-
-    let button, tooltip;
-
-    // Inspect Button - the shortcut string is built from the <key> element
-
-    let key = this.chromeDoc.getElementById("key_inspect");
-
-    if (key) {
-      let modifiersAttr = key.getAttribute("modifiers");
-
-      let combo = [];
-
-      if (modifiersAttr.match("accel"))
-#ifdef XP_MACOSX
-        combo.push(keysbundle.GetStringFromName("VK_META"));
-#else
-        combo.push(keysbundle.GetStringFromName("VK_CONTROL"));
-#endif
-      if (modifiersAttr.match("shift"))
-        combo.push(keysbundle.GetStringFromName("VK_SHIFT"));
-      if (modifiersAttr.match("alt"))
-        combo.push(keysbundle.GetStringFromName("VK_ALT"));
-      if (modifiersAttr.match("ctrl"))
-        combo.push(keysbundle.GetStringFromName("VK_CONTROL"));
-      if (modifiersAttr.match("meta"))
-        combo.push(keysbundle.GetStringFromName("VK_META"));
-
-      combo.push(key.getAttribute("key"));
-
-      tooltip = this.strings.formatStringFromName("inspectButtonWithShortcutKey.tooltip",
-        [combo.join(separator)], 1);
-    } else {
-      tooltip = this.strings.GetStringFromName("inspectButton.tooltip");
-    }
-
-    button = this.chromeDoc.getElementById("inspector-inspect-toolbutton");
-    button.setAttribute("tooltiptext", tooltip);
-
-    // Markup Button - the shortcut string is built from the accesskey attribute
-
-    button = this.chromeDoc.getElementById("inspector-treepanel-toolbutton");
-#ifdef XP_MACOSX
-    // On Mac, no accesskey
-    tooltip = this.strings.GetStringFromName("markupButton.tooltip");
-#else
-    let altString = keysbundle.GetStringFromName("VK_ALT");
-    let accesskey = button.getAttribute("accesskey");
-    let shortcut = altString + separator + accesskey;
-    tooltip = this.strings.formatStringFromName("markupButton.tooltipWithAccesskey",
-      [shortcut], 1);
-#endif
-    button.setAttribute("tooltiptext", tooltip);
-
-  },
-
-  /**
-   * Toggle the status of the inspector, starting or stopping it. Invoked
-   * from the toolbar's Inspect button.
-   */
-  toggleInspection: function IUI_toggleInspection()
-  {
-    if (!this.isInspectorOpen) {
-      this.openInspectorUI();
-      return;
-    }
-
-    if (this.inspecting) {
-      this.stopInspecting();
-    } else {
-      this.startInspecting();
-    }
-  },
-
-  /**
-   * Show or hide the sidebar. Called from the Styling button on the
-   * highlighter toolbar.
-   */
-  toggleSidebar: function IUI_toggleSidebar()
-  {
-    if (!this.sidebar.visible) {
-      this.sidebar.show();
-    } else {
-      this.sidebar.hide();
-    }
-  },
-
-  /**
-   * Toggle the TreePanel.
-   */
-  toggleHTMLPanel: function IUI_toggleHTMLPanel()
-  {
-    this.currentInspector.toggleMarkup();
-  },
-
-  /**
-   * Is the inspector UI open? Simply check if the toolbar is visible or not.
-   *
-   * @returns boolean
-   */
-  get isInspectorOpen()
-  {
-    return !!(this.toolbar && !this.toolbar.hidden && this.highlighter);
-  },
-
-  /**
-   * Return the default selection element for the inspected document.
-   */
-  get defaultSelection()
-  {
-    let doc = this.win.document;
-    return doc.documentElement ? doc.documentElement.lastElementChild : null;
-  },
-
-  /**
-   * Open inspector UI and HTML tree. Add listeners for document scrolling,
-   * resize, tabContainer.TabSelect and others. If a node is provided, then
-   * start inspecting it.
-   *
-   * @param [optional] aNode
-   *        The node to inspect.
-   */
-  openInspectorUI: function IUI_openInspectorUI(aNode)
-  {
-    // InspectorUI is already up and running. Lock a node if asked (via context).
-    if (this.isInspectorOpen) {
-      if (aNode) {
-        this.inspectNode(aNode);
-        this.stopInspecting();
-      }
-      return;
-    }
-
-    // Observer used to inspect the specified element from content after the
-    // inspector UI has been opened (via the content context menu).
-    function inspectObserver(aElement) {
-      Services.obs.removeObserver(boundInspectObserver,
-                                  INSPECTOR_NOTIFICATIONS.OPENED,
-                                  false);
-      this.inspectNode(aElement);
-      this.stopInspecting();
-    };
-
-    var boundInspectObserver = inspectObserver.bind(this, aNode);
-
-    if (aNode) {
-      // Add the observer to inspect the node after initialization finishes.
-      Services.obs.addObserver(boundInspectObserver,
-                               INSPECTOR_NOTIFICATIONS.OPENED,
-                               false);
-    }
-    // Start initialization.
-    this.browser = this.tabbrowser.selectedBrowser;
-    this.win = this.browser.contentWindow;
-    this.winID = this.getWindowID(this.win);
-    this.toolbar = this.chromeDoc.getElementById("inspector-toolbar");
-    this.inspectCommand = this.chromeDoc.getElementById("Inspector:Inspect");
-
-    // Update menus:
-    this.inspectorUICommand = this.chromeDoc.getElementById("Tools:Inspect");
-    this.inspectorUICommand.setAttribute("checked", "true");
-
-    this.chromeWin.Tilt.setup();
-
-    this.toolbar.hidden = false;
-
-    // initialize the HTML Breadcrumbs
-    this.breadcrumbs = new HTMLBreadcrumbs(this);
-
-    this.isDirty = false;
-
-    this.progressListener = new InspectorProgressListener(this);
-
-    this.chromeWin.addEventListener("keypress", this, false);
-
-    // initialize the highlighter
-    this.highlighter = new Highlighter(this.chromeWin);
-
-    this.initializeStore();
-
-    this._sidebar = new InspectorStyleSidebar({
-      document: this.chromeDoc,
-      inspector: this._currentInspector,
-    });
-
-    // Fade out the highlighter when needed
-    let deck = this.chromeDoc.getElementById("devtools-sidebar-deck");
-    deck.addEventListener("mouseenter", this, true);
-    deck.addEventListener("mouseleave", this, true);
-
-    // Create UI for any sidebars registered with
-    // InspectorUI.registerSidebar()
-    for each (let tool in InspectorUI._registeredSidebars) {
-      this._sidebar.addTool(tool);
-    }
-
-    this.setupNavigationKeys();
-    this.highlighterReady();
-
-    // Focus the first focusable element in the toolbar
-    this.chromeDoc.commandDispatcher.advanceFocusIntoSubtree(this.toolbar);
-
-    // If nothing is focused in the toolbar, it means that the focus manager
-    // is limited to some specific elements and has moved the focus somewhere else.
-    // So in this case, we want to focus the content window.
-    // See: https://developer.mozilla.org/en/XUL_Tutorial/Focus_and_Selection#Platform_Specific_Behaviors
-    if (!this.toolbar.querySelector(":-moz-focusring")) {
-      this.win.focus();
-    }
-
-  },
-
-  /**
-   * Initialize the InspectorStore.
-   */
-  initializeStore: function IUI_initializeStore()
-  {
-    // First time opened, add the TabSelect listener
-    if (this.store.isEmpty()) {
-      this.tabbrowser.tabContainer.addEventListener("TabSelect", this, false);
-    }
-
-    // Has this windowID been inspected before?
-    if (this.store.hasID(this.winID)) {
-      this._currentInspector = this.store.getInspector(this.winID);
-      this._currentInspector._thaw();
-      let selectedNode = this.currentInspector._selectedNode;
-      if (selectedNode) {
-        this.inspectNode(selectedNode);
-      }
-      this.isDirty = this.currentInspector._isDirty;
-    } else {
-      // First time inspecting, set state to no selection + live inspection.
-      let inspector = new Inspector(this);
-      this.store.addInspector(this.winID, inspector);
-      inspector._selectedNode = null;
-      inspector._inspecting = true;
-      inspector._isDirty = this.isDirty;
-
-      inspector._htmlPanelOpen =
-        Services.prefs.getBoolPref("devtools.inspector.htmlPanelOpen");
-
-      inspector._sidebarOpen =
-        Services.prefs.getBoolPref("devtools.inspector.sidebarOpen");
-
-      inspector._activeSidebar =
-        Services.prefs.getCharPref("devtools.inspector.activeSidebar");
-
-      this.win.addEventListener("pagehide", this, true);
-
-      this._currentInspector = inspector;
-    }
-  },
-
-  /**
-   * Browse nodes according to the breadcrumbs layout, only for some specific
-   * elements of the UI.
-   */
-   setupNavigationKeys: function IUI_setupNavigationKeys()
-   {
-     // UI elements that are arrow keys sensitive:
-     // - the Inspector toolbar.
-
-     this.onKeypress = this.onKeypress.bind(this);
-
-     this.toolbar.addEventListener("keypress", this.onKeypress, true);
-   },
-
-  /**
-   * Remove the event listeners for the arrowkeys.
-   */
-   removeNavigationKeys: function IUI_removeNavigationKeys()
-   {
-      this.toolbar.removeEventListener("keypress", this.onKeypress, true);
-   },
-
-  /**
-   * Close inspector UI and associated panels. Unhighlight and stop inspecting.
-   * Remove event listeners for document scrolling, resize,
-   * tabContainer.TabSelect and others.
-   *
-   * @param boolean aKeepInspector
-   *        Tells if you want the inspector associated to the current tab/window to
-   *        be cleared or not. Set this to true to save the inspector, or false
-   *        to destroy it.
-   */
-  closeInspectorUI: function IUI_closeInspectorUI(aKeepInspector)
-  {
-    if (this.closing || !this.win || !this.browser) {
-      return;
-    }
-
-    let winId = new String(this.winID); // retain this to notify observers.
-
-    this.closing = true;
-    this.toolbar.hidden = true;
-
-    this.removeNavigationKeys();
-
-    this.progressListener.destroy();
-    delete this.progressListener;
-
-    if (!aKeepInspector) {
-      this.win.removeEventListener("pagehide", this, true);
-      this.clearPseudoClassLocks();
-    } else {
-      // Update the inspector before closing.
-      if (this.selection) {
-        this.currentInspector._selectedNode = this.selection;
-      }
-      this.currentInspector._inspecting = this.inspecting;
-      this.currentInspector._isDirty = this.isDirty;
-    }
-
-    if (this.store.isEmpty()) {
-      this.tabbrowser.tabContainer.removeEventListener("TabSelect", this, false);
-    }
-
-    this.chromeWin.removeEventListener("keypress", this, false);
-
-    this.stopInspecting();
-
-    // close the sidebar
-    if (this._sidebar) {
-      this._sidebar.destroy();
-      this._sidebar = null;
-    }
-
-    let deck = this.chromeDoc.getElementById("devtools-sidebar-deck");
-    deck.removeEventListener("mouseenter", this, true);
-    deck.removeEventListener("mouseleave", this, true);
-
-    this.highlighter.destroy();
-    this.highlighter = null;
-
-    if (this.breadcrumbs) {
-      this.breadcrumbs.destroy();
-      this.breadcrumbs = null;
-    }
-
-    if (aKeepInspector) {
-      this._currentInspector._freeze();
-    } else {
-      this.store.deleteInspector(this.winID);
-    }
-    delete this._currentInspector;
-
-    this.inspectorUICommand.setAttribute("checked", "false");
-
-    this.browser = this.win = null; // null out references to browser and window
-    this.winID = null;
-    this.selection = null;
-    this.closing = false;
-    this.isDirty = false;
-
-    delete this.stylePanel;
-    delete this.inspectorUICommand;
-    delete this.inspectCommand;
-    delete this.toolbar;
-
-    Services.obs.notifyObservers(null, INSPECTOR_NOTIFICATIONS.CLOSED, null);
-
-    if (!aKeepInspector)
-      Services.obs.notifyObservers(null, INSPECTOR_NOTIFICATIONS.DESTROYED, winId);
-  },
-
-  /**
-   * Begin inspecting webpage, attach page event listeners, activate
-   * highlighter event listeners.
-   */
-  startInspecting: function IUI_startInspecting()
-  {
-    this.inspectCommand.setAttribute("checked", "true");
-
-    this.inspecting = true;
-    this.highlighter.unlock();
-    this._notifySelected();
-    this._currentInspector.emit("unlocked");
-  },
-
-  _notifySelected: function IUI__notifySelected(aFrom)
-  {
-    this._currentInspector._cancelLayoutChange();
-    this._currentInspector.emit("select", aFrom);
-  },
-
-  /**
-   * Stop inspecting webpage, detach page listeners, disable highlighter
-   * event listeners.
-   * @param aPreventScroll
-   *        Prevent scroll in the HTML tree?
-   */
-  stopInspecting: function IUI_stopInspecting(aPreventScroll)
-  {
-    if (!this.inspecting) {
-      return;
-    }
-
-    this.inspectCommand.setAttribute("checked", "false");
-
-    this.inspecting = false;
-
-    if (this.closing)
-      return;
-
-    if (this.highlighter.getNode()) {
-      this.select(this.highlighter.getNode(), true, !aPreventScroll);
-    } else {
-      this.select(null, true, true);
-    }
-
-    this.highlighter.lock();
-    this._notifySelected();
-    this._currentInspector.emit("locked");
-  },
-
-  /**
-   * Select an object in the inspector.
-   * @param aNode
-   *        node to inspect
-   * @param forceUpdate
-   *        force an update?
-   * @param aScroll boolean
-   *        scroll the tree panel?
-   * @param aFrom [optional] string
-   *        which part of the UI the selection occured from
-   */
-  select: function IUI_select(aNode, forceUpdate, aScroll, aFrom)
-  {
-    if (!aNode)
-      aNode = this.defaultSelection;
-
-    if (forceUpdate || aNode != this.selection) {
-      if (aFrom != "breadcrumbs") {
-        this.clearPseudoClassLocks();
-      }
-
-      this.selection = aNode;
-      if (!this.inspecting) {
-        this.highlighter.highlight(this.selection);
-      }
-    }
-
-    this.breadcrumbs.update();
-    this.chromeWin.Tilt.update(aNode);
-
-    this._notifySelected(aFrom);
-  },
-
-  /**
-   * Toggle the pseudo-class lock on the currently inspected element. If the
-   * pseudo-class is :hover or :active, that pseudo-class will also be toggled
-   * on every ancestor of the element, mirroring real :hover and :active
-   * behavior.
-   * 
-   * @param aPseudo the pseudo-class lock to toggle, e.g. ":hover"
-   */
-  togglePseudoClassLock: function IUI_togglePseudoClassLock(aPseudo)
-  {
-    if (DOMUtils.hasPseudoClassLock(this.selection, aPseudo)) {
-      this.breadcrumbs.nodeHierarchy.forEach(function(crumb) {
-        DOMUtils.removePseudoClassLock(crumb.node, aPseudo);
-      });
-    } else {
-      let hierarchical = aPseudo == ":hover" || aPseudo == ":active";
-      let node = this.selection;
-      do {
-        DOMUtils.addPseudoClassLock(node, aPseudo);
-        node = node.parentNode;
-      } while (hierarchical && node.parentNode)
-    }
-    this.nodeChanged("pseudoclass");
-  },
-
-  /**
-   * Clear all pseudo-class locks applied to elements in the node hierarchy
-   */
-  clearPseudoClassLocks: function IUI_clearPseudoClassLocks()
-  {
-    this.breadcrumbs.nodeHierarchy.forEach(function(crumb) {
-      if (LayoutHelpers.isNodeConnected(crumb.node)) {
-        DOMUtils.clearPseudoClassLocks(crumb.node);
-      }
-    });
-  },
-
-  /**
-   * Called when the highlighted node is changed by a tool.
-   *
-   * @param object aUpdater
-   *        The tool that triggered the update (if any), that tool's
-   *        onChanged will not be called.
-   */
-  nodeChanged: function IUI_nodeChanged(aUpdater)
-  {
-    this.highlighter.updateInfobar();
-    this.highlighter.invalidateSize();
-    this.breadcrumbs.updateSelectors();
-    this._currentInspector.emit("change", aUpdater);
-  },
-
-  /////////////////////////////////////////////////////////////////////////
-  //// Event Handling
-
-  highlighterReady: function IUI_highlighterReady()
-  {
-    let self = this;
-
-    this.highlighter.addListener("locked", function() {
-      self.stopInspecting();
-    });
-
-    this.highlighter.addListener("unlocked", function() {
-      self.startInspecting();
-    });
-
-    this.highlighter.addListener("nodeselected", function() {
-      self.select(self.highlighter.getNode(), false, false);
-    });
-
-    this.highlighter.addListener("pseudoclasstoggled", function(aPseudo) {
-      self.togglePseudoClassLock(aPseudo);
-    });
-
-    if (this.currentInspector._inspecting) {
-      this.startInspecting();
-      this.highlighter.unlock();
-    } else {
-      this.highlighter.lock();
-    }
-
-    Services.obs.notifyObservers(null, INSPECTOR_NOTIFICATIONS.STATE_RESTORED, null);
-
-    this.highlighter.highlight();
-
-    if (this.currentInspector._sidebarOpen) {
-      this._sidebar.show();
-    }
-
-    Services.obs.notifyObservers({wrappedJSObject: this},
-                                 INSPECTOR_NOTIFICATIONS.OPENED, null);
-  },
-
-  /**
-   * Main callback handler for events.
-   *
-   * @param event
-   *        The event to be handled.
-   */
-  handleEvent: function IUI_handleEvent(event)
-  {
-    let winID = null;
-    let win = null;
-    let inspectorClosed = false;
-
-    switch (event.type) {
-      case "TabSelect":
-        winID = this.getWindowID(this.tabbrowser.selectedBrowser.contentWindow);
-        if (this.isInspectorOpen && winID != this.winID) {
-          this.closeInspectorUI(true);
-          inspectorClosed = true;
-        }
-
-        if (winID && this.store.hasID(winID)) {
-          if (inspectorClosed && this.closing) {
-            Services.obs.addObserver(function reopenInspectorForTab() {
-              Services.obs.removeObserver(reopenInspectorForTab,
-                INSPECTOR_NOTIFICATIONS.CLOSED, false);
-
-              this.openInspectorUI();
-            }.bind(this), INSPECTOR_NOTIFICATIONS.CLOSED, false);
-          } else {
-            this.openInspectorUI();
-          }
-        }
-
-        if (this.store.isEmpty()) {
-          this.tabbrowser.tabContainer.removeEventListener("TabSelect", this,
-                                                         false);
-        }
-        break;
-      case "keypress":
-        switch (event.keyCode) {
-          case this.chromeWin.KeyEvent.DOM_VK_ESCAPE:
-            this.closeInspectorUI(false);
-            event.preventDefault();
-            event.stopPropagation();
-            break;
-      }
-      case "pagehide":
-        win = event.originalTarget.defaultView;
-        // Skip iframes/frames.
-        if (!win || win.frameElement || win.top != win) {
-          break;
-        }
-
-        win.removeEventListener(event.type, this, true);
-
-        winID = this.getWindowID(win);
-        if (winID && winID != this.winID) {
-          this.store.deleteInspector(winID);
-        }
-
-        if (this.store.isEmpty()) {
-          this.tabbrowser.tabContainer.removeEventListener("TabSelect", this,
-                                                         false);
-        }
-        break;
-      case "mouseleave":
-        this.highlighter.show();
-        break;
-      case "mouseenter":
-        this.highlighter.hide();
-        break;
-    }
-  },
-
-  /*
-   * handles "keypress" events.
-  */
-  onKeypress: function IUI_onKeypress(event)
-  {
-    let node = null;
-    let bc = this.breadcrumbs;
-    switch (event.keyCode) {
-      case this.chromeWin.KeyEvent.DOM_VK_LEFT:
-        if (bc.currentIndex != 0)
-          node = bc.nodeHierarchy[bc.currentIndex - 1].node;
-        if (node && this.highlighter.isNodeHighlightable(node))
-          this.highlighter.highlight(node);
-        event.preventDefault();
-        event.stopPropagation();
-        break;
-      case this.chromeWin.KeyEvent.DOM_VK_RIGHT:
-        if (bc.currentIndex < bc.nodeHierarchy.length - 1)
-          node = bc.nodeHierarchy[bc.currentIndex + 1].node;
-        if (node && this.highlighter.isNodeHighlightable(node)) {
-          this.highlighter.highlight(node);
-        }
-        event.preventDefault();
-        event.stopPropagation();
-        break;
-      case this.chromeWin.KeyEvent.DOM_VK_UP:
-        if (this.selection) {
-          // Find a previous sibling that is highlightable.
-          node = this.selection.previousSibling;
-          while (node && !this.highlighter.isNodeHighlightable(node)) {
-            node = node.previousSibling;
-          }
-        }
-        if (node && this.highlighter.isNodeHighlightable(node)) {
-          this.highlighter.highlight(node, true);
-        }
-        event.preventDefault();
-        event.stopPropagation();
-        break;
-      case this.chromeWin.KeyEvent.DOM_VK_DOWN:
-        if (this.selection) {
-          // Find a next sibling that is highlightable.
-          node = this.selection.nextSibling;
-          while (node && !this.highlighter.isNodeHighlightable(node)) {
-            node = node.nextSibling;
-          }
-        }
-        if (node && this.highlighter.isNodeHighlightable(node)) {
-          this.highlighter.highlight(node, true);
-        }
-        event.preventDefault();
-        event.stopPropagation();
-        break;
-    }
-  },
-
-  /**
-   * Return the currently-selected node for the purposes of the
-   * context menu.  This is usually the highlighter selection, unless
-   * the markup panel has a selected node that can't be highlighted
-   * (such as a text node).  This will be fixed once the highlighter/inspector
-   * is confortable with non-element nodes being the current selection.
-   * See bug 785180.
-   */
-  _contextSelection: function IUI__contextSelection()
-  {
-    let inspector = this.currentInspector;
-    if (inspector.markup) {
-      return inspector.markup.selected;
-    }
-    return this.selection;
-  },
-
-  /**
-   * Copy the innerHTML of the selected Node to the clipboard. Called via the
-   * Inspector:CopyInner command.
-   */
-  copyInnerHTML: function IUI_copyInnerHTML()
-  {
-    let selection = this._contextSelection();
-    clipboardHelper.copyString(selection.innerHTML, selection.ownerDocument);
-  },
-
-  /**
-   * Copy the outerHTML of the selected Node to the clipboard. Called via the
-   * Inspector:CopyOuter command.
-   */
-  copyOuterHTML: function IUI_copyOuterHTML()
-  {
-    let selection = this._contextSelection();
-    clipboardHelper.copyString(selection.outerHTML, selection.ownerDocument);
-  },
-
-  /**
-   * Delete the selected node. Called via the Inspector:DeleteNode command.
-   */
-  deleteNode: function IUI_deleteNode()
-  {
-    let selection = this._contextSelection();
-
-    let root = selection.ownerDocument.documentElement;
-    if (selection === root) {
-      // We can't delete the root element.
-      return;
-    }
-
-    let parent = selection.parentNode;
-
-    // If the markup panel is active, use the markup panel to delete
-    // the node, making this an undoable action.
-    let markup = this.currentInspector.markup;
-    if (markup) {
-      markup.deleteNode(selection);
-    } else {
-      // remove the node from content
-      parent.removeChild(selection);
-    }
-
-    // Otherwise, just delete the node.
-    this.breadcrumbs.invalidateHierarchy();
-
-    // select the parent node in the highlighter and breadcrumbs
-    this.inspectNode(parent);
-  },
-
-  /////////////////////////////////////////////////////////////////////////
-  //// Utility Methods
-
-  /**
-   * inspect the given node, highlighting it on the page and selecting the
-   * correct row in the tree panel
-   *
-   * @param aNode
-   *        the element in the document to inspect
-   * @param aScroll
-   *        force scroll?
-   */
-  inspectNode: function IUI_inspectNode(aNode, aScroll)
-  {
-    if (aNode.ownerDocument === this.chromeDoc) {
-      // This should never happen, but just in case, we don't let the inspector
-      // inspect browser nodes.
-      return;
-    }
-    this.select(aNode, true, true);
-    this.highlighter.highlight(aNode, aScroll);
-  },
-
-  ///////////////////////////////////////////////////////////////////////////
-  //// Utility functions
-
-  /**
-   * Retrieve the unique ID of a window object.
-   *
-   * @param nsIDOMWindow aWindow
-   * @returns integer ID
-   */
-  getWindowID: function IUI_getWindowID(aWindow)
-  {
-    if (!aWindow) {
-      return null;
-    }
-
-    let util = {};
-
-    try {
-      util = aWindow.QueryInterface(Ci.nsIInterfaceRequestor).
-        getInterface(Ci.nsIDOMWindowUtils);
-    } catch (ex) { }
-
-    return util.currentInnerWindowID;
-  },
-
-  /**
-   * @param msg
-   *        text message to send to the log
-   */
-  _log: function LOG(msg)
-  {
-    Services.console.logStringMessage(msg);
-  },
-
-  /**
-   * Debugging function.
-   * @param msg
-   *        text to show with the stack trace.
-   */
-  _trace: function TRACE(msg)
-  {
-    this._log("TRACE: " + msg);
-    let frame = Components.stack.caller;
-    while (frame = frame.caller) {
-      if (frame.language == Ci.nsIProgrammingLanguage.JAVASCRIPT ||
-          frame.language == Ci.nsIProgrammingLanguage.JAVASCRIPT2) {
-        this._log("filename: " + frame.filename + " lineNumber: " + frame.lineNumber +
-          " functionName: " + frame.name);
-      }
-    }
-    this._log("END TRACE");
-  },
-
-  /**
-   * Get the toolbar button name for a given id string. Used by the
-   * registerTools API to retrieve a consistent name for toolbar buttons
-   * based on the ID of the tool.
-   * @param anId String
-   *        id of the tool to be buttonized
-   * @returns String
-   */
-  getToolbarButtonId: function IUI_createButtonId(anId)
-  {
-    return "inspector-" + anId + "-toolbutton";
-  },
-
-  /**
-   * Destroy the InspectorUI instance. This is called by the InspectorUI API
-   * "user", see gBrowserInit.onUnload() in browser.js.
-   */
-  destroy: function IUI_destroy()
-  {
-    if (this.isInspectorOpen) {
-      this.closeInspectorUI();
-    }
-
-    delete this.store;
-    delete this.chromeDoc;
-    delete this.chromeWin;
-    delete this.tabbrowser;
-  },
-};
-
-/**
- * The Inspector store is used for storing data specific to each tab window.
- * @constructor
- */
-function InspectorStore()
-{
-  this.store = {};
-}
-InspectorStore.prototype = {
-  length: 0,
-
-  /**
-   * Check if there is any data recorded for any tab/window.
-   *
-   * @returns boolean True if there are no stores for any window/tab, or false
-   * otherwise.
-   */
-  isEmpty: function IS_isEmpty()
-  {
-    return this.length == 0 ? true : false;
-  },
-
-  /**
-   * Add a new inspector.
-   *
-   * @param string aID The Store ID you want created.
-   * @param Inspector aInspector The inspector to add.
-   * @returns boolean True if the store was added successfully, or false
-   * otherwise.
-   */
-  addInspector: function IS_addInspector(aID, aInspector)
-  {
-    let result = false;
-
-    if (!(aID in this.store)) {
-      this.store[aID] = aInspector;
-      this.length++;
-      result = true;
-    }
-
-    return result;
-  },
-
-  /**
-   * Get the inspector for a window, if any.
-   *
-   * @param string aID The Store ID you want created.
-   */
-  getInspector: function IS_getInspector(aID)
-  {
-    return this.store[aID] || null;
-  },
-
-  /**
-   * Delete an inspector by ID.
-   *
-   * @param string aID The store ID you want deleted.
-   * @returns boolean True if the store was removed successfully, or false
-   * otherwise.
-   */
-  deleteInspector: function IS_deleteInspector(aID)
-  {
-    let result = false;
-
-    if (aID in this.store) {
-      this.store[aID]._destroy();
-      delete this.store[aID];
-      this.length--;
-      result = true;
-    }
-
-    return result;
-  },
-
-  /**
-   * Check store existence.
-   *
-   * @param string aID The store ID you want to check.
-   * @returns boolean True if the store ID is registered, or false otherwise.
-   */
-  hasID: function IS_hasID(aID)
-  {
-    return (aID in this.store);
-  },
-};
-
-/**
- * The InspectorProgressListener object is an nsIWebProgressListener which
- * handles onStateChange events for the inspected browser. If the user makes
- * changes to the web page and he tries to navigate away, he is prompted to
- * confirm page navigation, such that he's given the chance to prevent the loss
- * of edits.
- *
- * @constructor
- * @param object aInspector
- *        InspectorUI instance object.
- */
-function InspectorProgressListener(aInspector)
-{
-  this.IUI = aInspector;
-  this.IUI.tabbrowser.addProgressListener(this);
-}
-
-InspectorProgressListener.prototype = {
-  onStateChange:
-  function IPL_onStateChange(aProgress, aRequest, aFlag, aStatus)
-  {
-    // Remove myself if the Inspector is no longer open.
-    if (!this.IUI.isInspectorOpen) {
-      this.destroy();
-      return;
-    }
-
-    let isStart = aFlag & Ci.nsIWebProgressListener.STATE_START;
-    let isDocument = aFlag & Ci.nsIWebProgressListener.STATE_IS_DOCUMENT;
-    let isNetwork = aFlag & Ci.nsIWebProgressListener.STATE_IS_NETWORK;
-    let isRequest = aFlag & Ci.nsIWebProgressListener.STATE_IS_REQUEST;
-
-    // Skip non-interesting states.
-    if (!isStart || !isDocument || !isRequest || !isNetwork) {
-      return;
-    }
-
-    // If the request is about to happen in a new window, we are not concerned
-    // about the request.
-    if (aProgress.DOMWindow != this.IUI.win) {
-      return;
-    }
-
-    if (this.IUI.isDirty) {
-      this.showNotification(aRequest);
-    } else {
-      this.IUI.closeInspectorUI();
-    }
-  },
-
-  /**
-   * Show an asynchronous notification which asks the user to confirm or cancel
-   * the page navigation request.
-   *
-   * @param nsIRequest aRequest
-   *        The request initiated by the user or by the page itself.
-   * @returns void
-   */
-  showNotification: function IPL_showNotification(aRequest)
-  {
-    aRequest.suspend();
-
-    let notificationBox = this.IUI.tabbrowser.getNotificationBox(this.IUI.browser);
-    let notification = notificationBox.
-      getNotificationWithValue("inspector-page-navigation");
-
-    if (notification) {
-      notificationBox.removeNotification(notification, true);
-    }
-
-    let cancelRequest = function onCancelRequest() {
-      if (aRequest) {
-        aRequest.cancel(Cr.NS_BINDING_ABORTED);
-        aRequest.resume(); // needed to allow the connection to be cancelled.
-        aRequest = null;
-      }
-    };
-
-    let eventCallback = function onNotificationCallback(aEvent) {
-      if (aEvent == "removed") {
-        cancelRequest();
-      }
-    };
-
-    let buttons = [
-      {
-        id: "inspector.confirmNavigationAway.buttonLeave",
-        label: this.IUI.strings.
-          GetStringFromName("confirmNavigationAway.buttonLeave"),
-        accessKey: this.IUI.strings.
-          GetStringFromName("confirmNavigationAway.buttonLeaveAccesskey"),
-        callback: function onButtonLeave() {
-          if (aRequest) {
-            aRequest.resume();
-            aRequest = null;
-            this.IUI.closeInspectorUI();
-            return true;
-          }
-          return false;
-        }.bind(this),
-      },
-      {
-        id: "inspector.confirmNavigationAway.buttonStay",
-        label: this.IUI.strings.
-          GetStringFromName("confirmNavigationAway.buttonStay"),
-        accessKey: this.IUI.strings.
-          GetStringFromName("confirmNavigationAway.buttonStayAccesskey"),
-        callback: cancelRequest
-      },
-    ];
-
-    let message = this.IUI.strings.
-      GetStringFromName("confirmNavigationAway.message");
-
-    notification = notificationBox.appendNotification(message,
-      "inspector-page-navigation", "chrome://browser/skin/Info.png",
-      notificationBox.PRIORITY_WARNING_HIGH, buttons, eventCallback);
-
-    // Make sure this not a transient notification, to avoid the automatic
-    // transient notification removal.
-    notification.persistence = -1;
-  },
-
-  /**
-   * Destroy the progress listener instance.
-   */
-  destroy: function IPL_destroy()
-  {
-    this.IUI.tabbrowser.removeProgressListener(this);
-
-    let notificationBox = this.IUI.tabbrowser.getNotificationBox(this.IUI.browser);
-    let notification = notificationBox.
-      getNotificationWithValue("inspector-page-navigation");
-
-    if (notification) {
-      notificationBox.removeNotification(notification, true);
-    }
-
-    delete this.IUI;
-  },
-};
-
-InspectorUI._registeredSidebars = [];
-
-/**
- * Register an inspector sidebar template.
- * Already running sidebars will not be affected, see bug 740665.
- *
- * @param aRegistration Object
- * {
- *   id: "toolname",
- *   label: "Button or tab label",
- *   icon: "chrome://somepath.png",
- *   tooltiptext: "Button tooltip",
- *   accesskey: "S",
- *   contentURL: string URI, source of the tool's iframe content.
- *   load: Called when the sidebar has been created and the contentURL loaded.
- *         Passed an Inspector object and an iframe object.
- *   destroy: Called when the sidebar is destroyed by the inspector.
- *     Passed whatever was returned by the tool's create function.
- * }
- */
-InspectorUI.registerSidebar = function IUI_registerSidebar(aRegistration)
-{
-  // Only allow a given tool ID to be registered once.
-  if (InspectorUI._registeredSidebars.some(function(elt) elt.id == aRegistration.id))
-    return false;
-
-  InspectorUI._registeredSidebars.push(aRegistration);
-
-  return true;
-}
-
-/**
- * Unregister a previously-registered inspector sidebar.
- * Already running sidebars will not be affected, see bug 740665.
- *
- * @param aID string
- */
-InspectorUI.unregisterSidebar = function IUI_unregisterSidebar(aID)
-{
-  InspectorUI._registeredSidebars = InspectorUI._registeredSidebars.filter(function(aReg) aReg.id != aID);
-}
-
-///////////////////////////////////////////////////////////////////////////
-//// Style Sidebar
-
-/**
- * Manages the UI and loading of registered sidebar tools.
- * @param aOptions object
- *   Initialization information for the style sidebar, including:
- *     document: The chrome document in which the style sidebar
- *             should be created.
- *     inspector: The Inspector object tied to this sidebar.
- */
-function InspectorStyleSidebar(aOptions)
-{
-  this._tools = {};
-  this._chromeDoc = aOptions.document;
-  this._inspector = aOptions.inspector;
-}
-
-InspectorStyleSidebar.prototype = {
-
-  get visible() !this._box.hasAttribute("hidden"),
-  get activePanel() this._deck.selectedPanel._toolID,
-
-  destroy: function ISS_destroy()
-  {
-    // close the Layout View
-    if (this._layoutview) {
-      this._layoutview.destroy();
-      this._layoutview = null;
-    }
-
-    for each (let toolID in Object.getOwnPropertyNames(this._tools)) {
-      this.removeTool(toolID);
-    }
-    delete this._tools;
-    this._teardown();
-  },
-
-  /**
-   * Called by InspectorUI to create the UI for a registered sidebar tool.
-   * Will create a toolbar button and an iframe for the tool.
-   * @param aRegObj object
-   *        See the documentation for InspectorUI.registerSidebar().
-   */
-  addTool: function ISS_addTool(aRegObj)
-  {
-    if (aRegObj.id in this._tools) {
-      return;
-    }
-
-    let btn = this._chromeDoc.createElement("toolbarbutton");
-    btn.setAttribute("label", aRegObj.label);
-    btn.setAttribute("class", "devtools-toolbarbutton");
-    btn.setAttribute("tooltiptext", aRegObj.tooltiptext);
-    btn.setAttribute("accesskey", aRegObj.accesskey);
-    btn.setAttribute("image", aRegObj.icon || "");
-    btn.setAttribute("type", "radio");
-    btn.setAttribute("group", "sidebar-tools");
-
-    let spacer = this._toolbar.querySelector("spacer");
-    this._toolbar.insertBefore(btn, spacer);
-    // create tool iframe
-    let frame = this._chromeDoc.createElement("iframe");
-    frame.setAttribute("flex", "1");
-    frame._toolID = aRegObj.id;
-
-    // This is needed to enable tooltips inside the iframe document.
-    frame.setAttribute("tooltip", "aHTMLTooltip");
-
-    this._deck.appendChild(frame);
-
-    // wire up button to show the iframe
-    let onClick = function() {
-      this.activatePanel(aRegObj.id);
-    }.bind(this);
-    btn.addEventListener("click", onClick, true);
-
-    this._tools[aRegObj.id] = {
-      id: aRegObj.id,
-      registration: aRegObj,
-      button: btn,
-      frame: frame,
-      loaded: false,
-      context: null,
-      onClick: onClick
-    };
-  },
-
-  /**
-   * Remove a tool from the sidebar.
-   *
-   * @param aID string
-   *        The string ID of the tool to remove.
-   */
-  removeTool: function ISS_removeTool(aID)
-  {
-    if (!aID in this._tools) {
-      return;
-    }
-    let tool = this._tools[aID];
-    delete this._tools[aID];
-
-    if (tool.loaded && tool.registration.destroy) {
-      tool.registration.destroy(tool.context);
-    }
-
-    if (tool.onLoad) {
-      tool.frame.removeEventListener("load", tool.onLoad, true);
-      delete tool.onLoad;
-    }
-
-    if (tool.onClick) {
-      tool.button.removeEventListener("click", tool.onClick, true);
-      delete tool.onClick;
-    }
-
-    tool.button.parentNode.removeChild(tool.button);
-    tool.frame.parentNode.removeChild(tool.frame);
-  },
-
-  /**
-   * Hide or show the sidebar.
-   */
-  toggle: function ISS_toggle()
-  {
-    if (!this.visible) {
-      this.show();
-    } else {
-      this.hide();
-    }
-  },
-
-  /**
-   * Shows the sidebar, updating the stored visibility pref.
-   */
-  show: function ISS_show()
-  {
-    this._box.removeAttribute("hidden");
-    this._splitter.removeAttribute("hidden");
-    this._toggleButton.checked = true;
-
-    this._showDefault();
-
-    this._inspector._sidebarOpen = true;
-    Services.prefs.setBoolPref("devtools.inspector.sidebarOpen", true);
-
-    // Instantiate the Layout View if needed.
-    if (Services.prefs.getBoolPref("devtools.layoutview.enabled")
-        && !this._layoutview) {
-      this._layoutview = new LayoutView({
-        document: this._chromeDoc,
-        inspector: this._inspector,
-      });
-    }
-  },
-
-  /**
-   * Hides the sidebar, updating the stored visibility pref.
-   */
-  hide: function ISS_hide()
-  {
-    this._teardown();
-    this._inspector._sidebarOpen = false;
-    Services.prefs.setBoolPref("devtools.inspector.sidebarOpen", false);
-  },
-
-  /**
-   * Hides the sidebar UI elements.
-   */
-  _teardown: function ISS__teardown()
-  {
-    this._toggleButton.checked = false;
-    this._box.setAttribute("hidden", true);
-    this._splitter.setAttribute("hidden", true);
-  },
-
-  /**
-   * Sets the current sidebar panel.
-   *
-   * @param aID string
-   *        The ID of the panel to make visible.
-   */
-  activatePanel: function ISS_activatePanel(aID) {
-    let tool = this._tools[aID];
-    Services.prefs.setCharPref("devtools.inspector.activeSidebar", aID);
-    this._inspector._activeSidebar = aID;
-    this._deck.selectedPanel = tool.frame;
-    this._showContent(tool);
-    tool.button.setAttribute("checked", "true");
-    let hasSelected = Array.forEach(this._toolbar.children, function(btn) {
-      if (btn != tool.button) {
-        btn.removeAttribute("checked");
-      }
-    });
-  },
-
-  /**
-   * Make the iframe content of a given tool visible.  If this is the first
-   * time the tool has been shown, load its iframe content and call the
-   * registration object's load method.
-   *
-   * @param aTool object
-   *        The tool object we're loading.
-   */
-  _showContent: function ISS__showContent(aTool)
-  {
-    // If the current tool is already loaded, notify that we're
-    // showing this sidebar.
-    if (aTool.loaded) {
-      this._inspector.emit("sidebaractivated", aTool.id);
-      this._inspector.emit("sidebaractivated-" + aTool.id);
-      return;
-    }
-
-    // If we're already loading, we're done.
-    if (aTool.onLoad) {
-      return;
-    }
-
-    // This will be canceled in removeTool if necessary.
-    aTool.onLoad = function(evt) {
-      if (evt.target.location != aTool.registration.contentURL) {
-        return;
-      }
-      aTool.frame.removeEventListener("load", aTool.onLoad, true);
-      delete aTool.onLoad;
-      aTool.loaded = true;
-      aTool.context = aTool.registration.load(this._inspector, aTool.frame);
-
-      this._inspector.emit("sidebaractivated", aTool.id);
-
-      // Send an event specific to the activation of this panel.  For
-      // this initial event, include a "createpanel" argument
-      // to let panels watch sidebaractivated to refresh themselves
-      // but ignore the one immediately after their load.
-      // I don't really like this, we should find a better solution.
-      this._inspector.emit("sidebaractivated-" + aTool.id, "createpanel");
-    }.bind(this);
-    aTool.frame.addEventListener("load", aTool.onLoad, true);
-    aTool.frame.setAttribute("src", aTool.registration.contentURL);
-  },
-
-  /**
-   * For testing purposes, mostly - return the tool-provided context
-   * for a given tool.  Will only work after the tool has been loaded
-   * and instantiated.
-   */
-  _toolContext: function ISS__toolContext(aID) {
-    return aID in this._tools ? this._tools[aID].context : null;
-  },
-
-  /**
-   * Also mostly for testing, return the list of tool objects stored in
-   * the sidebar.
-   */
-  _toolObjects: function ISS__toolObjects() {
-    return [this._tools[i] for each (i in Object.getOwnPropertyNames(this._tools))];
-  },
-
-  /**
-   * If no tool is already selected, show the last-used sidebar.  If there
-   * was no last-used sidebar, just show the first one.
-   */
-  _showDefault: function ISS__showDefault()
-  {
-    let hasSelected = Array.some(this._toolbar.children,
-      function(btn) btn.hasAttribute("checked"));
-
-    // Make sure the selected panel is loaded...
-    this._showContent(this._tools[this.activePanel]);
-
-    if (hasSelected) {
-      return;
-    }
-
-    let activeID = this._inspector._activeSidebar;
-    if (!activeID || !(activeID in this._tools)) {
-      activeID = Object.getOwnPropertyNames(this._tools)[0];
-    }
-    this.activatePanel(activeID);
-  },
-
-  // DOM elements
-  get _toggleButton() this._chromeDoc.getElementById("inspector-style-button"),
-  get _box() this._chromeDoc.getElementById("devtools-sidebar-box"),
-  get _splitter() this._chromeDoc.getElementById("devtools-side-splitter"),
-  get _toolbar() this._chromeDoc.getElementById("devtools-sidebar-toolbar"),
-  get _deck() this._chromeDoc.getElementById("devtools-sidebar-deck"),
-};
-
-///////////////////////////////////////////////////////////////////////////
-//// HTML Breadcrumbs
-
-/**
- * Display the ancestors of the current node and its children.
- * Only one "branch" of children are displayed (only one line).
- *
- * Mechanism:
- * . If no nodes displayed yet:
- *    then display the ancestor of the selected node and the selected node;
- *   else select the node;
- * . If the selected node is the last node displayed, append its first (if any).
- *
- * @param object aInspector
- *        The InspectorUI instance.
- */
-function HTMLBreadcrumbs(aInspector)
-{
-  this.IUI = aInspector;
-  this.DOMHelpers = new DOMHelpers(this.IUI.win);
-  this._init();
-}
-
-HTMLBreadcrumbs.prototype = {
-  _init: function BC__init()
-  {
-    this.container = this.IUI.chromeDoc.getElementById("inspector-breadcrumbs");
-    this.container.addEventListener("mousedown", this, true);
-
-    // We will save a list of already displayed nodes in this array.
-    this.nodeHierarchy = [];
-
-    // Last selected node in nodeHierarchy.
-    this.currentIndex = -1;
-
-    // Siblings menu
-    this.menu = this.IUI.chromeDoc.createElement("menupopup");
-    this.menu.id = "inspector-breadcrumbs-menu";
-
-    let popupSet = this.IUI.chromeDoc.getElementById("mainPopupSet");
-    popupSet.appendChild(this.menu);
-
-    // By default, hide the arrows. We let the <scrollbox> show them
-    // in case of overflow.
-    this.container.removeAttribute("overflows");
-    this.container._scrollButtonUp.collapsed = true;
-    this.container._scrollButtonDown.collapsed = true;
-
-    this.onscrollboxreflow = function() {
-      if (this.container._scrollButtonDown.collapsed)
-        this.container.removeAttribute("overflows");
-      else
-        this.container.setAttribute("overflows", true);
-    }.bind(this);
-
-    this.container.addEventListener("underflow", this.onscrollboxreflow, false);
-    this.container.addEventListener("overflow", this.onscrollboxreflow, false);
-
-    this.menu.addEventListener("popuphiding", (function() {
-      while (this.menu.hasChildNodes()) {
-        this.menu.removeChild(this.menu.firstChild);
-      }
-      let button = this.container.querySelector("button[siblings-menu-open]");
-      button.removeAttribute("siblings-menu-open");
-    }).bind(this), false);
-  },
-
-  /**
-   * Build a string that represents the node: tagName#id.class1.class2.
-   *
-   * @param aNode The node to pretty-print
-   * @returns a string
-   */
-  prettyPrintNodeAsText: function BC_prettyPrintNodeText(aNode)
-  {
-    let text = aNode.tagName.toLowerCase();
-    if (aNode.id) {
-      text += "#" + aNode.id;
-    }
-    for (let i = 0; i < aNode.classList.length; i++) {
-      text += "." + aNode.classList[i];
-    }
-    for (let i = 0; i < PSEUDO_CLASSES.length; i++) {
-      let pseudo = PSEUDO_CLASSES[i];
-      if (DOMUtils.hasPseudoClassLock(aNode, pseudo)) {
-        text += pseudo;  
-      }      
-    }
-
-    return text;
-  },
-
-
-  /**
-   * Build <label>s that represent the node:
-   *   <label class="inspector-breadcrumbs-tag">tagName</label>
-   *   <label class="inspector-breadcrumbs-id">#id</label>
-   *   <label class="inspector-breadcrumbs-classes">.class1.class2</label>
-   *
-   * @param aNode The node to pretty-print
-   * @returns a document fragment.
-   */
-  prettyPrintNodeAsXUL: function BC_prettyPrintNodeXUL(aNode)
-  {
-    let fragment = this.IUI.chromeDoc.createDocumentFragment();
-
-    let tagLabel = this.IUI.chromeDoc.createElement("label");
-    tagLabel.className = "inspector-breadcrumbs-tag plain";
-
-    let idLabel = this.IUI.chromeDoc.createElement("label");
-    idLabel.className = "inspector-breadcrumbs-id plain";
-
-    let classesLabel = this.IUI.chromeDoc.createElement("label");
-    classesLabel.className = "inspector-breadcrumbs-classes plain";
-
-    let pseudosLabel = this.IUI.chromeDoc.createElement("label");
-    pseudosLabel.className = "inspector-breadcrumbs-pseudo-classes plain";
-
-    tagLabel.textContent = aNode.tagName.toLowerCase();
-    idLabel.textContent = aNode.id ? ("#" + aNode.id) : "";
-
-    let classesText = "";
-    for (let i = 0; i < aNode.classList.length; i++) {
-      classesText += "." + aNode.classList[i];
-    }
-    classesLabel.textContent = classesText;
-
-    let pseudos = PSEUDO_CLASSES.filter(function(pseudo) {
-      return DOMUtils.hasPseudoClassLock(aNode, pseudo);
-    }, this);
-    pseudosLabel.textContent = pseudos.join("");
-
-    fragment.appendChild(tagLabel);
-    fragment.appendChild(idLabel);
-    fragment.appendChild(classesLabel);
-    fragment.appendChild(pseudosLabel);
-
-    return fragment;
-  },
-
-  /**
-   * Open the sibling menu.
-   *
-   * @param aButton the button representing the node.
-   * @param aNode the node we want the siblings from.
-   */
-  openSiblingMenu: function BC_openSiblingMenu(aButton, aNode)
-  {
-    let title = this.IUI.chromeDoc.createElement("menuitem");
-    title.setAttribute("label",
-      this.IUI.strings.GetStringFromName("breadcrumbs.siblings"));
-    title.setAttribute("disabled", "true");
-
-    let separator = this.IUI.chromeDoc.createElement("menuseparator");
-
-    this.menu.appendChild(title);
-    this.menu.appendChild(separator);
-
-    let fragment = this.IUI.chromeDoc.createDocumentFragment();
-
-    let nodes = aNode.parentNode.childNodes;
-    for (let i = 0; i < nodes.length; i++) {
-      if (nodes[i].nodeType == aNode.ELEMENT_NODE) {
-        let item = this.IUI.chromeDoc.createElement("menuitem");
-        let inspector = this.IUI;
-        if (nodes[i] === aNode) {
-          item.setAttribute("disabled", "true");
-          item.setAttribute("checked", "true");
-        }
-
-        item.setAttribute("type", "radio");
-        item.setAttribute("label", this.prettyPrintNodeAsText(nodes[i]));
-
-        item.onmouseup = (function(aNode) {
-          return function() {
-            inspector.select(aNode, true, true, "breadcrumbs");
-          }
-        })(nodes[i]);
-
-        fragment.appendChild(item);
-      }
-    }
-    this.menu.appendChild(fragment);
-    this.menu.openPopup(aButton, "before_start", 0, 0, true, false);
-    aButton.setAttribute("siblings-menu-open", "true");
-  },
-
-  /**
-   * Generic event handler.
-   *
-   * @param nsIDOMEvent aEvent
-   *        The DOM event object.
-   */
-  handleEvent: function BC_handleEvent(aEvent)
-  {
-    if (aEvent.type == "mousedown" && aEvent.button == 0) {
-      // on Click and Hold, open the Siblings menu
-
-      let timer;
-      let container = this.container;
-      let window = this.IUI.win;
-
-      function openMenu(aEvent) {
-        cancelHold();
-        let target = aEvent.originalTarget;
-        if (target.tagName == "button") {
-          target.onBreadcrumbsHold();
-        }
-      }
-
-      function handleClick(aEvent) {
-        cancelHold();
-        let target = aEvent.originalTarget;
-        if (target.tagName == "button") {
-          target.onBreadcrumbsClick();
-        }
-      }
-
-      function cancelHold(aEvent) {
-        window.clearTimeout(timer);
-        container.removeEventListener("mouseout", cancelHold, false);
-        container.removeEventListener("mouseup", handleClick, false);
-      }
-
-      container.addEventListener("mouseout", cancelHold, false);
-      container.addEventListener("mouseup", handleClick, false);
-      timer = window.setTimeout(openMenu, 500, aEvent);
-    }
-  },
-
-  /**
-   * Remove nodes and delete properties.
-   */
-  destroy: function BC_destroy()
-  {
-    this.container.removeEventListener("underflow", this.onscrollboxreflow, false);
-    this.container.removeEventListener("overflow", this.onscrollboxreflow, false);
-    this.onscrollboxreflow = null;
-
-    this.empty();
-    this.container.removeEventListener("mousedown", this, true);
-    this.menu.parentNode.removeChild(this.menu);
-    this.container = null;
-    this.nodeHierarchy = null;
-  },
-
-  /**
-   * Empty the breadcrumbs container.
-   */
-  empty: function BC_empty()
-  {
-    while (this.container.hasChildNodes()) {
-      this.container.removeChild(this.container.firstChild);
-    }
-  },
-
-  /**
-   * Re-init the cache and remove all the buttons.
-   */
-  invalidateHierarchy: function BC_invalidateHierarchy()
-  {
-    this.menu.hidePopup();
-    this.nodeHierarchy = [];
-    this.empty();
-  },
-
-  /**
-   * Set which button represent the selected node.
-   *
-   * @param aIdx Index of the displayed-button to select
-   */
-  setCursor: function BC_setCursor(aIdx)
-  {
-    // Unselect the previously selected button
-    if (this.currentIndex > -1 && this.currentIndex < this.nodeHierarchy.length) {
-      this.nodeHierarchy[this.currentIndex].button.removeAttribute("checked");
-    }
-    if (aIdx > -1) {
-      this.nodeHierarchy[aIdx].button.setAttribute("checked", "true");
-      if (this.hadFocus)
-        this.nodeHierarchy[aIdx].button.focus();
-    }
-    this.currentIndex = aIdx;
-  },
-
-  /**
-   * Get the index of the node in the cache.
-   *
-   * @param aNode
-   * @returns integer the index, -1 if not found
-   */
-  indexOf: function BC_indexOf(aNode)
-  {
-    let i = this.nodeHierarchy.length - 1;
-    for (let i = this.nodeHierarchy.length - 1; i >= 0; i--) {
-      if (this.nodeHierarchy[i].node === aNode) {
-        return i;
-      }
-    }
-    return -1;
-  },
-
-  /**
-   * Remove all the buttons and their references in the cache
-   * after a given index.
-   *
-   * @param aIdx
-   */
-  cutAfter: function BC_cutAfter(aIdx)
-  {
-    while (this.nodeHierarchy.length > (aIdx + 1)) {
-      let toRemove = this.nodeHierarchy.pop();
-      this.container.removeChild(toRemove.button);
-    }
-  },
-
-  /**
-   * Build a button representing the node.
-   *
-   * @param aNode The node from the page.
-   * @returns aNode The <button>.
-   */
-  buildButton: function BC_buildButton(aNode)
-  {
-    let button = this.IUI.chromeDoc.createElement("button");
-    let inspector = this.IUI;
-    button.appendChild(this.prettyPrintNodeAsXUL(aNode));
-    button.className = "inspector-breadcrumbs-button";
-
-    button.setAttribute("tooltiptext", this.prettyPrintNodeAsText(aNode));
-
-    button.onkeypress = function onBreadcrumbsKeypress(e) {
-      if (e.charCode == Ci.nsIDOMKeyEvent.DOM_VK_SPACE ||
-          e.keyCode == Ci.nsIDOMKeyEvent.DOM_VK_RETURN)
-        button.click();
-    }
-
-    button.onBreadcrumbsClick = function onBreadcrumbsClick() {
-      inspector.stopInspecting();
-      inspector.select(aNode, true, true, "breadcrumbs");
-    };
-
-    button.onclick = (function _onBreadcrumbsRightClick(aEvent) {
-      button.focus();
-      if (aEvent.button == 2) {
-        this.openSiblingMenu(button, aNode);
-      }
-    }).bind(this);
-
-    button.onBreadcrumbsHold = (function _onBreadcrumbsHold() {
-      this.openSiblingMenu(button, aNode);
-    }).bind(this);
-    return button;
-  },
-
-  /**
-   * Connecting the end of the breadcrumbs to a node.
-   *
-   * @param aNode The node to reach.
-   */
-  expand: function BC_expand(aNode)
-  {
-      let fragment = this.IUI.chromeDoc.createDocumentFragment();
-      let toAppend = aNode;
-      let lastButtonInserted = null;
-      let originalLength = this.nodeHierarchy.length;
-      let stopNode = null;
-      if (originalLength > 0) {
-        stopNode = this.nodeHierarchy[originalLength - 1].node;
-      }
-      while (toAppend && toAppend.tagName && toAppend != stopNode) {
-        let button = this.buildButton(toAppend);
-        fragment.insertBefore(button, lastButtonInserted);
-        lastButtonInserted = button;
-        this.nodeHierarchy.splice(originalLength, 0, {node: toAppend, button: button});
-        toAppend = this.DOMHelpers.getParentObject(toAppend);
-      }
-      this.container.appendChild(fragment, this.container.firstChild);
-  },
-
-  /**
-   * Get a child of a node that can be displayed in the breadcrumbs.
-   * By default, we want a node that can highlighted by the highlighter.
-   * If no highlightable child is found, we return the first node of type
-   * ELEMENT_NODE.
-   *
-   * @param aNode The parent node.
-   * @returns nsIDOMNode|null
-   */
-  getFirstHighlightableChild: function BC_getFirstHighlightableChild(aNode)
-  {
-    let nextChild = this.DOMHelpers.getChildObject(aNode, 0);
-    let fallback = null;
-
-    while (nextChild) {
-      if (this.IUI.highlighter.isNodeHighlightable(nextChild)) {
-        return nextChild;
-      }
-      if (!fallback && nextChild.nodeType == aNode.ELEMENT_NODE) {
-        fallback = nextChild;
-      }
-      nextChild = this.DOMHelpers.getNextSibling(nextChild);
-    }
-    return fallback;
-  },
-
-  /**
-   * Find the "youngest" ancestor of a node which is already in the breadcrumbs.
-   *
-   * @param aNode
-   * @returns Index of the ancestor in the cache
-   */
-  getCommonAncestor: function BC_getCommonAncestor(aNode)
-  {
-    let node = aNode;
-    while (node) {
-      let idx = this.indexOf(node);
-      if (idx > -1) {
-        return idx;
-      } else {
-        node = this.DOMHelpers.getParentObject(node);
-      }
-    }
-    return -1;
-  },
-
-  /**
-   * Make sure that the latest node in the breadcrumbs is not the selected node
-   * if the selected node still has children.
-   */
-  ensureFirstChild: function BC_ensureFirstChild()
-  {
-    // If the last displayed node is the selected node
-    if (this.currentIndex == this.nodeHierarchy.length - 1) {
-      let node = this.nodeHierarchy[this.currentIndex].node;
-      let child = this.getFirstHighlightableChild(node);
-      // If the node has a child
-      if (child) {
-        // Show this child
-        this.expand(child);
-      }
-    }
-  },
-
-  /**
-   * Ensure the selected node is visible.
-   */
-  scroll: function BC_scroll()
-  {
-    // FIXME bug 684352: make sure its immediate neighbors are visible too.
-
-    let scrollbox = this.container;
-    let element = this.nodeHierarchy[this.currentIndex].button;
-    scrollbox.ensureElementIsVisible(element);
-  },
-  
-  updateSelectors: function BC_updateSelectors()
-  {
-    for (let i = this.nodeHierarchy.length - 1; i >= 0; i--) {
-      let crumb = this.nodeHierarchy[i];
-      let button = crumb.button;
-
-      while(button.hasChildNodes()) {
-        button.removeChild(button.firstChild);
-      }
-      button.appendChild(this.prettyPrintNodeAsXUL(crumb.node));
-      button.setAttribute("tooltiptext", this.prettyPrintNodeAsText(crumb.node));
-    }
-  },
-
-  /**
-   * Update the breadcrumbs display when a new node is selected.
-   */
-  update: function BC_update()
-  {
-    this.menu.hidePopup();
-
-    let cmdDispatcher = this.IUI.chromeDoc.commandDispatcher;
-    this.hadFocus = (cmdDispatcher.focusedElement &&
-                     cmdDispatcher.focusedElement.parentNode == this.container);
-
-    let selection = this.IUI.selection;
-    let idx = this.indexOf(selection);
-
-    // Is the node already displayed in the breadcrumbs?
-    if (idx > -1) {
-      // Yes. We select it.
-      this.setCursor(idx);
-    } else {
-      // No. Is the breadcrumbs display empty?
-      if (this.nodeHierarchy.length > 0) {
-        // No. We drop all the element that are not direct ancestors
-        // of the selection
-        let parent = this.DOMHelpers.getParentObject(selection);
-        let idx = this.getCommonAncestor(parent);
-        this.cutAfter(idx);
-      }
-      // we append the missing button between the end of the breadcrumbs display
-      // and the current node.
-      this.expand(selection);
-
-      // we select the current node button
-      idx = this.indexOf(selection);
-      this.setCursor(idx);
-    }
-    // Add the first child of the very last node of the breadcrumbs if possible.
-    this.ensureFirstChild();
-
-    // Make sure the selected node and its neighbours are visible.
-    this.scroll();
-
-    this.updateSelectors();
-  },
-
-}
-
-/////////////////////////////////////////////////////////////////////////
-//// Initializers
-
-XPCOMUtils.defineLazyGetter(InspectorUI.prototype, "strings",
-  function () {
-    return Services.strings.createBundle(
-            "chrome://browser/locale/devtools/inspector.properties");
-  });
-
-XPCOMUtils.defineLazyGetter(this, "DOMUtils", function () {
-  return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
-});
-
-XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function() {
-  return Cc["@mozilla.org/widget/clipboardhelper;1"].
-    getService(Ci.nsIClipboardHelper);
-});
diff --git a/browser/devtools/highlighter/test/browser_inspector_bug_566084_location_changed.js b/browser/devtools/highlighter/test/browser_inspector_bug_566084_location_changed.js
deleted file mode 100644
index 71349374fcf5..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_bug_566084_location_changed.js
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let notificationBox = null;
-
-function startLocationTests() {
-  ok(window.InspectorUI, "InspectorUI variable exists");
-  Services.obs.addObserver(runInspectorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, null);
-  InspectorUI.toggleInspectorUI();
-}
-
-function runInspectorTests() {
-  Services.obs.removeObserver(runInspectorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, null);
-
-  let para = content.document.querySelector("p");
-  ok(para, "found the paragraph element");
-  is(para.textContent, "init", "paragraph content is correct");
-
-  ok(InspectorUI.inspecting, "Inspector is highlighting");
-  ok(InspectorUI.isInspectorOpen, "Inspector is open");
-
-  InspectorUI.isDirty = true;
-
-  notificationBox = gBrowser.getNotificationBox(gBrowser.selectedBrowser);
-  notificationBox.addEventListener("AlertActive", alertActive1, false);
-
-  gBrowser.selectedBrowser.addEventListener("load", onPageLoad, true);
-
-  content.location = "data:text/html,<div>location change test 1 for " +
-    "inspector</div><p>test1</p>";
-}
-
-function alertActive1() {
-  notificationBox.removeEventListener("AlertActive", alertActive1, false);
-
-  let notification = notificationBox.
-    getNotificationWithValue("inspector-page-navigation");
-  ok(notification, "found the inspector-page-navigation notification");
-
-  // By closing the notification it is expected that page navigation is
-  // canceled.
-  executeSoon(function() {
-    notification.close();
-    locationTest2();
-  });
-}
-
-function onPageLoad() {
-  gBrowser.selectedBrowser.removeEventListener("load", onPageLoad, true);
-
-  isnot(content.location.href.indexOf("test2"), -1,
-        "page navigated to the correct location");
-
-  let para = content.document.querySelector("p");
-  ok(para, "found the paragraph element, third time");
-  is(para.textContent, "test2", "paragraph content is correct");
-
-  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
-  ok(!InspectorUI.isInspectorOpen, "Inspector Panel is not open");
-
-  testEnd();
-}
-
-function locationTest2() {
-  // Location did not change.
-  let para = content.document.querySelector("p");
-  ok(para, "found the paragraph element, second time");
-  is(para.textContent, "init", "paragraph content is correct");
-
-  ok(InspectorUI.inspecting, "Inspector is highlighting");
-  ok(InspectorUI.isInspectorOpen, "Inspector Panel is open");
-
-  notificationBox.addEventListener("AlertActive", alertActive2, false);
-
-  content.location = "data:text/html,<div>location change test 2 for " +
-    "inspector</div><p>test2</p>";
-}
-
-function alertActive2() {
-  notificationBox.removeEventListener("AlertActive", alertActive2, false);
-
-  let notification = notificationBox.
-    getNotificationWithValue("inspector-page-navigation");
-  ok(notification, "found the inspector-page-navigation notification");
-
-  let buttons = notification.querySelectorAll("button");
-  let buttonLeave = null;
-  for (let i = 0; i < buttons.length; i++) {
-    if (buttons[i].buttonInfo.id == "inspector.confirmNavigationAway.buttonLeave") {
-      buttonLeave = buttons[i];
-      break;
-    }
-  }
-
-  ok(buttonLeave, "the Leave page button was found");
-
-  // Accept page navigation.
-  executeSoon(function(){
-    buttonLeave.doCommand();
-  });
-}
-
-function testEnd() {
-  notificationBox = null;
-  gBrowser.removeCurrentTab();
-  executeSoon(finish);
-}
-
-function test() {
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onBrowserLoad() {
-    gBrowser.selectedBrowser.removeEventListener("load", onBrowserLoad, true);
-    waitForFocus(startLocationTests, content);
-  }, true);
-
-  content.location = "data:text/html,<div>location change tests for " +
-    "inspector.</div><p>init</p>";
-}
diff --git a/browser/devtools/highlighter/test/browser_inspector_bug_690361.js b/browser/devtools/highlighter/test/browser_inspector_bug_690361.js
deleted file mode 100644
index c60a258acf5e..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_bug_690361.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-let doc;
-let salutation;
-let closing;
-
-function createDocument()
-{
-  doc.body.innerHTML = '<div id="first" style="{ margin: 10em; ' +
-    'font-size: 14pt; font-family: helvetica, sans-serif; color: #AAA}">\n' +
-    '<h1>Some header text</h1>\n' +
-    '<p id="salutation" style="{font-size: 12pt}">hi.</p>\n' +
-    '<p id="body" style="{font-size: 12pt}">I am a test-case. This text exists ' +
-    'solely to provide some things to test the inspector initialization.</p>\n' +
-    'If you are reading this, you should go do something else instead. Maybe ' +
-    'read a book. Or better yet, write some test-cases for another bit of code. ' +
-    '<span style="{font-style: italic}">Maybe more inspector test-cases!</span></p>\n' +
-    '<p id="closing">end transmission</p>\n' +
-    '</div>';
-  doc.title = "Inspector Opening and Closing Test";
-  startInspectorTests();
-}
-
-function startInspectorTests()
-{
-  ok(InspectorUI, "InspectorUI variable exists");
-  Services.obs.addObserver(runInspectorTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.toggleInspectorUI();
-}
-
-function runInspectorTests()
-{
-  Services.obs.removeObserver(runInspectorTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-  Services.obs.addObserver(closeInspectorTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-
-  ok(InspectorUI.toolbar, "we have the toolbar.");
-  ok(!InspectorUI.toolbar.hidden, "toolbar is visible");
-  ok(InspectorUI.inspecting, "Inspector is inspecting");
-  ok(!InspectorUI.currentInspector._markupOpen, "Inspector Tree Panel is not open");
-  ok(InspectorUI.highlighter, "Highlighter is up");
-
-  salutation = doc.getElementById("salutation");
-  InspectorUI.inspectNode(salutation);
-
-  let button = document.getElementById("highlighter-closebutton");
-  button.click();
-}
-
-function closeInspectorTests()
-{
-  Services.obs.removeObserver(closeInspectorTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
-  Services.obs.addObserver(inspectorOpenedTrap,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  ok(!InspectorUI.isInspectorOpen, "Inspector is not open");
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    gBrowser.removeCurrentTab();
-  }, true);
-
-  gBrowser.tabContainer.addEventListener("TabSelect", finishInspectorTests, false);
-}
-
-function inspectorOpenedTrap()
-{
-  ok(false, "Inspector opened! Should not have done so.");
-  InspectorUI.closeInspectorUI(false);
-}
-
-function finishInspectorTests()
-{
-  gBrowser.tabContainer.removeEventListener("TabSelect", finishInspectorTests, false);
-
-  Services.obs.removeObserver(inspectorOpenedTrap,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-
-  requestLongerTimeout(4); // give the inspector a chance to open
-  executeSoon(function() {
-    gBrowser.removeCurrentTab();
-    finish();
-  });
-}
-
-function test()
-{
-  waitForExplicitFinish();
-  ignoreAllUncaughtExceptions();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,basic tests for inspector";
-}
-
diff --git a/browser/devtools/highlighter/test/browser_inspector_bug_699308_iframe_navigation.js b/browser/devtools/highlighter/test/browser_inspector_bug_699308_iframe_navigation.js
deleted file mode 100644
index 50beccc16e29..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_bug_699308_iframe_navigation.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let iframe;
-let iframeLoads = 0;
-let checksAfterLoads = false;
-
-function startTest() {
-  ok(window.InspectorUI, "InspectorUI variable exists");
-  Services.obs.addObserver(runInspectorTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, null);
-  InspectorUI.toggleInspectorUI();
-}
-
-function runInspectorTests() {
-  Services.obs.removeObserver(runInspectorTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, null);
-
-  iframe = content.document.querySelector("iframe");
-  ok(iframe, "found the iframe element");
-
-  ok(InspectorUI.inspecting, "Inspector is highlighting");
-  ok(InspectorUI.isInspectorOpen, "Inspector is open");
-
-  Services.obs.addObserver(finishTest,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-
-  iframe.addEventListener("load", onIframeLoad, false);
-
-  executeSoon(function() {
-    iframe.contentWindow.location = "javascript:location.reload()";
-  });
-}
-
-function onIframeLoad() {
-  if (++iframeLoads != 2) {
-    executeSoon(function() {
-      iframe.contentWindow.location = "javascript:location.reload()";
-    });
-    return;
-  }
-
-  iframe.removeEventListener("load", onIframeLoad, false);
-
-  ok(InspectorUI.inspecting, "Inspector is highlighting after iframe nav");
-  ok(InspectorUI.isInspectorOpen, "Inspector Panel is open after iframe nav");
-
-  checksAfterLoads = true;
-
-  InspectorUI.closeInspectorUI();
-}
-
-function finishTest() {
-  Services.obs.removeObserver(finishTest,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
-
-  is(iframeLoads, 2, "iframe loads");
-  ok(checksAfterLoads, "the Inspector tests got the chance to run after iframe reloads");
-  ok(!InspectorUI.isInspectorOpen, "Inspector Panel is not open");
-
-  iframe = null;
-  gBrowser.removeCurrentTab();
-  executeSoon(finish);
-}
-
-function test() {
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onBrowserLoad() {
-    gBrowser.selectedBrowser.removeEventListener("load", onBrowserLoad, true);
-    waitForFocus(startTest, content);
-  }, true);
-
-  content.location = "data:text/html,<p>bug 699308 - test iframe navigation" +
-    "<iframe src='data:text/html,hello world'></iframe>";
-}
diff --git a/browser/devtools/highlighter/test/browser_inspector_changes.js b/browser/devtools/highlighter/test/browser_inspector_changes.js
deleted file mode 100644
index ce122a01341c..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_changes.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-let doc;
-let testDiv;
-
-function createDocument()
-{
-  doc.body.innerHTML = '<div id="testdiv">Test div!</div>';
-  doc.title = "Inspector Change Test";
-  startInspectorTests();
-}
-
-
-function getInspectorProp(aName)
-{
-  for each (let view in computedViewTree().propertyViews) {
-    if (view.name == aName) {
-      return view;
-    }
-  }
-  return null;
-}
-
-function startInspectorTests()
-{
-  ok(InspectorUI, "InspectorUI variable exists");
-  Services.obs.addObserver(runInspectorTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.toggleInspectorUI();
-}
-
-function runInspectorTests()
-{
-  Services.obs.removeObserver(runInspectorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-  testDiv = doc.getElementById("testdiv");
-
-  testDiv.style.fontSize = "10px";
-
-  InspectorUI.inspectNode(testDiv);
-  InspectorUI.stopInspecting();
-
-  // Start up the style inspector panel...
-  Services.obs.addObserver(stylePanelTests, "StyleInspector-populated", false);
-
-  InspectorUI.sidebar.show();
-  InspectorUI.sidebar.activatePanel("computedview");
-}
-
-function stylePanelTests()
-{
-  Services.obs.removeObserver(stylePanelTests, "StyleInspector-populated");
-
-  ok(InspectorUI.sidebar.visible, "Inspector Sidebar is open");
-  ok(computedViewTree(), "Style Panel has a cssHtmlTree");
-
-  let propView = getInspectorProp("font-size");
-  is(propView.value, "10px", "Style inspector should be showing the correct font size.");
-
-  Services.obs.addObserver(stylePanelAfterChange, "StyleInspector-populated", false);
-
-  testDiv.style.fontSize = "15px";
-  InspectorUI.nodeChanged();
-}
-
-function stylePanelAfterChange()
-{
-  Services.obs.removeObserver(stylePanelAfterChange, "StyleInspector-populated");
-
-  let propView = getInspectorProp("font-size");
-  is(propView.value, "15px", "Style inspector should be showing the new font size.");
-
-  stylePanelNotActive();
-}
-
-function stylePanelNotActive()
-{
-  // Tests changes made while the style panel is not active.
-  InspectorUI.sidebar.activatePanel("ruleview");
-
-  executeSoon(function() {
-    Services.obs.addObserver(stylePanelAfterSwitch, "StyleInspector-populated", false);
-    testDiv.style.fontSize = "20px";
-    InspectorUI.nodeChanged();
-    InspectorUI.sidebar.activatePanel("computedview");
-  });
-}
-
-function stylePanelAfterSwitch()
-{
-  Services.obs.removeObserver(stylePanelAfterSwitch, "StyleInspector-populated");
-
-  let propView = getInspectorProp("font-size");
-  is(propView.value, "20px", "Style inspector should be showing the newest font size.");
-
-  Services.obs.addObserver(finishTest, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-  executeSoon(function() {
-    InspectorUI.closeInspectorUI(true);
-  });
-}
-
-function finishTest()
-{
-  Services.obs.removeObserver(finishTest,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
-  gBrowser.removeCurrentTab();
-  finish();
-}
-
-function test()
-{
-  waitForExplicitFinish();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,basic tests for inspector";
-}
-
diff --git a/browser/devtools/highlighter/test/browser_inspector_highlighter_autohide.js b/browser/devtools/highlighter/test/browser_inspector_highlighter_autohide.js
deleted file mode 100644
index 5878b4f12f8f..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_highlighter_autohide.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let doc;
-
-function createDocument() {
-  doc.body.innerHTML = '<h1>highlighter autohide test</h1>';
-
-  InspectorUI.openInspectorUI(doc.querySelector("h1"));
-
-  // Open the sidebar and wait for the default view (the rule view) to show.
-  InspectorUI.currentInspector.once("sidebaractivated-ruleview", inspectorRuleViewOpened);
-
-  InspectorUI.sidebar.show();
-  InspectorUI.sidebar.activatePanel("ruleview");
-}
-
-function inspectorRuleViewOpened() {
-  let deck = InspectorUI.sidebar._deck;
-
-  EventUtils.synthesizeMouse(InspectorUI.highlighter.highlighterContainer, 2, 2, {type: "mousemove"}, window);
-
-  executeSoon(function() {
-    ok(!InspectorUI.highlighter.hidden, "Outline visible (1)");
-
-    EventUtils.synthesizeMouse(deck, 10, 2, {type: "mousemove"}, window);
-
-    executeSoon(function() {
-      ok(InspectorUI.highlighter.hidden, "Outline not visible");
-
-      EventUtils.synthesizeMouse(deck, -10, 2, {type: "mousemove"}, window);
-
-      executeSoon(function() {
-        ok(!InspectorUI.highlighter.hidden, "Outline visible (2)");
-        finishTest();
-      });
-    });
-  });
-}
-
-function finishTest() {
-  InspectorUI.closeInspectorUI();
-  gBrowser.removeCurrentTab();
-  finish();
-}
-
-function test() {
-  waitForExplicitFinish();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,basic tests for highlighter";
-}
-
-
diff --git a/browser/devtools/highlighter/test/browser_inspector_initialization.js b/browser/devtools/highlighter/test/browser_inspector_initialization.js
deleted file mode 100644
index 3c8c84b83288..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_initialization.js
+++ /dev/null
@@ -1,191 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-let doc;
-let salutation;
-let closing;
-let winId;
-
-function createDocument()
-{
-  doc.body.innerHTML = '<div id="first" style="{ margin: 10em; ' +
-    'font-size: 14pt; font-family: helvetica, sans-serif; color: #AAA}">\n' +
-    '<h1>Some header text</h1>\n' +
-    '<p id="salutation" style="{font-size: 12pt}">hi.</p>\n' +
-    '<p id="body" style="{font-size: 12pt}">I am a test-case. This text exists ' +
-    'solely to provide some things to test the inspector initialization.</p>\n' +
-    'If you are reading this, you should go do something else instead. Maybe ' +
-    'read a book. Or better yet, write some test-cases for another bit of code. ' +
-    '<span style="{font-style: italic}">Maybe more inspector test-cases!</span></p>\n' +
-    '<p id="closing">end transmission</p>\n' +
-    '</div>';
-  doc.title = "Inspector Initialization Test";
-  startInspectorTests();
-}
-
-function startInspectorTests()
-{
-  ok(InspectorUI, "InspectorUI variable exists");
-  Services.obs.addObserver(runInspectorTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.toggleInspectorUI();
-}
-
-function runInspectorTests()
-{
-  Services.obs.removeObserver(runInspectorTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-
-  ok(InspectorUI.toolbar, "we have the toolbar.");
-  ok(!InspectorUI.toolbar.hidden, "toolbar is visible");
-  ok(InspectorUI.inspecting, "Inspector is inspecting");
-  ok(!InspectorUI.markupOpen, "Inspector Tree Panel is not open");
-  ok(!InspectorUI.sidebar.visible, "Inspector sidebar should not visible.");
-  ok(InspectorUI.highlighter, "Highlighter is up");
-  InspectorUI.inspectNode(doc.body);
-  InspectorUI.stopInspecting();
-
-  InspectorUI.currentInspector.once("markuploaded", treePanelTests);
-  InspectorUI.currentInspector.openMarkup();
-}
-
-function treePanelTests()
-{
-  ok(InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is open");
-
-  InspectorUI.toggleSidebar();
-  ok(InspectorUI.sidebar.visible, "Inspector Sidebar should be open");
-  InspectorUI.toggleSidebar();
-  ok(!InspectorUI.sidebar.visible, "Inspector Sidebar should be closed");
-  InspectorUI.sidebar.show();
-  InspectorUI.currentInspector.once("sidebaractivated-computedview",
-    stylePanelTests)
-  InspectorUI.sidebar.activatePanel("computedview");
-}
-
-function stylePanelTests()
-{
-  ok(InspectorUI.sidebar.visible, "Inspector Sidebar is open");
-  is(InspectorUI.sidebar.activePanel, "computedview", "Computed View is open");
-  ok(computedViewTree(), "Computed view has a cssHtmlTree");
-
-  InspectorUI.sidebar.activatePanel("ruleview");
-  executeSoon(function() {
-    ruleViewTests();
-  });
-}
-
-function ruleViewTests()
-{
-  Services.obs.addObserver(runContextMenuTest,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-
-  is(InspectorUI.sidebar.activePanel, "ruleview", "Rule View is open");
-  ok(ruleView(), "InspectorUI has a cssRuleView");
-
-  executeSoon(function() {
-    InspectorUI.closeInspectorUI();
-  });
-}
-
-function runContextMenuTest()
-{
-  Services.obs.removeObserver(runContextMenuTest, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-  Services.obs.addObserver(inspectNodesFromContextTest, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  salutation = doc.getElementById("salutation");
-  ok(salutation, "hello, context menu test!");
-  let eventDeets = { type : "contextmenu", button : 2 };
-  let contextMenu = document.getElementById("contentAreaContextMenu");
-  ok(contextMenu, "we have the context menu");
-  let contextInspectMenuItem = document.getElementById("context-inspect");
-  ok(contextInspectMenuItem, "we have the inspect context menu item");
-  EventUtils.synthesizeMouse(salutation, 2, 2, eventDeets);
-  is(contextMenu.state, "showing", "context menu is open");
-  is(!contextInspectMenuItem.hidden, gPrefService.getBoolPref("devtools.inspector.enabled"), "is context menu item enabled?");
-  contextMenu.hidePopup();
-  executeSoon(function() {
-    InspectorUI.openInspectorUI(salutation);
-  });
-}
-
-function inspectNodesFromContextTest()
-{
-  Services.obs.removeObserver(inspectNodesFromContextTest, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  Services.obs.addObserver(openInspectorForContextTest, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-  ok(!InspectorUI.inspecting, "Inspector is not actively highlighting");
-  is(InspectorUI.selection, salutation, "Inspector is highlighting salutation");
-  executeSoon(function() {
-    InspectorUI.closeInspectorUI(true);
-  });
-}
-
-function openInspectorForContextTest()
-{
-  Services.obs.removeObserver(openInspectorForContextTest, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
-  Services.obs.addObserver(inspectNodesFromContextTestWhileOpen, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  executeSoon(function() {
-    InspectorUI.openInspectorUI(salutation);
-  });
-}
-
-function inspectNodesFromContextTestWhileOpen()
-{
-  Services.obs.removeObserver(inspectNodesFromContextTestWhileOpen, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-  Services.obs.addObserver(inspectNodesFromContextTestTrap, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.highlighter.addListener("nodeselected", inspectNodesFromContextTestHighlight);
-  is(InspectorUI.selection, salutation, "Inspector is highlighting salutation");
-  closing = doc.getElementById("closing");
-  ok(closing, "we have the closing statement");
-  executeSoon(function() {
-    InspectorUI.openInspectorUI(closing);
-  });
-}
-
-function inspectNodesFromContextTestHighlight()
-{
-  winId = InspectorUI.winID;
-  InspectorUI.highlighter.removeListener("nodeselected", inspectNodesFromContextTestHighlight);
-  Services.obs.addObserver(finishInspectorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.DESTROYED, false);
-  is(InspectorUI.selection, closing, "InspectorUI.selection is header");
-  executeSoon(function() {
-    InspectorUI.closeInspectorUI();
-  });
-}
-
-function inspectNodesFromContextTestTrap()
-{
-  Services.obs.removeObserver(inspectNodesFromContextTestTrap, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-  ok(false, "Inspector UI has been opened again. We Should Not Be Here!");
-}
-
-function finishInspectorTests(subject, topic, aWinIdString)
-{
-  Services.obs.removeObserver(finishInspectorTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.DESTROYED);
-
-  is(parseInt(aWinIdString), winId, "winId of destroyed Inspector matches");
-  ok(!InspectorUI.highlighter, "Highlighter is gone");
-  ok(!InspectorUI.inspecting, "Inspector is not inspecting");
-  ok(!InspectorUI._sidebar, "Inspector Sidebar is closed");
-  ok(!InspectorUI.toolbar, "toolbar is hidden");
-
-  Services.obs.removeObserver(inspectNodesFromContextTestTrap, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-  gBrowser.removeCurrentTab();
-  finish();
-}
-
-function test()
-{
-  waitForExplicitFinish();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,basic tests for inspector";
-}
-
diff --git a/browser/devtools/highlighter/test/browser_inspector_invalidate.js b/browser/devtools/highlighter/test/browser_inspector_invalidate.js
deleted file mode 100644
index dba5cd7862df..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_invalidate.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let doc;
-let div;
-
-function createDocument()
-{
-  div = doc.createElement("div");
-  div.setAttribute("style", "width: 100px; height: 100px; background:yellow;");
-  doc.body.appendChild(div);
-
-  Services.obs.addObserver(runTest,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.toggleInspectorUI();
-}
-
-function runTest(subject)
-{
-  Services.obs.removeObserver(runTest,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  InspectorUI.highlighter.highlight(div);
-
-  executeSoon(function() {
-    let outline = InspectorUI.highlighter.outline;
-    is(outline.style.width, "100px", "selection has the right width");
-
-    div.style.width = "200px";
-    function pollTest() {
-      if (outline.style.width == "100px") {
-    	setTimeout(pollTest, 10);
-    	return;
-      }
-      is(outline.style.width, "200px", "selection updated");
-      InspectorUI.closeInspectorUI();
-      gBrowser.removeCurrentTab();
-      finish();
-    }
-    setTimeout(pollTest, 10);
-  });
-}
-
-function test()
-{
-  waitForExplicitFinish();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,basic tests for inspector";
-}
-
diff --git a/browser/devtools/highlighter/test/browser_inspector_keybindings.js b/browser/devtools/highlighter/test/browser_inspector_keybindings.js
deleted file mode 100644
index 4e8fc459d8f4..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_keybindings.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-
-function test()
-{
-  waitForExplicitFinish();
-
-  let doc;
-  let node;
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onload() {
-    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
-    doc = content.document;
-    waitForFocus(setupKeyBindingsTest, content);
-  }, true);
-
-  content.location = "data:text/html,<h1>foobar</h1>";
-
-  function setupKeyBindingsTest()
-  {
-    node = doc.querySelector("h1");
-    Services.obs.addObserver(highlightNode,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.toggleInspectorUI();
-  }
-
-  function highlightNode()
-  {
-    Services.obs.removeObserver(highlightNode,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-
-    executeSoon(function() {
-      InspectorUI.highlighter.addListener("nodeselected", lockNode);
-      InspectorUI.inspectNode(node);
-    });
-  }
-
-  function lockNode()
-  {
-    InspectorUI.highlighter.removeListener("nodeselected", lockNode);
-    synthesizeKeyFromKeyTag("key_inspect");
-    executeSoon(isTheNodeLocked);
-  }
-
-  function isTheNodeLocked()
-  {
-    is(InspectorUI.selection, node, "selection matches node");
-    ok(!InspectorUI.inspecting, "the node is locked");
-    unlockNode();
-  }
-
-  function unlockNode() {
-    synthesizeKeyFromKeyTag("key_inspect");
-    executeSoon(isTheNodeUnlocked);
-  }
-
-  function isTheNodeUnlocked()
-  {
-    ok(InspectorUI.inspecting, "the node is unlocked");
-
-    // Let's close the inspector
-    Services.obs.addObserver(finishUp,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-
-    EventUtils.synthesizeKey("VK_ESCAPE", {});
-    ok(true, "Inspector is closing successfuly");
-  }
-
-  function finishUp() {
-    Services.obs.removeObserver(finishUp,
-                                InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
-    doc = node = null;
-    gBrowser.removeCurrentTab();
-    finish();
-  }
-}
diff --git a/browser/devtools/highlighter/test/browser_inspector_pseudoClass_menu.js b/browser/devtools/highlighter/test/browser_inspector_pseudoClass_menu.js
deleted file mode 100644
index 5cbcceb88dea..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_pseudoClass_menu.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let DOMUtils = Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
-
-let pseudos = [":hover", ":active", ":focus"];
-
-let doc;
-let div;
-let menu;
-
-function test()
-{
-  waitForExplicitFinish();
-  ignoreAllUncaughtExceptions();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,pseudo-class lock node menu tests";
-}
-
-function createDocument()
-{
-  div = doc.createElement("div");
-  div.textContent = "test div";
-
-  doc.body.appendChild(div);
-
-  setupTests();
-}
-
-function setupTests()
-{
-  Services.obs.addObserver(selectNode,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.openInspectorUI();
-}
-
-function selectNode()
-{
-  Services.obs.removeObserver(selectNode,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-
-  executeSoon(function() {
-    InspectorUI.highlighter.addListener("nodeselected", performTests);
-    InspectorUI.inspectNode(div);
-  });
-}
-
-function performTests()
-{
-  InspectorUI.highlighter.removeListener("nodeselected", performTests);
-
-  menu = document.getElementById("highlighter-node-menu");
-  menu.addEventListener("popupshowing", testMenuItems, true);
-
-  menu.openPopup();
-}
-
-function testMenuItems()
-{
-  menu.removeEventListener("popupshowing", testMenuItems, true);
-
-  for each (let pseudo in pseudos) {
-    let menuitem = document.getElementById("highlighter-pseudo-class-menuitem-"
-                   + pseudo);
-    ok(menuitem, pseudo + " menuitem exists");
-
-    menuitem.doCommand();
-
-    is(DOMUtils.hasPseudoClassLock(div, pseudo), true,
-       "pseudo-class lock has been applied");
-  }
-  finishUp();
-}
-
-function finishUp()
-{
-  InspectorUI.closeInspectorUI();
-  doc = div = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
diff --git a/browser/devtools/highlighter/test/browser_inspector_ruleviewstore.js b/browser/devtools/highlighter/test/browser_inspector_ruleviewstore.js
deleted file mode 100644
index c4c8039654db..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_ruleviewstore.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Tests that properties disabled in the rule view survive a tab switch.
- */
-
-let div;
-let tab1;
-
-function waitForRuleView(aCallback)
-{
-  InspectorUI.currentInspector.once("sidebaractivated-ruleview", aCallback);
-}
-
-function inspectorTabOpen1()
-{
-  Services.obs.addObserver(inspectorUIOpen1,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.openInspectorUI();
-}
-
-function inspectorUIOpen1()
-{
-  Services.obs.removeObserver(inspectorUIOpen1,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  // Highlight a node.
-  div = content.document.getElementsByTagName("div")[0];
-  InspectorUI.inspectNode(div);
-  InspectorUI.stopInspecting();
-
-  // Open the rule view sidebar.
-  waitForRuleView(ruleViewOpened1);
-  InspectorUI.sidebar.show();
-  InspectorUI.sidebar.activatePanel("ruleview");
-}
-
-function ruleViewOpened1()
-{
-  let prop = ruleView()._elementStyle.rules[0].textProps[0];
-  is(prop.name, "background-color", "First prop is the background color prop.");
-  prop.setEnabled(false);
-
-  // Open second tab and switch to it
-  gBrowser.selectedTab = gBrowser.addTab();
-
-  gBrowser.selectedBrowser.addEventListener("load", function(evt) {
-    gBrowser.selectedBrowser.removeEventListener(evt.type, arguments.callee,
-                                                 true);
-    waitForFocus(inspectorTabOpen2, content);
-  }, true);
-  content.location = "data:text/html,<p>tab 2: the inspector should close now";
-}
-
-function inspectorTabOpen2()
-{
-  // Switch back to tab 1.
-  executeSoon(function() {
-    Services.obs.addObserver(inspectorFocusTab1,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    gBrowser.removeCurrentTab();
-    gBrowser.selectedTab = tab1;
-  });
-}
-
-function inspectorFocusTab1()
-{
-  Services.obs.removeObserver(inspectorFocusTab1,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  // Now wait for the rule view to load again...
-  waitForRuleView(ruleViewOpened2);
-}
-
-function ruleViewOpened2()
-{
-  let prop = ruleView()._elementStyle.rules[0].textProps[0];
-  is(prop.name, "background-color", "First prop is the background color prop.");
-  ok(!prop.enabled, "First prop should be disabled.");
-
-  InspectorUI.closeInspectorUI();
-  gBrowser.removeCurrentTab();
-  finish();
-}
-
-function test()
-{
-  waitForExplicitFinish();
-
-  tab1 = gBrowser.addTab();
-  gBrowser.selectedTab = tab1;
-  gBrowser.selectedBrowser.addEventListener("load", function(evt) {
-    gBrowser.selectedBrowser.removeEventListener(evt.type, arguments.callee,
-      true);
-    waitForFocus(inspectorTabOpen1, content);
-  }, true);
-
-  content.location = "data:text/html,<p>tab switching tests for inspector" +
-    '<div style="background-color: green;">tab 1</div>';
-}
-
diff --git a/browser/devtools/highlighter/test/browser_inspector_sidebarstate.js b/browser/devtools/highlighter/test/browser_inspector_sidebarstate.js
deleted file mode 100644
index 4c0756beccdf..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_sidebarstate.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let doc;
-
-function createDocument()
-{
-  doc.body.innerHTML = '<h1>Sidebar state test</h1>';
-  doc.title = "Sidebar State Test";
-
-  InspectorUI.openInspectorUI();
-
-  // Open the sidebar and wait for the default view (the rule view) to show.
-  InspectorUI.currentInspector.once("sidebaractivated-ruleview", inspectorRuleViewOpened);
-
-  InspectorUI.sidebar.show();
-  InspectorUI.sidebar.activatePanel("ruleview");
-}
-
-function inspectorRuleViewOpened()
-{
-  is(InspectorUI.sidebar.activePanel, "ruleview", "Rule View is selected by default");
-
-  // Select the computed view and turn off the inspector.
-  InspectorUI.sidebar.activatePanel("computedview");
-
-  Services.obs.addObserver(inspectorClosed,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-  InspectorUI.closeInspectorUI();
-}
-
-function inspectorClosed()
-{
-  // Reopen the inspector, expect the computed view to be loaded.
-  Services.obs.removeObserver(inspectorClosed,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
-
-  Services.obs.addObserver(computedViewPopulated,
-    "StyleInspector-populated", false);
-
-  InspectorUI.openInspectorUI();
-}
-
-function computedViewPopulated()
-{
-  Services.obs.removeObserver(computedViewPopulated,
-    "StyleInspector-populated");
-  is(InspectorUI.sidebar.activePanel, "computedview", "Computed view is selected by default.");
-
-  finishTest();
-}
-
-
-function finishTest()
-{
-  InspectorUI.closeInspectorUI();
-  gBrowser.removeCurrentTab();
-  finish();
-}
-
-function test()
-{
-  waitForExplicitFinish();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,basic tests for inspector";
-}
-
diff --git a/browser/devtools/highlighter/test/browser_inspector_tab_switch.js b/browser/devtools/highlighter/test/browser_inspector_tab_switch.js
deleted file mode 100644
index 9b01e0ebe3d9..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_tab_switch.js
+++ /dev/null
@@ -1,247 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-let div;
-let tab1;
-let tab2;
-let tab1window;
-
-function inspectorTabOpen1()
-{
-  ok(window.InspectorUI, "InspectorUI variable exists");
-  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
-  ok(InspectorUI.store.isEmpty(), "Inspector.store is empty");
-
-  Services.obs.addObserver(inspectorUIOpen1,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.openInspectorUI();
-}
-
-function inspectorUIOpen1()
-{
-  Services.obs.removeObserver(inspectorUIOpen1,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  // Make sure the inspector is open.
-  ok(InspectorUI.inspecting, "Inspector is highlighting");
-  ok(!InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is not open");
-  ok(!InspectorUI.sidebar.visible, "Inspector Sidebar is not open");
-  ok(!InspectorUI.store.isEmpty(), "InspectorUI.store is not empty");
-  is(InspectorUI.store.length, 1, "Inspector.store.length = 1");
-
-  // Highlight a node.
-  div = content.document.getElementsByTagName("div")[0];
-  InspectorUI.inspectNode(div);
-  is(InspectorUI.selection, div, "selection matches the div element");
-
-  // Open the second tab.
-  tab2 = gBrowser.addTab();
-  gBrowser.selectedTab = tab2;
-
-  gBrowser.selectedBrowser.addEventListener("load", function(evt) {
-    gBrowser.selectedBrowser.removeEventListener(evt.type, arguments.callee,
-      true);
-    waitForFocus(inspectorTabOpen2, content);
-  }, true);
-
-  content.location = "data:text/html,<p>tab 2: the inspector should close now";
-}
-
-function inspectorTabOpen2()
-{
-  // Make sure the inspector is closed.
-  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
-  is(InspectorUI.store.length, 1, "Inspector.store.length = 1");
-
-  // Activate the inspector again.
-  executeSoon(function() {
-    Services.obs.addObserver(inspectorUIOpen2,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    clearUserPrefs();
-    InspectorUI.openInspectorUI();
-  });
-}
-
-function inspectorUIOpen2()
-{
-  Services.obs.removeObserver(inspectorUIOpen2,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  // Make sure the inspector is open.
-  ok(InspectorUI.inspecting, "Inspector is highlighting");
-  ok(!InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is not open");
-  is(InspectorUI.store.length, 2, "Inspector.store.length = 2");
-
-  // Disable highlighting.
-  InspectorUI.toggleInspection();
-  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
-
-
-  // Switch back to tab 1.
-  executeSoon(function() {
-    Services.obs.addObserver(inspectorFocusTab1,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    gBrowser.selectedTab = tab1;
-  });
-}
-
-function inspectorFocusTab1()
-{
-  Services.obs.removeObserver(inspectorFocusTab1,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  // Make sure the inspector is still open.
-  ok(InspectorUI.inspecting, "Inspector is highlighting");
-  ok(!InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is not open");
-  is(InspectorUI.store.length, 2, "Inspector.store.length = 2");
-  is(InspectorUI.selection, div, "selection matches the div element");
-
-  InspectorUI.currentInspector.once("markuploaded", inspectorOpenTreePanelTab1);
-  InspectorUI.toggleHTMLPanel();
-}
-
-function inspectorOpenTreePanelTab1()
-{
-  ok(InspectorUI.inspecting, "Inspector is highlighting");
-  ok(InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is open");
-  is(InspectorUI.store.length, 2, "Inspector.store.length = 2");
-  is(InspectorUI.selection, div, "selection matches the div element");
-
-  InspectorUI.currentInspector.once("sidebaractivated-computedview",
-    inspectorSidebarStyleView1);
-
-  executeSoon(function() {
-    InspectorUI.sidebar.show();
-    InspectorUI.sidebar.activatePanel("computedview");
-  });
-}
-
-function inspectorSidebarStyleView1()
-{
-  ok(InspectorUI.sidebar.visible, "Inspector Sidebar is open");
-  ok(computedView(), "Inspector Has a computed view Instance");
-
-  InspectorUI.sidebar._toolObjects().forEach(function (aTool) {
-    let btn = aTool.button;
-    is(btn.hasAttribute("checked"),
-      (aTool.id == "computedview"),
-      "Button " + btn.label + " has correct checked attribute");
-  });
-
-  // Switch back to tab 2.
-  Services.obs.addObserver(inspectorFocusTab2,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  gBrowser.selectedTab = tab2;
-}
-
-function inspectorFocusTab2()
-{
-  Services.obs.removeObserver(inspectorFocusTab2,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  // Make sure the inspector is still open.
-  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
-  ok(!InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is not open");
-  ok(!InspectorUI.sidebar.visible, "Inspector Sidebar is not open");
-  is(InspectorUI.store.length, 2, "Inspector.store.length is 2");
-  isnot(InspectorUI.selection, div, "selection does not match the div element");
-
-
-  executeSoon(function() {
-    // Make sure keybindings still work
-    synthesizeKeyFromKeyTag("key_inspect");
-
-    ok(InspectorUI.inspecting, "Inspector is highlighting");
-    InspectorUI.toggleInspection();
-
-    // Switch back to tab 1.
-    Services.obs.addObserver(inspectorSecondFocusTab1,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    gBrowser.selectedTab = tab1;
-  });
-}
-
-function inspectorSecondFocusTab1()
-{
-  Services.obs.removeObserver(inspectorSecondFocusTab1,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-  InspectorUI.currentInspector.once("sidebaractivated-computedview",
-    inspectorSecondFocusTabSidebarLoaded);
-}
-
-function inspectorSecondFocusTabSidebarLoaded()
-{
-  ok(InspectorUI.inspecting, "Inspector is highlighting");
-  ok(InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is open");
-  is(InspectorUI.store.length, 2, "Inspector.store.length = 2");
-  is(InspectorUI.selection, div, "selection matches the div element");
-
-  ok(InspectorUI.sidebar.visible, "Inspector Sidebar is open");
-  ok(computedView(), "Inspector Has a Style Panel Instance");
-  InspectorUI.sidebar._toolObjects().forEach(function(aTool) {
-    let btn = aTool.button;
-    is(btn.hasAttribute("checked"),
-      (aTool.id == "computedview"),
-      "Button " + btn.label + " has correct checked attribute");
-  });
-
-  // Switch back to tab 2.
-  Services.obs.addObserver(inspectorSecondFocusTab2,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  gBrowser.selectedTab = tab2;
-}
-
-function inspectorSecondFocusTab2()
-{
-  Services.obs.removeObserver(inspectorSecondFocusTab2,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-
-  // Make sure the inspector is still open.
-  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
-  ok(!InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is not open");
-  ok(!InspectorUI.isSidebarOpen, "Inspector Sidebar is not open");
-
-  is(InspectorUI.store.length, 2, "Inspector.store.length is 2");
-  isnot(InspectorUI.selection, div, "selection does not match the div element");
-
-  // Remove tab 1.
-  tab1window = gBrowser.getBrowserForTab(tab1).contentWindow;
-  tab1window.addEventListener("pagehide", inspectorTabUnload1, false);
-  gBrowser.removeTab(tab1);
-}
-
-function inspectorTabUnload1(evt)
-{
-  tab1window.removeEventListener(evt.type, arguments.callee, false);
-  tab1window = tab1 = tab2 = div = null;
-
-  // Make sure the Inspector is still open and that the state is correct.
-  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
-  ok(!InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is not open");
-  is(InspectorUI.store.length, 1, "Inspector.store.length = 1");
-
-  InspectorUI.closeInspectorUI();
-  gBrowser.removeCurrentTab();
-  finish();
-}
-
-function test()
-{
-  waitForExplicitFinish();
-  ignoreAllUncaughtExceptions();
-
-  tab1 = gBrowser.addTab();
-  gBrowser.selectedTab = tab1;
-  gBrowser.selectedBrowser.addEventListener("load", function(evt) {
-    gBrowser.selectedBrowser.removeEventListener(evt.type, arguments.callee,
-      true);
-    waitForFocus(inspectorTabOpen1, content);
-  }, true);
-
-  content.location = "data:text/html,<p>tab switching tests for inspector" +
-    "<div>tab 1</div>";
-}
-
diff --git a/browser/devtools/highlighter/test/browser_inspector_treeSelection.js b/browser/devtools/highlighter/test/browser_inspector_treeSelection.js
deleted file mode 100644
index 6e681623377d..000000000000
--- a/browser/devtools/highlighter/test/browser_inspector_treeSelection.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-let doc;
-let h1;
-
-function createDocument()
-{
-  let div = doc.createElement("div");
-  let h1 = doc.createElement("h1");
-  let p1 = doc.createElement("p");
-  let p2 = doc.createElement("p");
-  doc.title = "Inspector Tree Selection Test";
-  h1.textContent = "Inspector Tree Selection Test";
-  p1.textContent = "This is some example text";
-  p2.textContent = "Lorem ipsum dolor sit amet, consectetur adipisicing " +
-    "elit, sed do eiusmod tempor incididunt ut labore et dolore magna " +
-    "aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco " +
-    "laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure " +
-    "dolor in reprehenderit in voluptate velit esse cillum dolore eu " +
-    "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non " +
-    "proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-  div.appendChild(h1);
-  div.appendChild(p1);
-  div.appendChild(p2);
-  doc.body.appendChild(div);
-  setupSelectionTests();
-}
-
-function setupSelectionTests()
-{
-  h1 = doc.querySelectorAll("h1")[0];
-  ok(h1, "we have the header node");
-  Services.obs.addObserver(runSelectionTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.openInspectorUI();
-}
-
-function runSelectionTests()
-{
-  Services.obs.removeObserver(runSelectionTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  executeSoon(function() {
-    InspectorUI.highlighter.addListener("nodeselected", performTestComparisons);
-    InspectorUI.inspectNode(h1);
-  });
-}
-
-function performTestComparisons(evt)
-{
-  InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons);
-
-  is(h1, InspectorUI.selection, "selection matches node");
-  ok(isHighlighting(), "highlighter is highlighting");
-  is(getHighlitNode(), h1, "highlighter highlighting correct node");
-
-  finishUp();
-}
-
-function finishUp() {
-  InspectorUI.closeInspectorUI();
-  doc = h1 = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
-
-function test()
-{
-  waitForExplicitFinish();
-  ignoreAllUncaughtExceptions();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,basic tests for inspector";
-}
-
diff --git a/browser/devtools/inspector/Breadcrumbs.jsm b/browser/devtools/inspector/Breadcrumbs.jsm
new file mode 100644
index 000000000000..b0625140a271
--- /dev/null
+++ b/browser/devtools/inspector/Breadcrumbs.jsm
@@ -0,0 +1,593 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const Cc = Components.classes;
+const Cu = Components.utils;
+const Ci = Components.interfaces;
+
+const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
+
+this.EXPORTED_SYMBOLS = ["HTMLBreadcrumbs"];
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource:///modules/devtools/DOMHelpers.jsm");
+Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
+
+const LOW_PRIORITY_ELEMENTS = {
+  "HEAD": true,
+  "BASE": true,
+  "BASEFONT": true,
+  "ISINDEX": true,
+  "LINK": true,
+  "META": true,
+  "SCRIPT": true,
+  "STYLE": true,
+  "TITLE": true,
+};
+
+///////////////////////////////////////////////////////////////////////////
+//// HTML Breadcrumbs
+
+/**
+ * Display the ancestors of the current node and its children.
+ * Only one "branch" of children are displayed (only one line).
+ *
+ * Mechanism:
+ * . If no nodes displayed yet:
+ *    then display the ancestor of the selected node and the selected node;
+ *   else select the node;
+ * . If the selected node is the last node displayed, append its first (if any).
+ */
+this.HTMLBreadcrumbs = function HTMLBreadcrumbs(aInspector)
+{
+  this.inspector = aInspector;
+  this.selection = this.inspector.selection;
+  this.chromeWin = this.inspector.panelWin;
+  this.chromeDoc = this.inspector.panelDoc;
+  this.DOMHelpers = new DOMHelpers(this.chromeWin);
+  this._init();
+}
+
+HTMLBreadcrumbs.prototype = {
+  _init: function BC__init()
+  {
+    this.container = this.chromeDoc.getElementById("inspector-breadcrumbs");
+    this.container.addEventListener("mousedown", this, true);
+    this.container.addEventListener("keypress", this, true);
+
+    // We will save a list of already displayed nodes in this array.
+    this.nodeHierarchy = [];
+
+    // Last selected node in nodeHierarchy.
+    this.currentIndex = -1;
+
+    // By default, hide the arrows. We let the <scrollbox> show them
+    // in case of overflow.
+    this.container.removeAttribute("overflows");
+    this.container._scrollButtonUp.collapsed = true;
+    this.container._scrollButtonDown.collapsed = true;
+
+    this.onscrollboxreflow = function() {
+      if (this.container._scrollButtonDown.collapsed)
+        this.container.removeAttribute("overflows");
+      else
+        this.container.setAttribute("overflows", true);
+    }.bind(this);
+
+    this.container.addEventListener("underflow", this.onscrollboxreflow, false);
+    this.container.addEventListener("overflow", this.onscrollboxreflow, false);
+
+    this.update = this.update.bind(this);
+    this.updateSelectors = this.updateSelectors.bind(this);
+    this.selection.on("new-node", this.update);
+    this.selection.on("detached", this.update);
+    this.selection.on("pseudoclass", this.updateSelectors);
+    this.selection.on("attribute-changed", this.updateSelectors);
+    this.update();
+  },
+
+  /**
+   * Build a string that represents the node: tagName#id.class1.class2.
+   *
+   * @param aNode The node to pretty-print
+   * @returns a string
+   */
+  prettyPrintNodeAsText: function BC_prettyPrintNodeText(aNode)
+  {
+    let text = aNode.tagName.toLowerCase();
+    if (aNode.id) {
+      text += "#" + aNode.id;
+    }
+    for (let i = 0; i < aNode.classList.length; i++) {
+      text += "." + aNode.classList[i];
+    }
+    for (let i = 0; i < PSEUDO_CLASSES.length; i++) {
+      let pseudo = PSEUDO_CLASSES[i];
+      if (DOMUtils.hasPseudoClassLock(aNode, pseudo)) {
+        text += pseudo;
+      }
+    }
+
+    return text;
+  },
+
+
+  /**
+   * Build <label>s that represent the node:
+   *   <label class="inspector-breadcrumbs-tag">tagName</label>
+   *   <label class="inspector-breadcrumbs-id">#id</label>
+   *   <label class="inspector-breadcrumbs-classes">.class1.class2</label>
+   *
+   * @param aNode The node to pretty-print
+   * @returns a document fragment.
+   */
+  prettyPrintNodeAsXUL: function BC_prettyPrintNodeXUL(aNode)
+  {
+    let fragment = this.chromeDoc.createDocumentFragment();
+
+    let tagLabel = this.chromeDoc.createElement("label");
+    tagLabel.className = "inspector-breadcrumbs-tag plain";
+
+    let idLabel = this.chromeDoc.createElement("label");
+    idLabel.className = "inspector-breadcrumbs-id plain";
+
+    let classesLabel = this.chromeDoc.createElement("label");
+    classesLabel.className = "inspector-breadcrumbs-classes plain";
+
+    let pseudosLabel = this.chromeDoc.createElement("label");
+    pseudosLabel.className = "inspector-breadcrumbs-pseudo-classes plain";
+
+    tagLabel.textContent = aNode.tagName.toLowerCase();
+    idLabel.textContent = aNode.id ? ("#" + aNode.id) : "";
+
+    let classesText = "";
+    for (let i = 0; i < aNode.classList.length; i++) {
+      classesText += "." + aNode.classList[i];
+    }
+    classesLabel.textContent = classesText;
+
+    let pseudos = PSEUDO_CLASSES.filter(function(pseudo) {
+      return DOMUtils.hasPseudoClassLock(aNode, pseudo);
+    }, this);
+    pseudosLabel.textContent = pseudos.join("");
+
+    fragment.appendChild(tagLabel);
+    fragment.appendChild(idLabel);
+    fragment.appendChild(classesLabel);
+    fragment.appendChild(pseudosLabel);
+
+    return fragment;
+  },
+
+  /**
+   * Open the sibling menu.
+   *
+   * @param aButton the button representing the node.
+   * @param aNode the node we want the siblings from.
+   */
+  openSiblingMenu: function BC_openSiblingMenu(aButton, aNode)
+  {
+    // We make sure that the targeted node is selected
+    // because we want to use the nodemenu that only works
+    // for inspector.selection
+    this.selection.setNode(aNode, "breadcrumbs");
+
+    let title = this.chromeDoc.createElement("menuitem");
+    title.setAttribute("label", this.inspector.strings.GetStringFromName("breadcrumbs.siblings"));
+    title.setAttribute("disabled", "true");
+
+    let separator = this.chromeDoc.createElement("menuseparator");
+
+    let items = [title, separator];
+
+    let nodes = aNode.parentNode.childNodes;
+    for (let i = 0; i < nodes.length; i++) {
+      if (nodes[i].nodeType == aNode.ELEMENT_NODE) {
+        let item = this.chromeDoc.createElement("menuitem");
+        if (nodes[i] === aNode) {
+          item.setAttribute("disabled", "true");
+          item.setAttribute("checked", "true");
+        }
+
+        item.setAttribute("type", "radio");
+        item.setAttribute("label", this.prettyPrintNodeAsText(nodes[i]));
+
+        let selection = this.selection;
+        item.onmouseup = (function(aNode) {
+          return function() {
+            selection.setNode(aNode, "breadcrumbs");
+          }
+        })(nodes[i]);
+
+        items.push(item);
+      }
+    }
+    this.inspector.showNodeMenu(aButton, "before_start", items);
+  },
+
+  /**
+   * Generic event handler.
+   *
+   * @param nsIDOMEvent event
+   *        The DOM event object.
+   */
+  handleEvent: function BC_handleEvent(event)
+  {
+    if (event.type == "mousedown" && event.button == 0) {
+      // on Click and Hold, open the Siblings menu
+
+      let timer;
+      let container = this.container;
+
+      function openMenu(event) {
+        cancelHold();
+        let target = event.originalTarget;
+        if (target.tagName == "button") {
+          target.onBreadcrumbsHold();
+        }
+      }
+
+      function handleClick(event) {
+        cancelHold();
+        let target = event.originalTarget;
+        if (target.tagName == "button") {
+          target.onBreadcrumbsClick();
+        }
+      }
+
+      let window = this.chromeWin;
+      function cancelHold(event) {
+        window.clearTimeout(timer);
+        container.removeEventListener("mouseout", cancelHold, false);
+        container.removeEventListener("mouseup", handleClick, false);
+      }
+
+      container.addEventListener("mouseout", cancelHold, false);
+      container.addEventListener("mouseup", handleClick, false);
+      timer = window.setTimeout(openMenu, 500, event);
+    }
+
+    if (event.type == "keypress" && this.selection.isElementNode()) {
+      let node = null;
+      switch (event.keyCode) {
+        case this.chromeWin.KeyEvent.DOM_VK_LEFT:
+          if (this.currentIndex != 0) {
+            node = this.nodeHierarchy[this.currentIndex - 1].node;
+          }
+          break;
+        case this.chromeWin.KeyEvent.DOM_VK_RIGHT:
+          if (this.currentIndex < this.nodeHierarchy.length - 1) {
+            node = this.nodeHierarchy[this.currentIndex + 1].node;
+          }
+          break;
+        case this.chromeWin.KeyEvent.DOM_VK_UP:
+          node = this.selection.node.previousSibling;
+          while (node && (node.nodeType != node.ELEMENT_NODE)) {
+            node = node.previousSibling;
+          }
+          break;
+        case this.chromeWin.KeyEvent.DOM_VK_DOWN:
+          node = this.selection.node.nextSibling;
+          while (node && (node.nodeType != node.ELEMENT_NODE)) {
+            node = node.nextSibling;
+          }
+          break;
+      }
+      if (node) {
+        this.selection.setNode(node, "breadcrumbs");
+      }
+      event.preventDefault();
+      event.stopPropagation();
+    }
+  },
+
+  /**
+   * Remove nodes and delete properties.
+   */
+  destroy: function BC_destroy()
+  {
+    this.nodeHierarchy.forEach(function(crumb) {
+      if (LayoutHelpers.isNodeConnected(crumb.node)) {
+        DOMUtils.clearPseudoClassLocks(crumb.node);
+      }
+    });
+
+    this.selection.off("new-node", this.update);
+    this.selection.off("detached", this.update);
+    this.selection.off("pseudoclass", this.updateSelectors);
+    this.selection.off("attribute-changed", this.updateSelectors);
+
+    this.container.removeEventListener("underflow", this.onscrollboxreflow, false);
+    this.container.removeEventListener("overflow", this.onscrollboxreflow, false);
+    this.onscrollboxreflow = null;
+
+    this.empty();
+    this.container.removeEventListener("mousedown", this, true);
+    this.container.removeEventListener("keypress", this, true);
+    this.container = null;
+    this.nodeHierarchy = null;
+  },
+
+  /**
+   * Empty the breadcrumbs container.
+   */
+  empty: function BC_empty()
+  {
+    while (this.container.hasChildNodes()) {
+      this.container.removeChild(this.container.firstChild);
+    }
+  },
+
+  /**
+   * Re-init the cache and remove all the buttons.
+   */
+  invalidateHierarchy: function BC_invalidateHierarchy()
+  {
+    this.inspector.hideNodeMenu();
+    this.nodeHierarchy = [];
+    this.empty();
+  },
+
+  /**
+   * Set which button represent the selected node.
+   *
+   * @param aIdx Index of the displayed-button to select
+   */
+  setCursor: function BC_setCursor(aIdx)
+  {
+    // Unselect the previously selected button
+    if (this.currentIndex > -1 && this.currentIndex < this.nodeHierarchy.length) {
+      this.nodeHierarchy[this.currentIndex].button.removeAttribute("checked");
+    }
+    if (aIdx > -1) {
+      this.nodeHierarchy[aIdx].button.setAttribute("checked", "true");
+      if (this.hadFocus)
+        this.nodeHierarchy[aIdx].button.focus();
+    }
+    this.currentIndex = aIdx;
+  },
+
+  /**
+   * Get the index of the node in the cache.
+   *
+   * @param aNode
+   * @returns integer the index, -1 if not found
+   */
+  indexOf: function BC_indexOf(aNode)
+  {
+    let i = this.nodeHierarchy.length - 1;
+    for (let i = this.nodeHierarchy.length - 1; i >= 0; i--) {
+      if (this.nodeHierarchy[i].node === aNode) {
+        return i;
+      }
+    }
+    return -1;
+  },
+
+  /**
+   * Remove all the buttons and their references in the cache
+   * after a given index.
+   *
+   * @param aIdx
+   */
+  cutAfter: function BC_cutAfter(aIdx)
+  {
+    while (this.nodeHierarchy.length > (aIdx + 1)) {
+      let toRemove = this.nodeHierarchy.pop();
+      this.container.removeChild(toRemove.button);
+    }
+  },
+
+  /**
+   * Build a button representing the node.
+   *
+   * @param aNode The node from the page.
+   * @returns aNode The <button>.
+   */
+  buildButton: function BC_buildButton(aNode)
+  {
+    let button = this.chromeDoc.createElement("button");
+    button.appendChild(this.prettyPrintNodeAsXUL(aNode));
+    button.className = "inspector-breadcrumbs-button";
+
+    button.setAttribute("tooltiptext", this.prettyPrintNodeAsText(aNode));
+
+    button.onkeypress = function onBreadcrumbsKeypress(e) {
+      if (e.charCode == Ci.nsIDOMKeyEvent.DOM_VK_SPACE ||
+          e.keyCode == Ci.nsIDOMKeyEvent.DOM_VK_RETURN)
+        button.click();
+    }
+
+    button.onBreadcrumbsClick = function onBreadcrumbsClick() {
+      this.selection.setNode(aNode, "breadcrumbs");
+    }.bind(this);
+
+    button.onclick = (function _onBreadcrumbsRightClick(event) {
+      button.focus();
+      if (event.button == 2) {
+        this.openSiblingMenu(button, aNode);
+      }
+    }).bind(this);
+
+    button.onBreadcrumbsHold = (function _onBreadcrumbsHold() {
+      this.openSiblingMenu(button, aNode);
+    }).bind(this);
+    return button;
+  },
+
+  /**
+   * Connecting the end of the breadcrumbs to a node.
+   *
+   * @param aNode The node to reach.
+   */
+  expand: function BC_expand(aNode)
+  {
+      let fragment = this.chromeDoc.createDocumentFragment();
+      let toAppend = aNode;
+      let lastButtonInserted = null;
+      let originalLength = this.nodeHierarchy.length;
+      let stopNode = null;
+      if (originalLength > 0) {
+        stopNode = this.nodeHierarchy[originalLength - 1].node;
+      }
+      while (toAppend && toAppend.tagName && toAppend != stopNode) {
+        let button = this.buildButton(toAppend);
+        fragment.insertBefore(button, lastButtonInserted);
+        lastButtonInserted = button;
+        this.nodeHierarchy.splice(originalLength, 0, {node: toAppend, button: button});
+        toAppend = this.DOMHelpers.getParentObject(toAppend);
+      }
+      this.container.appendChild(fragment, this.container.firstChild);
+  },
+
+  /**
+   * Get a child of a node that can be displayed in the breadcrumbs
+   * and that is probably visible. See LOW_PRIORITY_ELEMENTS.
+   *
+   * @param aNode The parent node.
+   * @returns nsIDOMNode|null
+   */
+  getInterestingFirstNode: function BC_getInterestingFirstNode(aNode)
+  {
+    let nextChild = this.DOMHelpers.getChildObject(aNode, 0);
+    let fallback = null;
+
+    while (nextChild) {
+      if (nextChild.nodeType == aNode.ELEMENT_NODE) {
+        if (!(nextChild.tagName in LOW_PRIORITY_ELEMENTS)) {
+          return nextChild;
+        }
+        if (!fallback) {
+          fallback = nextChild;
+        }
+      }
+      nextChild = this.DOMHelpers.getNextSibling(nextChild);
+    }
+    return fallback;
+  },
+
+
+  /**
+   * Find the "youngest" ancestor of a node which is already in the breadcrumbs.
+   *
+   * @param aNode
+   * @returns Index of the ancestor in the cache
+   */
+  getCommonAncestor: function BC_getCommonAncestor(aNode)
+  {
+    let node = aNode;
+    while (node) {
+      let idx = this.indexOf(node);
+      if (idx > -1) {
+        return idx;
+      } else {
+        node = this.DOMHelpers.getParentObject(node);
+      }
+    }
+    return -1;
+  },
+
+  /**
+   * Make sure that the latest node in the breadcrumbs is not the selected node
+   * if the selected node still has children.
+   */
+  ensureFirstChild: function BC_ensureFirstChild()
+  {
+    // If the last displayed node is the selected node
+    if (this.currentIndex == this.nodeHierarchy.length - 1) {
+      let node = this.nodeHierarchy[this.currentIndex].node;
+      let child = this.getInterestingFirstNode(node);
+      // If the node has a child
+      if (child) {
+        // Show this child
+        this.expand(child);
+      }
+    }
+  },
+
+  /**
+   * Ensure the selected node is visible.
+   */
+  scroll: function BC_scroll()
+  {
+    // FIXME bug 684352: make sure its immediate neighbors are visible too.
+
+    let scrollbox = this.container;
+    let element = this.nodeHierarchy[this.currentIndex].button;
+    scrollbox.ensureElementIsVisible(element);
+  },
+
+  updateSelectors: function BC_updateSelectors()
+  {
+    for (let i = this.nodeHierarchy.length - 1; i >= 0; i--) {
+      let crumb = this.nodeHierarchy[i];
+      let button = crumb.button;
+
+      while(button.hasChildNodes()) {
+        button.removeChild(button.firstChild);
+      }
+      button.appendChild(this.prettyPrintNodeAsXUL(crumb.node));
+      button.setAttribute("tooltiptext", this.prettyPrintNodeAsText(crumb.node));
+    }
+  },
+
+  /**
+   * Update the breadcrumbs display when a new node is selected.
+   */
+  update: function BC_update()
+  {
+    this.inspector.hideNodeMenu();
+
+    let cmdDispatcher = this.chromeDoc.commandDispatcher;
+    this.hadFocus = (cmdDispatcher.focusedElement &&
+                     cmdDispatcher.focusedElement.parentNode == this.container);
+
+    if (!this.selection.isConnected()) {
+      this.cutAfter(-1); // remove all the crumbs
+      return;
+    }
+
+    if (!this.selection.isElementNode()) {
+      this.setCursor(-1); // no selection
+      return;
+    }
+
+    let idx = this.indexOf(this.selection.node);
+
+    // Is the node already displayed in the breadcrumbs?
+    if (idx > -1) {
+      // Yes. We select it.
+      this.setCursor(idx);
+    } else {
+      // No. Is the breadcrumbs display empty?
+      if (this.nodeHierarchy.length > 0) {
+        // No. We drop all the element that are not direct ancestors
+        // of the selection
+        let parent = this.DOMHelpers.getParentObject(this.selection.node);
+        let idx = this.getCommonAncestor(parent);
+        this.cutAfter(idx);
+      }
+      // we append the missing button between the end of the breadcrumbs display
+      // and the current node.
+      this.expand(this.selection.node);
+
+      // we select the current node button
+      idx = this.indexOf(this.selection.node);
+      this.setCursor(idx);
+    }
+    // Add the first child of the very last node of the breadcrumbs if possible.
+    this.ensureFirstChild();
+
+    // Make sure the selected node and its neighbours are visible.
+    this.scroll();
+
+    this.updateSelectors();
+  },
+}
+
+XPCOMUtils.defineLazyGetter(this, "DOMUtils", function () {
+  return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
+});
diff --git a/browser/devtools/inspector/CmdInspect.jsm b/browser/devtools/inspector/CmdInspect.jsm
new file mode 100644
index 000000000000..bde650c86aad
--- /dev/null
+++ b/browser/devtools/inspector/CmdInspect.jsm
@@ -0,0 +1,48 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+this.EXPORTED_SYMBOLS = [ ];
+
+Cu.import("resource:///modules/devtools/gcli.jsm");
+Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+
+XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
+                                  "resource:///modules/devtools/gDevTools.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
+                                  "resource:///modules/devtools/Target.jsm");
+
+/**
+ * 'inspect' command
+ */
+gcli.addCommand({
+  name: "inspect",
+  description: gcli.lookup("inspectDesc"),
+  manual: gcli.lookup("inspectManual"),
+  params: [
+    {
+      name: "selector",
+      type: "node",
+      description: gcli.lookup("inspectNodeDesc"),
+      manual: gcli.lookup("inspectNodeManual")
+    }
+  ],
+  exec: function Command_inspect(args, context) {
+    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+    let node = args.selector;
+
+    let inspector = gDevTools.getPanelForTarget("inspector", target);
+    if (inspector && inspector.isReady) {
+      inspector.selection.setNode(node, "gcli");
+    } else {
+      let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+      toolbox.once("inspector-ready", function(event, panel) {
+        let inspector = gDevTools.getPanelForTarget("inspector", target);
+        inspector.selection.setNode(node, "gcli");
+      }.bind(this));
+    }
+  }
+});
diff --git a/browser/devtools/highlighter/highlighter.jsm b/browser/devtools/inspector/Highlighter.jsm
similarity index 64%
rename from browser/devtools/highlighter/highlighter.jsm
rename to browser/devtools/inspector/Highlighter.jsm
index e94d41bfa557..587b4978e2e9 100644
--- a/browser/devtools/highlighter/highlighter.jsm
+++ b/browser/devtools/inspector/Highlighter.jsm
@@ -11,21 +11,10 @@ const Ci = Components.interfaces;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource:///modules/devtools/EventEmitter.jsm");
 
 this.EXPORTED_SYMBOLS = ["Highlighter"];
 
-const INSPECTOR_INVISIBLE_ELEMENTS = {
-  "head": true,
-  "base": true,
-  "basefont": true,
-  "isindex": true,
-  "link": true,
-  "meta": true,
-  "script": true,
-  "style": true,
-  "title": true,
-};
-
 const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
   // add ":visited" and ":link" after bug 713106 is fixed
 
@@ -39,22 +28,9 @@ const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
  * API:
  *
  *   // Constructor and destructor.
- *   // @param aWindow - browser.xul window.
- *   Highlighter(aWindow);
+ *   Highlighter(aTab, aInspector)
  *   void destroy();
  *
- *   // Highlight a node.
- *   // @param aNode - node to highlight
- *   // @param aScroll - scroll to ensure the node is visible
- *   void highlight(aNode, aScroll);
- *
- *   // Get the selected node.
- *   DOMNode getNode();
- *
- *   // Lock and unlock the select node.
- *   void lock();
- *   void unlock();
- *
  *   // Show and hide the highlighter
  *   void show();
  *   void hide();
@@ -63,44 +39,27 @@ const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
  *   // Redraw the highlighter if the visible portion of the node has changed.
  *   void invalidateSize(aScroll);
  *
- *   // Is a node highlightable.
- *   boolean isNodeHighlightable(aNode);
- *
- *   // Show/hide the outline and the infobar
- *   void showInfobar();
- *   void hideInfobar();
- *   void showOutline();
- *   void hideOutline();
- *
- *   // Add/Remove listeners
- *   // @param aEvent - event name
- *   // @param aListener - function callback
- *   void addListener(aEvent, aListener);
- *   void removeListener(aEvent, aListener);
- *
  * Events:
  *
  *   "closed" - Highlighter is closing
- *   "nodeselected" - A new node has been selected
  *   "highlighting" - Highlighter is highlighting
  *   "locked" - The selected node has been locked
  *   "unlocked" - The selected ndoe has been unlocked
- *   "pseudoclasstoggled" - A pseudo-class lock has changed on the selected node
  *
  * Structure:
- *  <stack id="highlighter-container">
- *    <box id="highlighter-outline-container">
- *      <box id="highlighter-outline" locked="true/false"/>
+ *  <stack class="highlighter-container">
+ *    <box class="highlighter-outline-container">
+ *      <box class="highlighter-outline" locked="true/false"/>
  *    </box>
- *    <box id="highlighter-controls">
- *      <box id="highlighter-nodeinfobar-container" position="top/bottom" locked="true/false">
- *        <box class="highlighter-nodeinfobar-arrow" id="highlighter-nodeinfobar-arrow-top"/>
- *        <hbox id="highlighter-nodeinfobar">
- *          <toolbarbutton id="highlighter-nodeinfobar-inspectbutton" class="highlighter-nodeinfobar-button"/>
- *          <hbox id="highlighter-nodeinfobar-text">tagname#id.class1.class2</hbox>
- *          <toolbarbutton id="highlighter-nodeinfobar-menu" class="highlighter-nodeinfobar-button">…</toolbarbutton>
+ *    <box class="highlighter-controls">
+ *      <box class="highlighter-nodeinfobar-container" position="top/bottom" locked="true/false">
+ *        <box class="highlighter-nodeinfobar-arrow highlighter-nodeinfobar-arrow-top"/>
+ *        <hbox class="highlighter-nodeinfobar">
+ *          <toolbarbutton class="highlighter-nodeinfobar-inspectbutton highlighter-nodeinfobar-button"/>
+ *          <hbox class="highlighter-nodeinfobar-text">tagname#id.class1.class2</hbox>
+ *          <toolbarbutton class="highlighter-nodeinfobar-menu highlighter-nodeinfobar-button">…</toolbarbutton>
  *        </hbox>
- *        <box class="highlighter-nodeinfobar-arrow" id="highlighter-nodeinfobar-arrow-bottom"/>
+ *        <box class="highlighter-nodeinfobar-arrow highlighter-nodeinfobar-arrow-bottom"/>
  *      </box>
  *    </box>
  *  </stack>
@@ -111,40 +70,54 @@ const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
 /**
  * Constructor.
  *
- * @param object aWindow
+ * @param aTarget The inspection target.
+ * @param aInspector Inspector panel.
+ * @param aToolbox The toolbox holding the inspector.
  */
-this.Highlighter = function Highlighter(aWindow)
+this.Highlighter = function Highlighter(aTarget, aInspector, aToolbox)
 {
-  this.chromeWin = aWindow;
-  this.tabbrowser = aWindow.gBrowser;
-  this.chromeDoc = aWindow.document;
-  this.browser = aWindow.gBrowser.selectedBrowser;
-  this.events = {};
+  this.target = aTarget;
+  this.tab = aTarget.tab;
+  this.toolbox = aToolbox;
+  this.browser = this.tab.linkedBrowser;
+  this.chromeDoc = this.tab.ownerDocument;
+  this.chromeWin = this.chromeDoc.defaultView;
+  this.inspector = aInspector
+
+  new EventEmitter(this);
 
   this._init();
 }
 
 Highlighter.prototype = {
+  get selection() {
+    return this.inspector.selection;
+  },
+
   _init: function Highlighter__init()
   {
+    this.unlock = this.unlock.bind(this);
+    this.updateInfobar = this.updateInfobar.bind(this);
+    this.highlight = this.highlight.bind(this);
+
     let stack = this.browser.parentNode;
     this.win = this.browser.contentWindow;
     this._highlighting = false;
 
     this.highlighterContainer = this.chromeDoc.createElement("stack");
-    this.highlighterContainer.id = "highlighter-container";
+    this.highlighterContainer.className = "highlighter-container";
 
     this.outline = this.chromeDoc.createElement("box");
-    this.outline.id = "highlighter-outline";
+    this.outline.className = "highlighter-outline";
 
     let outlineContainer = this.chromeDoc.createElement("box");
     outlineContainer.appendChild(this.outline);
-    outlineContainer.id = "highlighter-outline-container";
+    outlineContainer.className = "highlighter-outline-container";
 
     // The controlsBox will host the different interactive
     // elements of the highlighter (buttons, toolbars, ...).
     let controlsBox = this.chromeDoc.createElement("box");
-    controlsBox.id = "highlighter-controls";
+    controlsBox.className = "highlighter-controls";
     this.highlighterContainer.appendChild(outlineContainer);
     this.highlighterContainer.appendChild(controlsBox);
 
@@ -158,8 +131,23 @@ Highlighter.prototype = {
 
     this.unlock();
 
+    this.selection.on("new-node", this.highlight);
+    this.selection.on("new-node", this.updateInfobar);
+    this.selection.on("detached", this.highlight);
+    this.selection.on("pseudoclass", this.updateInfobar);
+    this.selection.on("attribute-changed", this.updateInfobar);
+
+    this.onToolSelected = function(event, id) {
+      if (id != "inspector") {
+        this.hide();
+      } else {
+        this.show();
+      }
+    }.bind(this);
+    this.toolbox.on("select", this.onToolSelected);
+
     this.hidden = true;
-    this.show();
+    this.highlight();
   },
 
   /**
@@ -167,6 +155,18 @@ Highlighter.prototype = {
    */
   destroy: function Highlighter_destroy()
   {
+    this.inspectButton.removeEventListener("command", this.unlock);
+    this.inspectButton = null;
+
+    this.toolbox.off("select", this.onToolSelected);
+    this.toolbox = null;
+
+    this.selection.off("new-node", this.highlight);
+    this.selection.off("new-node", this.updateInfobar);
+    this.selection.off("detached", this.highlight);
+    this.selection.off("pseudoclass", this.updateInfobar);
+    this.selection.off("attribute-changed", this.updateInfobar);
+
     this.detachMouseListeners();
     this.detachPageListeners();
 
@@ -177,7 +177,6 @@ Highlighter.prototype = {
     this._highlightRect = null;
     this._highlighting = false;
     this.outline = null;
-    this.node = null;
     this.nodeInfo = null;
     this.highlighterContainer.parentNode.removeChild(this.highlighterContainer);
     this.highlighterContainer = null;
@@ -187,92 +186,59 @@ Highlighter.prototype = {
     this.chromeWin = null;
     this.tabbrowser = null;
 
-    this.emitEvent("closed");
-    this.removeAllListeners();
+    this.emit("closed");
   },
 
   /**
    * Show the outline, and select a node.
-   * If no node is specified, the previous selected node is highlighted if any.
-   * If no node was selected, the root element is selected.
-   *
-   * @param aNode [optional] - The node to be selected.
-   * @param aScroll [optional] boolean
-   *        Should we scroll to ensure that the selected node is visible.
    */
-  highlight: function Highlighter_highlight(aNode, aScroll)
+  highlight: function Highlighter_highlight()
   {
-    if (this.hidden)
+    if (this.selection.reason != "highlighter") {
+      this.lock();
+    }
+
+    let canHighlightNode = this.selection.isNode() &&
+                          this.selection.isConnected() &&
+                          this.selection.isElementNode();
+
+    if (canHighlightNode) {
       this.show();
-
-    let oldNode = this.node;
-
-    if (!aNode) {
-      if (!this.node)
-        this.node = this.win.document.documentElement;
-    } else {
-      this.node = aNode;
-    }
-
-    if (oldNode !== this.node) {
       this.updateInfobar();
+      this.invalidateSize();
+      if (!this._highlighting &&
+          this.selection.reason != "highlighter") {
+        LayoutHelpers.scrollIntoViewIfNeeded(this.selection.node);
+      }
+    } else {
+      this.hide();
     }
-
-    this.invalidateSize(!!aScroll);
-
-    if (oldNode !== this.node) {
-      this.emitEvent("nodeselected");
-    }
-  },
-
-  /**
-   * Notify that a pseudo-class lock was toggled on the highlighted element
-   *
-   * @param aPseudo - The pseudo-class to toggle, e.g. ":hover".
-   */
-  pseudoClassLockToggled: function Highlighter_pseudoClassLockToggled(aPseudo)
-  {
-    this.emitEvent("pseudoclasstoggled", [aPseudo]);
-    this.updateInfobar();
-    this.moveInfobar();
   },
 
   /**
    * Update the highlighter size and position.
    */
-  invalidateSize: function Highlighter_invalidateSize(aScroll)
+  invalidateSize: function Highlighter_invalidateSize()
   {
-    let rect = null;
+    let canHiglightNode = this.selection.isNode() &&
+                          this.selection.isConnected() &&
+                          this.selection.isElementNode();
 
-    if (this.node && this.isNodeHighlightable(this.node)) {
-
-      if (aScroll &&
-          this.node.scrollIntoView) { // XUL elements don't have such method
-        this.node.scrollIntoView();
-      }
-      let clientRect = this.node.getBoundingClientRect();
-      rect = LayoutHelpers.getDirtyRect(this.node);
-    }
+    if (!canHiglightNode)
+      return;
 
+    let clientRect = this.selection.node.getBoundingClientRect();
+    let rect = LayoutHelpers.getDirtyRect(this.selection.node);
     this.highlightRectangle(rect);
 
     this.moveInfobar();
 
     if (this._highlighting) {
       this.showOutline();
-      this.emitEvent("highlighting");
+      this.emit("highlighting");
     }
   },
 
-  /**
-   * Returns the selected node.
-   *
-   * @returns node
-   */
-  getNode: function() {
-    return this.node;
-  },
-
   /**
    * Show the highlighter if it has been hidden.
    */
@@ -315,7 +281,7 @@ Highlighter.prototype = {
     this.nodeInfo.container.setAttribute("locked", "true");
     this.detachMouseListeners();
     this.locked = true;
-    this.emitEvent("locked");
+    this.emit("locked");
   },
 
   /**
@@ -328,28 +294,12 @@ Highlighter.prototype = {
     this.nodeInfo.container.removeAttribute("locked");
     this.attachMouseListeners();
     this.locked = false;
-    this.showOutline();
-    this.emitEvent("unlocked");
-  },
-
-  /**
-   * Is the specified node highlightable?
-   *
-   * @param nsIDOMNode aNode
-   *        the DOM element in question
-   * @returns boolean
-   *          True if the node is highlightable or false otherwise.
-   */
-  isNodeHighlightable: function Highlighter_isNodeHighlightable(aNode)
-  {
-    if (!LayoutHelpers.isNodeConnected(aNode)) {
-      return false;
+    this.chromeWin.focus();
+    if (this.selection.isElementNode() &&
+        this.selection.isConnected()) {
+      this.showOutline();
     }
-    if (aNode.nodeType != aNode.ELEMENT_NODE) {
-      return false;
-    }
-    let nodeName = aNode.nodeName.toLowerCase();
-    return !INSPECTOR_INVISIBLE_ELEMENTS[nodeName];
+    this.emit("unlocked");
   },
 
   /**
@@ -387,19 +337,19 @@ Highlighter.prototype = {
   /**
    * Build the node Infobar.
    *
-   * <box id="highlighter-nodeinfobar-container">
-   *   <box id="Highlighter-nodeinfobar-arrow-top"/>
-   *   <hbox id="highlighter-nodeinfobar">
-   *     <toolbarbutton class="highlighter-nodeinfobar-button" id="highlighter-nodeinfobar-inspectbutton"/>
-   *     <hbox id="highlighter-nodeinfobar-text">
-   *       <xhtml:span id="highlighter-nodeinfobar-tagname"/>
-   *       <xhtml:span id="highlighter-nodeinfobar-id"/>
-   *       <xhtml:span id="highlighter-nodeinfobar-classes"/>
-   *       <xhtml:span id="highlighter-nodeinfobar-pseudo-classes"/>
+   * <box class="highlighter-nodeinfobar-container">
+   *   <box class="Highlighter-nodeinfobar-arrow-top"/>
+   *   <hbox class="highlighter-nodeinfobar">
+   *     <toolbarbutton class="highlighter-nodeinfobar-button highlighter-nodeinfobar-inspectbutton"/>
+   *     <hbox class="highlighter-nodeinfobar-text">
+   *       <xhtml:span class="highlighter-nodeinfobar-tagname"/>
+   *       <xhtml:span class="highlighter-nodeinfobar-id"/>
+   *       <xhtml:span class="highlighter-nodeinfobar-classes"/>
+   *       <xhtml:span class="highlighter-nodeinfobar-pseudo-classes"/>
    *     </hbox>
-   *     <toolbarbutton class="highlighter-nodeinfobar-button" id="highlighter-nodeinfobar-menu"/>
+   *     <toolbarbutton class="highlighter-nodeinfobar-button highlighter-nodeinfobar-menu"/>
    *   </hbox>
-   *   <box id="Highlighter-nodeinfobar-arrow-bottom"/>
+   *   <box class="Highlighter-nodeinfobar-arrow-bottom"/>
    * </box>
    *
    * @param nsIDOMElement aParent
@@ -408,90 +358,71 @@ Highlighter.prototype = {
   buildInfobar: function Highlighter_buildInfobar(aParent)
   {
     let container = this.chromeDoc.createElement("box");
-    container.id = "highlighter-nodeinfobar-container";
+    container.className = "highlighter-nodeinfobar-container";
     container.setAttribute("position", "top");
     container.setAttribute("disabled", "true");
 
     let nodeInfobar = this.chromeDoc.createElement("hbox");
-    nodeInfobar.id = "highlighter-nodeinfobar";
-
-    nodeInfobar.addEventListener("mousedown", function(aEvent) {
-      this.emitEvent("nodeselected");
-    }.bind(this), true);
+    nodeInfobar.className = "highlighter-nodeinfobar";
 
     let arrowBoxTop = this.chromeDoc.createElement("box");
-    arrowBoxTop.className = "highlighter-nodeinfobar-arrow";
-    arrowBoxTop.id = "highlighter-nodeinfobar-arrow-top";
+    arrowBoxTop.className = "highlighter-nodeinfobar-arrow highlighter-nodeinfobar-arrow-top";
 
     let arrowBoxBottom = this.chromeDoc.createElement("box");
-    arrowBoxBottom.className = "highlighter-nodeinfobar-arrow";
-    arrowBoxBottom.id = "highlighter-nodeinfobar-arrow-bottom";
+    arrowBoxBottom.className = "highlighter-nodeinfobar-arrow highlighter-nodeinfobar-arrow-bottom";
 
     let tagNameLabel = this.chromeDoc.createElementNS("http://www.w3.org/1999/xhtml", "span");
-    tagNameLabel.id = "highlighter-nodeinfobar-tagname";
+    tagNameLabel.className = "highlighter-nodeinfobar-tagname";
 
     let idLabel = this.chromeDoc.createElementNS("http://www.w3.org/1999/xhtml", "span");
-    idLabel.id = "highlighter-nodeinfobar-id";
+    idLabel.className = "highlighter-nodeinfobar-id";
 
     let classesBox = this.chromeDoc.createElementNS("http://www.w3.org/1999/xhtml", "span");
-    classesBox.id = "highlighter-nodeinfobar-classes";
+    classesBox.className = "highlighter-nodeinfobar-classes";
 
     let pseudoClassesBox = this.chromeDoc.createElementNS("http://www.w3.org/1999/xhtml", "span");
-    pseudoClassesBox.id = "highlighter-nodeinfobar-pseudo-classes";
+    pseudoClassesBox.className = "highlighter-nodeinfobar-pseudo-classes";
 
     // Add some content to force a better boundingClientRect down below.
     pseudoClassesBox.textContent = "&nbsp;";
 
     // Create buttons
 
-    let inspect = this.chromeDoc.createElement("toolbarbutton");
-    inspect.id = "highlighter-nodeinfobar-inspectbutton";
-    inspect.className = "highlighter-nodeinfobar-button"
-    let toolbarInspectButton =
-      this.chromeDoc.getElementById("inspector-inspect-toolbutton");
-    inspect.setAttribute("tooltiptext",
-                         toolbarInspectButton.getAttribute("tooltiptext"));
-    inspect.setAttribute("command", "Inspector:Inspect");
+    this.inspectButton = this.chromeDoc.createElement("toolbarbutton");
+    this.inspectButton.className = "highlighter-nodeinfobar-button highlighter-nodeinfobar-inspectbutton"
+    let toolbarInspectButton = this.inspector.panelDoc.getElementById("inspector-inspect-toolbutton");
+    this.inspectButton.setAttribute("tooltiptext", toolbarInspectButton.getAttribute("tooltiptext"));
+    this.inspectButton.addEventListener("command", this.unlock);
 
     let nodemenu = this.chromeDoc.createElement("toolbarbutton");
     nodemenu.setAttribute("type", "menu");
-    nodemenu.id = "highlighter-nodeinfobar-menu";
-    nodemenu.className = "highlighter-nodeinfobar-button"
+    nodemenu.className = "highlighter-nodeinfobar-button highlighter-nodeinfobar-menu"
     nodemenu.setAttribute("tooltiptext",
                           this.strings.GetStringFromName("nodeMenu.tooltiptext"));
 
-    let menu = this.chromeDoc.getElementById("inspector-node-popup");
-    menu = menu.cloneNode(true);
-    menu.id = "highlighter-node-menu";
+    nodemenu.onclick = function() {
+      this.inspector.showNodeMenu(nodemenu, "after_start");
+    }.bind(this);
 
-    let separator = this.chromeDoc.createElement("menuseparator");
-    menu.appendChild(separator);
-
-    menu.addEventListener("popupshowing", function() {
-      let items = menu.getElementsByClassName("highlighter-pseudo-class-menuitem");
-      let i = items.length;
-      while (i--) {
-        menu.removeChild(items[i]);
-      }
-
-      let fragment = this.buildPseudoClassMenu();
-      menu.appendChild(fragment);
-    }.bind(this), true);
-
-    nodemenu.appendChild(menu);
-
-    // <hbox id="highlighter-nodeinfobar-text"/>
+    // <hbox class="highlighter-nodeinfobar-text"/>
     let texthbox = this.chromeDoc.createElement("hbox");
-    texthbox.id = "highlighter-nodeinfobar-text";
+    texthbox.className = "highlighter-nodeinfobar-text";
     texthbox.setAttribute("align", "center");
     texthbox.setAttribute("flex", "1");
 
+    texthbox.addEventListener("mousedown", function(aEvent) {
+      // On click, show the node:
+      if (this.selection.isElementNode()) {
+        LayoutHelpers.scrollIntoViewIfNeeded(this.selection.node);
+      }
+    }.bind(this), true);
+
     texthbox.appendChild(tagNameLabel);
     texthbox.appendChild(idLabel);
     texthbox.appendChild(classesBox);
     texthbox.appendChild(pseudoClassesBox);
 
-    nodeInfobar.appendChild(inspect);
+    nodeInfobar.appendChild(this.inspectButton);
     nodeInfobar.appendChild(texthbox);
     nodeInfobar.appendChild(nodemenu);
 
@@ -513,30 +444,6 @@ Highlighter.prototype = {
     };
   },
 
-  /**
-   * Create the menuitems for toggling the selection's pseudo-class state
-   *
-   * @returns DocumentFragment. The menuitems for toggling pseudo-classes.
-   */
-  buildPseudoClassMenu: function IUI_buildPseudoClassesMenu()
-  {
-    let fragment = this.chromeDoc.createDocumentFragment();
-    for (let i = 0; i < PSEUDO_CLASSES.length; i++) {
-      let pseudo = PSEUDO_CLASSES[i];
-      let item = this.chromeDoc.createElement("menuitem");
-      item.id = "highlighter-pseudo-class-menuitem-" + pseudo;
-      item.setAttribute("type", "checkbox");
-      item.setAttribute("label", pseudo);
-      item.className = "highlighter-pseudo-class-menuitem";
-      item.setAttribute("checked", DOMUtils.hasPseudoClassLock(this.node,
-                        pseudo));
-      item.addEventListener("command",
-                            this.pseudoClassLockToggled.bind(this, pseudo), false);
-      fragment.appendChild(item);
-    }
-    return fragment;
-  },
-
   /**
    * Highlight a rectangular region.
    *
@@ -599,21 +506,31 @@ Highlighter.prototype = {
    */
   updateInfobar: function Highlighter_updateInfobar()
   {
+    if (!this.selection.isElementNode()) {
+      this.nodeInfo.tagNameLabel.textContent = "";
+      this.nodeInfo.idLabel.textContent = "";
+      this.nodeInfo.classesBox.textContent = "";
+      this.nodeInfo.pseudoClassesBox.textContent = "";
+      return;
+    }
+
+    let node = this.selection.node;
+
     // Tag name
-    this.nodeInfo.tagNameLabel.textContent = this.node.tagName;
+    this.nodeInfo.tagNameLabel.textContent = node.tagName;
 
     // ID
-    this.nodeInfo.idLabel.textContent = this.node.id ? "#" + this.node.id : "";
+    this.nodeInfo.idLabel.textContent = node.id ? "#" + node.id : "";
 
     // Classes
     let classes = this.nodeInfo.classesBox;
 
-    classes.textContent = this.node.classList.length ?
-                            "." + Array.join(this.node.classList, ".") : "";
+    classes.textContent = node.classList.length ?
+                            "." + Array.join(node.classList, ".") : "";
 
     // Pseudo-classes
     let pseudos = PSEUDO_CLASSES.filter(function(pseudo) {
-      return DOMUtils.hasPseudoClassLock(this.node, pseudo);
+      return DOMUtils.hasPseudoClassLock(node, pseudo);
     }, this);
 
     let pseudoBox = this.nodeInfo.pseudoClassesBox;
@@ -697,46 +614,6 @@ Highlighter.prototype = {
       .fullZoom;
   },
 
-  /////////////////////////////////////////////////////////////////////////
-  //// Event Emitter Mechanism
-
-  addListener: function Highlighter_addListener(aEvent, aListener)
-  {
-    if (!(aEvent in this.events))
-      this.events[aEvent] = [];
-    this.events[aEvent].push(aListener);
-  },
-
-  removeListener: function Highlighter_removeListener(aEvent, aListener)
-  {
-    if (!(aEvent in this.events))
-      return;
-    let idx = this.events[aEvent].indexOf(aListener);
-    if (idx > -1)
-      this.events[aEvent].splice(idx, 1);
-  },
-
-  emitEvent: function Highlighter_emitEvent(aEvent, aArgv)
-  {
-    if (!(aEvent in this.events))
-      return;
-
-    let listeners = this.events[aEvent];
-    let highlighter = this;
-    listeners.forEach(function(aListener) {
-      try {
-        aListener.apply(highlighter, aArgv);
-      } catch(e) {}
-    });
-  },
-
-  removeAllListeners: function Highlighter_removeAllIsteners()
-  {
-    for (let event in this.events) {
-      delete this.events[event];
-    }
-  },
-
   /////////////////////////////////////////////////////////////////////////
   //// Event Handling
 
@@ -865,6 +742,8 @@ Highlighter.prototype = {
     if (aEvent.button == 0) {
       let win = aEvent.target.ownerDocument.defaultView;
       this.lock();
+      let node = this.selection.node;
+      this.selection.setNode(node, "highlighter-lock");
       win.focus();
       aEvent.preventDefault();
       aEvent.stopPropagation();
@@ -886,8 +765,8 @@ Highlighter.prototype = {
     if (doc && doc != this.chromeDoc) {
       let element = LayoutHelpers.getElementFromPoint(aEvent.target.ownerDocument,
         aEvent.clientX, aEvent.clientY);
-      if (element && element != this.node) {
-        this.highlight(element);
+      if (element && element != this.selection.node) {
+        this.selection.setNode(element, "highlighter");
       }
     }
   },
diff --git a/browser/devtools/inspector/InspectorDefinition.jsm b/browser/devtools/inspector/InspectorDefinition.jsm
new file mode 100644
index 000000000000..97a9a683ea6e
--- /dev/null
+++ b/browser/devtools/inspector/InspectorDefinition.jsm
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = ["InspectorDefinition"];
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+const properties = "chrome://browser/locale/devtools/inspector.properties";
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyGetter(this, "osString",
+  function() Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS);
+
+XPCOMUtils.defineLazyGetter(this, "Strings",
+  function() Services.strings.createBundle(properties));
+
+function l10n(aName) Strings.GetStringFromName(aName);
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "InspectorPanel", "resource:///modules/devtools/InspectorPanel.jsm");
+
+this.InspectorDefinition = {
+  id: "inspector",
+  accesskey: l10n("inspector.accesskey"),
+  key: l10n("inspector.commandkey"),
+  ordinal: 2,
+  modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
+  icon: "chrome://browser/skin/devtools/tools-icons-small.png",
+  url: "chrome://browser/content/devtools/inspector/inspector.xul",
+  label: l10n("inspector.label"),
+
+  isTargetSupported: function(target) {
+    return !target.isRemote;
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new InspectorPanel(iframeWindow, toolbox);
+  }
+};
diff --git a/browser/devtools/inspector/InspectorPanel.jsm b/browser/devtools/inspector/InspectorPanel.jsm
new file mode 100644
index 000000000000..1f45c547441c
--- /dev/null
+++ b/browser/devtools/inspector/InspectorPanel.jsm
@@ -0,0 +1,536 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const Cc = Components.classes;
+const Cu = Components.utils;
+const Ci = Components.interfaces;
+const Cr = Components.results;
+
+this.EXPORTED_SYMBOLS = ["InspectorPanel"];
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource:///modules/devtools/MarkupView.jsm");
+Cu.import("resource:///modules/devtools/EventEmitter.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource:///modules/devtools/gDevTools.jsm");
+Cu.import("resource:///modules/devtools/Selection.jsm");
+Cu.import("resource:///modules/devtools/Breadcrumbs.jsm");
+Cu.import("resource:///modules/devtools/Highlighter.jsm");
+Cu.import("resource:///modules/devtools/Sidebar.jsm");
+
+const LAYOUT_CHANGE_TIMER = 250;
+
+/**
+ * Represents an open instance of the Inspector for a tab.
+ * The inspector controls the highlighter, the breadcrumbs,
+ * the markup view, and the sidebar (computed view, rule view
+ * and layout view).
+ */
+this.InspectorPanel = function InspectorPanel(iframeWindow, toolbox) {
+  this._toolbox = toolbox;
+  this._target = toolbox._target;
+
+  if (this.target.isRemote) {
+    throw "Unsupported target";
+  }
+
+  this.tabTarget = (this.target.tab != null);
+  this.winTarget = (this.target.window != null);
+
+  new EventEmitter(this);
+
+  this.preventNavigateAway = this.preventNavigateAway.bind(this);
+  this.onNavigatedAway = this.onNavigatedAway.bind(this);
+  this.target.on("will-navigate", this.preventNavigateAway);
+  this.target.on("navigate", this.onNavigatedAway);
+
+  this.panelDoc = iframeWindow.document;
+  this.panelWin = iframeWindow;
+  this.panelWin.inspector = this;
+
+  this.nodemenu = this.panelDoc.getElementById("inspector-node-popup");
+  this.lastNodemenuItem = this.nodemenu.lastChild;
+  this._setupNodeMenu = this._setupNodeMenu.bind(this);
+  this._resetNodeMenu = this._resetNodeMenu.bind(this);
+  this.nodemenu.addEventListener("popupshowing", this._setupNodeMenu, true);
+  this.nodemenu.addEventListener("popuphiding", this._resetNodeMenu, true);
+
+  // Create an empty selection
+  this._selection = new Selection();
+  this.onNewSelection = this.onNewSelection.bind(this);
+  this.selection.on("new-node", this.onNewSelection);
+
+  this.breadcrumbs = new HTMLBreadcrumbs(this);
+
+  if (this.tabTarget) {
+    this.browser = this.target.tab.linkedBrowser;
+    this.scheduleLayoutChange = this.scheduleLayoutChange.bind(this);
+    this.browser.addEventListener("resize", this.scheduleLayoutChange, true);
+
+    this.highlighter = new Highlighter(this.target, this, this._toolbox);
+    let button = this.panelDoc.getElementById("inspector-inspect-toolbutton");
+    button.hidden = false;
+    this.updateInspectorButton = function() {
+      if (this.highlighter.locked) {
+        button.removeAttribute("checked");
+      } else {
+        button.setAttribute("checked", "true");
+      }
+    }.bind(this);
+    this.highlighter.on("locked", this.updateInspectorButton);
+    this.highlighter.on("unlocked", this.updateInspectorButton);
+  }
+
+  this._initMarkup();
+  this.isReady = false;
+
+  this.once("markuploaded", function() {
+    this.isReady = true;
+
+    // All the components are initialized. Let's select a node.
+    if (this.tabTarget) {
+      let root = this.browser.contentDocument.documentElement;
+      this._selection.setNode(root);
+    }
+    if (this.winTarget) {
+      let root = this.target.window.document.documentElement;
+      this._selection.setNode(root);
+    }
+
+    if (this.highlighter) {
+      this.highlighter.unlock();
+    }
+
+    this.emit("ready");
+  }.bind(this));
+
+  this.setupSidebar();
+}
+
+InspectorPanel.prototype = {
+  /**
+   * Selection object (read only)
+   */
+  get selection() {
+    return this._selection;
+  },
+
+  /**
+   * Target getter.
+   */
+  get target() {
+    return this._target;
+  },
+
+  /**
+   * Target setter.
+   */
+  set target(value) {
+    this._target = value;
+  },
+
+  /**
+   * Expose gViewSourceUtils so that other tools can make use of them.
+   */
+  get viewSourceUtils() {
+    return this.panelWin.gViewSourceUtils;
+  },
+
+  /**
+   * Indicate that a tool has modified the state of the page.  Used to
+   * decide whether to show the "are you sure you want to navigate"
+   * notification.
+   */
+  markDirty: function InspectorPanel_markDirty() {
+    this.isDirty = true;
+  },
+
+  /**
+   * Build the sidebar.
+   */
+  setupSidebar: function InspectorPanel_setupSidebar() {
+    let tabbox = this.panelDoc.querySelector("#inspector-sidebar");
+    this.sidebar = new ToolSidebar(tabbox, this);
+
+    let defaultTab = Services.prefs.getCharPref("devtools.inspector.activeSidebar");
+
+    this._setDefaultSidebar = function(event, toolId) {
+      Services.prefs.setCharPref("devtools.inspector.activeSidebar", toolId);
+    }.bind(this);
+
+    this.sidebar.on("select", this._setDefaultSidebar);
+
+    this.sidebar.addTab("ruleview",
+                        "chrome://browser/content/devtools/cssruleview.xul",
+                        "ruleview" == defaultTab);
+
+    this.sidebar.addTab("computedview",
+                        "chrome://browser/content/devtools/csshtmltree.xul",
+                        "computedview" == defaultTab);
+
+    this.sidebar.addTab("layoutview",
+                        "chrome://browser/content/devtools/layoutview/view.xhtml",
+                        "layoutview" == defaultTab);
+
+    this.sidebar.show();
+  },
+
+  /**
+   * Reset the inspector on navigate away.
+   */
+  onNavigatedAway: function InspectorPanel_onNavigatedAway(event, newWindow) {
+    this.selection.setNode(null);
+    this._destroyMarkup();
+    this.isDirty = false;
+    let self = this;
+    newWindow.addEventListener("DOMContentLoaded", function onDOMReady() {
+      newWindow.removeEventListener("DOMContentLoaded", onDOMReady, true);;
+      if (!self.selection.node) {
+        self.selection.setNode(newWindow.document.documentElement);
+      }
+      self._initMarkup();
+    }, true);
+  },
+
+  /**
+   * Show a message if the inspector is dirty.
+   */
+  preventNavigateAway: function InspectorPanel_preventNavigateAway(event, request) {
+    if (!this.isDirty) {
+      return;
+    }
+
+    request.suspend();
+
+    let notificationBox = this._toolbox.getNotificationBox();
+    let notification = notificationBox.
+      getNotificationWithValue("inspector-page-navigation");
+
+    if (notification) {
+      notificationBox.removeNotification(notification, true);
+    }
+
+    let cancelRequest = function onCancelRequest() {
+      if (request) {
+        request.cancel(Cr.NS_BINDING_ABORTED);
+        request.resume(); // needed to allow the connection to be cancelled.
+        request = null;
+      }
+    };
+
+    let eventCallback = function onNotificationCallback(event) {
+      if (event == "removed") {
+        cancelRequest();
+      }
+    };
+
+    let buttons = [
+      {
+        id: "inspector.confirmNavigationAway.buttonLeave",
+        label: this.strings.GetStringFromName("confirmNavigationAway.buttonLeave"),
+        accessKey: this.strings.GetStringFromName("confirmNavigationAway.buttonLeaveAccesskey"),
+        callback: function onButtonLeave() {
+          if (request) {
+            request.resume();
+            request = null;
+            return true;
+          }
+          return false;
+        }.bind(this),
+      },
+      {
+        id: "inspector.confirmNavigationAway.buttonStay",
+        label: this.strings.GetStringFromName("confirmNavigationAway.buttonStay"),
+        accessKey: this.strings.GetStringFromName("confirmNavigationAway.buttonStayAccesskey"),
+        callback: cancelRequest
+      },
+    ];
+
+    let message = this.strings.GetStringFromName("confirmNavigationAway.message2");
+
+    notification = notificationBox.appendNotification(message,
+      "inspector-page-navigation", "chrome://browser/skin/Info.png",
+      notificationBox.PRIORITY_WARNING_HIGH, buttons, eventCallback);
+
+    // Make sure this not a transient notification, to avoid the automatic
+    // transient notification removal.
+    notification.persistence = -1;
+  },
+
+  /**
+   * When a new node is selected.
+   */
+  onNewSelection: function InspectorPanel_onNewSelection() {
+    this.cancelLayoutChange();
+  },
+
+  /**
+   * Destroy the inspector.
+   */
+  destroy: function InspectorPanel__destroy() {
+    if (this._destroyed) {
+      return;
+    }
+    this.cancelLayoutChange();
+    this._destroyed = true;
+
+    this._toolbox = null;
+
+    if (this.browser) {
+      this.browser.removeEventListener("resize", this.scheduleLayoutChange, true);
+      this.browser = null;
+    }
+
+    this.target.off("will-navigate", this.preventNavigateAway);
+    this.target.off("navigate", this.onNavigatedAway);
+
+    if (this.highlighter) {
+      this.highlighter.off("locked", this.updateInspectorButton);
+      this.highlighter.off("unlocked", this.updateInspectorButton);
+      this.highlighter.destroy();
+    }
+
+    this.sidebar.off("select", this._setDefaultSidebar);
+    this.sidebar.destroy();
+    this.sidebar = null;
+
+    this.nodemenu.removeEventListener("popupshowing", this._setupNodeMenu, true);
+    this.nodemenu.removeEventListener("popuphiding", this._resetNodeMenu, true);
+    this.breadcrumbs.destroy();
+    this.selection.off("new-node", this.onNewSelection);
+    this._destroyMarkup();
+    this._selection.destroy();
+    this._selection = null;
+    this.panelWin.inspector = null;
+    this.target = null;
+    this.panelDoc = null;
+    this.panelWin = null;
+    this.breadcrumbs = null;
+    this.lastNodemenuItem = null;
+    this.nodemenu = null;
+    this.highlighter = null;
+  },
+
+  /**
+   * Show the node menu.
+   */
+  showNodeMenu: function InspectorPanel_showNodeMenu(aButton, aPosition, aExtraItems) {
+    if (aExtraItems) {
+      for (let item of aExtraItems) {
+        this.nodemenu.appendChild(item);
+      }
+    }
+    this.nodemenu.openPopup(aButton, aPosition, 0, 0, true, false);
+  },
+
+  hideNodeMenu: function InspectorPanel_hideNodeMenu() {
+    this.nodemenu.hidePopup();
+  },
+
+  /**
+   * Disable the delete item if needed. Update the pseudo classes.
+   */
+  _setupNodeMenu: function InspectorPanel_setupNodeMenu() {
+    // Set the pseudo classes
+    for (let name of ["hover", "active", "focus"]) {
+      let menu = this.panelDoc.getElementById("node-menu-pseudo-" + name);
+      let checked = DOMUtils.hasPseudoClassLock(this.selection.node, ":" + name);
+      menu.setAttribute("checked", checked);
+    }
+
+    // Disable delete item if needed
+    let deleteNode = this.panelDoc.getElementById("node-menu-delete");
+    if (this.selection.isRoot()) {
+      deleteNode.setAttribute("disabled", "true");
+    } else {
+      deleteNode.removeAttribute("disabled");
+    }
+  },
+
+  _resetNodeMenu: function InspectorPanel_resetNodeMenu() {
+    // Remove any extra items
+    while (this.lastNodemenuItem.nextSibling) {
+      let toDelete = this.lastNodemenuItem.nextSibling;
+      toDelete.parentNode.removeChild(toDelete);
+    }
+  },
+
+  _initMarkup: function InspectorPanel_initMarkup() {
+    let doc = this.panelDoc;
+
+    this._markupBox = doc.getElementById("markup-box");
+
+    // create tool iframe
+    this._markupFrame = doc.createElement("iframe");
+    this._markupFrame.setAttribute("flex", "1");
+    this._markupFrame.setAttribute("tooltip", "aHTMLTooltip");
+    this._markupFrame.setAttribute("context", "inspector-node-popup");
+
+    // This is needed to enable tooltips inside the iframe document.
+    this._boundMarkupFrameLoad = function InspectorPanel_initMarkupPanel_onload() {
+      this._markupFrame.contentWindow.focus();
+      this._onMarkupFrameLoad();
+    }.bind(this);
+    this._markupFrame.addEventListener("load", this._boundMarkupFrameLoad, true);
+
+    this._markupBox.setAttribute("hidden", true);
+    this._markupBox.appendChild(this._markupFrame);
+    this._markupFrame.setAttribute("src", "chrome://browser/content/devtools/markup-view.xhtml");
+  },
+
+  _onMarkupFrameLoad: function InspectorPanel__onMarkupFrameLoad() {
+    this._markupFrame.removeEventListener("load", this._boundMarkupFrameLoad, true);
+    delete this._boundMarkupFrameLoad;
+
+    this._markupBox.removeAttribute("hidden");
+
+    let controllerWindow;
+    if (this.tabTarget) {
+      controllerWindow = this.target.tab.ownerDocument.defaultView;
+    } else if (this.winTarget) {
+      controllerWindow = this.target.window;
+    }
+    this.markup = new MarkupView(this, this._markupFrame, controllerWindow);
+
+    this.emit("markuploaded");
+  },
+
+  _destroyMarkup: function InspectorPanel__destroyMarkup() {
+    if (this._boundMarkupFrameLoad) {
+      this._markupFrame.removeEventListener("load", this._boundMarkupFrameLoad, true);
+      delete this._boundMarkupFrameLoad;
+    }
+
+    if (this.markup) {
+      this.markup.destroy();
+      delete this.markup;
+    }
+
+    if (this._markupFrame) {
+      this._markupFrame.parentNode.removeChild(this._markupFrame);
+      delete this._markupFrame;
+    }
+  },
+
+  /**
+   * Toggle a pseudo class.
+   */
+  togglePseudoClass: function InspectorPanel_togglePseudoClass(aPseudo) {
+    if (this.selection.isElementNode()) {
+      if (DOMUtils.hasPseudoClassLock(this.selection.node, aPseudo)) {
+        this.breadcrumbs.nodeHierarchy.forEach(function(crumb) {
+          DOMUtils.removePseudoClassLock(crumb.node, aPseudo);
+        });
+      } else {
+        let hierarchical = aPseudo == ":hover" || aPseudo == ":active";
+        let node = this.selection.node;
+        do {
+          DOMUtils.addPseudoClassLock(node, aPseudo);
+          node = node.parentNode;
+        } while (hierarchical && node.parentNode)
+      }
+    }
+    this.selection.emit("pseudoclass");
+  },
+
+  /**
+   * Copy the innerHTML of the selected Node to the clipboard.
+   */
+  copyInnerHTML: function InspectorPanel_copyInnerHTML()
+  {
+    if (!this.selection.isNode()) {
+      return;
+    }
+    let toCopy = this.selection.node.innerHTML;
+    if (toCopy) {
+      clipboardHelper.copyString(toCopy);
+    }
+  },
+
+  /**
+   * Copy the outerHTML of the selected Node to the clipboard.
+   */
+  copyOuterHTML: function InspectorPanel_copyOuterHTML()
+  {
+    if (!this.selection.isNode()) {
+      return;
+    }
+    let toCopy = this.selection.node.outerHTML;
+    if (toCopy) {
+      clipboardHelper.copyString(toCopy);
+    }
+  },
+
+  /**
+   * Delete the selected node.
+   */
+  deleteNode: function IUI_deleteNode() {
+    if (!this.selection.isNode() ||
+         this.selection.isRoot()) {
+      return;
+    }
+
+    let toDelete = this.selection.node;
+
+    let parent = this.selection.node.parentNode;
+
+    // If the markup panel is active, use the markup panel to delete
+    // the node, making this an undoable action.
+    if (this.markup) {
+      this.markup.deleteNode(toDelete);
+    } else {
+      // remove the node from content
+      parent.removeChild(toDelete);
+    }
+  },
+
+  /**
+   * Schedule a low-priority change event for things like paint
+   * and resize.
+   */
+  scheduleLayoutChange: function Inspector_scheduleLayoutChange()
+  {
+    if (this._timer) {
+      return null;
+    }
+    this._timer = this.panelWin.setTimeout(function() {
+      this.emit("layout-change");
+      this._timer = null;
+    }.bind(this), LAYOUT_CHANGE_TIMER);
+  },
+
+  /**
+   * Cancel a pending low-priority change event if any is
+   * scheduled.
+   */
+  cancelLayoutChange: function Inspector_cancelLayoutChange()
+  {
+    if (this._timer) {
+      this.panelWin.clearTimeout(this._timer);
+      delete this._timer;
+    }
+  },
+
+}
+
+/////////////////////////////////////////////////////////////////////////
+//// Initializers
+
+XPCOMUtils.defineLazyGetter(InspectorPanel.prototype, "strings",
+  function () {
+    return Services.strings.createBundle(
+            "chrome://browser/locale/devtools/inspector.properties");
+  });
+
+XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function() {
+  return Cc["@mozilla.org/widget/clipboardhelper;1"].
+    getService(Ci.nsIClipboardHelper);
+});
+
+
+XPCOMUtils.defineLazyGetter(this, "DOMUtils", function () {
+  return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
+});
diff --git a/browser/devtools/inspector/Makefile.in b/browser/devtools/inspector/Makefile.in
new file mode 100644
index 000000000000..02dcc9f605ac
--- /dev/null
+++ b/browser/devtools/inspector/Makefile.in
@@ -0,0 +1,18 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEPTH		= @DEPTH@
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+TEST_DIRS += test
+
+include $(topsrcdir)/config/rules.mk
+
+libs::
+	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools/
diff --git a/browser/devtools/inspector/Selection.jsm b/browser/devtools/inspector/Selection.jsm
new file mode 100644
index 000000000000..a5cbf9020b2c
--- /dev/null
+++ b/browser/devtools/inspector/Selection.jsm
@@ -0,0 +1,230 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const Cu = Components.utils;
+Cu.import("resource:///modules/devtools/EventEmitter.jsm");
+
+this.EXPORTED_SYMBOLS = ["Selection"];
+
+/**
+ * API
+ *
+ *   new Selection(node=null, track={attributes,detached});
+ *   destroy()
+ *   node (readonly)
+ *   setNode(node, origin="unknown")
+ *
+ * Helpers:
+ *
+ *   window
+ *   document
+ *   isRoot()
+ *   isNode()
+ *   isHTMLNode()
+ *
+ * Check the nature of the node:
+ *
+ *   isElementNode()
+ *   isAttributeNode()
+ *   isTextNode()
+ *   isCDATANode()
+ *   isEntityRefNode()
+ *   isEntityNode()
+ *   isProcessingInstructionNode()
+ *   isCommentNode()
+ *   isDocumentNode()
+ *   isDocumentTypeNode()
+ *   isDocumentFragmentNode()
+ *   isNotationNode()
+ *
+ * Events:
+ *   "new-node" when the inner node changed
+ *   "attribute-changed" when an attribute is changed (only if tracked)
+ *   "detached" when the node (or one of its parents) is removed from the document (only if tracked)
+ *   "reparented" when the node (or one of its parents) is moved under a different node (only if tracked)
+ */
+
+/**
+ * A Selection object. Hold a reference to a node.
+ * Includes some helpers, fire some helpful events.
+ *
+ * @param node Inner node.
+ *    Can be null. Can be (un)set in the future via the "node" property;
+ * @param trackAttribute Tell if events should be fired when the attributes of
+ *    the ndoe change.
+ *
+ */
+this.Selection = function Selection(node=null, track={attributes:true,detached:true}) {
+  new EventEmitter(this);
+  this._onMutations = this._onMutations.bind(this);
+  this.track = track;
+  this.setNode(node);
+}
+
+Selection.prototype = {
+  _node: null,
+
+  _onMutations: function(mutations) {
+    let attributeChange = false;
+    let detached = false;
+    for (let m of mutations) {
+      if (!attributeChange && m.type == "attributes") {
+        attributeChange = true;
+      }
+      if (m.type == "childList") {
+        if (!detached && !this.isConnected()) {
+          detached = true;
+        }
+      }
+    }
+
+    if (attributeChange)
+      this.emit("attribute-changed");
+    if (detached)
+      this.emit("detached");
+  },
+
+  _attachEvents: function SN__attachEvents() {
+    if (!this.window || !this.isNode() || !this.track) {
+      return;
+    }
+
+    if (this.track.attributes) {
+      this._nodeObserver = new this.window.MutationObserver(this._onMutations);
+      this._nodeObserver.observe(this.node, {attributes: true});
+    }
+
+    if (this.track.detached) {
+      this._docObserver = new this.window.MutationObserver(this._onMutations);
+      this._docObserver.observe(this.document.documentElement, {childList: true, subtree: true});
+    }
+  },
+
+  _detachEvents: function SN__detachEvents() {
+    // `disconnect` fail if node's document has
+    // been deleted.
+    try {
+      if (this._nodeObserver)
+        this._nodeObserver.disconnect();
+    } catch(e) {}
+    try {
+      if (this._docObserver)
+        this._docObserver.disconnect();
+    } catch(e) {}
+  },
+
+  destroy: function SN_destroy() {
+    this._detachEvents();
+    this.setNode(null);
+  },
+
+  setNode: function SN_setNode(value, reason="unknown") {
+    this.reason = reason;
+    if (value !== this._node) {
+      let previousNode = this._node;
+      this._detachEvents();
+      this._node = value;
+      this._attachEvents();
+      this.emit("new-node", previousNode, this.reason);
+    }
+  },
+
+  get node() {
+    return this._node;
+  },
+
+  get window() {
+    if (this.isNode()) {
+      return this.node.ownerDocument.defaultView;
+    }
+    return null;
+  },
+
+  get document() {
+    if (this.isNode()) {
+      return this.node.ownerDocument;
+    }
+    return null;
+  },
+
+  isRoot: function SN_isRootNode() {
+    return this.isNode() &&
+           this.isConnected() &&
+           this.node.ownerDocument.documentElement === this.node;
+  },
+
+  isNode: function SN_isNode() {
+    return (this.node &&
+            this.node.ownerDocument &&
+            this.node.ownerDocument.defaultView &&
+            this.node instanceof this.node.ownerDocument.defaultView.Node);
+  },
+
+  isConnected: function SN_isConnected() {
+    try {
+      let doc = this.document;
+      return doc && doc.defaultView && doc.documentElement.contains(this.node);
+    } catch (e) {
+      // "can't access dead object" error
+      return false;
+    }
+  },
+
+  isHTMLNode: function SN_isHTMLNode() {
+    let xhtml_ns = "http://www.w3.org/1999/xhtml";
+    return this.isNode() && this.node.namespaceURI == xhtml_ns;
+  },
+
+  // Node type
+
+  isElementNode: function SN_isElementNode() {
+    return this.isNode() && this.node.nodeType == this.window.Node.ELEMENT_NODE;
+  },
+
+  isAttributeNode: function SN_isAttributeNode() {
+    return this.isNode() && this.node.nodeType == this.window.Node.ATTRIBUTE_NODE;
+  },
+
+  isTextNode: function SN_isTextNode() {
+    return this.isNode() && this.node.nodeType == this.window.Node.TEXT_NODE;
+  },
+
+  isCDATANode: function SN_isCDATANode() {
+    return this.isNode() && this.node.nodeType == this.window.Node.CDATA_SECTION_NODE;
+  },
+
+  isEntityRefNode: function SN_isEntityRefNode() {
+    return this.isNode() && this.node.nodeType == this.window.Node.ENTITY_REFERENCE_NODE;
+  },
+
+  isEntityNode: function SN_isEntityNode() {
+    return this.isNode() && this.node.nodeType == this.window.Node.ENTITY_NODE;
+  },
+
+  isProcessingInstructionNode: function SN_isProcessingInstructionNode() {
+    return this.isNode() && this.node.nodeType == this.window.Node.PROCESSING_INSTRUCTION_NODE;
+  },
+
+  isCommentNode: function SN_isCommentNode() {
+    return this.isNode() && this.node.nodeType == this.window.Node.PROCESSING_INSTRUCTION_NODE;
+  },
+
+  isDocumentNode: function SN_isDocumentNode() {
+    return this.isNode() && this.node.nodeType == this.window.Node.DOCUMENT_NODE;
+  },
+
+  isDocumentTypeNode: function SN_isDocumentTypeNode() {
+    return this.isNode() && this.node.nodeType ==this.window. Node.DOCUMENT_TYPE_NODE;
+  },
+
+  isDocumentFragmentNode: function SN_isDocumentFragmentNode() {
+    return this.isNode() && this.node.nodeType == this.window.Node.DOCUMENT_FRAGMENT_NODE;
+  },
+
+  isNotationNode: function SN_isNotationNode() {
+    return this.isNode() && this.node.nodeType == this.window.Node.NOTATION_NODE;
+  },
+}
diff --git a/browser/devtools/inspector/inspector.css b/browser/devtools/inspector/inspector.css
new file mode 100644
index 000000000000..981c7f547488
--- /dev/null
+++ b/browser/devtools/inspector/inspector.css
@@ -0,0 +1,11 @@
+.inspector-breadcrumbs-button {
+  direction: ltr;
+}
+
+.devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
+  display: none;
+}
+
+#inspector-sidebar {
+  min-width: 250px;
+}
diff --git a/browser/devtools/inspector/inspector.xul b/browser/devtools/inspector/inspector.xul
new file mode 100644
index 000000000000..0331d35a0ad8
--- /dev/null
+++ b/browser/devtools/inspector/inspector.xul
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<?xml-stylesheet href="chrome://browser/content/devtools/inspector/inspector.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/devtools/inspector.css" type="text/css"?>
+<!DOCTYPE window [
+<!ENTITY % inspectorDTD SYSTEM "chrome://browser/locale/devtools/inspector.dtd" >
+ %inspectorDTD;
+]>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script type="application/javascript"
+          src="chrome://global/content/viewSourceUtils.js"/>
+
+  <popupset id="inspectorPopupSet">
+    <!-- Used by the Markup Panel, the Highlighter and the Breadcrumbs -->
+    <menupopup id="inspector-node-popup">
+      <menuitem id="node-menu-copyinner"
+        label="&inspectorHTMLCopyInner.label;"
+        accesskey="&inspectorHTMLCopyInner.accesskey;"
+        oncommand="inspector.copyInnerHTML()"/>
+      <menuitem id="node-menu-copyouter"
+        label="&inspectorHTMLCopyOuter.label;"
+        accesskey="&inspectorHTMLCopyOuter.accesskey;"
+        oncommand="inspector.copyOuterHTML()"/>
+      <menuseparator/>
+      <menuitem id="node-menu-delete"
+        label="&inspectorHTMLDelete.label;"
+        accesskey="&inspectorHTMLDelete.accesskey;"
+        oncommand="inspector.deleteNode()"/>
+      <menuseparator/>
+      <menuitem id="node-menu-pseudo-hover"
+        label=":hover" type="checkbox"
+        oncommand="inspector.togglePseudoClass(':hover')"/>
+      <menuitem id="node-menu-pseudo-active"
+        label=":active" type="checkbox"
+        oncommand="inspector.togglePseudoClass(':active')"/>
+      <menuitem id="node-menu-pseudo-focus"
+        label=":focus" type="checkbox"
+        oncommand="inspector.togglePseudoClass(':focus')"/>
+    </menupopup>
+  </popupset>
+
+  <hbox flex="1">
+    <vbox flex="1">
+      <toolbar id="inspector-toolbar"
+        class="devtools-toolbar"
+        nowindowdrag="true">
+        <toolbarbutton id="inspector-inspect-toolbutton"
+          tooltiptext="&inspector.selectButton.tooltip;"
+          class="devtools-toolbarbutton"
+          hidden="true"
+          oncommand="inspector.highlighter.unlock()"/>
+        <arrowscrollbox id="inspector-breadcrumbs"
+          flex="1" orient="horizontal"
+          clicktoscroll="true"/>
+      </toolbar>
+      <vbox flex="1" id="markup-box">
+      </vbox>
+    </vbox>
+    <splitter class="devtools-side-splitter"/>
+    <tabbox id="inspector-sidebar" class="devtools-sidebar-tabs" hidden="true">
+      <tabs/>
+      <tabpanels flex="1"/>
+    </tabbox>
+  </hbox>
+</window>
diff --git a/browser/devtools/highlighter/test/Makefile.in b/browser/devtools/inspector/test/Makefile.in
similarity index 88%
rename from browser/devtools/highlighter/test/Makefile.in
rename to browser/devtools/inspector/test/Makefile.in
index 14c302b51623..422f66485965 100644
--- a/browser/devtools/highlighter/test/Makefile.in
+++ b/browser/devtools/inspector/test/Makefile.in
@@ -12,34 +12,29 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_FILES = \
-		browser_inspector_initialization.js \
-		browser_inspector_treeSelection.js \
-		browser_inspector_highlighter.js \
-		browser_inspector_highlighter_autohide.js \
 		browser_inspector_iframeTest.js \
+		browser_inspector_initialization.js \
+		browser_inspector_highlighter.js \
 		browser_inspector_scrolling.js \
-		browser_inspector_tab_switch.js \
 		browser_inspector_bug_665880.js \
-		browser_inspector_bug_674871.js \
-		browser_inspector_bug_566084_location_changed.js \
 		browser_inspector_infobar.js \
-		browser_inspector_bug_690361.js \
-		browser_inspector_bug_672902_keyboard_shortcuts.js \
-		browser_inspector_keybindings.js \
 		browser_inspector_breadcrumbs.html \
 		browser_inspector_breadcrumbs.js \
-		browser_inspector_bug_699308_iframe_navigation.js \
-		browser_inspector_changes.js \
-		browser_inspector_ruleviewstore.js \
 		browser_inspector_invalidate.js \
-		browser_inspector_sidebarstate.js \
 		browser_inspector_menu.js \
-		browser_inspector_pseudoclass_lock.js \
 		browser_inspector_pseudoClass_menu.js \
 		browser_inspector_destroyselection.html \
 		browser_inspector_destroyselection.js \
+		browser_inspector_bug_699308_iframe_navigation.js \
+		browser_inspector_bug_672902_keyboard_shortcuts.js \
+		browser_inspector_bug_566084_location_changed.js \
+		browser_inspector_sidebarstate.js \
+		browser_inspector_pseudoclass_lock.js \
 		browser_inspector_cmd_inspect.js \
 		browser_inspector_cmd_inspect.html \
+		browser_inspector_highlighter_autohide.js \
+		browser_inspector_changes.js \
+		browser_inspector_bug_674871.js \
 		head.js \
 		helpers.js \
 		$(NULL)
diff --git a/browser/devtools/highlighter/test/browser_inspector_breadcrumbs.html b/browser/devtools/inspector/test/browser_inspector_breadcrumbs.html
similarity index 100%
rename from browser/devtools/highlighter/test/browser_inspector_breadcrumbs.html
rename to browser/devtools/inspector/test/browser_inspector_breadcrumbs.html
diff --git a/browser/devtools/highlighter/test/browser_inspector_breadcrumbs.js b/browser/devtools/inspector/test/browser_inspector_breadcrumbs.js
similarity index 68%
rename from browser/devtools/highlighter/test/browser_inspector_breadcrumbs.js
rename to browser/devtools/inspector/test/browser_inspector_breadcrumbs.js
index 0b1f78290347..50ceed087e97 100644
--- a/browser/devtools/highlighter/test/browser_inspector_breadcrumbs.js
+++ b/browser/devtools/inspector/test/browser_inspector_breadcrumbs.js
@@ -18,6 +18,7 @@ function test()
   let doc;
   let nodes;
   let cursor;
+  let inspector;
 
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.selectedBrowser.addEventListener("load", function onload() {
@@ -26,7 +27,7 @@ function test()
     waitForFocus(setupTest, content);
   }, true);
 
-  content.location = "http://mochi.test:8888/browser/browser/devtools/highlighter/test/browser_inspector_breadcrumbs.html";
+  content.location = "http://mochi.test:8888/browser/browser/devtools/inspector/test/browser_inspector_breadcrumbs.html";
 
   function setupTest()
   {
@@ -36,20 +37,16 @@ function test()
       ok(nodes[i].node, "node " + nodes[i].nodeId + " found");
     }
 
-    Services.obs.addObserver(runTests,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.toggleInspectorUI();
+    openInspector(runTests);
   }
 
-  function runTests()
+  function runTests(aInspector)
   {
-    Services.obs.removeObserver(runTests,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-
+    inspector = aInspector;
     cursor = 0;
+    inspector.selection.on("new-node", nodeSelected);
     executeSoon(function() {
-      InspectorUI.highlighter.addListener("nodeselected", nodeSelected);
-      InspectorUI.inspectNode(nodes[0].node);
+      inspector.selection.setNode(nodes[0].node);
     });
   }
 
@@ -59,24 +56,20 @@ function test()
       performTest();
       cursor++;
       if (cursor >= nodes.length) {
-
-        InspectorUI.highlighter.removeListener("nodeselected", nodeSelected);
-        Services.obs.addObserver(finishUp,
-          InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-
-        executeSoon(function() {
-          InspectorUI.closeInspectorUI();
-        });
+        inspector.selection.off("new-node", nodeSelected);
+        finishUp();
       } else {
         let node = nodes[cursor].node;
-        InspectorUI.inspectNode(node);
+        inspector.selection.setNode(node);
       }
     });
   }
 
   function performTest()
   {
-    let container = document.getElementById("inspector-breadcrumbs");
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let panel = gDevTools.getPanelForTarget("inspector", target);
+    let container = panel.panelDoc.getElementById("inspector-breadcrumbs");
     let buttonsLabelIds = nodes[cursor].result.split(" ");
 
     // html > body > …
@@ -91,11 +84,11 @@ function test()
 
     let checkedButton = container.querySelector("button[checked]");
     let labelId = checkedButton.querySelector(".inspector-breadcrumbs-id");
-    is(labelId.textContent, "#" + InspectorUI.selection.id, "Node " + cursor + ": selection matches");
+    let id = inspector.selection.node.id;
+    is(labelId.textContent, "#" + id, "Node " + cursor + ": selection matches");
   }
 
   function finishUp() {
-    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
     doc = nodes = null;
     gBrowser.removeCurrentTab();
     finish();
diff --git a/browser/devtools/inspector/test/browser_inspector_bug_566084_location_changed.js b/browser/devtools/inspector/test/browser_inspector_bug_566084_location_changed.js
new file mode 100644
index 000000000000..c209f9f6e935
--- /dev/null
+++ b/browser/devtools/inspector/test/browser_inspector_bug_566084_location_changed.js
@@ -0,0 +1,131 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
+function test() {
+  let notificationBox, inspector;
+  let alertActive1_called = false;
+  let alertActive2_called = false;
+
+  function startLocationTests() {
+    openInspector(runInspectorTests);
+  }
+
+  function runInspectorTests(aInspector) {
+    inspector = aInspector;
+
+    let para = content.document.querySelector("p");
+    ok(para, "found the paragraph element");
+    is(para.textContent, "init", "paragraph content is correct");
+
+    inspector.markDirty();
+
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let toolbox = gDevTools.getToolboxForTarget(target);
+    notificationBox = toolbox.getNotificationBox();
+    notificationBox.addEventListener("AlertActive", alertActive1, false);
+
+    ok(toolbox, "We have access to the notificationBox");
+
+    gBrowser.selectedBrowser.addEventListener("load", onPageLoad, true);
+
+    content.location = "data:text/html,<div>location change test 1 for " +
+      "inspector</div><p>test1</p>";
+  }
+
+  function alertActive1() {
+    alertActive1_called = true;
+    notificationBox.removeEventListener("AlertActive", alertActive1, false);
+
+    let notification = notificationBox.
+      getNotificationWithValue("inspector-page-navigation");
+    ok(notification, "found the inspector-page-navigation notification");
+
+    // By closing the notification it is expected that page navigation is
+    // canceled.
+    executeSoon(function() {
+      notification.close();
+      locationTest2();
+    });
+  }
+
+  function locationTest2() {
+    // Location did not change.
+    let para = content.document.querySelector("p");
+    ok(para, "found the paragraph element, second time");
+    is(para.textContent, "init", "paragraph content is correct");
+
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let inspector = gDevTools.getPanelForTarget("inspector", target);
+    ok(inspector, "Inspector still alive");
+
+    notificationBox.addEventListener("AlertActive", alertActive2, false);
+
+    content.location = "data:text/html,<div>location change test 2 for " +
+      "inspector</div><p>test2</p>";
+  }
+
+  function alertActive2() {
+    alertActive2_called = true;
+    notificationBox.removeEventListener("AlertActive", alertActive2, false);
+
+    let notification = notificationBox.
+      getNotificationWithValue("inspector-page-navigation");
+    ok(notification, "found the inspector-page-navigation notification");
+
+    let buttons = notification.querySelectorAll("button");
+    let buttonLeave = null;
+    for (let i = 0; i < buttons.length; i++) {
+      if (buttons[i].buttonInfo.id == "inspector.confirmNavigationAway.buttonLeave") {
+        buttonLeave = buttons[i];
+        break;
+      }
+    }
+
+    ok(buttonLeave, "the Leave page button was found");
+
+    // Accept page navigation.
+    executeSoon(function(){
+      buttonLeave.doCommand();
+    });
+  }
+
+  function onPageLoad() {
+    gBrowser.selectedBrowser.removeEventListener("load", onPageLoad, true);
+
+    isnot(content.location.href.indexOf("test2"), -1,
+          "page navigated to the correct location");
+
+    let para = content.document.querySelector("p");
+    ok(para, "found the paragraph element, third time");
+    is(para.textContent, "test2", "paragraph content is correct");
+
+    let root = content.document.documentElement;
+    ok(inspector.selection.node, root, "Selection is the root of the new page.");
+
+    ok(alertActive1_called, "first notification box has been showed");
+    ok(alertActive2_called, "second notification box has been showed");
+    testEnd();
+  }
+
+
+  function testEnd() {
+    notificationBox = null;
+    gBrowser.removeCurrentTab();
+    executeSoon(finish);
+  }
+
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onBrowserLoad() {
+    gBrowser.selectedBrowser.removeEventListener("load", onBrowserLoad, true);
+    waitForFocus(startLocationTests, content);
+  }, true);
+
+  content.location = "data:text/html,<div>location change tests for " +
+    "inspector.</div><p>init</p>";
+}
diff --git a/browser/devtools/highlighter/test/browser_inspector_bug_665880.js b/browser/devtools/inspector/test/browser_inspector_bug_665880.js
similarity index 52%
rename from browser/devtools/highlighter/test/browser_inspector_bug_665880.js
rename to browser/devtools/inspector/test/browser_inspector_bug_665880.js
index b5e23af2bb2a..b80de1cc211c 100644
--- a/browser/devtools/highlighter/test/browser_inspector_bug_665880.js
+++ b/browser/devtools/inspector/test/browser_inspector_bug_665880.js
@@ -23,37 +23,25 @@ function test()
   {
     objectNode = doc.querySelector("object");
     ok(objectNode, "we have the object node");
-    Services.obs.addObserver(runObjectInspectionTest,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.toggleInspectorUI();
+    openInspector(runObjectInspectionTest);
   }
 
-  function runObjectInspectionTest()
+  function runObjectInspectionTest(inspector)
   {
-    Services.obs.removeObserver(runObjectInspectionTest,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-
-    executeSoon(function() {
-      InspectorUI.highlighter.addListener("nodeselected", performTestComparison);
-
-      InspectorUI.inspectNode(objectNode);
-    });
+    inspector.highlighter.once("locked", performTestComparison);
+    inspector.selection.setNode(objectNode, "");
   }
 
   function performTestComparison()
   {
-    InspectorUI.highlighter.removeListener("nodeselected", performTestComparison);
-
-    is(InspectorUI.selection, objectNode, "selection matches node");
-
-    Services.obs.addObserver(finishUp,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-    InspectorUI.closeInspectorUI();
+    is(getActiveInspector().selection.node, objectNode, "selection matches node");
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    gDevTools.closeToolbox(target);
+    finishUp();
   }
 
 
   function finishUp() {
-    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
     doc = objectNode = null;
     gBrowser.removeCurrentTab();
     finish();
diff --git a/browser/devtools/highlighter/test/browser_inspector_bug_672902_keyboard_shortcuts.js b/browser/devtools/inspector/test/browser_inspector_bug_672902_keyboard_shortcuts.js
similarity index 51%
rename from browser/devtools/highlighter/test/browser_inspector_bug_672902_keyboard_shortcuts.js
rename to browser/devtools/inspector/test/browser_inspector_bug_672902_keyboard_shortcuts.js
index 1e11ec60e944..f44ad7ba9838 100644
--- a/browser/devtools/highlighter/test/browser_inspector_bug_672902_keyboard_shortcuts.js
+++ b/browser/devtools/inspector/test/browser_inspector_bug_672902_keyboard_shortcuts.js
@@ -11,6 +11,7 @@ function test()
 
   let doc;
   let node;
+  let inspector;
 
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.selectedBrowser.addEventListener("load", function onload() {
@@ -26,23 +27,19 @@ function test()
 
   function setupKeyBindingsTest()
   {
-    Services.obs.addObserver(findAndHighlightNode,
-                             InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED,
-                             false);
-    InspectorUI.toggleInspectorUI();
+    openInspector(findAndHighlightNode);
   }
 
-  function findAndHighlightNode()
+  function findAndHighlightNode(aInspector)
   {
-    Services.obs.removeObserver(findAndHighlightNode,
-                                InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+    inspector = aInspector;
 
     executeSoon(function() {
-      InspectorUI.highlighter.addListener("nodeselected", highlightBodyNode);
+      inspector.selection.once("new-node", highlightBodyNode);
       // Test that navigating around without a selected node gets us to the
       // body element.
       node = doc.querySelector("body");
-      let bc = InspectorUI.breadcrumbs;
+      let bc = inspector.breadcrumbs;
       bc.nodeHierarchy[bc.currentIndex].button.focus();
       EventUtils.synthesizeKey("VK_RIGHT", { });
     });
@@ -50,11 +47,10 @@ function test()
 
   function highlightBodyNode()
   {
-    InspectorUI.highlighter.removeListener("nodeselected", highlightBodyNode);
-    is(InspectorUI.selection, node, "selected body element");
+    is(inspector.selection.node, node, "selected body element");
 
     executeSoon(function() {
-      InspectorUI.highlighter.addListener("nodeselected", highlightHeaderNode);
+      inspector.selection.once("new-node", highlightHeaderNode);
       // Test that moving to the child works.
       node = doc.querySelector("h1");
       EventUtils.synthesizeKey("VK_RIGHT", { });
@@ -63,11 +59,10 @@ function test()
 
   function highlightHeaderNode()
   {
-    InspectorUI.highlighter.removeListener("nodeselected", highlightHeaderNode);
-    is(InspectorUI.selection, node, "selected h1 element");
+    is(inspector.selection.node, node, "selected h1 element");
 
     executeSoon(function() {
-      InspectorUI.highlighter.addListener("nodeselected", highlightParagraphNode);
+      inspector.selection.once("new-node", highlightParagraphNode);
       // Test that moving to the next sibling works.
       node = doc.querySelector("p");
       EventUtils.synthesizeKey("VK_DOWN", { });
@@ -76,11 +71,10 @@ function test()
 
   function highlightParagraphNode()
   {
-    InspectorUI.highlighter.removeListener("nodeselected", highlightParagraphNode);
-    is(InspectorUI.selection, node, "selected p element");
+    is(inspector.selection.node, node, "selected p element");
 
     executeSoon(function() {
-      InspectorUI.highlighter.addListener("nodeselected", highlightHeaderNodeAgain);
+      inspector.selection.once("new-node", highlightHeaderNodeAgain);
       // Test that moving to the previous sibling works.
       node = doc.querySelector("h1");
       EventUtils.synthesizeKey("VK_UP", { });
@@ -89,11 +83,10 @@ function test()
 
   function highlightHeaderNodeAgain()
   {
-    InspectorUI.highlighter.removeListener("nodeselected", highlightHeaderNodeAgain);
-    is(InspectorUI.selection, node, "selected h1 element");
+    is(inspector.selection.node, node, "selected h1 element");
 
     executeSoon(function() {
-      InspectorUI.highlighter.addListener("nodeselected", highlightParentNode);
+      inspector.selection.once("new-node", highlightParentNode);
       // Test that moving to the parent works.
       node = doc.querySelector("body");
       EventUtils.synthesizeKey("VK_LEFT", { });
@@ -102,27 +95,11 @@ function test()
 
   function highlightParentNode()
   {
-    InspectorUI.highlighter.removeListener("nodeselected", highlightParentNode);
-    is(InspectorUI.selection, node, "selected body element");
-
-    // Test that locking works.
-    synthesizeKeyFromKeyTag("key_inspect");
-
-    executeSoon(isTheNodeLocked);
-  }
-
-  function isTheNodeLocked()
-  {
-    ok(!InspectorUI.inspecting, "the node is locked");
-    Services.obs.addObserver(finishUp,
-                             InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED,
-                             false);
-    InspectorUI.closeInspectorUI();
+    is(inspector.selection.node, node, "selected body element");
+    finishUp();
   }
 
   function finishUp() {
-    Services.obs.removeObserver(finishUp,
-                                InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
     doc = node = null;
     gBrowser.removeCurrentTab();
     finish();
diff --git a/browser/devtools/highlighter/test/browser_inspector_bug_674871.js b/browser/devtools/inspector/test/browser_inspector_bug_674871.js
similarity index 68%
rename from browser/devtools/highlighter/test/browser_inspector_bug_674871.js
rename to browser/devtools/inspector/test/browser_inspector_bug_674871.js
index 6b6e3d167423..ed448d8f161b 100644
--- a/browser/devtools/highlighter/test/browser_inspector_bug_674871.js
+++ b/browser/devtools/inspector/test/browser_inspector_bug_674871.js
@@ -1,7 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-
 function test()
 {
   waitForExplicitFinish();
@@ -46,52 +45,45 @@ function test()
     iframeBodyNode = iframeNode.contentDocument.querySelector("body");
     ok(iframeNode, "we have the iframe node");
     ok(iframeBodyNode, "we have the body node");
-    Services.obs.addObserver(runTests,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.toggleInspectorUI();
+    openInspector(runTests);
   }
 
-  function runTests()
+  function runTests(inspector)
   {
-    Services.obs.removeObserver(runTests,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-
     executeSoon(function() {
-      InspectorUI.highlighter.addListener("nodeselected", isTheIframeSelected);
-
+      inspector.highlighter.once("highlighting", isTheIframeSelected);
       moveMouseOver(iframeNode, 1, 1);
     });
   }
 
   function isTheIframeSelected()
   {
-    InspectorUI.highlighter.removeListener("nodeselected", isTheIframeSelected);
+    let inspector = getActiveInspector();
 
-    is(InspectorUI.selection, iframeNode, "selection matches node");
+    is(inspector.selection.node, iframeNode, "selection matches node");
     iframeNode.style.marginBottom = doc.defaultView.innerHeight + "px";
     doc.defaultView.scrollBy(0, 40);
 
     executeSoon(function() {
-      InspectorUI.highlighter.addListener("nodeselected", isTheIframeContentSelected);
+      inspector.selection.once("new-node", isTheIframeContentSelected);
       moveMouseOver(iframeNode, 40, 40);
     });
   }
 
   function isTheIframeContentSelected()
   {
-    InspectorUI.highlighter.removeListener("nodeselected", isTheIframeContentSelected);
-    is(InspectorUI.selection, iframeBodyNode, "selection matches node");
+    let inspector = getActiveInspector();
+    is(inspector.selection.node, iframeBodyNode, "selection matches node");
     // 184 == 200 + 11(border) + 13(padding) - 40(scroll)
-    is(InspectorUI.highlighter._highlightRect.height, 184,
+    is(inspector.highlighter._highlightRect.height, 184,
       "highlighter height");
 
-    Services.obs.addObserver(finishUp,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-    InspectorUI.closeInspectorUI();
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    gDevTools.closeToolbox(target);
+    finishUp();
   }
 
   function finishUp() {
-    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
     doc = iframeNode = iframeBodyNode = null;
     gBrowser.removeCurrentTab();
     finish();
diff --git a/browser/devtools/inspector/test/browser_inspector_bug_699308_iframe_navigation.js b/browser/devtools/inspector/test/browser_inspector_bug_699308_iframe_navigation.js
new file mode 100644
index 000000000000..3f9355dd7335
--- /dev/null
+++ b/browser/devtools/inspector/test/browser_inspector_bug_699308_iframe_navigation.js
@@ -0,0 +1,65 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+  let iframe;
+  let iframeLoads = 0;
+  let checksAfterLoads = false;
+  let inspector;
+
+  function startTest() {
+    openInspector(runInspectorTests);
+  }
+
+  function runInspectorTests(aInspector) {
+    inspector = aInspector;
+
+    iframe = content.document.querySelector("iframe");
+    ok(iframe, "found the iframe element");
+
+    ok(inspector.highlighter._highlighting, "Inspector is highlighting");
+
+    iframe.addEventListener("load", onIframeLoad, false);
+
+    executeSoon(function() {
+      iframe.contentWindow.location = "javascript:location.reload()";
+    });
+  }
+
+  function onIframeLoad() {
+    if (++iframeLoads != 2) {
+      executeSoon(function() {
+        iframe.contentWindow.location = "javascript:location.reload()";
+      });
+      return;
+    }
+
+    iframe.removeEventListener("load", onIframeLoad, false);
+
+    ok(inspector.highlighter._highlighting, "Inspector is highlighting after iframe nav");
+
+    checksAfterLoads = true;
+
+    finishTest();
+  }
+
+  function finishTest() {
+    is(iframeLoads, 2, "iframe loads");
+    ok(checksAfterLoads, "the Inspector tests got the chance to run after iframe reloads");
+
+    iframe = null;
+    gBrowser.removeCurrentTab();
+    executeSoon(finish);
+  }
+
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onBrowserLoad() {
+    gBrowser.selectedBrowser.removeEventListener("load", onBrowserLoad, true);
+    waitForFocus(startTest, content);
+  }, true);
+
+  content.location = "data:text/html,<p>bug 699308 - test iframe navigation" +
+    "<iframe src='data:text/html,hello world'></iframe>";
+}
diff --git a/browser/devtools/inspector/test/browser_inspector_changes.js b/browser/devtools/inspector/test/browser_inspector_changes.js
new file mode 100644
index 000000000000..a3088e51d221
--- /dev/null
+++ b/browser/devtools/inspector/test/browser_inspector_changes.js
@@ -0,0 +1,112 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+let doc;
+let testDiv;
+
+function test() {
+  let inspector;
+
+  function createDocument()
+  {
+    doc.body.innerHTML = '<div id="testdiv">Test div!</div>';
+    doc.title = "Inspector Change Test";
+    openInspector(runInspectorTests);
+  }
+
+
+  function getInspectorProp(aName)
+  {
+    let computedview = inspector.sidebar.getWindowForTab("computedview").computedview.view;
+    for each (let view in computedview.propertyViews) {
+      if (view.name == aName) {
+        return view;
+      }
+    }
+    return null;
+  }
+
+  function runInspectorTests(aInspector)
+  {
+    inspector = aInspector;
+    inspector.sidebar.once("computedview-ready", function() {
+      info("Computed View ready");
+      inspector.sidebar.select("computedview");
+
+      testDiv = doc.getElementById("testdiv");
+
+      testDiv.style.fontSize = "10px";
+
+      // Start up the style inspector panel...
+      Services.obs.addObserver(stylePanelTests, "StyleInspector-populated", false);
+
+      inspector.selection.setNode(testDiv);
+    });
+  }
+
+  function stylePanelTests()
+  {
+    Services.obs.removeObserver(stylePanelTests, "StyleInspector-populated");
+
+    let computedview = inspector.sidebar.getWindowForTab("computedview").computedview;
+    ok(computedview, "Style Panel has a cssHtmlTree");
+
+    let propView = getInspectorProp("font-size");
+    is(propView.value, "10px", "Style inspector should be showing the correct font size.");
+
+    Services.obs.addObserver(stylePanelAfterChange, "StyleInspector-populated", false);
+
+    testDiv.style.fontSize = "15px";
+    inspector.emit("layout-change");
+  }
+
+  function stylePanelAfterChange()
+  {
+    Services.obs.removeObserver(stylePanelAfterChange, "StyleInspector-populated");
+
+    let propView = getInspectorProp("font-size");
+    is(propView.value, "15px", "Style inspector should be showing the new font size.");
+
+    stylePanelNotActive();
+  }
+
+  function stylePanelNotActive()
+  {
+    // Tests changes made while the style panel is not active.
+    inspector.sidebar.select("ruleview");
+
+    executeSoon(function() {
+      Services.obs.addObserver(stylePanelAfterSwitch, "StyleInspector-populated", false);
+      testDiv.style.fontSize = "20px";
+      inspector.sidebar.select("computedview");
+    });
+  }
+
+  function stylePanelAfterSwitch()
+  {
+    Services.obs.removeObserver(stylePanelAfterSwitch, "StyleInspector-populated");
+
+    let propView = getInspectorProp("font-size");
+    is(propView.value, "20px", "Style inspector should be showing the newest font size.");
+
+    finishTest();
+  }
+
+  function finishTest()
+  {
+    gBrowser.removeCurrentTab();
+    finish();
+  }
+
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,basic tests for inspector";
+}
diff --git a/browser/devtools/highlighter/test/browser_inspector_cmd_inspect.html b/browser/devtools/inspector/test/browser_inspector_cmd_inspect.html
similarity index 100%
rename from browser/devtools/highlighter/test/browser_inspector_cmd_inspect.html
rename to browser/devtools/inspector/test/browser_inspector_cmd_inspect.html
diff --git a/browser/devtools/highlighter/test/browser_inspector_cmd_inspect.js b/browser/devtools/inspector/test/browser_inspector_cmd_inspect.js
similarity index 97%
rename from browser/devtools/highlighter/test/browser_inspector_cmd_inspect.js
rename to browser/devtools/inspector/test/browser_inspector_cmd_inspect.js
index 3879ffbebedf..545e60799c74 100644
--- a/browser/devtools/highlighter/test/browser_inspector_cmd_inspect.js
+++ b/browser/devtools/inspector/test/browser_inspector_cmd_inspect.js
@@ -3,7 +3,7 @@
 
 // Tests that the inspect command works as it should
 
-const TEST_URI = "http://example.com/browser/browser/devtools/highlighter/" +
+const TEST_URI = "http://example.com/browser/browser/devtools/inspector/" +
                  "test/browser_inspector_cmd_inspect.html";
 
 function test() {
diff --git a/browser/devtools/highlighter/test/browser_inspector_destroyselection.html b/browser/devtools/inspector/test/browser_inspector_destroyselection.html
similarity index 100%
rename from browser/devtools/highlighter/test/browser_inspector_destroyselection.html
rename to browser/devtools/inspector/test/browser_inspector_destroyselection.html
diff --git a/browser/devtools/highlighter/test/browser_inspector_destroyselection.js b/browser/devtools/inspector/test/browser_inspector_destroyselection.js
similarity index 55%
rename from browser/devtools/highlighter/test/browser_inspector_destroyselection.js
rename to browser/devtools/inspector/test/browser_inspector_destroyselection.js
index 73fe34d71a26..bf24c5e34d07 100644
--- a/browser/devtools/highlighter/test/browser_inspector_destroyselection.js
+++ b/browser/devtools/inspector/test/browser_inspector_destroyselection.js
@@ -6,7 +6,7 @@ function test()
   waitForExplicitFinish();
   //ignoreAllUncaughtExceptions();
 
-  let node, iframe;
+  let node, iframe, inspector;
 
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.selectedBrowser.addEventListener("load", function onload() {
@@ -14,42 +14,28 @@ function test()
     waitForFocus(setupTest, content);
   }, true);
 
-  content.location = "http://mochi.test:8888/browser/browser/devtools/highlighter/test/browser_inspector_destroyselection.html";
+  content.location = "http://mochi.test:8888/browser/browser/devtools/inspector/test/browser_inspector_destroyselection.html";
 
   function setupTest()
   {
     iframe = content.document.querySelector("iframe");
     node = iframe.contentDocument.querySelector("span");
-
-    Services.obs.addObserver(runTests,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.openInspectorUI(node);
+    openInspector(runTests);
   }
 
-  function runTests()
+  function runTests(aInspector)
   {
-    Services.obs.removeObserver(runTests,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-    is(InspectorUI.selection, node, "node selected");
+    inspector = aInspector;
+    inspector.selection.setNode(node);
+
     iframe.parentNode.removeChild(iframe);
     iframe = null;
 
     let tmp = {};
     Cu.import("resource:///modules/devtools/LayoutHelpers.jsm", tmp);
     ok(!tmp.LayoutHelpers.isNodeConnected(node), "Node considered as disconnected.");
+    ok(!inspector.selection.isConnected(), "Selection considered as disconnected");
 
-    Services.obs.addObserver(testBreadcrumbs,
-                             InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-
-    executeSoon(function() {
-      InspectorUI.closeInspectorUI();
-    });
-  }
-
-  function testBreadcrumbs()
-  {
-    Services.obs.removeObserver(testBreadcrumbs, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-    ok(!InspectorUI.breadcrumbs, "Breadcrumbs destroyed");
     finishUp();
   }
 
diff --git a/browser/devtools/highlighter/test/browser_inspector_highlighter.js b/browser/devtools/inspector/test/browser_inspector_highlighter.js
similarity index 78%
rename from browser/devtools/highlighter/test/browser_inspector_highlighter.js
rename to browser/devtools/inspector/test/browser_inspector_highlighter.js
index b2b0c133f188..d7ad02c8486d 100644
--- a/browser/devtools/highlighter/test/browser_inspector_highlighter.js
+++ b/browser/devtools/inspector/test/browser_inspector_highlighter.js
@@ -48,56 +48,45 @@ function createDocument()
   doc.body.appendChild(div2);
   doc.body.appendChild(div3);
 
-  setupHighlighterTests();
+  openInspector(setupHighlighterTests);
 }
 
 function setupHighlighterTests()
 {
   h1 = doc.querySelector("h1");
   ok(h1, "we have the header");
-  Services.obs.addObserver(runSelectionTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.toggleInspectorUI();
-}
 
-function runSelectionTests(subject)
-{
-  Services.obs.removeObserver(runSelectionTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  is(subject.wrappedJSObject, InspectorUI,
-     "InspectorUI accessible in the observer");
-
-  InspectorUI.highlighter.outline.setAttribute("disable-transitions", "true");
+  let i = getActiveInspector();
+  i.highlighter.unlock();
+  i.highlighter.outline.setAttribute("disable-transitions", "true");
 
   executeSoon(function() {
-    InspectorUI.highlighter.addListener("nodeselected", performTestComparisons);
+    i.selection.once("new-node", performTestComparisons);
     EventUtils.synthesizeMouse(h1, 2, 2, {type: "mousemove"}, content);
   });
 }
 
 function performTestComparisons(evt)
 {
-  InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons);
-
-  InspectorUI.stopInspecting();
+  let i = getActiveInspector();
+  i.highlighter.lock();
   ok(isHighlighting(), "highlighter is highlighting");
   is(getHighlitNode(), h1, "highlighter matches selection")
-  is(InspectorUI.selection, h1, "selection matches node");
-  is(InspectorUI.selection, getHighlitNode(), "selection matches highlighter");
+  is(i.selection.node, h1, "selection matches node");
+  is(i.selection.node, getHighlitNode(), "selection matches highlighter");
 
 
   div = doc.querySelector("div#checkOutThisWickedSpread");
 
   executeSoon(function() {
-    InspectorUI.highlighter.addListener("nodeselected", finishTestComparisons);
-    InspectorUI.inspectNode(div);
+    i.selection.once("new-node", finishTestComparisons);
+    i.selection.setNode(div);
   });
 }
 
 function finishTestComparisons()
 {
-  InspectorUI.highlighter.removeListener("nodeselected", finishTestComparisons);
+  let i = getActiveInspector();
 
   // get dimensions of div element
   let divDims = div.getBoundingClientRect();
@@ -105,8 +94,7 @@ function finishTestComparisons()
   let divHeight = divDims.height;
 
   // get dimensions of the outline
-  let outlineDims = 
-    InspectorUI.highlighter.outline.getBoundingClientRect();
+  let outlineDims = i.highlighter.outline.getBoundingClientRect();
   let outlineWidth = outlineDims.width;
   let outlineHeight = outlineDims.height;
 
@@ -115,7 +103,7 @@ function finishTestComparisons()
   //is(outlineHeight, divHeight, "outline height matches dimensions of element (no zoom)");
 
   // zoom the page by a factor of 2
-  let contentViewer = InspectorUI.browser.docShell.contentViewer
+  let contentViewer = gBrowser.selectedBrowser.docShell.contentViewer
                              .QueryInterface(Ci.nsIMarkupDocumentViewer);
   contentViewer.fullZoom = 2;
 
@@ -124,7 +112,7 @@ function finishTestComparisons()
 
   window.setTimeout(function() {
     // check what zoom factor we're at, should be 2
-    let zoom = InspectorUI.highlighter.zoom;
+    let zoom = i.highlighter.zoom;
     is(zoom, 2, "zoom is 2?");
 
     // simulate the zoomed dimensions of the div element
@@ -133,8 +121,7 @@ function finishTestComparisons()
     let divHeight = divDims.height * zoom;
 
     // now zoomed, get new dimensions the outline
-    let outlineDims = 
-      InspectorUI.highlighter.outline.getBoundingClientRect();
+    let outlineDims = i.highlighter.outline.getBoundingClientRect();
     let outlineWidth = outlineDims.width;
     let outlineHeight = outlineDims.height;
 
@@ -148,7 +135,8 @@ function finishTestComparisons()
 }
 
 function finishUp() {
-  InspectorUI.closeInspectorUI();
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  gDevTools.closeToolbox(target);
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter_autohide.js b/browser/devtools/inspector/test/browser_inspector_highlighter_autohide.js
new file mode 100644
index 000000000000..8dfca604b74b
--- /dev/null
+++ b/browser/devtools/inspector/test/browser_inspector_highlighter_autohide.js
@@ -0,0 +1,46 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+
+function test()
+{
+  let toolbox;
+  let inspector;
+
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onload() {
+    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
+    waitForFocus(startInspector, content);
+  }, true);
+  content.location = "data:text/html,mop"
+
+  function startInspector() {
+    info("Tab loaded");
+    openInspector(function(aInspector) {
+      inspector = aInspector;
+      ok(!inspector.highlighter.hidden, "Highlighter is visible");
+      toolbox = inspector._toolbox;
+      toolbox.once("webconsole-selected", onWebConsoleSelected);
+      toolbox.selectTool("webconsole");
+    });
+  }
+
+  function onWebConsoleSelected() {
+    executeSoon(function() {
+      ok(inspector.highlighter.hidden, "Highlighter is hidden");
+      toolbox.once("inspector-selected", onInspectorSelected);
+      toolbox.selectTool("inspector");
+    });
+  }
+
+  function onInspectorSelected() {
+    executeSoon(function() {
+      ok(!inspector.highlighter.hidden, "Highlighter is visible once inspector reopen");
+      gBrowser.removeCurrentTab();
+      finish();
+    });
+  }
+}
+
diff --git a/browser/devtools/highlighter/test/browser_inspector_iframeTest.js b/browser/devtools/inspector/test/browser_inspector_iframeTest.js
similarity index 72%
rename from browser/devtools/highlighter/test/browser_inspector_iframeTest.js
rename to browser/devtools/inspector/test/browser_inspector_iframeTest.js
index f146046ef743..8d23b0493f41 100644
--- a/browser/devtools/highlighter/test/browser_inspector_iframeTest.js
+++ b/browser/devtools/inspector/test/browser_inspector_iframeTest.js
@@ -32,7 +32,7 @@ function createDocument()
       div2.textContent = 'nested div';
       iframe2.contentDocument.body.appendChild(div2);
 
-      setupIframeTests();
+      openInspector(runIframeTests);
     }, false);
 
     iframe2.src = 'data:text/html,nested iframe';
@@ -49,43 +49,29 @@ function moveMouseOver(aElement)
     aElement.ownerDocument.defaultView);
 }
 
-function setupIframeTests()
-{
-  Services.obs.addObserver(runIframeTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.openInspectorUI();
-}
-
 function runIframeTests()
 {
-  Services.obs.removeObserver(runIframeTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-
-  executeSoon(function() {
-    InspectorUI.highlighter.addListener("nodeselected", performTestComparisons1);
-    moveMouseOver(div1)
-  });
+  getActiveInspector().selection.once("new-node", performTestComparisons1);
+  moveMouseOver(div1)
 }
 
 function performTestComparisons1()
 {
-  InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons1);
-
-  is(InspectorUI.selection, div1, "selection matches div1 node");
+  let i = getActiveInspector();
+  is(i.selection.node, div1, "selection matches div1 node");
   is(getHighlitNode(), div1, "highlighter matches selection");
 
+  i.selection.once("new-node", performTestComparisons2);
   executeSoon(function() {
-    InspectorUI.highlighter.addListener("nodeselected", performTestComparisons2);
     moveMouseOver(div2);
   });
 }
 
 function performTestComparisons2()
 {
-  InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons2);
+  let i = getActiveInspector();
 
-  is(InspectorUI.selection, div2, "selection matches div2 node");
+  is(i.selection.node, div2, "selection matches div2 node");
   is(getHighlitNode(), div2, "highlighter matches selection");
 
   finish();
@@ -105,7 +91,8 @@ function test() {
   content.location = "data:text/html,iframe tests for inspector";
 
   registerCleanupFunction(function () {
-    InspectorUI.closeInspectorUI(true);
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    gDevTools.closeToolbox(target);
     gBrowser.removeCurrentTab();
   });
 }
diff --git a/browser/devtools/highlighter/test/browser_inspector_infobar.js b/browser/devtools/inspector/test/browser_inspector_infobar.js
similarity index 72%
rename from browser/devtools/highlighter/test/browser_inspector_infobar.js
rename to browser/devtools/inspector/test/browser_inspector_infobar.js
index 1ca3ed741c9d..1e20539cd1f0 100644
--- a/browser/devtools/highlighter/test/browser_inspector_infobar.js
+++ b/browser/devtools/inspector/test/browser_inspector_infobar.js
@@ -9,6 +9,7 @@ function test()
   let doc;
   let nodes;
   let cursor;
+  let inspector;
 
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.selectedBrowser.addEventListener("load", function onload() {
@@ -36,19 +37,15 @@ function test()
       ok(nodes[i].node, "node " + i + " found");
     }
 
-    Services.obs.addObserver(runTests,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.toggleInspectorUI();
+    openInspector(runTests);
   }
 
-  function runTests()
+  function runTests(aInspector)
   {
-    Services.obs.removeObserver(runTests,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-
+    inspector = aInspector;
     cursor = 0;
     executeSoon(function() {
-      InspectorUI.inspectNode(nodes[0].node);
+      inspector.selection.setNode(nodes[0].node, "");
       nodeSelected();
     });
   }
@@ -59,16 +56,10 @@ function test()
       performTest();
       cursor++;
       if (cursor >= nodes.length) {
-
-        Services.obs.addObserver(finishUp,
-          InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-
-        executeSoon(function() {
-          InspectorUI.closeInspectorUI();
-        });
+        finishUp();
       } else {
         let node = nodes[cursor].node;
-        InspectorUI.inspectNode(node);
+        inspector.selection.setNode(node, "");
         nodeSelected();
       }
     });
@@ -76,21 +67,23 @@ function test()
 
   function performTest()
   {
-    let container = document.getElementById("highlighter-nodeinfobar-container");
+    let browser = gBrowser.selectedBrowser;
+    let stack = browser.parentNode;
+
+    let container = stack.querySelector(".highlighter-nodeinfobar-container");
     is(container.getAttribute("position"), nodes[cursor].position, "node " + cursor + ": position matches.");
 
-    let tagNameLabel = document.getElementById("highlighter-nodeinfobar-tagname");
+    let tagNameLabel = stack.querySelector(".highlighter-nodeinfobar-tagname");
     is(tagNameLabel.textContent, nodes[cursor].tag, "node " + cursor  + ": tagName matches.");
 
-    let idLabel = document.getElementById("highlighter-nodeinfobar-id");
+    let idLabel = stack.querySelector(".highlighter-nodeinfobar-id");
     is(idLabel.textContent, nodes[cursor].id, "node " + cursor  + ": id matches.");
 
-    let classesBox = document.getElementById("highlighter-nodeinfobar-classes");
+    let classesBox = stack.querySelector(".highlighter-nodeinfobar-classes");
     is(classesBox.textContent, nodes[cursor].classes, "node " + cursor  + ": classes match.");
   }
 
   function finishUp() {
-    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
     doc = nodes = null;
     gBrowser.removeCurrentTab();
     finish();
diff --git a/browser/devtools/inspector/test/browser_inspector_initialization.js b/browser/devtools/inspector/test/browser_inspector_initialization.js
new file mode 100644
index 000000000000..4083dd29b178
--- /dev/null
+++ b/browser/devtools/inspector/test/browser_inspector_initialization.js
@@ -0,0 +1,147 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+let doc;
+let salutation;
+
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
+function createDocument()
+{
+  doc.body.innerHTML = '<div id="first" style="{ margin: 10em; ' +
+    'font-size: 14pt; font-family: helvetica, sans-serif; color: #AAA}">\n' +
+    '<h1>Some header text</h1>\n' +
+    '<p id="salutation" style="{font-size: 12pt}">hi.</p>\n' +
+    '<p id="body" style="{font-size: 12pt}">I am a test-case. This text exists ' +
+    'solely to provide some things to test the inspector initialization.</p>\n' +
+    'If you are reading this, you should go do something else instead. Maybe ' +
+    'read a book. Or better yet, write some test-cases for another bit of code. ' +
+    '<span style="{font-style: italic}">Maybe more inspector test-cases!</span></p>\n' +
+    '<p id="closing">end transmission</p>\n' +
+    '</div>';
+  doc.title = "Inspector Initialization Test";
+
+  openInspector(startInspectorTests);
+}
+
+function startInspectorTests()
+{
+  ok(true, "Inspector started, and notification received.");
+
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  let inspector = gDevTools.getPanelForTarget("inspector", target);
+
+  ok(inspector, "Inspector instance is accessible");
+  ok(inspector.isReady, "Inspector instance is ready");
+  is(inspector.target.tab, gBrowser.selectedTab, "Valid target");
+  ok(inspector.highlighter, "Highlighter is up");
+
+  let p = doc.querySelector("p");
+
+  inspector.selection.setNode(p);
+
+  testHighlighter(p);
+  testMarkupView(p);
+  testBreadcrumbs(p);
+
+  let span = doc.querySelector("span");
+  span.scrollIntoView();
+
+  inspector.selection.setNode(span);
+
+  testHighlighter(span);
+  testMarkupView(span);
+  testBreadcrumbs(span);
+
+  let toolbox = gDevTools.getToolboxForTarget(target);
+  toolbox.once("destroyed", function() {
+    ok("true", "'destroyed' notification received.");
+    let toolbox = gDevTools.getToolboxForTarget(target);
+    ok(!toolbox, "Toolbox destroyed.");
+    executeSoon(runContextMenuTest);
+  });
+  toolbox.destroy();
+}
+
+
+function testHighlighter(node)
+{
+  ok(isHighlighting(), "Highlighter is highlighting");
+  is(getHighlitNode(), node, "Right node is highlighted");
+}
+
+function testMarkupView(node)
+{
+  let i = getActiveInspector();
+  is(i.markup._selectedContainer.node, node, "Right node is selected in the markup view");
+}
+
+function testBreadcrumbs(node)
+{
+  let b = getActiveInspector().breadcrumbs;
+  let expectedText = b.prettyPrintNodeAsText(node);
+  let button = b.container.querySelector("button[checked=true]");
+  ok(button, "A crumbs is checked=true");
+  is(button.getAttribute("tooltiptext"), expectedText, "Crumb refers to the right node");
+}
+
+function _clickOnInspectMenuItem(node) {
+  document.popupNode = node;
+  var contentAreaContextMenu = document.getElementById("contentAreaContextMenu");
+  var contextMenu = new nsContextMenu(contentAreaContextMenu, gBrowser);
+  contextMenu.inspectNode();
+}
+
+function runContextMenuTest()
+{
+  salutation = doc.getElementById("salutation");
+  _clickOnInspectMenuItem(salutation);
+  gDevTools.once("inspector-ready", testInitialNodeIsSelected);
+}
+
+function testInitialNodeIsSelected() {
+  testHighlighter(salutation);
+  testMarkupView(salutation);
+  testBreadcrumbs(salutation);
+  inspectNodesFromContextTestWhileOpen();
+}
+
+function inspectNodesFromContextTestWhileOpen()
+{
+  let closing = doc.getElementById("closing");
+  getActiveInspector().selection.once("new-node", function() {
+    ok(true, "Get selection's 'new-node' selection");
+    executeSoon(function() {
+      testHighlighter(closing);
+      testMarkupView(closing);
+      testBreadcrumbs(closing);
+      finishInspectorTests();
+    }
+  )});
+  _clickOnInspectMenuItem(closing);
+}
+
+function finishInspectorTests(subject, topic, aWinIdString)
+{
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,basic tests for inspector";
+}
+
diff --git a/browser/devtools/inspector/test/browser_inspector_invalidate.js b/browser/devtools/inspector/test/browser_inspector_invalidate.js
new file mode 100644
index 000000000000..3fc9a20434e0
--- /dev/null
+++ b/browser/devtools/inspector/test/browser_inspector_invalidate.js
@@ -0,0 +1,50 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+
+  let doc;
+  let div;
+  let inspector;
+
+  function createDocument()
+  {
+    div = doc.createElement("div");
+    div.setAttribute("style", "width: 100px; height: 100px; background:yellow;");
+    doc.body.appendChild(div);
+
+    openInspector(runTest);
+  }
+
+  function runTest(inspector)
+  {
+    inspector.selection.setNode(div);
+
+    executeSoon(function() {
+      let outline = inspector.highlighter.outline;
+      is(outline.style.width, "100px", "selection has the right width");
+
+      div.style.width = "200px";
+      function pollTest() {
+        if (outline.style.width == "100px") {
+          setTimeout(pollTest, 10);
+          return;
+        }
+        is(outline.style.width, "200px", "selection updated");
+        gBrowser.removeCurrentTab();
+        finish();
+      }
+      setTimeout(pollTest, 10);
+    });
+  }
+
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,basic tests for inspector";
+}
diff --git a/browser/devtools/highlighter/test/browser_inspector_menu.js b/browser/devtools/inspector/test/browser_inspector_menu.js
similarity index 62%
rename from browser/devtools/highlighter/test/browser_inspector_menu.js
rename to browser/devtools/inspector/test/browser_inspector_menu.js
index 61c95ed1a7c3..88f0c57e6de1 100644
--- a/browser/devtools/highlighter/test/browser_inspector_menu.js
+++ b/browser/devtools/inspector/test/browser_inspector_menu.js
@@ -9,6 +9,7 @@ function test() {
   let doc;
   let node1;
   let div;
+  let inspector;
 
   function createDocument() {
     div = doc.createElement("div");
@@ -22,7 +23,7 @@ function test() {
     div.appendChild(p1);
     doc.body.appendChild(div);
     node1 = p1;
-    setupTest();
+    openInspector(runTests);
   }
 
   gBrowser.selectedTab = gBrowser.addTab();
@@ -34,20 +35,14 @@ function test() {
 
   content.location = content.location = "data:text/html,basic tests for inspector";;
 
-  function setupTest() {
-    Services.obs.addObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.toggleInspectorUI();
-  }
-
-  function runTests() {
-    Services.obs.removeObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-    InspectorUI.stopInspecting();
-    InspectorUI.inspectNode(node1, true);
+  function runTests(aInspector) {
+    inspector = aInspector;
+    inspector.selection.setNode(node1);
     testCopyInnerMenu();
   }
 
   function testCopyInnerMenu() {
-    let copyInner = document.getElementById("inspectorHTMLCopyInner");
+    let copyInner = inspector.panelDoc.getElementById("node-menu-copyinner");
     ok(copyInner, "the popup menu has a copy inner html menu item");
 
     waitForClipboard("This is some example text",
@@ -56,7 +51,7 @@ function test() {
   }
 
   function testCopyOuterMenu() {
-    let copyOuter = document.getElementById("inspectorHTMLCopyOuter");
+    let copyOuter = inspector.panelDoc.getElementById("node-menu-copyouter");
     ok(copyOuter, "the popup menu has a copy outer html menu item");
 
     waitForClipboard("<p>This is some example text</p>",
@@ -65,10 +60,10 @@ function test() {
   }
 
   function testDeleteNode() {
-    let deleteNode = document.getElementById("inspectorHTMLDelete");
+    let deleteNode = inspector.panelDoc.getElementById("node-menu-delete");
     ok(deleteNode, "the popup menu has a delete menu item");
 
-    InspectorUI.highlighter.addListener("nodeselected", deleteTest);
+    inspector.selection.once("detached", deleteTest);
 
     let commandEvent = document.createEvent("XULCommandEvent");
     commandEvent.initCommandEvent("command", true, true, window, 0, false, false,
@@ -77,19 +72,16 @@ function test() {
   }
 
   function deleteTest() {
-    InspectorUI.highlighter.removeListener("nodeselected", deleteTest);
-    is(InspectorUI.selection, div, "parent node selected");
     let p = doc.querySelector("P");
     is(p, null, "node deleted");
 
-    InspectorUI.highlighter.addListener("nodeselected", deleteRootNode);
-    InspectorUI.inspectNode(doc.documentElement, true);
+    deleteRootNode();
   }
 
   function deleteRootNode() {
-    InspectorUI.highlighter.removeListener("nodeselected", deleteRootNode);
-    let deleteNode = document.getElementById("inspectorHTMLDelete");
-    let commandEvent = document.createEvent("XULCommandEvent");
+    inspector.selection.setNode(doc.documentElement);
+    let deleteNode = inspector.panelDoc.getElementById("node-menu-delete");
+    let commandEvent = inspector.panelDoc.createEvent("XULCommandEvent");
     commandEvent.initCommandEvent("command", true, true, window, 0, false, false,
                                   false, false, null);
     deleteNode.dispatchEvent(commandEvent);
@@ -98,15 +90,6 @@ function test() {
 
   function isRootStillAlive() {
     ok(doc.documentElement, "Document element still alive.");
-    Services.obs.addObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-    executeSoon(function() {
-      InspectorUI.closeInspectorUI();
-    });
-  }
-
-  function finishUp() {
-    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
-    doc = node1 = div = null;
     gBrowser.removeCurrentTab();
     finish();
   }
diff --git a/browser/devtools/inspector/test/browser_inspector_pseudoClass_menu.js b/browser/devtools/inspector/test/browser_inspector_pseudoClass_menu.js
new file mode 100644
index 000000000000..f8e2baf1ccf1
--- /dev/null
+++ b/browser/devtools/inspector/test/browser_inspector_pseudoClass_menu.js
@@ -0,0 +1,71 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+
+  let DOMUtils = Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
+
+  let pseudos = ["hover", "active", "focus"];
+
+  let doc;
+  let div;
+  let menu;
+  let inspector;
+
+  waitForExplicitFinish();
+  ignoreAllUncaughtExceptions();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,pseudo-class lock node menu tests";
+
+  function createDocument()
+  {
+    div = doc.createElement("div");
+    div.textContent = "test div";
+
+    doc.body.appendChild(div);
+
+    openInspector(selectNode);
+  }
+
+  function selectNode(aInspector)
+  {
+    inspector = aInspector;
+    inspector.selection.setNode(div);
+    performTests();
+  }
+
+  function performTests()
+  {
+    menu = inspector.panelDoc.getElementById("inspector-node-popup");
+    menu.addEventListener("popupshowing", testMenuItems, true);
+    menu.openPopup();
+  }
+
+  function testMenuItems()
+  {
+    menu.removeEventListener("popupshowing", testMenuItems, true);
+
+    for each (let pseudo in pseudos) {
+      let menuitem = inspector.panelDoc.getElementById("node-menu-pseudo-" + pseudo);
+      ok(menuitem, ":" + pseudo + " menuitem exists");
+
+      menuitem.doCommand();
+
+      is(DOMUtils.hasPseudoClassLock(div, ":" + pseudo), true,
+        "pseudo-class lock has been applied");
+    }
+    finishUp();
+  }
+
+  function finishUp()
+  {
+    gBrowser.removeCurrentTab();
+    finish();
+  }
+}
diff --git a/browser/devtools/highlighter/test/browser_inspector_pseudoclass_lock.js b/browser/devtools/inspector/test/browser_inspector_pseudoclass_lock.js
similarity index 59%
rename from browser/devtools/highlighter/test/browser_inspector_pseudoclass_lock.js
rename to browser/devtools/inspector/test/browser_inspector_pseudoclass_lock.js
index 6dcfee24d91c..6f8fc29a7c48 100644
--- a/browser/devtools/highlighter/test/browser_inspector_pseudoclass_lock.js
+++ b/browser/devtools/inspector/test/browser_inspector_pseudoclass_lock.js
@@ -1,10 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
 let DOMUtils = Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
 
 let doc;
 let div;
+let inspector;
+let ruleview;
 
 let pseudo = ":hover";
 
@@ -35,57 +41,38 @@ function createDocument()
   head.appendChild(style);
   doc.body.appendChild(div);
 
-  setupTests();
+  openInspector(selectNode);
 }
 
-function setupTests()
+function selectNode(aInspector)
 {
-  Services.obs.addObserver(selectNode,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.openInspectorUI();
-}
-
-function selectNode()
-{
-  Services.obs.removeObserver(selectNode,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-
-  executeSoon(function() {
-    InspectorUI.highlighter.addListener("locked", openRuleView);
-    InspectorUI.inspectNode(div);
-    InspectorUI.stopInspecting();
+  inspector = aInspector;
+  inspector.selection.setNode(div);
+  inspector.sidebar.once("ruleview-ready", function() {
+    ruleview = inspector.sidebar.getWindowForTab("ruleview").ruleview.view;
+    inspector.sidebar.select("ruleview");
+    performTests();
   });
 }
 
-function openRuleView()
-{
-  InspectorUI.sidebar.show();
-  InspectorUI.currentInspector.once("sidebaractivated-ruleview", performTests);
-  InspectorUI.sidebar.activatePanel("ruleview");
-}
-
 function performTests()
 {
-  InspectorUI.highlighter.removeListener("locked", performTests);
-
   // toggle the class
-  InspectorUI.highlighter.pseudoClassLockToggled(pseudo);
+  inspector.togglePseudoClass(pseudo);
 
   testAdded();
 
   // toggle the lock off
-  InspectorUI.highlighter.pseudoClassLockToggled(pseudo);
+  inspector.togglePseudoClass(pseudo);
 
   testRemoved();
   testRemovedFromUI();
 
   // toggle it back on
-  InspectorUI.highlighter.pseudoClassLockToggled(pseudo);  
+  inspector.togglePseudoClass(pseudo);
 
   // close the inspector
-  Services.obs.addObserver(testInspectorClosed,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-  InspectorUI.closeInspectorUI();
+  finishUp();
 }
 
 function testAdded()
@@ -99,14 +86,14 @@ function testAdded()
   } while (node.parentNode)
 
   // infobar selector contains pseudo-class
-  let pseudoClassesBox = document.getElementById("highlighter-nodeinfobar-pseudo-classes");
+  let pseudoClassesBox = getActiveInspector().highlighter.nodeInfo.pseudoClassesBox;
   is(pseudoClassesBox.textContent, pseudo, "pseudo-class in infobar selector");
-  
+
   // ruleview contains pseudo-class rule
-  is(ruleView().element.children.length, 3,
+  is(ruleview.element.children.length, 3,
      "rule view is showing 3 rules for pseudo-class locked div");
-     
-  is(ruleView().element.children[1]._ruleEditor.rule.selectorText,
+
+  is(ruleview.element.children[1]._ruleEditor.rule.selectorText,
      "div:hover", "rule view is showing " + pseudo + " rule");
 }
 
@@ -124,27 +111,25 @@ function testRemoved()
 function testRemovedFromUI()
 {
   // infobar selector doesn't contain pseudo-class
-  let pseudoClassesBox = document.getElementById("highlighter-nodeinfobar-pseudo-classes");
+  let pseudoClassesBox = getActiveInspector().highlighter.nodeInfo.pseudoClassesBox;
   is(pseudoClassesBox.textContent, "", "pseudo-class removed from infobar selector");    
 
   // ruleview no longer contains pseudo-class rule
-  is(ruleView().element.children.length, 2,
+  is(ruleview.element.children.length, 2,
      "rule view is showing 2 rules after removing lock");    
 }
 
-function testInspectorClosed()
-{
-  Services.obs.removeObserver(testInspectorClosed,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
-
-  testRemoved();
-
-  finishUp();  
-}
-
 function finishUp()
 {
-  doc = div = null;
-  gBrowser.removeCurrentTab();
-  finish();
+  gDevTools.once("toolbox-destroyed", function() {
+    testRemoved();
+    inspector = ruleview = null;
+    doc = div = null;
+    gBrowser.removeCurrentTab();
+    finish();
+  });
+
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  let toolbox = gDevTools.getToolboxForTarget(target);
+  toolbox.destroy();
 }
diff --git a/browser/devtools/highlighter/test/browser_inspector_scrolling.js b/browser/devtools/inspector/test/browser_inspector_scrolling.js
similarity index 76%
rename from browser/devtools/highlighter/test/browser_inspector_scrolling.js
rename to browser/devtools/inspector/test/browser_inspector_scrolling.js
index 2116188fbd73..85db0080e7ec 100644
--- a/browser/devtools/highlighter/test/browser_inspector_scrolling.js
+++ b/browser/devtools/inspector/test/browser_inspector_scrolling.js
@@ -7,6 +7,7 @@
 let doc;
 let div;
 let iframe;
+let inspector;
 
 function createDocument()
 {
@@ -21,35 +22,25 @@ function createDocument()
     div.textContent = "big div";
     div.setAttribute("style", "height:500px; width:500px; border:1px solid gray;");
     iframe.contentDocument.body.appendChild(div);
-    toggleInspector();
+    openInspector(inspectNode);
   }, false);
 
   iframe.src = "data:text/html,foo bar";
   doc.body.appendChild(iframe);
 }
 
-function toggleInspector()
+function inspectNode(aInspector)
 {
-  Services.obs.addObserver(inspectNode, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.toggleInspectorUI();
-}
-
-function inspectNode()
-{
-  Services.obs.removeObserver(inspectNode,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  InspectorUI.highlighter.addListener("nodeselected", performScrollingTest);
+  inspector = aInspector;
 
+  inspector.highlighter.once("locked", performScrollingTest);
   executeSoon(function() {
-    InspectorUI.inspectNode(div);
+    inspector.selection.setNode(div, "");
   });
 }
 
 function performScrollingTest()
 {
-  InspectorUI.highlighter.removeListener("nodeselected", performScrollingTest);
-
   executeSoon(function() {
     EventUtils.synthesizeWheel(div, 10, 10,
       { deltaY: 50.0, deltaMode: WheelEvent.DOM_DELTA_PIXEL },
@@ -62,8 +53,9 @@ function performScrollingTest()
 
     is(iframe.contentDocument.body.scrollTop, 50, "inspected iframe scrolled");
 
-    div = iframe = doc = null;
-    InspectorUI.closeInspectorUI();
+    inspector = div = iframe = doc = null;
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    gDevTools.closeToolbox(target);
     gBrowser.removeCurrentTab();
     finish();
   }, false);
diff --git a/browser/devtools/inspector/test/browser_inspector_sidebarstate.js b/browser/devtools/inspector/test/browser_inspector_sidebarstate.js
new file mode 100644
index 000000000000..ba51db9a584e
--- /dev/null
+++ b/browser/devtools/inspector/test/browser_inspector_sidebarstate.js
@@ -0,0 +1,77 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
+let doc;
+let inspector;
+
+function createDocument()
+{
+  doc.body.innerHTML = '<h1>Sidebar state test</h1>';
+  doc.title = "Sidebar State Test";
+
+  openInspector(function(panel) {
+    inspector = panel;
+    inspector.sidebar.select("ruleview");
+    inspectorRuleViewOpened();
+  });
+}
+
+function inspectorRuleViewOpened()
+{
+  is(inspector.sidebar.getCurrentTabID(), "ruleview", "Rule View is selected by default");
+
+  // Select the computed view and turn off the inspector.
+  inspector.sidebar.select("computedview");
+
+  gDevTools.once("toolbox-destroyed", inspectorClosed);
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  let toolbox = gDevTools.getToolboxForTarget(target);
+  executeSoon(function() {
+    toolbox.destroy();
+  });
+}
+
+function inspectorClosed()
+{
+  openInspector(function(panel) {
+    inspector = panel;
+    if (inspector.sidebar.getCurrentTabID()) {
+      // Default sidebar already selected.
+      testNewDefaultTab();
+    } else {
+      // Default sidebar still to be selected.
+      inspector.sidebar.once("select", testNewDefaultTab);
+    }
+  });
+}
+
+function testNewDefaultTab()
+{
+  is(inspector.sidebar.getCurrentTabID(), "computedview", "Computed view is selected by default.");
+
+  finishTest();
+}
+
+
+function finishTest()
+{
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,basic tests for inspector";
+}
diff --git a/browser/devtools/highlighter/test/browser_inspector_tree_height.js b/browser/devtools/inspector/test/browser_inspector_tree_height.js
similarity index 100%
rename from browser/devtools/highlighter/test/browser_inspector_tree_height.js
rename to browser/devtools/inspector/test/browser_inspector_tree_height.js
diff --git a/browser/devtools/highlighter/test/head.js b/browser/devtools/inspector/test/head.js
similarity index 64%
rename from browser/devtools/highlighter/test/head.js
rename to browser/devtools/inspector/test/head.js
index 7c34572aee6e..45332a27bf0c 100644
--- a/browser/devtools/highlighter/test/head.js
+++ b/browser/devtools/inspector/test/head.js
@@ -6,30 +6,44 @@ const Cu = Components.utils;
 let tempScope = {};
 Cu.import("resource:///modules/devtools/LayoutHelpers.jsm", tempScope);
 let LayoutHelpers = tempScope.LayoutHelpers;
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
 
 // Import the GCLI test helper
 let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
 Services.scriptloader.loadSubScript(testDir + "/helpers.js", this);
 
-// Clear preferences that may be set during the course of tests.
-function clearUserPrefs()
+function openInspector(callback)
 {
-  Services.prefs.clearUserPref("devtools.inspector.htmlPanelOpen");
-  Services.prefs.clearUserPref("devtools.inspector.sidebarOpen");
-  Services.prefs.clearUserPref("devtools.inspector.activeSidebar");
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  let inspector = gDevTools.getPanelForTarget("inspector", target);
+  if (inspector && inspector.isReady) {
+    callback(inspector);
+  } else {
+    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+    toolbox.once("inspector-ready", function(event, panel) {
+      let inspector = gDevTools.getPanelForTarget("inspector", target);
+      callback(inspector);
+    });
+  }
 }
 
-registerCleanupFunction(clearUserPrefs);
+function getActiveInspector()
+{
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  return gDevTools.getPanelForTarget("inspector", target);
+}
 
 function isHighlighting()
 {
-  let outline = InspectorUI.highlighter.outline;
+  let outline = getActiveInspector().highlighter.outline;
   return !(outline.getAttribute("hidden") == "true");
 }
 
 function getHighlitNode()
 {
-  let h = InspectorUI.highlighter;
+  let h = getActiveInspector().highlighter;
   if (!isHighlighting() || !h._contentRect)
     return null;
 
@@ -61,7 +75,9 @@ function midPoint(aPointA, aPointB)
 
 function computedView()
 {
-  return InspectorUI.sidebar._toolContext("computedview");
+  let sidebar = getActiveInspector().sidebar;
+  let iframe = sidebar.tabbox.querySelector(".iframe-computedview");
+  return iframe.contentWindow.computedView;
 }
 
 function computedViewTree()
@@ -71,8 +87,11 @@ function computedViewTree()
 
 function ruleView()
 {
-  return InspectorUI.sidebar._toolContext("ruleview").view;
+  let sidebar = getActiveInspector().sidebar;
+  let iframe = sidebar.tabbox.querySelector(".iframe-ruleview");
+  return iframe.contentWindow.ruleView;
 }
+
 function synthesizeKeyFromKeyTag(aKeyId) {
   let key = document.getElementById(aKeyId);
   isnot(key, null, "Successfully retrieved the <key> node");
diff --git a/browser/devtools/highlighter/test/helpers.js b/browser/devtools/inspector/test/helpers.js
similarity index 100%
rename from browser/devtools/highlighter/test/helpers.js
rename to browser/devtools/inspector/test/helpers.js
diff --git a/browser/devtools/jar.mn b/browser/devtools/jar.mn
index d3435d620598..ea3f4638947f 100644
--- a/browser/devtools/jar.mn
+++ b/browser/devtools/jar.mn
@@ -7,7 +7,7 @@ browser.jar:
     content/browser/devtools/markup-view.css      (markupview/markup-view.css)
     content/browser/NetworkPanel.xhtml            (webconsole/NetworkPanel.xhtml)
     content/browser/devtools/webconsole.js        (webconsole/webconsole.js)
-*   content/browser/devtools/webconsole.xul       (webconsole/webconsole.xul)
+    content/browser/devtools/webconsole.xul       (webconsole/webconsole.xul)
 *   content/browser/scratchpad.xul                (scratchpad/scratchpad.xul)
     content/browser/scratchpad.js                 (scratchpad/scratchpad.js)
     content/browser/splitview.css                 (shared/splitview.css)
@@ -16,11 +16,12 @@ browser.jar:
     content/browser/devtools/csshtmltree.xul      (styleinspector/csshtmltree.xul)
     content/browser/devtools/cssruleview.xul      (styleinspector/cssruleview.xul)
     content/browser/devtools/styleinspector.css   (styleinspector/styleinspector.css)
+    content/browser/devtools/layoutview/view.js   (layoutview/view.js)
     content/browser/devtools/layoutview/view.xhtml  (layoutview/view.xhtml)
     content/browser/devtools/layoutview/view.css  (layoutview/view.css)
     content/browser/orion.js                      (sourceeditor/orion/orion.js)
 *   content/browser/source-editor-overlay.xul     (sourceeditor/source-editor-overlay.xul)
-*   content/browser/debugger.xul                  (debugger/debugger.xul)
+    content/browser/debugger.xul                  (debugger/debugger.xul)
     content/browser/debugger.css                  (debugger/debugger.css)
     content/browser/debugger-controller.js        (debugger/debugger-controller.js)
     content/browser/debugger-view.js              (debugger/debugger-view.js)
@@ -29,3 +30,11 @@ browser.jar:
     content/browser/devtools/commandline.css      (commandline/commandline.css)
     content/browser/devtools/commandlineoutput.xhtml  (commandline/commandlineoutput.xhtml)
     content/browser/devtools/commandlinetooltip.xhtml  (commandline/commandlinetooltip.xhtml)
+    content/browser/devtools/framework/toolbox-window.xul    (framework/toolbox-window.xul)
+    content/browser/devtools/framework/toolbox.xul           (framework/toolbox.xul)
+    content/browser/devtools/framework/toolbox.css           (framework/toolbox.css)
+    content/browser/devtools/inspector/inspector.xul         (inspector/inspector.xul)
+    content/browser/devtools/inspector/inspector.css         (inspector/inspector.css)
+    content/browser/devtools/connect.xhtml  (framework/connect/connect.xhtml)
+    content/browser/devtools/connect.css    (framework/connect/connect.css)
+    content/browser/devtools/connect.js     (framework/connect/connect.js)
diff --git a/browser/devtools/layoutview/LayoutView.jsm b/browser/devtools/layoutview/LayoutView.jsm
deleted file mode 100644
index b07d411acff0..000000000000
--- a/browser/devtools/layoutview/LayoutView.jsm
+++ /dev/null
@@ -1,368 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const Cu = Components.utils;
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/inspector.jsm");
-Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
-Cu.import("resource:///modules/devtools/CssLogic.jsm");
-
-this.EXPORTED_SYMBOLS = ["LayoutView"];
-
-this.LayoutView = function LayoutView(aOptions)
-{
-  this.chromeDoc = aOptions.document;
-  this.inspector = aOptions.inspector;
-  this.browser = this.inspector.chromeWindow.gBrowser;
-
-  this.init();
-}
-
-LayoutView.prototype = {
-  init: function LV_init() {
-    this.cssLogic = new CssLogic();
-
-    this.update = this.update.bind(this);
-    this.onMessage = this.onMessage.bind(this);
-
-    this.isOpen = false;
-    this.documentReady = false;
-
-    // Is the layout view was open before?
-    if (!("_layoutViewIsOpen" in this.inspector)) {
-      this.inspector._layoutViewIsOpen =
-        Services.prefs.getBoolPref("devtools.layoutview.open");
-    }
-
-    // We update the values when:
-    //  a node is locked
-    //  we get the MozAfterPaint event and the node is locked
-    function onSelect() {
-      if (this.inspector.locked) {
-        this.cssLogic.highlight(this.inspector.selection);
-        this.undim();
-        this.update();
-        // We make sure we never add 2 listeners.
-        if (!this.trackingPaint) {
-          this.browser.addEventListener("MozAfterPaint", this.update, true);
-          this.trackingPaint = true;
-        }
-      }
-    }
-
-    function onUnlock() {
-      this.browser.removeEventListener("MozAfterPaint", this.update, true);
-      this.trackingPaint = false;
-      this.dim();
-    }
-
-    this.onSelect= onSelect.bind(this);
-    this.onUnlock = onUnlock.bind(this);
-    this.inspector.on("select", this.onSelect);
-    this.inspector.on("unlocked", this.onUnlock);
-
-    // Build the layout view in the sidebar.
-    this.buildView();
-
-    this.bound_handleKeypress = this.handleKeypress.bind(this);
-    this.iframe.addEventListener("keypress", this.bound_handleKeypress, true);
-
-    // Get messages from the iframe.
-    this.inspector.chromeWindow.addEventListener("message", this.onMessage, true);
-
-    // Store for the different dimensions of the node.
-    // 'selector' refers to the element that holds the value in view.xhtml;
-    // 'property' is what we are measuring;
-    // 'value' is the computed dimension, computed in update().
-    this.map = {
-      marginTop: {selector: ".margin.top > span",
-                  property: "margin-top",
-                  value: undefined},
-      marginBottom: {selector: ".margin.bottom > span",
-                  property: "margin-bottom",
-                  value: undefined},
-      marginLeft: {selector: ".margin.left > span",
-                  property: "margin-left",
-                  value: undefined},
-      marginRight: {selector: ".margin.right > span",
-                  property: "margin-right",
-                  value: undefined},
-      paddingTop: {selector: ".padding.top > span",
-                  property: "padding-top",
-                  value: undefined},
-      paddingBottom: {selector: ".padding.bottom > span",
-                  property: "padding-bottom",
-                  value: undefined},
-      paddingLeft: {selector: ".padding.left > span",
-                  property: "padding-left",
-                  value: undefined},
-      paddingRight: {selector: ".padding.right > span",
-                  property: "padding-right",
-                  value: undefined},
-      borderTop: {selector: ".border.top > span",
-                  property: "border-top-width",
-                  value: undefined},
-      borderBottom: {selector: ".border.bottom > span",
-                  property: "border-bottom-width",
-                  value: undefined},
-      borderLeft: {selector: ".border.left > span",
-                  property: "border-left-width",
-                  value: undefined},
-      borderRight: {selector: ".border.right > span",
-                  property: "border-right-width",
-                  value: undefined},
-    };
-  },
-
-  /**
-   * Destroy the nodes. Remove listeners.
-   */
-  destroy: function LV_destroy() {
-    this.inspector.off("select", this.onSelect);
-    this.inspector.off("unlocked", this.onUnlock);
-    this.browser.removeEventListener("MozAfterPaint", this.update, true);
-    this.iframe.removeEventListener("keypress", this.bound_handleKeypress, true);
-    this.inspector.chromeWindow.removeEventListener("message", this.onMessage, true);
-    this.close();
-    this.sizeHeadingLabel = null;
-    this.sizeLabel = null;
-    this.iframe = null;
-    this.view.parentNode.removeChild(this.view);
-  },
-
-  /**
-   * Build the Layout container:
-   *
-   * <vbox id="inspector-layoutview-container">
-   *  <iframe src="chrome://browser/content/devtools/layoutview/view.xhtml"/>
-   * </vbox>
-   */
-  buildView: function LV_buildPanel() {
-    this.iframe = this.chromeDoc.createElement("iframe");
-    this.iframe.setAttribute("src", "chrome://browser/content/devtools/layoutview/view.xhtml");
-
-    this.view = this.chromeDoc.createElement("vbox");
-    this.view.id = "inspector-layoutview-container";
-    this.view.appendChild(this.iframe);
-
-    let sidebar = this.chromeDoc.getElementById("devtools-sidebar-box");
-    sidebar.appendChild(this.view);
-  },
-
-  /**
-   * Called when the iframe is loaded.
-   */
-  onDocumentReady: function LV_onDocumentReady() {
-    this.documentReady = true;
-    this.doc = this.iframe.contentDocument;
-
-    // Save reference to the labels displaying size of the node.
-    this.sizeLabel = this.doc.querySelector(".size > span");
-    this.sizeHeadingLabel = this.doc.getElementById("element-size");
-
-    // We can't do that earlier because open() and close() need to do stuff
-    // inside the iframe.
-
-    if (this.inspector.locked)
-      this.onSelect();
-    else
-      this.onUnlock();
-
-    if (this.inspector._layoutViewIsOpen) {
-      this.open();
-    } else {
-      this.close();
-    }
-
-  },
-
-  /**
-   * This is where we get messages from the layout view iframe.
-   */
-  onMessage: function LV_onMessage(e) {
-    switch (e.data) {
-      case "layoutview-toggle-view":
-        this.toggle(true);
-        break;
-      case "layoutview-ready":
-        this.onDocumentReady();
-        break;
-      default:
-        break;
-    }
-  },
-
-  /**
-   * Handle keypress.
-   */
-   handleKeypress: function LV_handleKeypress(event) {
-     let win = this.inspector.chromeWindow;
-
-     // avoid scroll
-     if (event.keyCode == win.KeyEvent.DOM_VK_LEFT ||
-         event.keyCode == win.KeyEvent.DOM_VK_RIGHT ||
-         event.keyCode == win.KeyEvent.DOM_VK_UP ||
-         event.keyCode == win.KeyEvent.DOM_VK_DOWN ||
-         event.keyCode == win.KeyEvent.DOM_VK_PAGE_UP ||
-         event.keyCode == win.KeyEvent.DOM_VK_PAGE_DOWN) {
-
-        event.preventDefault();
-     }
-
-     if (event.charCode == win.KeyEvent.DOM_VK_SPACE) {
-       this.toggle(true);
-     }
-   },
-
-  /**
-   * Open the view container.
-   *
-   * @param aUserAction Is the action triggered by the user (click on the
-   * open/close button in the view)
-   */
-  open: function LV_open(aUserAction) {
-    this.isOpen = true;
-    if (this.documentReady)
-      this.doc.body.classList.add("open");
-    if (aUserAction) {
-      this.inspector._layoutViewIsOpen = true;
-      Services.prefs.setBoolPref("devtools.layoutview.open", true);
-      this.view.removeAttribute("disable-transitions");
-    } else {
-      this.view.setAttribute("disable-transitions", "true");
-    }
-    this.iframe.setAttribute("open", "true");
-    this.update();
-  },
-
-  /**
-   * Close the view container.
-   *
-   * @param aUserAction Is the action triggered by the user (click on the
-   * open/close button in the view)
-   */
-  close: function LV_close(aUserAction) {
-    this.isOpen = false;
-    if (this.documentReady)
-      this.doc.body.classList.remove("open");
-    if (aUserAction) {
-      this.inspector._layoutViewIsOpen = false;
-      Services.prefs.setBoolPref("devtools.layoutview.open", false);
-      this.view.removeAttribute("disable-transitions");
-    } else {
-      this.view.setAttribute("disable-transitions", "true");
-    }
-    this.iframe.removeAttribute("open");
-  },
-
-  /**
-   * Toggle view container state (open/close).
-   *
-   * @param aUserAction Is the action triggered by the user (click on the
-   * open/close button in the view)
-   */
-  toggle: function LV_toggle(aUserAction) {
-    this.isOpen ? this.close(aUserAction):this.open(aUserAction);
-  },
-
-  /**
-   * Hide the layout boxes. No node are selected.
-   */
-  dim: function LV_dim() {
-    if (!this.documentReady) return;
-    this.doc.body.classList.add("dim");
-  },
-
-  /**
-   * Show the layout boxes. A node is selected.
-   */
-  undim: function LV_dim() {
-    if (!this.documentReady) return;
-    this.doc.body.classList.remove("dim");
-  },
-
-  /**
-   * Compute the dimensions of the node and update the values in
-   * the layoutview/view.xhtml document.
-   */
-  update: function LV_update() {
-    let node = this.inspector.selection;
-    if (!node ||
-        !LayoutHelpers.isNodeConnected(node) ||
-        !this.documentReady) {
-      return;
-    }
-
-    // First, we update the first part of the layout view, with
-    // the size of the element.
-
-    let clientRect = node.getBoundingClientRect();
-    let width = Math.round(clientRect.width);
-    let height = Math.round(clientRect.height);
-
-    let newLabel = width + "x" + height;
-    if (this.sizeHeadingLabel.textContent != newLabel) {
-      this.sizeHeadingLabel.textContent = newLabel;
-    }
-
-    // If the view is closed, no need to do anything more.
-    if (!this.isOpen) return;
-
-    // We compute and update the values of margins & co.
-    let style = this.browser.contentWindow.getComputedStyle(node);;
-
-    for (let i in this.map) {
-      let property = this.map[i].property;
-      this.map[i].value = parseInt(style.getPropertyValue(property));
-    }
-
-    let margins = this.processMargins(node);
-    if ("top" in margins) this.map.marginTop.value = "auto";
-    if ("right" in margins) this.map.marginRight.value = "auto";
-    if ("bottom" in margins) this.map.marginBottom.value = "auto";
-    if ("left" in margins) this.map.marginLeft.value = "auto";
-
-    for (let i in this.map) {
-      let selector = this.map[i].selector;
-      let span = this.doc.querySelector(selector);
-      if (span.textContent.length > 0 &&
-          span.textContent == this.map[i].value) {
-        continue;
-      }
-      span.textContent = this.map[i].value;
-    }
-
-    width -= this.map.borderLeft.value + this.map.borderRight.value +
-             this.map.paddingLeft.value + this.map.paddingRight.value;
-
-    height -= this.map.borderTop.value + this.map.borderBottom.value +
-              this.map.paddingTop.value + this.map.paddingBottom.value;
-
-    let newValue = width + "x" + height;
-    if (this.sizeLabel.textContent != newValue) {
-      this.sizeLabel.textContent = newValue;
-    }
-  },
-
-  /**
-   * Find margins declared 'auto'
-   */
-  processMargins: function LV_processMargins(node) {
-    let margins = {};
-
-    for each (let prop in ["top", "bottom", "left", "right"]) {
-      let info = this.cssLogic.getPropertyInfo("margin-" + prop);
-      let selectors = info.matchedSelectors;
-      if (selectors && selectors.length > 0 && selectors[0].value == "auto") {
-        margins[prop] = "auto";
-      }
-    }
-
-    return margins;
-  },
-}
diff --git a/browser/devtools/layoutview/Makefile.in b/browser/devtools/layoutview/Makefile.in
index df206dadd999..a8d0b209397e 100644
--- a/browser/devtools/layoutview/Makefile.in
+++ b/browser/devtools/layoutview/Makefile.in
@@ -13,6 +13,3 @@ include $(DEPTH)/config/autoconf.mk
 TEST_DIRS += test
 
 include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
diff --git a/browser/devtools/layoutview/test/browser_layoutview.js b/browser/devtools/layoutview/test/browser_layoutview.js
index 291b8d267b00..3767c54424f6 100644
--- a/browser/devtools/layoutview/test/browser_layoutview.js
+++ b/browser/devtools/layoutview/test/browser_layoutview.js
@@ -1,6 +1,10 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
 function test() {
   waitForExplicitFinish();
 
@@ -10,6 +14,7 @@ function test() {
   let doc;
   let node;
   let view;
+  let inspector;
 
   // Expected values:
   let res1 = [
@@ -61,44 +66,36 @@ function test() {
     node = doc.querySelector("div");
     ok(node, "node found");
 
-    Services.obs.addObserver(openLayoutView,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.toggleInspectorUI();
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+    toolbox.once("inspector-ready", function(event, panel) {
+      let inspector = gDevTools.getPanelForTarget("inspector", target);
+      openLayoutView(inspector);
+    });
   }
 
-  function openLayoutView() {
-    Services.obs.removeObserver(openLayoutView,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+  function openLayoutView(aInspector) {
+    inspector = aInspector;
 
     info("Inspector open");
 
-    let highlighter = InspectorUI.highlighter;
-    highlighter.highlight(node);
-    highlighter.lock();
-
-    window.addEventListener("message", viewReady, true);
+    inspector.selection.setNode(node);
+    inspector.sidebar.select("layoutview");
+    inspector.sidebar.once("layoutview-ready", viewReady);
   }
 
-  function viewReady(e) {
-    if (e.data != "layoutview-ready") return;
-
-    window.removeEventListener("message", viewReady, true);
-
+  function viewReady() {
     info("Layout view ready");
 
-    view = InspectorUI._sidebar._layoutview;
+    view = inspector.sidebar.getWindowForTab("layoutview");
 
-    ok(!!view, "LayoutView document is alive.");
-
-    view.open();
-
-    ok(view.iframe.getAttribute("open"), "true", "View is open.");
+    ok(!!view.layoutview, "LayoutView document is alive.");
 
     test1();
   }
 
   function test1() {
-    let viewdoc = view.iframe.contentDocument;
+    let viewdoc = view.document;
 
     for (let i = 0; i < res1.length; i++) {
       let elt = viewdoc.querySelector(res1[i].selector);
@@ -107,14 +104,14 @@ function test() {
 
     gBrowser.selectedBrowser.addEventListener("MozAfterPaint", test2, false);
 
-    InspectorUI.selection.style.height = "150px";
-    InspectorUI.selection.style.paddingRight = "50px";
+    inspector.selection.node.style.height = "150px";
+    inspector.selection.node.style.paddingRight = "50px";
   }
 
   function test2() {
     gBrowser.selectedBrowser.removeEventListener("MozAfterPaint", test2, false);
 
-    let viewdoc = view.iframe.contentDocument;
+    let viewdoc = view.document;
 
     for (let i = 0; i < res2.length; i++) {
       let elt = viewdoc.querySelector(res2[i].selector);
@@ -122,16 +119,14 @@ function test() {
     }
 
     executeSoon(function() {
-      Services.obs.addObserver(finishUp,
-        InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-      InspectorUI.closeInspectorUI();
+      gDevTools.once("toolbox-destroyed", finishUp);
+      inspector._toolbox.destroy();
     });
   }
 
   function finishUp() {
     Services.prefs.clearUserPref("devtools.layoutview.enabled");
     Services.prefs.clearUserPref("devtools.inspector.sidebarOpen");
-    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
     gBrowser.removeCurrentTab();
     finish();
   }
diff --git a/browser/devtools/layoutview/view.css b/browser/devtools/layoutview/view.css
index a8e9d2861b0f..4042929f0d00 100644
--- a/browser/devtools/layoutview/view.css
+++ b/browser/devtools/layoutview/view.css
@@ -38,10 +38,6 @@ body {
   -moz-box-pack: end;
 }
 
-#header:focus {
-  outline: none;
-}
-
 #main {
   margin: 0 10px 10px 10px;
   -moz-box-sizing: border-box;
diff --git a/browser/devtools/layoutview/view.js b/browser/devtools/layoutview/view.js
new file mode 100644
index 000000000000..130b6d790bcd
--- /dev/null
+++ b/browser/devtools/layoutview/view.js
@@ -0,0 +1,248 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const Cu = Components.utils;
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
+Cu.import("resource:///modules/devtools/CssLogic.jsm");
+Cu.import("resource:///modules/devtools/gDevTools.jsm");
+
+function LayoutView(aInspector, aWindow)
+{
+  this.inspector = aInspector;
+
+  // <browser> is not always available (for Chrome targets for example)
+  if (this.inspector.target.tab) {
+    this.browser = aInspector.target.tab.linkedBrowser;
+  }
+
+  this.doc = aWindow.document;
+  this.sizeLabel = this.doc.querySelector(".size > span");
+  this.sizeHeadingLabel = this.doc.getElementById("element-size");
+
+  this.init();
+}
+
+LayoutView.prototype = {
+  init: function LV_init() {
+    this.cssLogic = new CssLogic();
+
+    this.update = this.update.bind(this);
+    this.onNewNode = this.onNewNode.bind(this);
+    this.onHighlighterLocked = this.onHighlighterLocked.bind(this);
+    this.inspector.selection.on("detached", this.onNewNode);
+    this.inspector.selection.on("new-node", this.onNewNode);
+    this.inspector.sidebar.on("layoutview-selected", this.onNewNode);
+    if (this.inspector.highlighter) {
+      this.inspector.highlighter.on("locked", this.onHighlighterLocked);
+    }
+
+    // Store for the different dimensions of the node.
+    // 'selector' refers to the element that holds the value in view.xhtml;
+    // 'property' is what we are measuring;
+    // 'value' is the computed dimension, computed in update().
+    this.map = {
+      marginTop: {selector: ".margin.top > span",
+                  property: "margin-top",
+                  value: undefined},
+      marginBottom: {selector: ".margin.bottom > span",
+                  property: "margin-bottom",
+                  value: undefined},
+      marginLeft: {selector: ".margin.left > span",
+                  property: "margin-left",
+                  value: undefined},
+      marginRight: {selector: ".margin.right > span",
+                  property: "margin-right",
+                  value: undefined},
+      paddingTop: {selector: ".padding.top > span",
+                  property: "padding-top",
+                  value: undefined},
+      paddingBottom: {selector: ".padding.bottom > span",
+                  property: "padding-bottom",
+                  value: undefined},
+      paddingLeft: {selector: ".padding.left > span",
+                  property: "padding-left",
+                  value: undefined},
+      paddingRight: {selector: ".padding.right > span",
+                  property: "padding-right",
+                  value: undefined},
+      borderTop: {selector: ".border.top > span",
+                  property: "border-top-width",
+                  value: undefined},
+      borderBottom: {selector: ".border.bottom > span",
+                  property: "border-bottom-width",
+                  value: undefined},
+      borderLeft: {selector: ".border.left > span",
+                  property: "border-left-width",
+                  value: undefined},
+      borderRight: {selector: ".border.right > span",
+                  property: "border-right-width",
+                  value: undefined},
+    };
+
+    this.onNewNode();
+  },
+
+  /**
+   * Is the layoutview visible in the sidebar?
+   */
+  isActive: function LV_isActive() {
+    return this.inspector.sidebar.getCurrentTabID() == "layoutview";
+  },
+
+  /**
+   * Destroy the nodes. Remove listeners.
+   */
+  destroy: function LV_destroy() {
+    this.inspector.sidebar.off("layoutview-selected", this.onNewNode);
+    this.inspector.selection.off("new-node", this.onNewNode);
+    this.inspector.selection.off("detached", this.onNewNode);
+    if (this.browser) {
+      this.browser.removeEventListener("MozAfterPaint", this.update, true);
+    }
+    if (this.inspector.highlighter) {
+      this.inspector.highlighter.on("locked", this.onHighlighterLocked);
+    }
+    this.sizeHeadingLabel = null;
+    this.sizeLabel = null;
+    this.inspector = null;
+    this.doc = null;
+  },
+
+  /**
+   * Selection 'new-node' event handler.
+   */
+  onNewNode: function LV_onNewNode() {
+    if (this.isActive() &&
+        this.inspector.selection.isConnected() &&
+        this.inspector.selection.isElementNode() &&
+        this.inspector.selection.reason != "highlighter") {
+      this.cssLogic.highlight(this.inspector.selection.node);
+      this.undim();
+      this.update();
+    } else {
+      this.dim();
+    }
+  },
+
+  /**
+   * Highlighter 'locked' event handler
+   */
+  onHighlighterLocked: function LV_onHighlighterLocked() {
+    this.cssLogic.highlight(this.inspector.selection.node);
+    this.undim();
+    this.update();
+  },
+
+  /**
+   * Hide the layout boxes. No node are selected.
+   */
+  dim: function LV_dim() {
+    if (this.browser) {
+      this.browser.removeEventListener("MozAfterPaint", this.update, true);
+    }
+    this.trackingPaint = false;
+    this.doc.body.classList.add("dim");
+    this.dimmed = true;
+  },
+
+  /**
+   * Show the layout boxes. A node is selected.
+   */
+  undim: function LV_undim() {
+    if (!this.trackingPaint) {
+      if (this.browser) {
+        this.browser.addEventListener("MozAfterPaint", this.update, true);
+      }
+      this.trackingPaint = true;
+    }
+    this.doc.body.classList.remove("dim");
+    this.dimmed = false;
+  },
+
+  /**
+   * Compute the dimensions of the node and update the values in
+   * the layoutview/view.xhtml document.
+   */
+  update: function LV_update() {
+    if (!this.isActive() ||
+        !this.inspector.selection.isConnected() ||
+        !this.inspector.selection.isElementNode()) {
+      return;
+    }
+
+    let node = this.inspector.selection.node;
+
+    // First, we update the first part of the layout view, with
+    // the size of the element.
+
+    let clientRect = node.getBoundingClientRect();
+    let width = Math.round(clientRect.width);
+    let height = Math.round(clientRect.height);
+
+    let newLabel = width + "x" + height;
+    if (this.sizeHeadingLabel.textContent != newLabel) {
+      this.sizeHeadingLabel.textContent = newLabel;
+    }
+
+    // If the view is dimmed, no need to do anything more.
+    if (this.dimmed) return;
+
+    // We compute and update the values of margins & co.
+    let style = node.ownerDocument.defaultView.getComputedStyle(node);
+
+    for (let i in this.map) {
+      let property = this.map[i].property;
+      this.map[i].value = parseInt(style.getPropertyValue(property));
+    }
+
+    let margins = this.processMargins(node);
+    if ("top" in margins) this.map.marginTop.value = "auto";
+    if ("right" in margins) this.map.marginRight.value = "auto";
+    if ("bottom" in margins) this.map.marginBottom.value = "auto";
+    if ("left" in margins) this.map.marginLeft.value = "auto";
+
+    for (let i in this.map) {
+      let selector = this.map[i].selector;
+      let span = this.doc.querySelector(selector);
+      if (span.textContent.length > 0 &&
+          span.textContent == this.map[i].value) {
+        continue;
+      }
+      span.textContent = this.map[i].value;
+    }
+
+    width -= this.map.borderLeft.value + this.map.borderRight.value +
+             this.map.paddingLeft.value + this.map.paddingRight.value;
+
+    height -= this.map.borderTop.value + this.map.borderBottom.value +
+              this.map.paddingTop.value + this.map.paddingBottom.value;
+
+    let newValue = width + "x" + height;
+    if (this.sizeLabel.textContent != newValue) {
+      this.sizeLabel.textContent = newValue;
+    }
+  },
+
+  /**
+   * Find margins declared 'auto'
+   */
+  processMargins: function LV_processMargins(node) {
+    let margins = {};
+
+    for each (let prop in ["top", "bottom", "left", "right"]) {
+      let info = this.cssLogic.getPropertyInfo("margin-" + prop);
+      let selectors = info.matchedSelectors;
+      if (selectors && selectors.length > 0 && selectors[0].value == "auto") {
+        margins[prop] = "auto";
+      }
+    }
+
+    return margins;
+  },
+}
diff --git a/browser/devtools/layoutview/view.xhtml b/browser/devtools/layoutview/view.xhtml
index d6f6db6ee2c6..c4a20c0e7bfa 100644
--- a/browser/devtools/layoutview/view.xhtml
+++ b/browser/devtools/layoutview/view.xhtml
@@ -10,8 +10,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
-    <title>Layout View</title>
+    <title>&title;</title>
 
+    <script type="application/javascript;version=1.8" src="view.js"></script>
     <script type="application/javascript;version=1.8">
     <![CDATA[
       let elts;
@@ -20,7 +21,8 @@
       const Ci = Components.interfaces;
       const Cc = Components.classes;
 
-      window.onload = function() {
+      window.setPanel = function(panel) {
+        this.layoutview = new LayoutView(panel, window);
 
         // Tooltip mechanism
         elts = document.querySelectorAll("*[tooltip]");
@@ -41,6 +43,7 @@
       }
 
       window.onunload = function() {
+        this.layoutview.destroy();
         if (elts) {
           for (let i = 0; i < elts.length; i++) {
             let elt = elts[i];
@@ -57,10 +60,6 @@
       function onmouseout(e) {
         tooltip.textContent = "";
       }
-
-      function toggleView() {
-        window.parent.postMessage("layoutview-toggle-view", "*");
-      }
     ]]>
     </script>
 
@@ -70,13 +69,10 @@
   </head>
   <body>
 
-    <!-- Header: always visible, even when the view is closed. -->
-    <a onclick="toggleView()" href="#" id="header">
+    <p id="header">
         <span id="element-size"></span>
-        <span id="togglebutton"></span>
-    </a>
+    </p>
 
-    <!-- Boxes: hidden when the view is closed. -->
     <div id="main">
 
       <div id="margins" tooltip="&margins.tooltip;">
diff --git a/browser/devtools/markupview/MarkupView.jsm b/browser/devtools/markupview/MarkupView.jsm
index 55967b0d3cae..a0ab2eeb6ccb 100644
--- a/browser/devtools/markupview/MarkupView.jsm
+++ b/browser/devtools/markupview/MarkupView.jsm
@@ -39,7 +39,7 @@ Cu.import("resource://gre/modules/Services.jsm");
  * @param iframe aFrame
  *        An iframe in which the caller has kindly loaded markup-view.xhtml.
  */
-this.MarkupView = function MarkupView(aInspector, aFrame)
+this.MarkupView = function MarkupView(aInspector, aFrame, aControllerWindow)
 {
   this._inspector = aInspector;
   this._frame = aFrame;
@@ -47,15 +47,15 @@ this.MarkupView = function MarkupView(aInspector, aFrame)
   this._elt = this.doc.querySelector("#root");
 
   this.undo = new UndoStack();
-  this.undo.installController(this._frame.ownerDocument.defaultView);
+  this.undo.installController(aControllerWindow);
 
   this._containers = new WeakMap();
 
   this._observer = new this.doc.defaultView.MutationObserver(this._mutationObserver.bind(this));
 
-  this._boundSelect = this._onSelect.bind(this);
-  this._inspector.on("select", this._boundSelect);
-  this._onSelect();
+  this._boundOnNewSelection = this._onNewSelection.bind(this);
+  this._inspector.selection.on("new-node", this._boundOnNewSelection);
+  this._onNewSelection();
 
   this._boundKeyDown = this._onKeyDown.bind(this);
   this._frame.addEventListener("keydown", this._boundKeyDown, false);
@@ -69,13 +69,6 @@ this.MarkupView = function MarkupView(aInspector, aFrame)
 MarkupView.prototype = {
   _selectedContainer: null,
 
-  /**
-   * Return the selected node.
-   */
-  get selected() {
-    return this._selectedContainer ? this._selectedContainer.node : null;
-  },
-
   template: function MT_template(aName, aDest, aOptions)
   {
     let node = this.doc.getElementById("template-" + aName).cloneNode(true);
@@ -94,14 +87,16 @@ MarkupView.prototype = {
   },
 
   /**
-   * Highlight the given element in the markup panel.
+   * Highlight the inspector selected node.
    */
-  _onSelect: function MT__onSelect()
+  _onNewSelection: function MT__onNewSelection()
   {
-    if (this._inspector.selection) {
-      this.showNode(this._inspector.selection, true);
+    if (this._inspector.selection.isNode()) {
+      this.showNode(this._inspector.selection.node, true);
+      this.markNodeAsSelected(this._inspector.selection.node);
+    } else {
+      this.unmarkSelectedNode();
     }
-    this.selectNode(this._inspector.selection);
   },
 
   /**
@@ -255,12 +250,11 @@ MarkupView.prototype = {
 
     let node = aContainer.node;
     this.showNode(node, false);
-    this.selectNode(node);
 
-    if (this._inspector._IUI.highlighter.isNodeHighlightable(node)) {
-      this._inspector._IUI.select(node, true, false, "treepanel");
-      this._inspector._IUI.highlighter.highlight(node);
-    }
+    this._inspector.selection.setNode(node, "treepanel");
+    // This event won't be fired if the node is the same. But the highlighter
+    // need to lock the node if it wasn't.
+    this._inspector.selection.emit("new-node");
 
     if (!aIgnoreFocus) {
       aContainer.focus();
@@ -413,7 +407,7 @@ MarkupView.prototype = {
   /**
    * Mark the given node selected.
    */
-  selectNode: function MT_selectNode(aNode)
+  markNodeAsSelected: function MT_markNodeAsSelected(aNode)
   {
     let container = this._containers.get(aNode);
     if (this._selectedContainer === container) {
@@ -427,11 +421,20 @@ MarkupView.prototype = {
       this._selectedContainer.selected = true;
     }
 
-    this._selectedContainer.focus();
-
     return true;
   },
 
+  /**
+   * Unmark selected node (no node selected).
+   */
+  unmarkSelectedNode: function MT_unmarkSelectedNode()
+  {
+    if (this._selectedContainer) {
+      this._selectedContainer.selected = false;
+      this._selectedContainer = null;
+    }
+  },
+
   /**
    * Called when the markup panel initiates a change on a node.
    */
@@ -490,8 +493,8 @@ MarkupView.prototype = {
     this._frame.removeEventListener("keydown", this._boundKeyDown, true);
     delete this._boundKeyDown;
 
-    this._inspector.off("select", this._boundSelect);
-    delete this._boundSelect;
+    this._inspector.selection.off("new-node", this._boundOnNewSelection);
+    delete this._boundOnNewSelection;
 
     delete this._elt;
 
@@ -947,9 +950,9 @@ ElementEditor.prototype = {
         start: function EE_editAttribute_start(aEditor, aEvent) {
           // If the editing was started inside the name or value areas,
           // select accordingly.
-          if (aEvent.target === name) {
+          if (aEvent && aEvent.target === name) {
             aEditor.input.setSelectionRange(0, name.textContent.length);
-          } else if (aEvent.target === val) {
+          } else if (aEvent && aEvent.target === val) {
             let length = val.textContent.length;
             let editorLength = aEditor.input.value.length;
             let start = editorLength - (length + 1);
diff --git a/browser/devtools/markupview/test/browser_inspector_markup_edit.js b/browser/devtools/markupview/test/browser_inspector_markup_edit.js
index 280f025dce5a..dfe1ed6d734b 100644
--- a/browser/devtools/markupview/test/browser_inspector_markup_edit.js
+++ b/browser/devtools/markupview/test/browser_inspector_markup_edit.js
@@ -17,8 +17,10 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
  */
 
 function test() {
+  let inspector;
   let tempScope = {}
   Cu.import("resource:///modules/devtools/CssRuleView.jsm", tempScope);
+
   let inplaceEditor = tempScope._getInplaceEditorForSpan;
 
   waitForExplicitFinish();
@@ -52,8 +54,8 @@ function test() {
 
   // All the mutation types we want to test.
   let edits = [
-    // Change an attribute
     {
+      desc: "Change an attribute",
       before: function() {
         assertAttributes(doc.querySelector("#node1"), {
           id: "node1",
@@ -73,8 +75,8 @@ function test() {
       }
     },
 
-    // Try change an attribute to a badly formed string
     {
+      desc: "Try change an attribute to a badly formed string",
       before: function() {
         assertAttributes(doc.querySelector("#node22"), {
           id: "node22",
@@ -94,9 +96,8 @@ function test() {
       }
     },
 
-
-    // Remove an attribute
     {
+      desc: "Remove an attribute",
       before: function() {
         assertAttributes(doc.querySelector("#node4"), {
           id: "node4",
@@ -115,8 +116,8 @@ function test() {
       }
     },
 
-    // Add an attribute by clicking the empty space after a node
     {
+      desc: "Add an attribute by clicking the empty space after a node",
       before: function() {
         assertAttributes(doc.querySelector("#node14"), {
           id: "node14",
@@ -136,8 +137,8 @@ function test() {
       }
     },
 
-    // Try add a badly formed attribute by clicking the empty space after a node
     {
+      desc: "Try add a badly formed attribute by clicking the empty space after a node",
       before: function() {
         assertAttributes(doc.querySelector("#node23"), {
           id: "node23",
@@ -155,34 +156,8 @@ function test() {
       }
     },
 
-    // Add attributes by adding to an existing attribute's entry
-    {
-      setup: function() {
-        InspectorUI.select(doc.querySelector("#node18"), true, true, true);
-      },
-      before: function() {
-        assertAttributes(doc.querySelector("#node18"), {
-          id: "node18",
-        });
-        is(InspectorUI.highlighter.nodeInfo.classesBox.textContent, "", "No classes in the infobar before edit.");
-      },
-      execute: function() {
-        let editor = markup.getContainer(doc.querySelector("#node18")).editor;
-        let attr = editor.attrs["id"].querySelector(".editable");
-        editField(attr, attr.textContent + ' class="newclass" style="color:green"');
-      },
-      after: function() {
-        assertAttributes(doc.querySelector("#node18"), {
-          id: "node18",
-          class: "newclass",
-          style: "color:green"
-        });
-        is(InspectorUI.highlighter.nodeInfo.classesBox.textContent, ".newclass", "Correct classes in the infobar after edit.");
-      }
-    },
-
-    // Try add attributes by adding to an existing attribute's entry
     {
+      desc: "Try add attributes by adding to an existing attribute's entry",
       before: function() {
         assertAttributes(doc.querySelector("#node24"), {
           id: "node24",
@@ -200,22 +175,8 @@ function test() {
       }
     },
 
-    // Remove an element with the delete key
-    {
-      before: function() {
-        ok(!!doc.querySelector("#node18"), "Node 18 should exist.");
-      },
-      execute: function() {
-        markup.selectNode(doc.querySelector("#node18"));
-        EventUtils.sendKey("delete");
-      },
-      after: function() {
-        ok(!doc.querySelector("#node18"), "Node 18 should not exist.")
-      }
-    },
-
-    // Edit text
     {
+      desc: "Edit text",
       before: function() {
         let node = doc.querySelector('.node6').firstChild;
         is(node.nodeValue, "line6", "Text should be unchanged");
@@ -231,19 +192,103 @@ function test() {
         is(node.nodeValue, "New text", "Text should be changed.");
       },
     },
+  ];
 
-    // Edit the tag name
-    {
+  // Create the helper tab for parsing...
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onload() {
+    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
+    doc = content.document;
+    waitForFocus(setupTest, content);
+  }, true);
+  content.location = "http://mochi.test:8888/browser/browser/devtools/markupview/test/browser_inspector_markup_edit.html";
+
+  function setupTest() {
+    var target = TargetFactory.forTab(gBrowser.selectedTab);
+    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+    toolbox.once("inspector-selected", function SE_selected(id, aInspector) {
+      inspector = aInspector;
+      runTests();
+    });
+  }
+
+  function runTests() {
+    inspector.selection.once("new-node", startTests);
+    executeSoon(function() {
+      inspector.selection.setNode(doc.body);
+    });
+  }
+
+  function startTests() {
+    let startNode = doc.documentElement.cloneNode();
+    markup = inspector.markup;
+    markup.expandAll();
+    for (let step of edits) {
+      info("START " + step.desc);
+      if (step.setup) {
+        step.setup();
+      }
+      step.before();
+      step.execute();
+      step.after();
+      ok(markup.undo.canUndo(), "Should be able to undo.");
+      markup.undo.undo();
+      step.before();
+      ok(markup.undo.canRedo(), "Should be able to redo.");
+      markup.undo.redo();
+      step.after();
+      info("END " + step.desc);
+    }
+    addAttributes();
+  }
+
+  function addAttributes() {
+    let test = {
+      desc: "Add attributes by adding to an existing attribute's entry",
       setup: function() {
-        markup.selectNode(doc.querySelector("#retag-me"));
+        inspector.selection.setNode(doc.querySelector("#node18"));
+      },
+      before: function() {
+        assertAttributes(doc.querySelector("#node18"), {
+          id: "node18",
+        });
+
+        is(inspector.highlighter.nodeInfo.classesBox.textContent, "",
+          "No classes in the infobar before edit.");
+      },
+      execute: function() {
+        let editor = markup.getContainer(doc.querySelector("#node18")).editor;
+        let attr = editor.attrs["id"].querySelector(".editable");
+        editField(attr, attr.textContent + ' class="newclass" style="color:green"');
+      },
+      after: function() {
+        assertAttributes(doc.querySelector("#node18"), {
+          id: "node18",
+          class: "newclass",
+          style: "color:green"
+        });
+        is(inspector.highlighter.nodeInfo.classesBox.textContent, ".newclass",
+          "Correct classes in the infobar after edit.");
+      }
+    };
+    testAsyncSetup(test, editTagName);
+  }
+
+  function editTagName() {
+    let test =  {
+      desc: "Edit the tag name",
+      setup: function() {
+        inspector.selection.setNode(doc.querySelector("#retag-me"));
       },
       before: function() {
         let node = doc.querySelector("#retag-me");
         let container = markup.getContainer(node);
+
         is(node.tagName, "DIV", "retag-me should be a div.");
         ok(container.selected, "retag-me should be selected.");
         ok(container.expanded, "retag-me should be expanded.");
-        is(doc.querySelector("#retag-me-2").parentNode, node, "retag-me-2 should be a child of the old element.");
+        is(doc.querySelector("#retag-me-2").parentNode, node,
+          "retag-me-2 should be a child of the old element.");
       },
       execute: function() {
         let node = doc.querySelector("#retag-me");
@@ -257,65 +302,80 @@ function test() {
         is(node.tagName, "P", "retag-me should be a p.");
         ok(container.selected, "retag-me should be selected.");
         ok(container.expanded, "retag-me should be expanded.");
-        is(doc.querySelector("#retag-me-2").parentNode, node, "retag-me-2 should be a child of the new element.");
+        is(doc.querySelector("#retag-me-2").parentNode, node,
+          "retag-me-2 should be a child of the new element.");
       }
-    },
-  ];
-
-  // Create the helper tab for parsing...
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onload() {
-    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
-    doc = content.document;
-    waitForFocus(setupTest, content);
-  }, true);
-  content.location = "http://mochi.test:8888/browser/browser/devtools/markupview/test/browser_inspector_markup_edit.html";
-
-  function setupTest() {
-    Services.obs.addObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.toggleInspectorUI();
+    };
+    testAsyncSetup(test, removeElementWithDelete);
   }
 
-  function runTests() {
-    Services.obs.removeObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-    InspectorUI.currentInspector.once("markuploaded", startTests);
-    InspectorUI.select(doc.body, true, true, true);
-    InspectorUI.stopInspecting();
-    InspectorUI.toggleHTMLPanel();
+  function removeElementWithDelete() {
+    let test =  {
+      desc: "Remove an element with the delete key",
+      before: function() {
+        ok(!!doc.querySelector("#node18"), "Node 18 should exist.");
+      },
+      execute: function() {
+        inspector.selection.setNode(doc.querySelector("#node18"));
+      },
+      executeCont: function() {
+        EventUtils.sendKey("delete");
+      },
+      after: function() {
+        ok(!doc.querySelector("#node18"), "Node 18 should not exist.")
+      }
+    };
+    testAsyncExecute(test, finishUp);
   }
 
-  function startTests() {
-    let startNode = doc.documentElement.cloneNode();
-    markup = InspectorUI.currentInspector.markup;
-    markup.expandAll();
-    for (let step of edits) {
-      if (step.setup) {
-        step.setup();
-      }
-      step.before();
-      step.execute();
-      step.after();
-      ok(markup.undo.canUndo(), "Should be able to undo.");
-      markup.undo.undo();
-      step.before();
+  function testAsyncExecute(test, callback) {
+    info("START " + test.desc);
+
+    test.before();
+    inspector.selection.once("new-node", function BIMET_testAsyncExecNewNode() {
+      test.executeCont();
+      test.after();
+      undoRedo(test, callback);
+    });
+    executeSoon(function BIMET_setNode1() {
+      test.execute();
+    });
+  }
+
+  function testAsyncSetup(test, callback) {
+    info("START " + test.desc);
+
+    inspector.selection.once("new-node", function BIMET_testAsyncSetupNewNode() {
+      test.before();
+      test.execute();
+      test.after();
+      undoRedo(test, callback);
+    });
+    executeSoon(function BIMET_setNode2() {
+      test.setup();
+    });
+  }
+
+  function undoRedo(test, callback) {
+    ok(markup.undo.canUndo(), "Should be able to undo.");
+    markup.undo.undo();
+    executeSoon(function() {
+      test.before();
       ok(markup.undo.canRedo(), "Should be able to redo.");
       markup.undo.redo();
-      step.after();
-    }
-
-    while (markup.undo.canUndo()) {
-      markup.undo.undo();
-    }
-    // By now we should have a healthy undo stack, clear it out and we should be back where
-    // we started.
-    ok(doc.documentElement.isEqualNode(startNode), "Clearing the undo stack should leave us where we started.");
-    Services.obs.addObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-    InspectorUI.closeInspectorUI();
+      executeSoon(function() {
+        test.after();
+        info("END " + test.desc);
+        callback();
+      });
+    });
   }
 
   function finishUp() {
-    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
-    doc = null;
+    while (markup.undo.canUndo()) {
+      markup.undo.undo();
+    }
+    doc = inspector = null;
     gBrowser.removeCurrentTab();
     finish();
   }
diff --git a/browser/devtools/markupview/test/browser_inspector_markup_mutation.js b/browser/devtools/markupview/test/browser_inspector_markup_mutation.js
index a34d86fd65a0..463fc8e48804 100644
--- a/browser/devtools/markupview/test/browser_inspector_markup_mutation.js
+++ b/browser/devtools/markupview/test/browser_inspector_markup_mutation.js
@@ -24,6 +24,8 @@ function test() {
   let parseTab;
   let parseDoc;
 
+  let inspector;
+
   // Strip whitespace from a node and its children.
   function stripWhitespace(node)
   {
@@ -143,32 +145,27 @@ function test() {
   content.location = "data:text/html,<html></html>";
 
   function setupTest() {
-    Services.obs.addObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.toggleInspectorUI();
-  }
-
-  function runTests() {
-    Services.obs.removeObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-    InspectorUI.currentInspector.once("markuploaded", startTests);
-    InspectorUI.select(doc.body, true, true, true);
-    InspectorUI.stopInspecting();
-    InspectorUI.toggleHTMLPanel();
+    var target = TargetFactory.forTab(gBrowser.selectedTab);
+    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+    toolbox.once("inspector-selected", function BIMMT_selected(id, aInspector) {
+      inspector = aInspector;
+      startTests();
+    });
   }
 
   function startTests() {
-    markup = InspectorUI.currentInspector.markup;
+    markup = inspector.markup;
     checkMarkup();
     nextStep(0);
   }
 
   function nextStep(cursor) {
     if (cursor >= mutations.length) {
-      Services.obs.addObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-      InspectorUI.closeInspectorUI();
+      finishUp();
       return;
     }
     mutations[cursor]();
-    InspectorUI.currentInspector.once("markupmutation", function() {
+    inspector.once("markupmutation", function() {
       executeSoon(function() {
         checkMarkup();
         nextStep(cursor + 1);
@@ -177,8 +174,7 @@ function test() {
   }
 
   function finishUp() {
-    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
-    doc = null;
+    doc = inspector = null;
     gBrowser.removeTab(contentTab);
     gBrowser.removeTab(parseTab);
     finish();
diff --git a/browser/devtools/markupview/test/browser_inspector_markup_navigation.html b/browser/devtools/markupview/test/browser_inspector_markup_navigation.html
index fe5561181b14..9633052e17f9 100644
--- a/browser/devtools/markupview/test/browser_inspector_markup_navigation.html
+++ b/browser/devtools/markupview/test/browser_inspector_markup_navigation.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html>
 
 <html class="html">
-  <meta charset=utf-8 />
+  <head class="head">
+    <meta charset=utf-8 />
+  </head>
 
   <body class="body">
     <div class="node0">
diff --git a/browser/devtools/markupview/test/browser_inspector_markup_navigation.js b/browser/devtools/markupview/test/browser_inspector_markup_navigation.js
index 4540c1e5c606..3cc3a18c5050 100644
--- a/browser/devtools/markupview/test/browser_inspector_markup_navigation.js
+++ b/browser/devtools/markupview/test/browser_inspector_markup_navigation.js
@@ -3,12 +3,16 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 
 
 function test() {
+  let inspector;
 
   waitForExplicitFinish();
 
   let doc;
 
   let keySequences = [
+    ["right", "html"],
+    ["down", "head"],
+    ["down", "body"],
     ["right", "body"],
     ["down", "node0"],
     ["right", "node0"],
@@ -68,34 +72,28 @@ function test() {
 
   content.location = "http://mochi.test:8888/browser/browser/devtools/markupview/test/browser_inspector_markup_navigation.html";
 
-  let markup = null;
-
   function setupTest() {
-    Services.obs.addObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.toggleInspectorUI();
-  }
-
-  function runTests() {
-    Services.obs.removeObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
-    InspectorUI.currentInspector.once("markuploaded", startNavigation);
-    InspectorUI.select(doc.body, true, true, true);
-    InspectorUI.toggleHTMLPanel();
+    var target = TargetFactory.forTab(gBrowser.selectedTab);
+    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+    toolbox.once("inspector-selected", function BIMNT_selected(id, aInspector) {
+      inspector = aInspector;
+      startNavigation();
+    });
   }
 
   function startNavigation() {
-    markup = InspectorUI.currentInspector.markup;
     nextStep(0);
   }
 
   function nextStep(cursor) {
     if (cursor >= keySequences.length) {
-      Services.obs.addObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-      InspectorUI.closeInspectorUI();
+      finishUp();
       return;
     }
 
     let key = keySequences[cursor][0];
     let className = keySequences[cursor][1];
+    inspector.markup._frame.focus();
 
     switch(key) {
       case "right":
@@ -121,8 +119,9 @@ function test() {
         break;
     }
 
-    executeSoon(function() {
-      let node = markup.selected;
+    executeSoon(function BIMNT_newNode() {
+      let node = inspector.selection.node;
+
       if (className == "*comment*") {
         is(node.nodeType, Node.COMMENT_NODE, "[" + cursor + "] should be a comment after moving " + key);
       } else if (className == "*text*") {
@@ -132,13 +131,13 @@ function test() {
       } else {
         is(node.className, className, "[" + cursor + "] right node selected: " + className + " after moving " + key);
       }
+
       nextStep(cursor + 1);
     });
   }
 
   function finishUp() {
-    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
-    doc = null;
+    doc = inspector = null;
     gBrowser.removeCurrentTab();
     finish();
   }
diff --git a/browser/devtools/markupview/test/head.js b/browser/devtools/markupview/test/head.js
index 3907fad4fbd0..61cc04274100 100644
--- a/browser/devtools/markupview/test/head.js
+++ b/browser/devtools/markupview/test/head.js
@@ -4,6 +4,12 @@
 
 const Cu = Components.utils;
 
+let TargetFactory = (function() {
+  let tempScope = {};
+  Components.utils.import("resource:///modules/devtools/Target.jsm", tempScope);
+  return tempScope.TargetFactory;
+})();
+
 // Clear preferences that may be set during the course of tests.
 function clearUserPrefs()
 {
diff --git a/browser/devtools/responsivedesign/CmdResize.jsm b/browser/devtools/responsivedesign/CmdResize.jsm
index 1303136c296f..d35fdf33ed70 100644
--- a/browser/devtools/responsivedesign/CmdResize.jsm
+++ b/browser/devtools/responsivedesign/CmdResize.jsm
@@ -30,6 +30,8 @@ gcli.addCommand({
 
 gcli.addCommand({
   name: 'resize toggle',
+  buttonId: "command-button-responsive",
+  buttonClass: "command-button",
   description: gcli.lookup('resizeModeToggleDesc'),
   manual: gcli.lookup('resizeModeManual'),
   exec: gcli_cmd_resize
diff --git a/browser/devtools/responsivedesign/responsivedesign.jsm b/browser/devtools/responsivedesign/responsivedesign.jsm
index a74df04f9da1..8f45f9eecf57 100644
--- a/browser/devtools/responsivedesign/responsivedesign.jsm
+++ b/browser/devtools/responsivedesign/responsivedesign.jsm
@@ -9,8 +9,10 @@ const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource:///modules/devtools/gDevTools.jsm");
 Cu.import("resource:///modules/devtools/FloatingScrollbars.jsm");
 Cu.import("resource:///modules/devtools/EventEmitter.jsm");
+Cu.import("resource:///modules/devtools/Target.jsm");
 
 this.EXPORTED_SYMBOLS = ["ResponsiveUIManager"];
 
@@ -161,7 +163,8 @@ function ResponsiveUI(aWindow, aTab)
   this.buildUI();
   this.checkMenus();
 
-  this.inspectorWasOpen = this.mainWindow.InspectorUI.isInspectorOpen;
+  let target = TargetFactory.forTab(this.tab);
+  this.toolboxWasOpen = !!gDevTools.getToolboxForTarget(target);
 
   try {
     if (Services.prefs.getBoolPref("devtools.responsiveUI.rotate")) {
@@ -241,12 +244,13 @@ ResponsiveUI.prototype = {
     if (aEvent.keyCode == this.mainWindow.KeyEvent.DOM_VK_ESCAPE &&
         this.mainWindow.gBrowser.selectedBrowser == this.browser) {
 
-      // If the inspector wasn't open at first but is open now,
+      // If the toolbox wasn't open at first but is open now,
       // we don't want to close the Responsive Mode on Escape.
-      // We let the inspector close first.
+      // We let the toolbox close first.
 
-      let isInspectorOpen = this.mainWindow.InspectorUI.isInspectorOpen;
-      if (this.inspectorWasOpen || !isInspectorOpen) {
+      let target = TargetFactory.forTab(this.tab);
+      let isToolboxOpen =  !!gDevTools.getToolboxForTarget(target);
+      if (this.toolboxWasOpen || !isToolboxOpen) {
         aEvent.preventDefault();
         aEvent.stopPropagation();
         this.close();
diff --git a/browser/devtools/responsivedesign/test/browser_responsivecomputedview.js b/browser/devtools/responsivedesign/test/browser_responsivecomputedview.js
index bfdcb11d6008..540e918f5966 100644
--- a/browser/devtools/responsivedesign/test/browser_responsivecomputedview.js
+++ b/browser/devtools/responsivedesign/test/browser_responsivecomputedview.js
@@ -5,6 +5,7 @@ function test() {
   let instance;
 
   let computedView;
+  let inspector;
 
   waitForExplicitFinish();
 
@@ -52,29 +53,27 @@ function test() {
 
     instance.setSize(500, 500);
 
-    Services.obs.addObserver(onInspectorUIOpen,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.openInspectorUI();
+    openInspector(onInspectorUIOpen);
   }
 
-  function onInspectorUIOpen() {
-    Services.obs.removeObserver(onInspectorUIOpen,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+  function onInspectorUIOpen(aInspector) {
+    inspector = aInspector;
+    ok(inspector, "Got inspector instance");
+    inspector.sidebar.select("computedview");
 
     let div = content.document.getElementsByTagName("div")[0];
-    InspectorUI.inspectNode(div);
-    InspectorUI.stopInspecting();
 
-    Services.obs.addObserver(testShrink, "StyleInspector-populated", false);
-
-    InspectorUI.sidebar.show();
-    InspectorUI.sidebar.activatePanel("computedview");
+    inspector.sidebar.once("computedview-ready", function() {
+      Services.obs.addObserver(testShrink, "StyleInspector-populated", false);
+      inspector.selection.setNode(div);
+    });
   }
 
   function testShrink() {
     Services.obs.removeObserver(testShrink, "StyleInspector-populated", false);
 
-    computedView = InspectorUI.sidebar._toolContext("computedview").view;
+    computedView = inspector.sidebar.getWindowForTab("computedview").computedview.view;
+    ok(computedView, "We have access to the Computed View object");
 
     is(computedWidth(), "500px", "Should show 500px initially.");
 
@@ -103,8 +102,6 @@ function test() {
     // Menus are correctly updated?
     is(document.getElementById("Tools:ResponsiveUI").getAttribute("checked"), "false", "menu unchecked");
 
-    InspectorUI.closeInspectorUI();
-
     gBrowser.removeCurrentTab();
     finish();
   }
diff --git a/browser/devtools/responsivedesign/test/browser_responsiveruleview.js b/browser/devtools/responsivedesign/test/browser_responsiveruleview.js
index 8161e8dc0d2d..9aeb3147a303 100644
--- a/browser/devtools/responsivedesign/test/browser_responsiveruleview.js
+++ b/browser/devtools/responsivedesign/test/browser_responsiveruleview.js
@@ -5,6 +5,7 @@ function test() {
   let instance;
 
   let ruleView;
+  let inspector;
 
   waitForExplicitFinish();
 
@@ -47,27 +48,26 @@ function test() {
 
     instance.setSize(500, 500);
 
-    Services.obs.addObserver(onInspectorUIOpen,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    InspectorUI.openInspectorUI();
+    openInspector(onInspectorUIOpen);
   }
 
-  function onInspectorUIOpen() {
-    Services.obs.removeObserver(onInspectorUIOpen,
-      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+  function onInspectorUIOpen(aInspector) {
+    inspector = aInspector;
+    ok(inspector, "Got inspector instance");
+    inspector.sidebar.select("ruleview");
 
     let div = content.document.getElementsByTagName("div")[0];
-    InspectorUI.inspectNode(div);
-    InspectorUI.stopInspecting();
 
-    InspectorUI.currentInspector.once("sidebaractivated-ruleview", testShrink);
-
-    InspectorUI.sidebar.show();
-    InspectorUI.sidebar.activatePanel("ruleview");
+    inspector.sidebar.once("ruleview-ready", function() {
+      Services.obs.addObserver(testShrink, "StyleInspector-populated", false);
+      inspector.selection.setNode(div);
+    });
   }
 
   function testShrink() {
-    ruleView = InspectorUI.sidebar._toolContext("ruleview").view;
+    Services.obs.removeObserver(testShrink, "StyleInspector-populated");
+
+    ruleView = inspector.sidebar.getWindowForTab("ruleview").ruleview.view;
 
     is(numberOfRules(), 2, "Should have two rules initially.");
 
@@ -96,7 +96,6 @@ function test() {
     // Menus are correctly updated?
     is(document.getElementById("Tools:ResponsiveUI").getAttribute("checked"), "false", "menu unchecked");
 
-    InspectorUI.closeInspectorUI();
     gBrowser.removeCurrentTab();
     finish();
   }
diff --git a/browser/devtools/responsivedesign/test/head.js b/browser/devtools/responsivedesign/test/head.js
index d4dc324c4383..cc6b0832a7e5 100644
--- a/browser/devtools/responsivedesign/test/head.js
+++ b/browser/devtools/responsivedesign/test/head.js
@@ -3,6 +3,27 @@
 
 "use strict";
 
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
 // Import the GCLI test helper
 let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
 Services.scriptloader.loadSubScript(testDir + "/helpers.js", this);
+
+function openInspector(callback)
+{
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  let inspector = gDevTools.getPanelForTarget("inspector", target);
+  if (inspector && inspector.isReady) {
+    callback(inspector);
+  } else {
+    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+    toolbox.once("inspector-ready", function(event, panel) {
+      let inspector = gDevTools.getPanelForTarget("inspector", target);
+      callback(inspector);
+    });
+  }
+}
+
diff --git a/browser/devtools/scratchpad/CmdScratchpad.jsm b/browser/devtools/scratchpad/CmdScratchpad.jsm
new file mode 100644
index 000000000000..859b287f1fa5
--- /dev/null
+++ b/browser/devtools/scratchpad/CmdScratchpad.jsm
@@ -0,0 +1,21 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+this.EXPORTED_SYMBOLS = [ ];
+
+Components.utils.import("resource:///modules/devtools/gcli.jsm");
+
+/**
+ * 'scratchpad' command
+ */
+gcli.addCommand({
+  name: "scratchpad",
+  buttonId: "command-button-scratchpad",
+  buttonClass: "command-button",
+  hidden: true,
+  exec: function(args, context) {
+    let chromeWindow = context.environment.chromeDocument.defaultView;
+    chromeWindow.Scratchpad.ScratchpadManager.openScratchpad();
+  }
+});
diff --git a/browser/devtools/scratchpad/scratchpad.js b/browser/devtools/scratchpad/scratchpad.js
index f69743bab46e..a8dde0114dc2 100644
--- a/browser/devtools/scratchpad/scratchpad.js
+++ b/browser/devtools/scratchpad/scratchpad.js
@@ -26,6 +26,8 @@ Cu.import("resource:///modules/source-editor.jsm");
 Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
 Cu.import("resource:///modules/devtools/scratchpad-manager.jsm");
 Cu.import("resource://gre/modules/jsdebugger.jsm");
+Cu.import("resource:///modules/devtools/gDevTools.jsm");
+Cu.import("resource:///modules/devtools/Target.jsm");
 
 const SCRATCHPAD_CONTEXT_CONTENT = 1;
 const SCRATCHPAD_CONTEXT_BROWSER = 2;
@@ -1053,9 +1055,8 @@ var Scratchpad = {
    */
   openWebConsole: function SP_openWebConsole()
   {
-    if (!this.browserWindow.HUDConsoleUI.getOpenHUD()) {
-      this.browserWindow.HUDConsoleUI.toggleHUD();
-    }
+    let target = TargetFactory.forTab(this.gBrowser.selectedTab);
+    gDevTools.openToolboxForTab(target, "webconsole");
     this.browserWindow.focus();
   },
 
diff --git a/browser/devtools/scratchpad/scratchpad.xul b/browser/devtools/scratchpad/scratchpad.xul
index 8dfcfa7c372a..dd6edd351c4d 100644
--- a/browser/devtools/scratchpad/scratchpad.xul
+++ b/browser/devtools/scratchpad/scratchpad.xul
@@ -100,10 +100,6 @@
        key="&errorConsoleCmd.commandkey;"
        command="sp-cmd-errorConsole"
        modifiers="accel,shift"/>
-  <key id="sp-key-webConsole"
-       key="&webConsoleCmd.commandkey;"
-       command="sp-cmd-webConsole"
-       modifiers="accel,shift"/>
   <key id="key_openHelp"
        keycode="VK_F1"
        command="sp-cmd-documentationLink"/>
diff --git a/browser/devtools/shared/DeveloperToolbar.jsm b/browser/devtools/shared/DeveloperToolbar.jsm
index 8a921e65c85d..ecf9095cb583 100644
--- a/browser/devtools/shared/DeveloperToolbar.jsm
+++ b/browser/devtools/shared/DeveloperToolbar.jsm
@@ -4,7 +4,7 @@
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = [ "DeveloperToolbar" ];
+this.EXPORTED_SYMBOLS = [ "DeveloperToolbar", "CommandUtils" ];
 
 const NS_XHTML = "http://www.w3.org/1999/xhtml";
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
@@ -27,6 +27,92 @@ XPCOMUtils.defineLazyModuleGetter(this, "CmdCommands",
 XPCOMUtils.defineLazyModuleGetter(this, "PageErrorListener",
                                   "resource://gre/modules/devtools/WebConsoleUtils.jsm");
 
+XPCOMUtils.defineLazyGetter(this, "prefBranch", function() {
+  var prefService = Components.classes["@mozilla.org/preferences-service;1"]
+          .getService(Components.interfaces.nsIPrefService);
+  return prefService.getBranch(null)
+          .QueryInterface(Components.interfaces.nsIPrefBranch2);
+});
+
+/**
+ * A collection of utilities to help working with commands
+ */
+this.CommandUtils = {
+  /**
+   * Read a toolbarSpec from preferences
+   * @param aPref The name of the preference to read
+   */
+  getCommandbarSpec: function CU_getCommandbarSpec(aPref) {
+    let value = prefBranch.getComplexValue(aPref,
+                               Components.interfaces.nsISupportsString).data;
+    return JSON.parse(value);
+  },
+
+  /**
+   * A toolbarSpec is an array of buttonSpecs. A buttonSpec is an array of
+   * strings each of which is a GCLI command (including args if needed).
+   */
+  createButtons: function CU_createButtons(toolbarSpec, document, requisition) {
+    var reply = [];
+
+    toolbarSpec.forEach(function(buttonSpec) {
+      var button = document.createElement("toolbarbutton");
+      reply.push(button);
+
+      if (typeof buttonSpec == "string") {
+        buttonSpec = { typed: buttonSpec };
+      }
+      // Ask GCLI to parse the typed string (doesn't execute it)
+      requisition.update(buttonSpec.typed);
+
+      // Ignore invalid commands
+      var command = requisition.commandAssignment.value;
+      if (command == null) {
+        // TODO: Have a broken icon
+        // button.icon = 'Broken';
+        button.setAttribute("label", "X");
+        button.setAttribute("tooltip", "Unknown command: " + buttonSpec.typed);
+        button.setAttribute("disabled", "true");
+      }
+      else {
+        if (command.buttonId != null) {
+          button.id = command.buttonId;
+        }
+        if (command.buttonClass != null) {
+          button.className = command.buttonClass;
+        }
+
+        button.addEventListener("click", function() {
+          requisition.update(buttonSpec.typed);
+          //if (requisition.getStatus() == Status.VALID) {
+            requisition.exec();
+          /*
+          }
+          else {
+            console.error('incomplete commands not yet supported');
+          }
+          */
+        }, false);
+
+        // Allow the command button to be toggleable
+        /*
+        if (command.checkedState) {
+          button.setAttribute("type", "checkbox");
+          button.setAttribute("checked", command.checkedState.get() ? "true" : "false");
+          command.checkedState.on("change", function() {
+            button.checked = command.checkedState.get();
+          });
+        }
+        */
+      }
+    });
+
+    requisition.update('');
+
+    return reply;
+  }
+};
+
 /**
  * Due to a number of panel bugs we need a way to check if we are running on
  * Linux. See the comments for TooltipPanel and OutputPanel for further details.
@@ -57,10 +143,10 @@ this.DeveloperToolbar = function DeveloperToolbar(aChromeWindow, aToolbarElement
   this._lastState = NOTIFICATIONS.HIDE;
   this._pendingShowCallback = undefined;
   this._pendingHide = false;
-  this._errorsCount = Object.create(null);
-  this._errorListeners = Object.create(null);
-  this._webConsoleButton = this._doc
-                           .getElementById("developer-toolbar-webconsole");
+  this._errorsCount = {};
+  this._errorListeners = {};
+  this._errorCounterButton = this._doc
+                             .getElementById("developer-toolbar-toolbox-button");
 
   try {
     CmdCommands.refreshAutoCommands(aChromeWindow);
@@ -497,9 +583,9 @@ function DT__updateErrorsCount(aChangedTabId)
   let errors = this._errorsCount[tabId];
 
   if (errors) {
-    this._webConsoleButton.setAttribute("error-count", errors);
+    this._errorCounterButton.setAttribute("error-count", errors);
   } else {
-    this._webConsoleButton.removeAttribute("error-count");
+    this._errorCounterButton.removeAttribute("error-count");
   }
 };
 
diff --git a/browser/devtools/shared/EventEmitter.jsm b/browser/devtools/shared/EventEmitter.jsm
index d70324fc5700..fdeda4074597 100644
--- a/browser/devtools/shared/EventEmitter.jsm
+++ b/browser/devtools/shared/EventEmitter.jsm
@@ -1,8 +1,23 @@
-// XXXkhuey this should have a license header.
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.EXPORTED_SYMBOLS = ["EventEmitter"];
 
-this.EventEmitter = function EventEmitter() {
+/**
+ * EventEmitter.
+ *
+ * @param Object aObjectToExtend
+ *        If aObjectToExtend is not null, the public methods of EventEmitter
+ *        are bound to the object.
+ */
+this.EventEmitter = function EventEmitter(aObjectToExtend) {
+  if (aObjectToExtend) {
+    aObjectToExtend.on = this.on.bind(this);
+    aObjectToExtend.off = this.off.bind(this);
+    aObjectToExtend.once = this.once.bind(this);
+    aObjectToExtend.emit = this.emit.bind(this);
+  }
 }
 
 EventEmitter.prototype = {
@@ -34,7 +49,7 @@ EventEmitter.prototype = {
   once: function EventEmitter_once(aEvent, aListener) {
     let handler = function() {
       this.off(aEvent, handler);
-      aListener();
+      aListener.apply(null, arguments);
     }.bind(this);
     this.on(aEvent, handler);
   },
@@ -52,7 +67,9 @@ EventEmitter.prototype = {
     if (!this._eventEmitterListeners)
       return;
     let listeners = this._eventEmitterListeners.get(aEvent);
-    this._eventEmitterListeners.set(aEvent, listeners.filter(function(l) aListener != l));
+    if (listeners) {
+      this._eventEmitterListeners.set(aEvent, listeners.filter(function(l) aListener != l));
+    }
   },
 
   /**
diff --git a/browser/devtools/shared/test/browser_eventemitter_basic.js b/browser/devtools/shared/test/browser_eventemitter_basic.js
index c54ce5420eef..e15adbe72e2d 100644
--- a/browser/devtools/shared/test/browser_eventemitter_basic.js
+++ b/browser/devtools/shared/test/browser_eventemitter_basic.js
@@ -1,10 +1,24 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-
 function test() {
+  testEmitter();
+  testEmitter({});
+}
+
+
+function testEmitter(aObject) {
   Cu.import("resource:///modules/devtools/EventEmitter.jsm", this);
-  let emitter = new EventEmitter();
+
+  let emitter;
+
+  if (aObject) {
+    emitter = aObject;
+    new EventEmitter(emitter);
+  } else {
+    emitter = new EventEmitter();
+  }
+
   ok(emitter, "We have an event emitter");
 
   emitter.on("next", next);
diff --git a/browser/devtools/shared/test/browser_toolbar_basic.js b/browser/devtools/shared/test/browser_toolbar_basic.js
index 31d3ae19a0d6..10734464cf84 100644
--- a/browser/devtools/shared/test/browser_toolbar_basic.js
+++ b/browser/devtools/shared/test/browser_toolbar_basic.js
@@ -31,102 +31,34 @@ function isChecked(b) {
 
 function checkOpen() {
   ok(DeveloperToolbar.visible, "DeveloperToolbar is visible in checkOpen");
-
   let close = document.getElementById("developer-toolbar-closebutton");
-  let webconsole = document.getElementById("developer-toolbar-webconsole");
-  let inspector = document.getElementById("developer-toolbar-inspector");
-  let styleeditor = document.getElementById("developer-toolbar-styleeditor");
-  let debuggr = document.getElementById("developer-toolbar-debugger");
-
   ok(close, "Close button exists");
 
-  ok(!isChecked(webconsole), "web console button state 1");
-  ok(!isChecked(inspector), "inspector button state 1");
-  ok(!isChecked(debuggr), "debugger button state 1");
-  ok(!isChecked(styleeditor), "styleeditor button state 1");
+  let toggleToolbox =
+    document.getElementById("devtoolsMenuBroadcaster_DevToolbox");
+  ok(!isChecked(toggleToolbox), "toggle toolbox button is not checked");
 
-  document.getElementById("Tools:WebConsole").doCommand();
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  let toolbox = gDevTools.openToolboxForTab(target, "webconsole");
+  toolbox.once("webconsole-selected", function BTBT_selected(id, aInspector) {
+    ok(isChecked(toggleToolbox), "toggle toolbox button is checked");
 
-  ok(isChecked(webconsole), "web console button state 2");
-  ok(!isChecked(inspector), "inspector button state 2");
-  ok(!isChecked(debuggr), "debugger button state 2");
-  ok(!isChecked(styleeditor), "styleeditor button state 2");
+    addTab("about:blank", function(browser, tab) {
+      info("Opened a new tab");
 
-  document.getElementById("Tools:Inspect").doCommand();
+      ok(!isChecked(toggleToolbox), "toggle toolbox button is not checked");
 
-  ok(isChecked(webconsole), "web console button state 3");
-  ok(isChecked(inspector), "inspector button state 3");
-  ok(!isChecked(debuggr), "debugger button state 3");
-  ok(!isChecked(styleeditor), "styleeditor button state 3");
+      gBrowser.removeCurrentTab();
 
-  // Christmas tree!
-
-  // The web console opens synchronously, but closes asynchronously.
-  let hud = imported.HUDService.getHudByWindow(content);
-  imported.HUDService.disableAnimation(hud.hudId);
-
-  document.getElementById("Tools:WebConsole").doCommand();
-
-  ok(!isChecked(webconsole), "web console button state 6");
-  ok(isChecked(inspector), "inspector button state 6");
-  ok(!isChecked(debuggr), "debugger button state 6");
-  ok(!isChecked(styleeditor), "styleeditor button state 6");
-
-  document.getElementById("Tools:Inspect").doCommand();
-
-  ok(!isChecked(webconsole), "web console button state 7");
-  ok(!isChecked(inspector), "inspector button state 7");
-  ok(!isChecked(debuggr), "debugger button state 7");
-  ok(!isChecked(styleeditor), "styleeditor button state 7");
-
-  // All closed
-
-  // Check we can open and close and retain button state
-  document.getElementById("Tools:Inspect").doCommand();
-
-  ok(!isChecked(webconsole), "web console button state 8");
-  ok(isChecked(inspector), "inspector button state 8");
-  ok(!isChecked(debuggr), "debugger button state 8");
-  ok(!isChecked(styleeditor), "styleeditor button state 8");
-
-
-  // Test Style Editor
-  document.getElementById("Tools:StyleEditor").doCommand();
-
-  ok(!isChecked(webconsole), "web console button state 9");
-  ok(isChecked(inspector), "inspector button state 9");
-  ok(!isChecked(debuggr), "debugger button state 9");
-  ok(isChecked(styleeditor), "styleeditor button state 9");
-
-  // Test Debugger
-  document.getElementById("Tools:Debugger").doCommand();
-
-  ok(!isChecked(webconsole), "web console button state 9");
-  ok(isChecked(inspector), "inspector button state 9");
-  ok(isChecked(debuggr), "debugger button state 9");
-  ok(isChecked(styleeditor), "styleeditor button state 9");
-
-  addTab("about:blank", function(browser, tab) {
-    info("Opening a new tab");
-
-    ok(!isChecked(webconsole), "web console button state 10");
-    ok(!isChecked(inspector), "inspector button state 10");
-    ok(!isChecked(debuggr), "debugger button state 10");
-    ok(!isChecked(styleeditor), "styleeditor button state 10");
-
-    gBrowser.removeCurrentTab();
-
-    oneTimeObserve(DeveloperToolbar.NOTIFICATIONS.HIDE, catchFail(checkClosed));
-    document.getElementById("Tools:DevToolbar").doCommand();
+      oneTimeObserve(DeveloperToolbar.NOTIFICATIONS.HIDE, catchFail(checkClosed));
+      document.getElementById("Tools:DevToolbar").doCommand();
+    });
   });
 }
 
 function checkClosed() {
   ok(!DeveloperToolbar.visible, "DeveloperToolbar is not visible in checkClosed");
 
-  // Check we grok state even when closed
-  document.getElementById("Tools:WebConsole").doCommand();
-
   oneTimeObserve(DeveloperToolbar.NOTIFICATIONS.SHOW, catchFail(checkReOpen));
   document.getElementById("Tools:DevToolbar").doCommand();
 }
@@ -134,18 +66,9 @@ function checkClosed() {
 function checkReOpen() {
   ok(DeveloperToolbar.visible, "DeveloperToolbar is visible in checkReOpen");
 
-  let webconsole = document.getElementById("developer-toolbar-webconsole");
-  let inspector = document.getElementById("developer-toolbar-inspector");
-  let debuggr = document.getElementById("developer-toolbar-debugger");
-  let styleeditor = document.getElementById("developer-toolbar-styleeditor");
-
-  ok(isChecked(webconsole), "web console button state 99");
-  ok(isChecked(inspector), "inspector button state 99");
-  ok(isChecked(debuggr), "debugger button state 99");
-  ok(isChecked(styleeditor), "styleeditor button state 99");
-
-  // We close the style editor (not automatically closed)
-  document.getElementById("Tools:StyleEditor").doCommand();
+  let toggleToolbox =
+    document.getElementById("devtoolsMenuBroadcaster_DevToolbox");
+  ok(isChecked(toggleToolbox), "toggle toolbox button is checked");
 
   oneTimeObserve(DeveloperToolbar.NOTIFICATIONS.HIDE, catchFail(checkReClosed));
   document.getElementById("developer-toolbar-closebutton").doCommand();
diff --git a/browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.js b/browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.js
index 9dfbdc12c00b..ee5e36c5747e 100644
--- a/browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.js
+++ b/browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.js
@@ -4,13 +4,20 @@
 // Tests that the developer toolbar errors count works properly.
 
 function test() {
-  const TEST_URI = "http://example.com/browser/browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.html";
+  const TEST_URI = "http://example.com/browser/browser/devtools/shared/test/" +
+                   "browser_toolbar_webconsole_errors_count.html";
 
   let imported = {};
   Components.utils.import("resource:///modules/HUDService.jsm", imported);
   let HUDService = imported.HUDService;
 
-  let webconsole = document.getElementById("developer-toolbar-webconsole");
+  Components.utils.import("resource:///modules/devtools/gDevTools.jsm", imported);
+  let gDevTools = imported.gDevTools;
+
+  Components.utils.import("resource:///modules/devtools/Target.jsm", imported);
+  let TargetFactory = imported.TargetFactory;
+
+  let webconsole = document.getElementById("developer-toolbar-toolbox-button");
   let toolbar = document.getElementById("Tools:DevToolbar");
   let tab1, tab2;
 
@@ -104,7 +111,8 @@ function test() {
 
     oneTimeObserve("web-console-created", _onWebConsoleOpen);
 
-    HUDService.activateHUDForContext(tab);
+    let target = TargetFactory.forTab(tab);
+    gDevTools.openToolboxForTab(target, "webconsole");
   }
 
   function onWebConsoleOpen(hud) {
@@ -206,7 +214,8 @@ function test() {
 
   function testEnd() {
     document.getElementById("developer-toolbar-closebutton").doCommand();
-    HUDService.deactivateHUDForContext(tab1);
+    let target1 = TargetFactory.forTab(tab1);
+    gDevTools.closeToolbox(target1);
     gBrowser.removeTab(tab1);
     gBrowser.removeTab(tab2);
     finish();
diff --git a/browser/devtools/shared/test/head.js b/browser/devtools/shared/test/head.js
index abb1dc76f147..6c2999659802 100644
--- a/browser/devtools/shared/test/head.js
+++ b/browser/devtools/shared/test/head.js
@@ -8,6 +8,12 @@ let console = (function() {
   return tempScope.console;
 })();
 
+let TargetFactory = (function() {
+  let tempScope = {};
+  Components.utils.import("resource:///modules/devtools/Target.jsm", tempScope);
+  return tempScope.TargetFactory;
+})();
+
 // Import the GCLI test helper
 let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
 Services.scriptloader.loadSubScript(testDir + "/helpers.js", this);
diff --git a/browser/devtools/shared/test/leakhunt.js b/browser/devtools/shared/test/leakhunt.js
index c5b956981313..66d067a3c851 100644
--- a/browser/devtools/shared/test/leakhunt.js
+++ b/browser/devtools/shared/test/leakhunt.js
@@ -10,22 +10,12 @@
  *   otherthing: otherthing
  * });
  */
-
-var noRecurse = [
-  /^string$/, /^number$/, /^boolean$/, /^null/, /^undefined/,
-  /^Window$/, /^Document$/,
-  /^XULDocument$/, /^XULElement$/,
-  /^DOMWindow$/, /^HTMLDocument$/, /^HTML.*Element$/
-];
-
-var hide = [ /^string$/, /^number$/, /^boolean$/, /^null/, /^undefined/ ];
-
-function leakHunt(root, path, seen) {
-  path = path || [];
-  seen = seen || [];
+function leakHunt(root) {
+  var path = [];
+  var seen = [];
 
   try {
-    var output = leakHuntInner(root, path, seen);
+    var output = leakHunt.inner(root, path, seen);
     output.forEach(function(line) {
       dump(line + '\n');
     });
@@ -35,7 +25,7 @@ function leakHunt(root, path, seen) {
   }
 }
 
-function leakHuntInner(root, path, seen) {
+leakHunt.inner = function LH_inner(root, path, seen) {
   var prefix = new Array(path.length).join('  ');
 
   var reply = [];
@@ -52,70 +42,93 @@ function leakHuntInner(root, path, seen) {
     return reply;
   }
 
-  for (var prop in root) {
-    var newPath = path.slice();
-    newPath.push(prop);
-    prefix = new Array(newPath.length).join('  ');
+  try {
+    var index = 0;
+    for (var data of root) {
+      var prop = '' + index;
+      leakHunt.digProperty(prop, data, path, seen, direct, log);
+      index++;
+    }
+  }
+  catch (ex) { /* Ignore things that are not enumerable */ }
 
+  for (var prop in root) {
     var data;
     try {
       data = root[prop];
     }
     catch (ex) {
-      log(prefix + prop + '  Error reading: ' + ex);
+      log(prefix + '  ' + prop + ' = Error: ' + ex.toString().substring(0, 30));
       continue;
     }
 
-    var recurse = true;
-    var message = getType(data);
-
-    if (matchesAnyPattern(message, hide)) {
-      continue;
-    }
-
-    if (message === 'function' && direct.indexOf(prop) == -1) {
-      continue;
-    }
-
-    if (message === 'string') {
-      var extra = data.length > 10 ? data.substring(0, 9) + '_' : data;
-      message += ' "' + extra.replace(/\n/g, "|") + '"';
-      recurse = false;
-    }
-    else if (matchesAnyPattern(message, noRecurse)) {
-      message += ' (no recurse)'
-      recurse = false;
-    }
-    else if (seen.indexOf(data) !== -1) {
-      message += ' (already seen)';
-      recurse = false;
-    }
-
-    if (recurse) {
-      seen.push(data);
-      var lines = leakHuntInner(data, newPath, seen);
-      if (lines.length == 0) {
-        if (message !== 'function') {
-          log(prefix + prop + ' = ' + message + ' { }');
-        }
-      }
-      else {
-        log(prefix + prop + ' = ' + message + ' {');
-        lines.forEach(function(line) {
-          reply.push(line);
-        });
-        log(prefix + '}');
-      }
-    }
-    else {
-      log(prefix + prop + ' = ' + message);
-    }
+    leakHunt.digProperty(prop, data, path, seen, direct, log);
   }
 
   return reply;
 }
 
-function matchesAnyPattern(str, patterns) {
+leakHunt.hide = [ /^string$/, /^number$/, /^boolean$/, /^null/, /^undefined/ ];
+
+leakHunt.noRecurse = [
+  /^string$/, /^number$/, /^boolean$/, /^null/, /^undefined/,
+  /^Window$/, /^Document$/,
+  /^XULDocument$/, /^XULElement$/,
+  /^DOMWindow$/, /^HTMLDocument$/, /^HTML.*Element$/, /^ChromeWindow$/
+];
+
+leakHunt.digProperty = function LH_digProperty(prop, data, path, seen, direct, log) {
+  var newPath = path.slice();
+  newPath.push(prop);
+  var prefix = new Array(newPath.length).join('  ');
+
+  var recurse = true;
+  var message = leakHunt.getType(data);
+
+  if (leakHunt.matchesAnyPattern(message, leakHunt.hide)) {
+    return;
+  }
+
+  if (message === 'function' && direct.indexOf(prop) == -1) {
+    return;
+  }
+
+  if (message === 'string') {
+    var extra = data.length > 10 ? data.substring(0, 9) + '_' : data;
+    message += ' "' + extra.replace(/\n/g, "|") + '"';
+    recurse = false;
+  }
+  else if (leakHunt.matchesAnyPattern(message, leakHunt.noRecurse)) {
+    message += ' (no recurse)'
+    recurse = false;
+  }
+  else if (seen.indexOf(data) !== -1) {
+    message += ' (already seen)';
+    recurse = false;
+  }
+
+  if (recurse) {
+    seen.push(data);
+    var lines = leakHunt.inner(data, newPath, seen);
+    if (lines.length == 0) {
+      if (message !== 'function') {
+        log(prefix + prop + ' = ' + message + ' { }');
+      }
+    }
+    else {
+      log(prefix + prop + ' = ' + message + ' {');
+      lines.forEach(function(line) {
+        log(line);
+      });
+      log(prefix + '}');
+    }
+  }
+  else {
+    log(prefix + prop + ' = ' + message);
+  }
+};
+
+leakHunt.matchesAnyPattern = function LH_matchesAnyPattern(str, patterns) {
   var match = false;
   patterns.forEach(function(pattern) {
     if (str.match(pattern)) {
@@ -123,9 +136,9 @@ function matchesAnyPattern(str, patterns) {
     }
   });
   return match;
-}
+};
 
-function getType(data) {
+leakHunt.getType = function LH_getType(data) {
   if (data === null) {
     return 'null';
   }
@@ -135,13 +148,13 @@ function getType(data) {
 
   var type = typeof data;
   if (type === 'object' || type === 'Object') {
-    type = getCtorName(data);
+    type = leakHunt.getCtorName(data);
   }
 
   return type;
-}
+};
 
-function getCtorName(aObj) {
+leakHunt.getCtorName = function LH_getCtorName(aObj) {
   try {
     if (aObj.constructor && aObj.constructor.name) {
       return aObj.constructor.name;
@@ -154,4 +167,4 @@ function getCtorName(aObj) {
   // If that fails, use Objects toString which sometimes gives something
   // better than 'Object', and at least defaults to Object if nothing better
   return Object.prototype.toString.call(aObj).slice(8, -1);
-}
+};
diff --git a/browser/devtools/styleeditor/StyleEditor.jsm b/browser/devtools/styleeditor/StyleEditor.jsm
index 685d039d2a05..c7464162268c 100644
--- a/browser/devtools/styleeditor/StyleEditor.jsm
+++ b/browser/devtools/styleeditor/StyleEditor.jsm
@@ -5,7 +5,7 @@
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = ["StyleEditor", "StyleEditorFlags", "StyleEditorManager"];
+this.EXPORTED_SYMBOLS = ["StyleEditor", "StyleEditorFlags"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
@@ -298,7 +298,7 @@ StyleEditor.prototype = {
           }
           let source = NetUtil.readInputStreamToString(aStream, aStream.available());
           aStream.close();
-    
+
           this._appendNewStyleSheet(source);
           this.clearFlag(StyleEditorFlags.ERROR);
         }.bind(this));
@@ -1120,6 +1120,7 @@ StyleEditor.prototype = {
       accel: true,
       callback: function save() {
         this.saveToFile(this._savedFile);
+        return true;
       }.bind(this)
     });
 
@@ -1130,6 +1131,7 @@ StyleEditor.prototype = {
       shift: true,
       callback: function saveAs() {
         this.saveToFile();
+        return true;
       }.bind(this)
     });
 
@@ -1277,134 +1279,3 @@ function setupBracketCompletion(aSourceEditor)
     aSourceEditor.setCaretOffset(aSourceEditor.getCaretOffset() - 1);
   }, false);
 }
-
-/**
-  * Manage the different editors instances.
-  */
-
-this.StyleEditorManager = function StyleEditorManager(aWindow) {
-  this.chromeWindow = aWindow;
-  this.listenToTabs();
-  this.editors = new WeakMap();
-}
-
-StyleEditorManager.prototype = {
-
-  /**
-   * Get the editor for a specific content window.
-   */
-  getEditorForWindow: function SEM_getEditorForWindow(aContentWindow) {
-    return this.editors.get(aContentWindow);
-  },
-
-  /**
-   * Focus the editor and select a stylesheet.
-   *
-   * @param {CSSStyleSheet} [aSelectedStyleSheet] default Stylesheet.
-   * @param {Number} [aLine] Line to which the caret should be moved (one-indexed).
-   * @param {Number} [aCol] Column to which the caret should be moved (one-indexed).
-   */
-  selectEditor: function SEM_selectEditor(aWindow, aSelectedStyleSheet, aLine, aCol) {
-    if (aSelectedStyleSheet) {
-      aWindow.styleEditorChrome.selectStyleSheet(aSelectedStyleSheet, aLine, aCol);
-    }
-    aWindow.focus();
-  },
-
-  /**
-   * Open a new editor.
-   *
-   * @param {Window} content window.
-   * @param {Window} chrome window.
-   * @param {CSSStyleSheet} [aSelectedStyleSheet] default Stylesheet.
-   * @param {Number} [aLine] Line to which the caret should be moved (one-indexed).
-   * @param {Number} [aCol] Column to which the caret should be moved (one-indexed).
-   */
-  newEditor: function SEM_newEditor(aContentWindow, aChromeWindow, aSelectedStyleSheet, aLine, aCol) {
-    const CHROME_URL = "chrome://browser/content/styleeditor.xul";
-    const CHROME_WINDOW_FLAGS = "chrome,centerscreen,resizable,dialog=no";
-
-    let args = {
-      contentWindow: aContentWindow,
-      selectedStyleSheet: aSelectedStyleSheet,
-      line: aLine,
-      col: aCol
-    };
-    args.wrappedJSObject = args;
-    let chromeWindow = Services.ww.openWindow(aChromeWindow, CHROME_URL, "_blank",
-                                              CHROME_WINDOW_FLAGS, args);
-
-    chromeWindow.onunload = function() {
-      if (chromeWindow.location == CHROME_URL) {
-        // not about:blank being unloaded
-        this.unregisterEditor(aContentWindow);
-      }
-    }.bind(this);
-    chromeWindow.focus();
-
-    this.editors.set(aContentWindow, chromeWindow);
-
-    this.refreshCommand();
-
-    return chromeWindow;
-  },
-
-  /**
-   * Toggle an editor.
-   *
-   * @param {Window} associated content window.
-   */
-  toggleEditor: function SEM_toggleEditor(aContentWindow, aChromeWindow) {
-    let editor = this.getEditorForWindow(aContentWindow);
-    if (editor) {
-      editor.close();
-    } else {
-      this.newEditor(aContentWindow, aChromeWindow);
-    }
-  },
-
-  /**
-   * Close an editor.
-   *
-   * @param {Window} associated content window.
-   */
-  unregisterEditor: function SEM_unregisterEditor(aContentWindow) {
-    let chromeWindow = this.editors.get(aContentWindow);
-    if (chromeWindow) {
-      chromeWindow.close();
-    }
-    this.editors.delete(aContentWindow);
-    this.refreshCommand();
-  },
-
-  /**
-   * Update the status of tool's menuitems and buttons.
-   */
-  refreshCommand: function SEM_refreshCommand() {
-    let contentWindow = this.chromeWindow.gBrowser.contentWindow;
-    let command = this.chromeWindow.document.getElementById("Tools:StyleEditor");
-
-    let win = this.getEditorForWindow(contentWindow);
-    if (win) {
-      command.setAttribute("checked", "true");
-    } else {
-      command.setAttribute("checked", "false");
-    }
-  },
-
-  /**
-   * Trigger refreshCommand when needed.
-   */
-  listenToTabs: function SEM_listenToTabs() {
-    let win = this.chromeWindow;
-    let tabs = win.gBrowser.tabContainer;
-
-    let bound_refreshCommand = this.refreshCommand.bind(this);
-    tabs.addEventListener("TabSelect", bound_refreshCommand, true);
-
-    win.addEventListener("unload", function onClose(aEvent) {
-      tabs.removeEventListener("TabSelect", bound_refreshCommand, true);
-      win.removeEventListener("unload", onClose, false);
-    }, false);
-  },
-}
diff --git a/browser/devtools/styleeditor/StyleEditorChrome.jsm b/browser/devtools/styleeditor/StyleEditorChrome.jsm
index ca9dccd9e2fe..7c2aeb6099e5 100644
--- a/browser/devtools/styleeditor/StyleEditorChrome.jsm
+++ b/browser/devtools/styleeditor/StyleEditorChrome.jsm
@@ -69,6 +69,8 @@ this.StyleEditorChrome = function StyleEditorChrome(aRoot, aContentWindow)
 }
 
 StyleEditorChrome.prototype = {
+  _styleSheetToSelect: null,
+
   /**
    * Retrieve the content window attached to this chrome.
    *
@@ -274,7 +276,7 @@ StyleEditorChrome.prototype = {
   /**
    * Reset the chrome UI to an empty and ready state.
    */
-  _resetChrome: function SEC__resetChrome()
+  resetChrome: function SEC__resetChrome()
   {
     this._editors.forEach(function (aEditor) {
       aEditor.removeActionListener(this);
@@ -297,7 +299,7 @@ StyleEditorChrome.prototype = {
    */
   _populateChrome: function SEC__populateChrome()
   {
-    this._resetChrome();
+    this.resetChrome();
 
     let document = this.contentDocument;
     this._document.title = _("chromeWindowTitle",
@@ -337,49 +339,60 @@ StyleEditorChrome.prototype = {
    */
   selectStyleSheet: function SEC_selectSheet(aSheet, aLine, aCol)
   {
-    let select = function DEC_select(aEditor) {
-      let summary = aSheet ? this.getSummaryElementForEditor(aEditor)
-                           : this._view.getSummaryElementByOrdinal(0);
-      let setCaret = false;
+    let alreadyCalled = !!this._styleSheetToSelect;
 
-      if (aLine || aCol) {
-        aLine = aLine || 1;
-        aCol = aCol || 1;
-        setCaret = true;
-      }
-      if (!aEditor.sourceEditor) {
-        // If a line or column was specified we move the caret appropriately.
-        if (setCaret) {
+    this._styleSheetToSelect = {
+      sheet: aSheet,
+      line: aLine,
+      col: aCol,
+    };
+
+    if (alreadyCalled) {
+      return;
+    }
+
+    let select = function DEC_select(aEditor) {
+      let sheet = this._styleSheetToSelect.sheet;
+      let line = this._styleSheetToSelect.line;
+      let col = this._styleSheetToSelect.col;
+      let summary = sheet ? this.getSummaryElementForEditor(aEditor)
+                          : this._view.getSummaryElementByOrdinal(0);
+
+      if (line) {
+        col = col || 1;
+
+        if (!aEditor.sourceEditor) {
+          // If a line or column was specified we move the caret appropriately.
           let self = this;
           aEditor.addActionListener({
             onAttach: function SEC_selectSheet_onAttach()
             {
               aEditor.removeActionListener(this);
               self.selectedStyleSheetIndex = aEditor.styleSheetIndex;
-              aEditor.sourceEditor.setCaretPosition(aLine - 1, aCol - 1);
+              aEditor.sourceEditor.setCaretPosition(line - 1, col - 1);
             }
           });
-        }
-        this._view.activeSummary = summary;
-      } else {
-        this._view.activeSummary = summary;
-
-        // If a line or column was specified we move the caret appropriately.
-        if (setCaret) {
-          aEditor.sourceEditor.setCaretPosition(aLine - 1, aCol - 1);
+        } else {
+          // If a line or column was specified we move the caret appropriately.
+          aEditor.sourceEditor.setCaretPosition(line - 1, col - 1);
         }
       }
+
+      this._view.activeSummary = summary;
       this.selectedStyleSheetIndex = aEditor.styleSheetIndex;
+      this._styleSheetToSelect = null;
     }.bind(this);
 
     if (!this.editors.length) {
       // We are in the main initialization phase so we wait for the editor
       // containing the target stylesheet to be added and select the target
       // stylesheet, optionally moving the cursor to a selected line.
+      let self = this;
       this.addChromeListener({
         onEditorAdded: function SEC_selectSheet_onEditorAdded(aChrome, aEditor) {
-          if ((!aSheet && aEditor.styleSheetIndex == 0) ||
-              aEditor.styleSheet == aSheet) {
+          let sheet = self._styleSheetToSelect.sheet;
+          if ((sheet && aEditor.styleSheet == sheet) ||
+              aEditor.styleSheetIndex == 0) {
             aChrome.removeChromeListener(this);
             select(aEditor);
           }
diff --git a/browser/devtools/styleeditor/StyleEditorDefinition.jsm b/browser/devtools/styleeditor/StyleEditorDefinition.jsm
new file mode 100644
index 000000000000..654e304d4206
--- /dev/null
+++ b/browser/devtools/styleeditor/StyleEditorDefinition.jsm
@@ -0,0 +1,56 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = [ "StyleEditorDefinition" ];
+
+const Cu = Components.utils;
+const STRINGS_URI = "chrome://browser/locale/devtools/styleeditor.properties";
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource:///modules/devtools/StyleEditorChrome.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+XPCOMUtils.defineLazyGetter(this, "_strings",
+  function() Services.strings.createBundle(STRINGS_URI));
+
+XPCOMUtils.defineLazyModuleGetter(this, "StyleEditorPanel",
+  "resource:///modules/devtools/StyleEditorPanel.jsm");
+
+/**
+ * The external API allowing us to be registered with DevTools.jsm
+ */
+this.StyleEditorDefinition = {
+  id: "styleeditor",
+  key: l10n("open.commandkey"),
+  ordinal: 3,
+  accesskey: l10n("open.accesskey"),
+  modifiers: "shift",
+  label: l10n("ToolboxStyleEditor.label"),
+  url: "chrome://browser/content/styleeditor.xul",
+
+  isTargetSupported: function(target) {
+    return !target.isRemote && !target.isChrome;
+  },
+
+  build: function(iframeWindow, toolbox) {
+    return new StyleEditorPanel(iframeWindow, toolbox);
+  }
+};
+
+/**
+ * Lookup l10n string from a string bundle.
+ * @param {string} aName The key to lookup.
+ * @returns A localized version of the given key.
+ */
+function l10n(aName)
+{
+  try {
+    return _strings.GetStringFromName(aName);
+  } catch (ex) {
+    Services.console.logStringMessage("Error reading '" + aName + "'");
+    throw new Error("l10n error with " + aName);
+  }
+}
diff --git a/browser/devtools/styleeditor/StyleEditorPanel.jsm b/browser/devtools/styleeditor/StyleEditorPanel.jsm
new file mode 100644
index 000000000000..ff0d3c18e162
--- /dev/null
+++ b/browser/devtools/styleeditor/StyleEditorPanel.jsm
@@ -0,0 +1,109 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const Cu = Components.utils;
+const Ci = Components.interfaces;
+
+this.EXPORTED_SYMBOLS = ["StyleEditorPanel"];
+
+Cu.import("resource:///modules/devtools/EventEmitter.jsm");
+Cu.import("resource:///modules/devtools/StyleEditorChrome.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+this.StyleEditorPanel = function StyleEditorPanel(panelWin, toolbox) {
+  new EventEmitter(this);
+
+  this._toolbox = toolbox;
+  this._target = toolbox.target;
+
+  this.reset = this.reset.bind(this);
+  this.newPage = this.newPage.bind(this);
+  this.destroy = this.destroy.bind(this);
+
+  this._target.on("will-navigate", this.reset);
+  this._target.on("navigate", this.newPage);
+  this._target.on("close", this.destroy);
+
+  this._panelWin = panelWin;
+  this._panelDoc = panelWin.document;
+
+  let contentWin = toolbox.target.tab.linkedBrowser.contentWindow;
+  this.setPage(contentWin);
+
+  this.isReady = true;
+}
+
+StyleEditorPanel.prototype = {
+  /**
+   * Target getter.
+   */
+  get target() {
+    return this._target;
+  },
+
+  /**
+   * Panel window getter.
+   */
+  get panelWindow() this._panelWin,
+
+  /**
+   * StyleEditorChrome instance getter.
+   */
+  get styleEditorChrome() this._panelWin.styleEditorChrome,
+
+  /**
+   * Set the page to target.
+   */
+  setPage: function StyleEditor_setPage(contentWindow) {
+    if (this._panelWin.styleEditorChrome) {
+      this._panelWin.styleEditorChrome.contentWindow = contentWindow;
+    } else {
+      let chromeRoot = this._panelDoc.getElementById("style-editor-chrome");
+      let chrome = new StyleEditorChrome(chromeRoot, contentWindow);
+      this._panelWin.styleEditorChrome = chrome;
+    }
+    this.selectStyleSheet(null, null, null);
+  },
+
+  /**
+   * Navigated to a new page.
+   */
+  newPage: function StyleEditor_newPage(event, window) {
+    this.setPage(window);
+  },
+
+  /**
+   * No window available anymore.
+   */
+  reset: function StyleEditor_reset() {
+    this._panelWin.styleEditorChrome.resetChrome();
+  },
+
+  /**
+   * Select a stylesheet.
+   */
+  selectStyleSheet: function StyleEditor_selectStyleSheet(stylesheet, line, col) {
+    this._panelWin.styleEditorChrome.selectStyleSheet(stylesheet, line, col);
+  },
+
+  /**
+   * Destroy StyleEditor
+   */
+  destroy: function StyleEditor_destroy() {
+    if (this._destroyed) {
+      return;
+    }
+    this._destroyed = true;
+
+    this._target.off("will-navigate", this.reset);
+    this._target.off("navigate", this.newPage);
+    this._target.off("close", this.destroy);
+    this._target = null;
+    this._toolbox = null;
+    this._panelWin = null;
+    this._panelDoc = null;
+  },
+}
diff --git a/browser/devtools/styleeditor/styleeditor.xul b/browser/devtools/styleeditor/styleeditor.xul
index 93887d1e125d..6a3cff7c5f63 100644
--- a/browser/devtools/styleeditor/styleeditor.xul
+++ b/browser/devtools/styleeditor/styleeditor.xul
@@ -16,117 +16,95 @@
 <?xul-overlay href="chrome://browser/content/source-editor-overlay.xul"?>
 <xul:window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns="http://www.w3.org/1999/xhtml"
-        id="style-editor-chrome-window"
-        title="&window.title;"
-        windowtype="Tools:StyleEditor"
-        width="800" height="280"
-        persist="screenX screenY width height sizemode">
-<xul:script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+        id="style-editor-chrome-window">
 
-<xul:popupset id="style-editor-popups">
-  <xul:menupopup id="sourceEditorContextMenu"
-                 onpopupshowing="goUpdateSourceEditorMenuItems()">
-    <xul:menuitem id="se-cMenu-undo"/>
-    <xul:menuseparator/>
-    <xul:menuitem id="se-cMenu-cut"/>
-    <xul:menuitem id="se-cMenu-copy"/>
-    <xul:menuitem id="se-cMenu-paste"/>
-    <xul:menuitem id="se-cMenu-delete"/>
-    <xul:menuseparator/>
-    <xul:menuitem id="se-cMenu-selectAll"/>
-    <xul:menuseparator/>
-    <xul:menuitem id="se-cMenu-find"/>
-    <xul:menuitem id="se-cMenu-findAgain"/>
-    <xul:menuseparator/>
-    <xul:menuitem id="se-cMenu-gotoLine"/>
-  </xul:menupopup>
-</xul:popupset>
+  <xul:script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
-<xul:commandset id="editMenuCommands"/>
-<xul:commandset id="sourceEditorCommands"/>
-<xul:commandset id="style-editor-commandset">
-  <xul:command id="style-editor-cmd-close" oncommand="window.close();"/>
-</xul:commandset>
+  <xul:popupset id="style-editor-popups">
+    <xul:menupopup id="sourceEditorContextMenu"
+                  onpopupshowing="goUpdateSourceEditorMenuItems()">
+      <xul:menuitem id="se-cMenu-undo"/>
+      <xul:menuseparator/>
+      <xul:menuitem id="se-cMenu-cut"/>
+      <xul:menuitem id="se-cMenu-copy"/>
+      <xul:menuitem id="se-cMenu-paste"/>
+      <xul:menuitem id="se-cMenu-delete"/>
+      <xul:menuseparator/>
+      <xul:menuitem id="se-cMenu-selectAll"/>
+      <xul:menuseparator/>
+      <xul:menuitem id="se-cMenu-find"/>
+      <xul:menuitem id="se-cMenu-findAgain"/>
+      <xul:menuseparator/>
+      <xul:menuitem id="se-cMenu-gotoLine"/>
+    </xul:menupopup>
+  </xul:popupset>
 
-<xul:keyset id="sourceEditorKeys"/>
-<xul:keyset id="style-editor-keyset">
-  <xul:key id="style-editor-key-close"
-           key="&closeCmd.key;"
-           command="style-editor-cmd-close"
-           modifiers="accel"/>
-</xul:keyset>
+  <xul:commandset id="editMenuCommands"/>
+  <xul:commandset id="sourceEditorCommands"/>
 
-<xul:box id="style-editor-chrome" class="splitview-root loading">
-  <xul:box class="splitview-controller">
-    <xul:box class="splitview-main">
-      <xul:toolbar class="devtools-toolbar">
-        <xul:toolbarbutton class="style-editor-newButton devtools-toolbarbutton"
-                    accesskey="&newButton.accesskey;"
-                    tooltiptext="&newButton.tooltip;"
-                    label="&newButton.label;"
-                    disabled="true"/>
-        <xul:toolbarbutton class="style-editor-importButton devtools-toolbarbutton"
-                    accesskey="&importButton.accesskey;"
-                    tooltiptext="&importButton.tooltip;"
-                    label="&importButton.label;"
-                    disabled="true"/>
-      </xul:toolbar>
-    </xul:box>
-    <xul:box id="splitview-resizer-target" class="splitview-nav-container"
-             persist="width height">
-      <ol class="splitview-nav" tabindex="0"></ol>
-      <div class="splitview-nav placeholder empty">
-        <p><strong>&noStyleSheet.label;</strong></p>
-        <p>&noStyleSheet-tip-start.label;
-          <a href="#"
-             class="style-editor-newButton">&noStyleSheet-tip-action.label;</a>
-          &noStyleSheet-tip-end.label;</p>
-      </div>
-    </xul:box> <!-- .splitview-nav-container -->
-  </xul:box>   <!-- .splitview-controller -->
-  <xul:box class="splitview-side-details"/>
+  <xul:keyset id="sourceEditorKeys"/>
 
-  <div id="splitview-templates" hidden="true">
-    <li id="splitview-tpl-summary-stylesheet" tabindex="0">
-      <a class="stylesheet-enabled" tabindex="0" href="#"
-         title="&visibilityToggle.tooltip;"
-         accesskey="&saveButton.accesskey;"></a>
-      <hgroup class="stylesheet-info">
-        <h1><a class="stylesheet-name" href="#"><xul:label crop="start"/></a></h1>
-        <div class="stylesheet-more">
-          <h3 class="stylesheet-title"></h3>
-          <h3 class="stylesheet-rule-count"></h3>
-          <h3 class="stylesheet-error-message"></h3>
-          <xul:spacer/>
-          <h3><a class="stylesheet-saveButton" href="#"
-                 title="&saveButton.tooltip;"
-                 accesskey="&saveButton.accesskey;">&saveButton.label;</a></h3>
+  <xul:box id="style-editor-chrome" class="splitview-root loading">
+    <xul:box class="splitview-controller">
+      <xul:box class="splitview-main">
+        <xul:toolbar class="devtools-toolbar">
+          <xul:toolbarbutton class="style-editor-newButton devtools-toolbarbutton"
+                      accesskey="&newButton.accesskey;"
+                      tooltiptext="&newButton.tooltip;"
+                      label="&newButton.label;"
+                      disabled="true"/>
+          <xul:toolbarbutton class="style-editor-importButton devtools-toolbarbutton"
+                      accesskey="&importButton.accesskey;"
+                      tooltiptext="&importButton.tooltip;"
+                      label="&importButton.label;"
+                      disabled="true"/>
+        </xul:toolbar>
+      </xul:box>
+      <xul:box id="splitview-resizer-target" class="splitview-nav-container"
+              persist="width height">
+        <ol class="splitview-nav" tabindex="0"></ol>
+        <div class="splitview-nav placeholder empty">
+          <p><strong>&noStyleSheet.label;</strong></p>
+          <p>&noStyleSheet-tip-start.label;
+            <a href="#"
+              class="style-editor-newButton">&noStyleSheet-tip-action.label;</a>
+            &noStyleSheet-tip-end.label;</p>
         </div>
-      </hgroup>
-    </li>
+      </xul:box> <!-- .splitview-nav-container -->
+    </xul:box>   <!-- .splitview-controller -->
+    <xul:box class="splitview-side-details"/>
 
-    <xul:box id="splitview-tpl-details-stylesheet" class="splitview-details">
-      <xul:resizer class="splitview-portrait-resizer"
-                   dir="bottom"
-                   element="splitview-resizer-target"/>
-      <xul:toolbar id="splitview-details-toolbar" class="devtools-toolbar">
-        <xul:resizer class="splitview-landscape-resizer"
-                     dir="bottomend"
-                     element="splitview-resizer-target"/>
-      </xul:toolbar>
-      <xul:box class="stylesheet-editor-input textbox"
-               data-placeholder="&editorTextbox.placeholder;"/>
-    </xul:box>
-  </div> <!-- #splitview-templates -->
-</xul:box>   <!-- .splitview-root -->
+    <div id="splitview-templates" hidden="true">
+      <li id="splitview-tpl-summary-stylesheet" tabindex="0">
+        <a class="stylesheet-enabled" tabindex="0" href="#"
+          title="&visibilityToggle.tooltip;"
+          accesskey="&saveButton.accesskey;"></a>
+        <hgroup class="stylesheet-info">
+          <h1><a class="stylesheet-name" href="#"><xul:label crop="start"/></a></h1>
+          <div class="stylesheet-more">
+            <h3 class="stylesheet-title"></h3>
+            <h3 class="stylesheet-rule-count"></h3>
+            <h3 class="stylesheet-error-message"></h3>
+            <xul:spacer/>
+            <h3><a class="stylesheet-saveButton" href="#"
+                  title="&saveButton.tooltip;"
+                  accesskey="&saveButton.accesskey;">&saveButton.label;</a></h3>
+          </div>
+        </hgroup>
+      </li>
 
-<xul:script type="application/javascript"><![CDATA[
-Components.utils.import("resource:///modules/devtools/StyleEditorChrome.jsm");
-let chromeRoot = document.getElementById("style-editor-chrome");
-let args = window.arguments[0].wrappedJSObject;
-let contentWindow = args.contentWindow;
-let chrome = new StyleEditorChrome(chromeRoot, contentWindow);
-chrome.selectStyleSheet(args.selectedStyleSheet, args.line, args.col);
-window.styleEditorChrome = chrome;
-]]></xul:script>
+      <xul:box id="splitview-tpl-details-stylesheet" class="splitview-details">
+        <xul:resizer class="splitview-portrait-resizer"
+                    dir="bottom"
+                    element="splitview-resizer-target"/>
+        <xul:toolbar id="splitview-details-toolbar" class="devtools-toolbar">
+          <xul:resizer class="splitview-landscape-resizer"
+                      dir="bottomend"
+                      element="splitview-resizer-target"/>
+        </xul:toolbar>
+        <xul:box class="stylesheet-editor-input textbox"
+                data-placeholder="&editorTextbox.placeholder;"/>
+      </xul:box>
+    </div> <!-- #splitview-templates -->
+  </xul:box>   <!-- .splitview-root -->
 </xul:window>
diff --git a/browser/devtools/styleeditor/test/Makefile.in b/browser/devtools/styleeditor/test/Makefile.in
index 4ca04ee26bae..95ef1121f73d 100644
--- a/browser/devtools/styleeditor/test/Makefile.in
+++ b/browser/devtools/styleeditor/test/Makefile.in
@@ -23,9 +23,11 @@ _BROWSER_TEST_FILES = \
                  browser_styleeditor_passedinsheet.js \
                  browser_styleeditor_pretty.js \
                  browser_styleeditor_readonly.js \
-		 $(filter disabled-for-intermittent-failures--bug-707891, browser_styleeditor_reopen.js) \
+                 $(filter disabled-for-intermittent-failures--bug-707891, browser_styleeditor_reopen.js) \
                  browser_styleeditor_sv_keynav.js \
                  browser_styleeditor_sv_resize.js \
+                 head.js \
+                 helpers.js \
                  four.html \
                  head.js \
                  helpers.js \
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_init.js b/browser/devtools/styleeditor/test/browser_styleeditor_init.js
index 51f8663aee93..7835c7c15ba2 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_init.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_init.js
@@ -32,19 +32,11 @@ function run(aChrome)
   let SEC = gChromeWindow.styleEditorChrome;
   is(SEC, aChrome, "StyleEditorChrome object exists as new window property");
 
-  ok(gChromeWindow.document.title.indexOf("simple testcase") >= 0,
-     "the Style Editor window title contains the document's title");
-
   // check editors are instantiated
   is(SEC.editors.length, 2,
      "there is two StyleEditor instances managed");
   ok(SEC.editors[0].styleSheetIndex < SEC.editors[1].styleSheetIndex,
      "editors are ordered by styleSheetIndex");
-
-  // check StyleEditorChrome is a singleton wrt to the same DOMWindow
-  let chromeWindow = StyleEditor.openChrome();
-  is(chromeWindow, gChromeWindow,
-     "attempt to edit the same document returns the same Style Editor window");
 }
 
 let gEditorAddedCount = 0;
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_loading.js b/browser/devtools/styleeditor/test/browser_styleeditor_loading.js
index 9b5e86e4d838..07331c6e092c 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_loading.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_loading.js
@@ -15,31 +15,32 @@ function test()
   // this checks that the Style Editor still launches correctly when it is opened
   // *while* the page is still loading
   launchStyleEditorChrome(function (aChrome) {
-    isnot(gBrowser.selectedBrowser.contentWindow.document.readyState, "complete",
-          "content document is still loading");
+    content.location = TESTCASE_URI;
+    executeSoon(function() {
+      isnot(gBrowser.selectedBrowser.contentWindow.document.readyState, "complete",
+            "content document is still loading");
 
-    let root = gChromeWindow.document.querySelector(".splitview-root");
-    ok(root.classList.contains("loading"),
-       "style editor root element has 'loading' class name");
+      let root = gChromeWindow.document.querySelector(".splitview-root");
+      ok(root.classList.contains("loading"),
+        "style editor root element has 'loading' class name");
 
-    let button = gChromeWindow.document.querySelector(".style-editor-newButton");
-    ok(button.hasAttribute("disabled"),
-       "new style sheet button is disabled");
+      let button = gChromeWindow.document.querySelector(".style-editor-newButton");
+      ok(button.hasAttribute("disabled"),
+        "new style sheet button is disabled");
 
-    button = gChromeWindow.document.querySelector(".style-editor-importButton");
-    ok(button.hasAttribute("disabled"),
-       "import button is disabled");
+      button = gChromeWindow.document.querySelector(".style-editor-importButton");
+      ok(button.hasAttribute("disabled"),
+        "import button is disabled");
 
-    if (!aChrome.isContentAttached) {
-      aChrome.addChromeListener({
-        onContentAttach: run
-      });
-    } else {
-      run(aChrome);
-    }
+      if (!aChrome.isContentAttached) {
+        aChrome.addChromeListener({
+          onContentAttach: run
+        });
+      } else {
+        run(aChrome);
+      }
+    });
   });
-
-  content.location = TESTCASE_URI;
 }
 
 function run(aChrome)
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_passedinsheet.js b/browser/devtools/styleeditor/test/browser_styleeditor_passedinsheet.js
index 05b37019e49f..d095d1a48c6e 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_passedinsheet.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_passedinsheet.js
@@ -6,56 +6,53 @@ const TESTCASE_URI = TEST_BASE + "simple.html";
 const LINE = 6;
 const COL = 2;
 
-let editor = null;
-let sheet = null;
-
 function test()
 {
+  let editor = null;
+  let sheet = null;
+
   waitForExplicitFinish();
-  gBrowser.selectedBrowser.addEventListener("load", function () {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
+    gBrowser.selectedBrowser.removeEventListener("load", onLoad, true);
     run();
   }, true);
   content.location = TESTCASE_URI;
-}
 
-function run()
-{
-  sheet = content.document.styleSheets[1];
-  launchStyleEditorChrome(function attachListeners(aChrome) {
-    aChrome.addChromeListener({
-      onEditorAdded: checkSourceEditor
-    });
-  }, sheet, LINE, COL);
-}
+  function run()
+  {
+    sheet = content.document.styleSheets[1];
+    launchStyleEditorChrome(function attachListeners(aChrome) {
+      aChrome.addChromeListener({
+        onEditorAdded: checkSourceEditor
+      });
+    }, sheet, LINE, COL);
+  }
 
-function checkSourceEditor(aChrome, aEditor)
-{
-  if (!aEditor.sourceEditor) {
-    aEditor.addActionListener({
-      onAttach: function (aEditor) {
-        aEditor.removeActionListener(this);
-        validate(aEditor);
-      }
-    });
-  } else {
-    validate(aEditor);
+  function checkSourceEditor(aChrome, aEditor)
+  {
+    aChrome.removeChromeListener(this);
+    if (!aEditor.sourceEditor) {
+      aEditor.addActionListener({
+        onAttach: function (aEditor) {
+          aEditor.removeActionListener(this);
+          validate(aEditor);
+        }
+      });
+    } else {
+      validate(aEditor);
+    }
+  }
+
+  function validate(aEditor)
+  {
+    info("validating style editor");
+    let sourceEditor = aEditor.sourceEditor;
+    let caretPosition = sourceEditor.getCaretPosition();
+    is(caretPosition.line, LINE - 1, "caret row is correct"); // index based
+    is(caretPosition.col, COL - 1, "caret column is correct");
+    is(aEditor.styleSheet, sheet, "loaded stylesheet matches document stylesheet");
+    finish();
   }
 }
-
-function validate(aEditor)
-{
-  info("validating style editor");
-  let sourceEditor = aEditor.sourceEditor;
-  let caretPosition = sourceEditor.getCaretPosition();
-  is(caretPosition.line, LINE - 1, "caret row is correct"); // index based
-  is(caretPosition.col, COL - 1, "caret column is correct");
-  is(aEditor.styleSheet, sheet, "loaded stylesheet matches document stylesheet");
-  finishUp();
-}
-
-function finishUp()
-{
-  editor = sheet = null;
-  finish();
-}
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_private.js b/browser/devtools/styleeditor/test/browser_styleeditor_private.js
index 4172caf5e4ca..e3677e7c5d5b 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_private.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_private.js
@@ -19,23 +19,33 @@ function test() {
     finish();
   }
 
+  gBrowser.selectedTab = gBrowser.addTab();
+
   gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
     gBrowser.selectedBrowser.removeEventListener("load", onLoad, true);
     cache.evictEntries(Ci.nsICache.STORE_ANYWHERE);
     launchStyleEditorChrome(function(aChrome) {
-      aChrome.addChromeListener({
-        onEditorAdded: function(aChrome, aEditor) {
-          if (aEditor.isLoaded) {
-            checkCache();
-          } else {
-            aEditor.addActionListener({
-              onLoad: checkCache
-            });
-          }
-        }
-      });
+      if (aChrome.isContentAttached) {
+        onEditorAdded(aChrome, aChrome.editors[0]);
+      } else {
+        aChrome.addChromeListener({
+          onEditorAdded: onEditorAdded
+        });
+      }
     });
   }, true);
 
+  function onEditorAdded(aChrome, aEditor) {
+    aChrome.removeChromeListener(this);
+
+    if (aEditor.isLoaded) {
+      checkCache();
+    } else {
+      aEditor.addActionListener({
+        onLoad: checkCache
+      });
+    }
+  }
+
   content.location = 'http://' + TEST_HOST + '/browser/browser/devtools/styleeditor/test/test_private.html';
 }
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_reopen.js b/browser/devtools/styleeditor/test/browser_styleeditor_reopen.js
index bf3045a83225..d27431617227 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_reopen.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_reopen.js
@@ -2,22 +2,30 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-// http rather than chrome to improve coverage
-const TESTCASE_URI = TEST_BASE_HTTP + "simple.gz.html";
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
 let tempScope = {};
-Components.utils.import("resource://gre/modules/FileUtils.jsm", tempScope);
-let FileUtils = tempScope.FileUtils;
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
+function test() {
+
+  // http rather than chrome to improve coverage
+  const TESTCASE_URI = TEST_BASE_HTTP + "simple.gz.html";
+
+  const Cc = Components.classes;
+  const Ci = Components.interfaces;
+
+  let toolbox;
+  let tempScope = {};
+  Components.utils.import("resource://gre/modules/FileUtils.jsm", tempScope);
+  let FileUtils = tempScope.FileUtils;
 
 
-function test()
-{
   waitForExplicitFinish();
 
   addTabAndLaunchStyleEditorChromeWhenLoaded(function (aChrome) {
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    toolbox = gDevTools.getToolboxForTarget(target);
+
     aChrome.addChromeListener({
       onEditorAdded: function (aChrome, aEditor) {
         if (aEditor.styleSheetIndex != 0) {
@@ -34,8 +42,7 @@ function test()
       }
     });
 
-    gChromeWindow.addEventListener("unload", function onClose() {
-      gChromeWindow.removeEventListener("unload", onClose, true);
+    toolbox.once("destroyed", function onClose() {
       gChromeWindow = null;
       executeSoon(function () {
         waitForFocus(function () {
@@ -43,8 +50,8 @@ function test()
           // open StyleEditorChrome again (a new one since we closed the previous one)
           launchStyleEditorChrome(function (aChrome) {
             is(gChromeWindow.document.documentElement.hasAttribute("data-marker"),
-               false,
-               "opened a completely new StyleEditorChrome window");
+              false,
+              "opened a completely new StyleEditorChrome window");
 
             aChrome.addChromeListener({
               onEditorAdded: function (aChrome, aEditor) {
@@ -68,91 +75,91 @@ function test()
   });
 
   content.location = TESTCASE_URI;
-}
 
-let gFilename;
+  let gFilename;
 
-function run(aEditor)
-{
-  gFilename = FileUtils.getFile("ProfD", ["styleeditor-test.css"])
+  function run(aEditor)
+  {
+    gFilename = FileUtils.getFile("ProfD", ["styleeditor-test.css"])
 
-  aEditor.saveToFile(gFilename, function (aFile) {
-    ok(aFile, "file got saved successfully");
+    aEditor.saveToFile(gFilename, function (aFile) {
+      ok(aFile, "file got saved successfully");
 
-    aEditor.addActionListener({
-      onFlagChange: function (aEditor, aFlag) {
-        if (aFlag != "unsaved") {
-          return;
+      aEditor.addActionListener({
+        onFlagChange: function (aEditor, aFlag) {
+          if (aFlag != "unsaved") {
+            return;
+          }
+
+          ok(aEditor.hasFlag("unsaved"),
+            "first stylesheet has UNSAVED flag after making a change");
+
+          // marker used to check it does not exist when we reopen
+          // ie. the window we opened is indeed a new one
+          gChromeWindow.document.documentElement.setAttribute("data-marker", "true");
+          toolbox.destroy();
         }
+      });
 
-        ok(aEditor.hasFlag("unsaved"),
-           "first stylesheet has UNSAVED flag after making a change");
-
-        // marker used to check it does not exist when we reopen
-        // ie. the window we opened is indeed a new one
-        gChromeWindow.document.documentElement.setAttribute("data-marker", "true");
-        gChromeWindow.close();
-      }
-    });
-
-    waitForFocus(function () {
-      // insert char so that this stylesheet has the UNSAVED flag
-      EventUtils.synthesizeKey("x", {}, gChromeWindow);
-    }, gChromeWindow);
-  });
-}
-
-function testNewChrome(aEditor)
-{
-  ok(aEditor.savedFile,
-     "first stylesheet editor will save directly into the same file");
-
-  is(aEditor.getFriendlyName(), gFilename.leafName,
-     "first stylesheet still has the filename as it was saved");
-  gFilename = null;
-
-  ok(aEditor.hasFlag("unsaved"),
-     "first stylesheet still has UNSAVED flag at reopening");
-
-  ok(!aEditor.hasFlag("inline"),
-     "first stylesheet does not have INLINE flag");
-
-  ok(!aEditor.hasFlag("error"),
-     "editor does not have error flag initially");
-  let hadError = false;
-
-  let onSaveCallback = function (aFile) {
-    aEditor.addActionListener({
-      onFlagChange: function (aEditor, aFlag) {
-        if (!hadError && aFlag == "error") {
-          ok(aEditor.hasFlag("error"),
-             "editor has ERROR flag after attempting to save with invalid path");
-          hadError = true;
-
-          // save using source editor key binding (previous successful path)
-          waitForFocus(function () {
-            EventUtils.synthesizeKey("S", {accelKey: true}, gChromeWindow);
-          }, gChromeWindow);
-          return;
-        }
-
-        if (hadError && aFlag == "unsaved") {
-          executeSoon(function () {
-            ok(!aEditor.hasFlag("unsaved"),
-               "first stylesheet has no UNSAVED flag after successful save");
-            ok(!aEditor.hasFlag("error"),
-               "ERROR flag has been removed since last operation succeeded");
-            finish();
-          });
-        }
-      }
+      waitForFocus(function () {
+        // insert char so that this stylesheet has the UNSAVED flag
+        EventUtils.synthesizeKey("x", {}, gChromeWindow);
+      }, gChromeWindow);
     });
   }
 
-  let os = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
-  if (os == "WINNT") {
-    aEditor.saveToFile("C:\\I_DO_NOT_EXIST_42\\bogus.css", onSaveCallback);
-  } else {
-    aEditor.saveToFile("/I_DO_NOT_EXIST_42/bogos.css", onSaveCallback);
+  function testNewChrome(aEditor)
+  {
+    ok(aEditor.savedFile,
+      "first stylesheet editor will save directly into the same file");
+
+    is(aEditor.getFriendlyName(), gFilename.leafName,
+      "first stylesheet still has the filename as it was saved");
+    gFilename = null;
+
+    ok(aEditor.hasFlag("unsaved"),
+      "first stylesheet still has UNSAVED flag at reopening");
+
+    ok(!aEditor.hasFlag("inline"),
+      "first stylesheet does not have INLINE flag");
+
+    ok(!aEditor.hasFlag("error"),
+      "editor does not have error flag initially");
+    let hadError = false;
+
+    let onSaveCallback = function (aFile) {
+      aEditor.addActionListener({
+        onFlagChange: function (aEditor, aFlag) {
+          if (!hadError && aFlag == "error") {
+            ok(aEditor.hasFlag("error"),
+              "editor has ERROR flag after attempting to save with invalid path");
+            hadError = true;
+
+            // save using source editor key binding (previous successful path)
+            waitForFocus(function () {
+              EventUtils.synthesizeKey("S", {accelKey: true}, gChromeWindow);
+            }, gChromeWindow);
+            return;
+          }
+
+          if (hadError && aFlag == "unsaved") {
+            executeSoon(function () {
+              ok(!aEditor.hasFlag("unsaved"),
+                "first stylesheet has no UNSAVED flag after successful save");
+              ok(!aEditor.hasFlag("error"),
+                "ERROR flag has been removed since last operation succeeded");
+              finish();
+            });
+          }
+        }
+      });
+    }
+
+    let os = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
+    if (os == "WINNT") {
+      aEditor.saveToFile("C:\\I_DO_NOT_EXIST_42\\bogus.css", onSaveCallback);
+    } else {
+      aEditor.saveToFile("/I_DO_NOT_EXIST_42/bogos.css", onSaveCallback);
+    }
   }
 }
diff --git a/browser/devtools/styleeditor/test/head.js b/browser/devtools/styleeditor/test/head.js
index f2e646a47063..d08249dca059 100644
--- a/browser/devtools/styleeditor/test/head.js
+++ b/browser/devtools/styleeditor/test/head.js
@@ -6,6 +6,10 @@ const TEST_BASE_HTTP = "http://example.com/browser/browser/devtools/styleeditor/
 const TEST_BASE_HTTPS = "https://example.com/browser/browser/devtools/styleeditor/test/";
 const TEST_HOST = 'mochi.test:8888';
 
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
 let gChromeWindow;               //StyleEditorChrome window
 let cache = Cc["@mozilla.org/network/cache-service;1"]
               .getService(Ci.nsICacheService);
@@ -17,10 +21,7 @@ Services.scriptloader.loadSubScript(testDir + "/helpers.js", this);
 
 function cleanup()
 {
-  if (gChromeWindow) {
-    gChromeWindow.close();
-    gChromeWindow = null;
-  }
+  gChromeWindow = null;
   while (gBrowser.tabs.length > 1) {
     gBrowser.removeCurrentTab();
   }
@@ -28,16 +29,26 @@ function cleanup()
 
 function launchStyleEditorChrome(aCallback, aSheet, aLine, aCol)
 {
-  gChromeWindow = StyleEditor.openChrome(aSheet, aLine, aCol);
-  if (gChromeWindow.document.readyState != "complete") {
-    gChromeWindow.addEventListener("load", function onChromeLoad() {
-      gChromeWindow.removeEventListener("load", onChromeLoad, true);
-      gChromeWindow.styleEditorChrome._alwaysDisableAnimations = true;
-      aCallback(gChromeWindow.styleEditorChrome);
-    }, true);
-  } else {
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  let panel = gDevTools.getPanelForTarget("styleeditor", target);
+  if (panel && panel.isReady) {
+    gChromeWindow = panel._panelWin;
     gChromeWindow.styleEditorChrome._alwaysDisableAnimations = true;
+    if (aSheet) {
+      panel.selectStyleSheet(aSheet, aLine, aCol);
+    }
     aCallback(gChromeWindow.styleEditorChrome);
+  } else {
+    let toolbox = gDevTools.openToolboxForTab(target, "styleeditor");
+    toolbox.once("styleeditor-ready", function(event, panel) {
+      gChromeWindow = panel._panelWin;
+      gChromeWindow.styleEditorChrome._alwaysDisableAnimations = true;
+      if (aSheet) {
+        panel.selectStyleSheet(aSheet, aLine, aCol);
+      }
+      aCallback(gChromeWindow.styleEditorChrome);
+    });
   }
 }
 
diff --git a/browser/devtools/styleinspector/CssHtmlTree.jsm b/browser/devtools/styleinspector/CssHtmlTree.jsm
index 0e1ddb30da13..35f3bcbfceca 100644
--- a/browser/devtools/styleinspector/CssHtmlTree.jsm
+++ b/browser/devtools/styleinspector/CssHtmlTree.jsm
@@ -17,6 +17,10 @@ Cu.import("resource://gre/modules/PluralForm.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/devtools/CssLogic.jsm");
 Cu.import("resource:///modules/devtools/Templater.jsm");
+Cu.import("resource:///modules/devtools/StyleEditorDefinition.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
+                                  "resource:///modules/devtools/gDevTools.jsm");
 
 this.EXPORTED_SYMBOLS = ["CssHtmlTree", "PropertyView"];
 
@@ -118,14 +122,16 @@ UpdateProcess.prototype = {
  */
 this.CssHtmlTree = function CssHtmlTree(aStyleInspector)
 {
-  this.styleWin = aStyleInspector.iframe;
+  this.styleWindow = aStyleInspector.window;
+  this.styleDocument = aStyleInspector.window.document;
   this.styleInspector = aStyleInspector;
   this.cssLogic = aStyleInspector.cssLogic;
-  this.doc = aStyleInspector.document;
-  this.win = aStyleInspector.window;
-  this.getRTLAttr = this.win.getComputedStyle(this.win.gBrowser).direction;
   this.propertyViews = [];
 
+  let chromeReg = Cc["@mozilla.org/chrome/chrome-registry;1"].
+    getService(Ci.nsIXULChromeRegistry);
+  this.getRTLAttr = chromeReg.isLocaleRTL("global") ? "rtl" : "ltr";
+
   // Create bound methods.
   this.siBoundMenuUpdate = this.computedViewMenuUpdate.bind(this);
   this.siBoundCopy = this.computedViewCopy.bind(this);
@@ -133,9 +139,6 @@ this.CssHtmlTree = function CssHtmlTree(aStyleInspector)
   this.siBoundCopyProperty = this.computedViewCopyProperty.bind(this);
   this.siBoundCopyPropertyValue = this.computedViewCopyPropertyValue.bind(this);
 
-  // The document in which we display the results (csshtmltree.xul).
-  this.styleDocument = this.styleWin.contentWindow.document;
-
   this.styleDocument.addEventListener("copy", this.siBoundCopy);
 
   // Nodes used in templating
@@ -266,8 +269,8 @@ CssHtmlTree.prototype = {
       // processed.
       this.refreshSourceFilter();
       this.numVisibleProperties = 0;
-      let fragment = this.doc.createDocumentFragment();
-      this._refreshProcess = new UpdateProcess(this.win, CssHtmlTree.propertyNames, {
+      let fragment = this.styleDocument.createDocumentFragment();
+      this._refreshProcess = new UpdateProcess(this.styleWindow, CssHtmlTree.propertyNames, {
         onItem: function(aPropertyName) {
           // Per-item callback.
           let propView = new PropertyView(this, aPropertyName);
@@ -327,7 +330,7 @@ CssHtmlTree.prototype = {
     this._darkStripe = true;
 
     let display = this.propertyContainer.style.display;
-    this._refreshProcess = new UpdateProcess(this.win, this.propertyViews, {
+    this._refreshProcess = new UpdateProcess(this.styleWindow, this.propertyViews, {
       onItem: function(aPropView) {
         aPropView.refresh();
       }.bind(this),
@@ -347,7 +350,7 @@ CssHtmlTree.prototype = {
    */
   filterChanged: function CssHtmlTree_filterChanged(aEvent)
   {
-    let win = this.styleWin.contentWindow;
+    let win = this.styleWindow;
 
     if (this._filterChangedTimeout) {
       win.clearTimeout(this._filterChangedTimeout);
@@ -397,7 +400,7 @@ CssHtmlTree.prototype = {
 
     // Here we build and cache a list of css properties supported by the browser
     // We could use any element but let's use the main document's root element
-    let styles = this.styleWin.contentWindow.getComputedStyle(this.styleDocument.documentElement);
+    let styles = this.styleWindow.getComputedStyle(this.styleDocument.documentElement);
     let mozProps = [];
     for (let i = 0, numStyles = styles.length; i < numStyles; i++) {
       let prop = styles.item(i);
@@ -468,9 +471,12 @@ CssHtmlTree.prototype = {
    */
   createContextMenu: function SI_createContextMenu()
   {
-    let popupSet = this.doc.getElementById("mainPopupSet");
+    let iframe = this.styleInspector.outerIFrame;
+    let outerDoc = iframe.ownerDocument;
 
-    let menu = this.doc.createElement("menupopup");
+    let popupSet = outerDoc.getElementById("inspectorPopupSet");
+
+    let menu = outerDoc.createElement("menupopup");
     menu.addEventListener("popupshowing", this.siBoundMenuUpdate);
     menu.id = "computed-view-context-menu";
     popupSet.appendChild(menu);
@@ -478,7 +484,7 @@ CssHtmlTree.prototype = {
     // Copy selection
     let label = CssHtmlTree.l10n("style.contextmenu.copyselection");
     let accessKey = CssHtmlTree.l10n("style.contextmenu.copyselection.accesskey");
-    let item = this.doc.createElement("menuitem");
+    let item = outerDoc.createElement("menuitem");
     item.id = "computed-view-copy";
     item.setAttribute("label", label);
     item.setAttribute("accesskey", accessKey);
@@ -488,7 +494,7 @@ CssHtmlTree.prototype = {
     // Copy declaration
     label = CssHtmlTree.l10n("style.contextmenu.copydeclaration");
     accessKey = CssHtmlTree.l10n("style.contextmenu.copydeclaration.accesskey");
-    item = this.doc.createElement("menuitem");
+    item = outerDoc.createElement("menuitem");
     item.id = "computed-view-copy-declaration";
     item.setAttribute("label", label);
     item.setAttribute("accesskey", accessKey);
@@ -498,7 +504,7 @@ CssHtmlTree.prototype = {
     // Copy property name
     label = CssHtmlTree.l10n("style.contextmenu.copyproperty");
     accessKey = CssHtmlTree.l10n("style.contextmenu.copyproperty.accesskey");
-    item = this.doc.createElement("menuitem");
+    item = outerDoc.createElement("menuitem");
     item.id = "computed-view-copy-property";
     item.setAttribute("label", label);
     item.setAttribute("accesskey", accessKey);
@@ -508,14 +514,14 @@ CssHtmlTree.prototype = {
     // Copy property value
     label = CssHtmlTree.l10n("style.contextmenu.copypropertyvalue");
     accessKey = CssHtmlTree.l10n("style.contextmenu.copypropertyvalue.accesskey");
-    item = this.doc.createElement("menuitem");
+    item = outerDoc.createElement("menuitem");
     item.id = "computed-view-copy-property-value";
     item.setAttribute("label", label);
     item.setAttribute("accesskey", accessKey);
     item.addEventListener("command", this.siBoundCopyPropertyValue);
     menu.appendChild(item);
 
-    this.styleWin.setAttribute("context", menu.id);
+    iframe.setAttribute("context", menu.id);
   },
 
   /**
@@ -524,12 +530,13 @@ CssHtmlTree.prototype = {
    */
   computedViewMenuUpdate: function si_computedViewMenuUpdate()
   {
-    let win = this.styleDocument.defaultView;
-    let disable = win.getSelection().isCollapsed;
-    let menuitem = this.doc.querySelector("#computed-view-copy");
+    let disable = this.styleWindow.getSelection().isCollapsed;
+
+    let outerDoc = this.styleInspector.outerIFrame.ownerDocument;
+    let menuitem = outerDoc.querySelector("#computed-view-copy");
     menuitem.disabled = disable;
 
-    let node = this.doc.popupNode;
+    let node = outerDoc.popupNode;
     if (!node) {
       return;
     }
@@ -542,11 +549,11 @@ CssHtmlTree.prototype = {
       }
     }
     let disablePropertyItems = !node;
-    menuitem = this.doc.querySelector("#computed-view-copy-declaration");
+    menuitem = outerDoc.querySelector("#computed-view-copy-declaration");
     menuitem.disabled = disablePropertyItems;
-    menuitem = this.doc.querySelector("#computed-view-copy-property");
+    menuitem = outerDoc.querySelector("#computed-view-copy-property");
     menuitem.disabled = disablePropertyItems;
-    menuitem = this.doc.querySelector("#computed-view-copy-property-value");
+    menuitem = outerDoc.querySelector("#computed-view-copy-property-value");
     menuitem.disabled = disablePropertyItems;
   },
 
@@ -566,7 +573,8 @@ CssHtmlTree.prototype = {
 
     // Remove any MDN link titles
     text = text.replace(CssHtmlTree.HELP_LINK_TITLE, "");
-    clipboardHelper.copyString(text, this.doc);
+    let outerDoc = this.styleInspector.outerIFrame.ownerDocument;
+    clipboardHelper.copyString(text, outerDoc);
 
     if (aEvent) {
       aEvent.preventDefault();
@@ -580,7 +588,8 @@ CssHtmlTree.prototype = {
    */
   computedViewCopyDeclaration: function si_computedViewCopyDeclaration(aEvent)
   {
-    let node = this.doc.popupNode;
+    let outerDoc = this.styleInspector.outerIFrame.ownerDocument;
+    let node = outerDoc.popupNode;
     if (!node) {
       return;
     }
@@ -596,7 +605,7 @@ CssHtmlTree.prototype = {
       let name = node.querySelector(".property-name").textContent;
       let value = node.querySelector(".property-value").textContent;
 
-      clipboardHelper.copyString(name + ": " + value + ";", this.doc);
+      clipboardHelper.copyString(name + ": " + value + ";", outerDoc);
     }
   },
 
@@ -607,7 +616,8 @@ CssHtmlTree.prototype = {
    */
   computedViewCopyProperty: function si_computedViewCopyProperty(aEvent)
   {
-    let node = this.doc.popupNode;
+    let outerDoc = this.styleInspector.outerIFrame.ownerDocument;
+    let node = outerDoc.popupNode;
     if (!node) {
       return;
     }
@@ -621,7 +631,7 @@ CssHtmlTree.prototype = {
     }
     if (node) {
       node = node.querySelector(".property-name");
-      clipboardHelper.copyString(node.textContent, this.doc);
+      clipboardHelper.copyString(node.textContent, outerDoc);
     }
   },
 
@@ -632,7 +642,8 @@ CssHtmlTree.prototype = {
    */
   computedViewCopyPropertyValue: function si_computedViewCopyPropertyValue(aEvent)
   {
-    let node = this.doc.popupNode;
+    let outerDoc = this.styleInspector.outerIFrame.ownerDocument;
+    let node = outerDoc.popupNode;
     if (!node) {
       return;
     }
@@ -646,7 +657,7 @@ CssHtmlTree.prototype = {
     }
     if (node) {
       node = node.querySelector(".property-value");
-      clipboardHelper.copyString(node.textContent, this.doc);
+      clipboardHelper.copyString(node.textContent, outerDoc);
     }
   },
 
@@ -668,22 +679,23 @@ CssHtmlTree.prototype = {
     }
 
     // Remove context menu
-    let menu = this.doc.querySelector("#computed-view-context-menu");
+    let outerDoc = this.styleInspector.outerIFrame.ownerDocument;
+    let menu = outerDoc.querySelector("#computed-view-context-menu");
     if (menu) {
       // Copy selected
-      let menuitem = this.doc.querySelector("#computed-view-copy");
+      let menuitem = outerDoc.querySelector("#computed-view-copy");
       menuitem.removeEventListener("command", this.siBoundCopy);
 
       // Copy property
-      menuitem = this.doc.querySelector("#computed-view-copy-declaration");
+      menuitem = outerDoc.querySelector("#computed-view-copy-declaration");
       menuitem.removeEventListener("command", this.siBoundCopyDeclaration);
 
       // Copy property name
-      menuitem = this.doc.querySelector("#computed-view-copy-property");
+      menuitem = outerDoc.querySelector("#computed-view-copy-property");
       menuitem.removeEventListener("command", this.siBoundCopyProperty);
 
       // Copy property value
-      menuitem = this.doc.querySelector("#computed-view-copy-property-value");
+      menuitem = outerDoc.querySelector("#computed-view-copy-property-value");
       menuitem.removeEventListener("command", this.siBoundCopyPropertyValue);
 
       menu.removeEventListener("popupshowing", this.siBoundMenuUpdate);
@@ -703,10 +715,9 @@ CssHtmlTree.prototype = {
 
     // The element that we're inspecting, and the document that it comes from.
     delete this.propertyViews;
-    delete this.styleWin;
+    delete this.styleWindow;
+    delete this.styleDocument;
     delete this.cssLogic;
-    delete this.doc;
-    delete this.win;
     delete this.styleInspector;
   },
 };
@@ -862,7 +873,7 @@ PropertyView.prototype = {
 
   buildMain: function PropertyView_buildMain()
   {
-    let doc = this.tree.doc;
+    let doc = this.tree.styleDocument;
     this.element = doc.createElementNS(HTML_NS, "tr");
     this.element.setAttribute("class", this.propertyHeaderClassName);
 
@@ -917,7 +928,7 @@ PropertyView.prototype = {
 
   buildSelectorContainer: function PropertyView_buildSelectorContainer()
   {
-    let doc = this.tree.doc;
+    let doc = this.tree.styleDocument;
     let element = doc.createElementNS(HTML_NS, "tr");
     element.setAttribute("class", this.propertyContentClassName);
     this.matchedSelectorsContainer = doc.createElementNS(HTML_NS, "td");
@@ -1086,7 +1097,12 @@ PropertyView.prototype = {
    */
   mdnLinkClick: function PropertyView_mdnLinkClick(aEvent)
   {
-    this.tree.win.openUILinkIn(this.link, "tab");
+    let inspector = this.tree.styleInspector.inspector;
+
+    if (inspector.target.tab) {
+      let browserWin = inspector.target.tab.ownerDocument.defaultView;
+      browserWin.openUILinkIn(this.link, "tab");
+    }
     aEvent.preventDefault();
   },
 };
@@ -1197,27 +1213,35 @@ SelectorView.prototype = {
 
   /**
    * When a css link is clicked this method is called in order to either:
-   *   1. Open the link in view source (for element style attributes).
+   *   1. Open the link in view source (for chrome stylesheets).
    *   2. Open the link in the style editor.
    *
-   *   Like the style editor, we only view stylesheets contained in
-   *   document.styleSheets inside the style editor.
+   *   We can only view stylesheets contained in document.styleSheets inside the
+   *   style editor.
    *
    * @param aEvent The click event
    */
   openStyleEditor: function(aEvent)
   {
-    let rule = this.selectorInfo.selector._cssRule;
-    let doc = this.tree.win.content.document;
+    let inspector = this.tree.styleInspector.inspector;
+    let contentDoc = inspector.selection.document;
+    let cssSheet = this.selectorInfo.selector._cssRule._cssSheet;
     let line = this.selectorInfo.ruleLine || 0;
-    let cssSheet = rule._cssSheet;
     let contentSheet = false;
     let styleSheet;
     let styleSheets;
 
+    // The style editor can only display stylesheets coming from content because
+    // chrome stylesheets are not listed in the editor's stylesheet selector.
+    //
+    // If the stylesheet is a content stylesheet we send it to the style
+    // editor else we display it in the view source window.
+    //
+    // We check if cssSheet exists in case of inline styles (which contain no
+    // sheet)
     if (cssSheet) {
       styleSheet = cssSheet.domSheet;
-      styleSheets = doc.styleSheets;
+      styleSheets = contentDoc.styleSheets;
 
       // Array.prototype.indexOf always returns -1 here so we loop through
       // the styleSheets array instead.
@@ -1230,15 +1254,24 @@ SelectorView.prototype = {
     }
 
     if (contentSheet) {
-      this.tree.win.StyleEditor.openChrome(styleSheet, line);
+      let target = inspector.target;
+
+      if (StyleEditorDefinition.isTargetSupported(target)) {
+        let toolbox = gDevTools.getToolboxForTarget(target);
+
+        toolbox.once("styleeditor-selected", function SE_selected(id, styleEditor) {
+          styleEditor.selectStyleSheet(styleSheet, line);
+        });
+        toolbox.selectTool("styleeditor");
+      }
     } else {
       let href = styleSheet ? styleSheet.href : "";
-      let viewSourceUtils = this.tree.win.gViewSourceUtils;
+      let viewSourceUtils = inspector.viewSourceUtils;
 
       if (this.selectorInfo.sourceElement) {
         href = this.selectorInfo.sourceElement.ownerDocument.location.href;
       }
-      viewSourceUtils.viewSource(href, null, doc, line);
+      viewSourceUtils.viewSource(href, null, contentDoc, line);
     }
   },
 };
diff --git a/browser/devtools/styleinspector/StyleInspector.jsm b/browser/devtools/styleinspector/StyleInspector.jsm
index 0496c381de48..d724a8214094 100644
--- a/browser/devtools/styleinspector/StyleInspector.jsm
+++ b/browser/devtools/styleinspector/StyleInspector.jsm
@@ -11,83 +11,44 @@ const Ci = Components.interfaces;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/devtools/CssRuleView.jsm");
-Cu.import("resource:///modules/inspector.jsm");
+Cu.import("resource:///modules/devtools/StyleEditorDefinition.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
+                                  "resource:///modules/devtools/gDevTools.jsm");
 
 // This module doesn't currently export any symbols directly, it only
 // registers inspector tools.
-this.EXPORTED_SYMBOLS = [];
+this.EXPORTED_SYMBOLS = ["RuleViewTool", "ComputedViewTool"];
 
-/**
- * Lookup l10n string from a string bundle.
- * @param {string} aName The key to lookup.
- * @returns A localized version of the given key.
- */
-function l10n(aName)
-{
-  try {
-    return _strings.GetStringFromName(aName);
-  } catch (ex) {
-    Services.console.logStringMessage("Error reading '" + aName + "'");
-    throw new Error("l10n error with " + aName);
-  }
-}
-
-function RegisterStyleTools()
-{
-  // Register the rules view
-  if (Services.prefs.getBoolPref("devtools.ruleview.enabled")) {
-    InspectorUI.registerSidebar({
-      id: "ruleview",
-      label: l10n("ruleView.label"),
-      tooltiptext: l10n("ruleView.tooltiptext"),
-      accesskey: l10n("ruleView.accesskey"),
-      contentURL: "chrome://browser/content/devtools/cssruleview.xul",
-      load: function(aInspector, aFrame) new RuleViewTool(aInspector, aFrame),
-      destroy: function(aContext) aContext.destroy()
-    });
-  }
-
-  // Register the computed styles view
-  if (Services.prefs.getBoolPref("devtools.styleinspector.enabled")) {
-    InspectorUI.registerSidebar({
-      id: "computedview",
-      label: this.l10n("style.highlighter.button.label2"),
-      tooltiptext: this.l10n("style.highlighter.button.tooltip2"),
-      accesskey: this.l10n("style.highlighter.accesskey2"),
-      contentURL: "chrome://browser/content/devtools/csshtmltree.xul",
-      load: function(aInspector, aFrame) new ComputedViewTool(aInspector, aFrame),
-      destroy: function(aContext) aContext.destroy()
-    });
-  }
-}
-
-function RuleViewTool(aInspector, aFrame)
+this.RuleViewTool = function RVT_RuleViewTool(aInspector, aWindow, aIFrame)
 {
   this.inspector = aInspector;
-  this.chromeWindow = this.inspector.chromeWindow;
-  this.doc = aFrame.contentDocument;
+  this.doc = aWindow.document;
+  this.outerIFrame = aIFrame;
 
-  if (!this.inspector._ruleViewStore) {
-   this.inspector._ruleViewStore = {};
-  }
-  this.view = new CssRuleView(this.doc, this.inspector._ruleViewStore);
+  this.view = new CssRuleView(this.doc);
   this.doc.documentElement.appendChild(this.view.element);
 
   this._changeHandler = function() {
     this.inspector.markDirty();
-    this.inspector.change("ruleview");
   }.bind(this);
 
   this.view.element.addEventListener("CssRuleViewChanged", this._changeHandler)
 
   this._cssLinkHandler = function(aEvent) {
+    let contentDoc = this.inspector.selection.document;
     let rule = aEvent.detail.rule;
-    let styleSheet = rule.sheet;
-    let doc = this.chromeWindow.content.document;
-    let styleSheets = doc.styleSheets;
-    let contentSheet = false;
     let line = rule.ruleLine || 0;
+    let styleSheet = rule.sheet;
+    let styleSheets = contentDoc.styleSheets;
+    let contentSheet = false;
 
+    // The style editor can only display stylesheets coming from content because
+    // chrome stylesheets are not listed in the editor's stylesheet selector.
+    //
+    // If the stylesheet is a content stylesheet we send it to the style
+    // editor else we display it in the view source window.
+    //
     // Array.prototype.indexOf always returns -1 here so we loop through
     // the styleSheets object instead.
     for each (let sheet in styleSheets) {
@@ -98,14 +59,23 @@ function RuleViewTool(aInspector, aFrame)
     }
 
     if (contentSheet)  {
-      this.chromeWindow.StyleEditor.openChrome(styleSheet, line);
+      let target = this.inspector.target;
+
+      if (StyleEditorDefinition.isTargetSupported(target)) {
+        let toolbox = gDevTools.getToolboxForTarget(target);
+
+        toolbox.once("styleeditor-selected", function SE_selected(id, styleEditor) {
+          styleEditor.selectStyleSheet(styleSheet, line);
+        });
+        toolbox.selectTool("styleeditor");
+      }
     } else {
       let href = styleSheet ? styleSheet.href : "";
       if (rule.elementStyle.element) {
         href = rule.elementStyle.element.ownerDocument.location.href;
       }
-      let viewSourceUtils = this.chromeWindow.gViewSourceUtils;
-      viewSourceUtils.viewSource(href, null, doc, line);
+      let viewSourceUtils = this.inspector.viewSourceUtils;
+      viewSourceUtils.viewSource(href, null, contentDoc, line);
     }
   }.bind(this);
 
@@ -113,75 +83,93 @@ function RuleViewTool(aInspector, aFrame)
                                      this._cssLinkHandler);
 
   this._onSelect = this.onSelect.bind(this);
-  this.inspector.on("select", this._onSelect);
-
-  this._onChange = this.onChange.bind(this);
-  this.inspector.on("change", this._onChange);
-  this.inspector.on("sidebaractivated-ruleview", this._onChange);
+  this.inspector.selection.on("new-node", this._onSelect);
+  this.refresh = this.refresh.bind(this);
+  this.inspector.on("layout-change", this.refresh);
+  this.inspector.sidebar.on("ruleview-selected", this.refresh);
+  this.inspector.selection.on("pseudoclass", this.refresh);
+  if (this.inspector.highlighter) {
+    this.inspector.highlighter.on("locked", this._onSelect);
+  }
 
   this.onSelect();
 }
 
 RuleViewTool.prototype = {
-  onSelect: function RVT_onSelect(aEvent, aFrom) {
-    let node = this.inspector.selection;
-    if (!node) {
+  onSelect: function RVT_onSelect(aEvent) {
+    if (!this.inspector.selection.isConnected() ||
+        !this.inspector.selection.isElementNode()) {
       this.view.highlight(null);
       return;
     }
 
-    if (this.inspector.locked) {
-      this.view.highlight(node);
+    if (!aEvent || aEvent == "new-node") {
+      if (this.inspector.selection.reason == "highlighter") {
+        this.view.highlight(null);
+      } else {
+        this.view.highlight(this.inspector.selection.node);
+      }
+    }
+
+    if (aEvent == "locked") {
+      this.view.highlight(this.inspector.selection.node);
     }
   },
 
-  onChange: function RVT_onChange(aEvent, aFrom) {
-    if (aFrom == "ruleview" || aFrom == "createpanel") {
-      return;
-    }
+  isActive: function RVT_isActive() {
+    return this.inspector.sidebar.getCurrentTabID() == "ruleview";
+  },
 
-    if (this.inspector.locked && this.inspector.isPanelVisible("ruleview")) {
+  refresh: function RVT_refresh() {
+    if (this.isActive()) {
       this.view.nodeChanged();
     }
   },
 
   destroy: function RVT_destroy() {
-    this.inspector.off("select", this._onSelect);
-    this.inspector.off("change", this._onChange);
-    this.inspector.off("sidebaractivated-ruleview", this._onChange);
-    this.view.element.removeEventListener("CssRuleViewChanged",
-                                          this._changeHandler);
+    this.inspector.off("layout-change", this.refresh);
+    this.inspector.sidebar.off("ruleview-selected", this.refresh);
+    this.inspector.selection.off("pseudoclass", this.refresh);
+    this.inspector.selection.off("new-node", this._onSelect);
+    if (this.inspector.highlighter) {
+      this.inspector.highlighter.off("locked", this._onSelect);
+    }
+
     this.view.element.removeEventListener("CssRuleViewCSSLinkClicked",
-                                          this._cssLinkHandler);
+      this._cssLinkHandler);
+
+    this.view.element.removeEventListener("CssRuleViewChanged",
+      this._changeHandler);
+
     this.doc.documentElement.removeChild(this.view.element);
 
     this.view.destroy();
 
-    delete this._changeHandler;
+    delete this.outerIFrame;
     delete this.view;
     delete this.doc;
     delete this.inspector;
   }
 }
 
-function ComputedViewTool(aInspector, aFrame)
+this.ComputedViewTool = function CVT_ComputedViewTool(aInspector, aWindow, aIFrame)
 {
   this.inspector = aInspector;
-  this.iframe = aFrame;
-  this.window = aInspector.chromeWindow;
-  this.document = this.window.document;
+  this.window = aWindow;
+  this.document = aWindow.document;
+  this.outerIFrame = aIFrame;
   this.cssLogic = new CssLogic();
   this.view = new CssHtmlTree(this);
 
   this._onSelect = this.onSelect.bind(this);
-  this.inspector.on("select", this._onSelect);
-  this._onChange = this.onChange.bind(this);
-  this.inspector.on("change", this._onChange);
-
-  // Since refreshes of the computed view are non-destructive,
-  // refresh when the tab is changed so we can notice script-driven
-  // changes.
-  this.inspector.on("sidebaractivated-computedview", this._onChange);
+  this.inspector.selection.on("new-node", this._onSelect);
+  if (this.inspector.highlighter) {
+    this.inspector.highlighter.on("locked", this._onSelect);
+  }
+  this.refresh = this.refresh.bind(this);
+  this.inspector.on("layout-change", this.refresh);
+  this.inspector.sidebar.on("computedview-selected", this.refresh);
+  this.inspector.selection.on("pseudoclass", this.refresh);
 
   this.cssLogic.highlight(null);
   this.view.highlight(null);
@@ -192,39 +180,57 @@ function ComputedViewTool(aInspector, aFrame)
 ComputedViewTool.prototype = {
   onSelect: function CVT_onSelect(aEvent)
   {
-    if (this.inspector.locked) {
-      this.cssLogic.highlight(this.inspector.selection);
-      this.view.highlight(this.inspector.selection);
-    }
-  },
-
-  onChange: function CVT_change(aEvent, aFrom)
-  {
-    if (aFrom == "computedview" ||
-        aFrom == "createpanel" ||
-        this.inspector.selection != this.cssLogic.viewedElement) {
+    if (!this.inspector.selection.isConnected() ||
+        !this.inspector.selection.isElementNode()) {
+      // FIXME: We should hide view's content
       return;
     }
 
-    if (this.inspector.locked && this.inspector.isPanelVisible("computedview")) {
-      this.cssLogic.highlight(this.inspector.selection);
+    if (!aEvent || aEvent == "new-node") {
+      if (this.inspector.selection.reason == "highlighter") {
+        // FIXME: We should hide view's content
+      } else {
+        this.cssLogic.highlight(this.inspector.selection.node);
+        this.view.highlight(this.inspector.selection.node);
+      }
+    }
+
+    if (aEvent == "locked") {
+      this.cssLogic.highlight(this.inspector.selection.node);
+      this.view.highlight(this.inspector.selection.node);
+    }
+  },
+
+  isActive: function CVT_isActive() {
+    return this.inspector.sidebar.getCurrentTabID() == "computedview";
+  },
+
+  refresh: function CVT_refresh() {
+    if (this.isActive()) {
+      this.cssLogic.highlight(this.inspector.selection.node);
       this.view.refreshPanel();
     }
   },
 
   destroy: function CVT_destroy(aContext)
   {
-    this.inspector.off("select", this._onSelect);
-    this.inspector.off("change", this._onChange);
-    this.inspector.off("sidebaractivated-computedview", this._onChange);
+    this.inspector.off("layout-change", this.refresh);
+    this.inspector.sidebar.off("computedview-selected", this.refresh);
+    this.inspector.selection.off("pseudoclass", this.refresh);
+    this.inspector.selection.off("new-node", this._onSelect);
+    if (this.inspector.highlighter) {
+      this.inspector.highlighter.off("locked", this._onSelect);
+    }
+
     this.view.destroy();
     delete this.view;
 
+    delete this.outerIFrame;
     delete this.cssLogic;
     delete this.cssHtmlTree;
-    delete this.iframe;
     delete this.window;
     delete this.document;
+    delete this.inspector;
   }
 }
 
@@ -242,5 +248,3 @@ XPCOMUtils.defineLazyGetter(this, "CssHtmlTree", function() {
   Cu.import("resource:///modules/devtools/CssHtmlTree.jsm", tmp);
   return tmp.CssHtmlTree;
 });
-
-RegisterStyleTools();
diff --git a/browser/devtools/styleinspector/csshtmltree.xul b/browser/devtools/styleinspector/csshtmltree.xul
index 216ffa30b7a2..dfac610dd95d 100644
--- a/browser/devtools/styleinspector/csshtmltree.xul
+++ b/browser/devtools/styleinspector/csshtmltree.xul
@@ -24,7 +24,20 @@
 ]>
 
 <xul:window xmlns="http://www.w3.org/1999/xhtml"
-            xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+            xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+            title="&computedViewTitle;">
+
+<script type="application/javascript;version=1.8">
+  window.setPanel = function(panel, iframe) {
+    Components.utils.import("resource:///modules/devtools/StyleInspector.jsm");
+    this.computedview = new ComputedViewTool(panel, window, iframe);
+  }
+  window.onunload = function() {
+    if (this.computedview) {
+      this.computedview.destroy();
+    }
+  }
+</script>
 
 <!-- The output from #templateRoot (below) is inserted here. -->
 <div id="root"></div>
diff --git a/browser/devtools/styleinspector/cssruleview.xul b/browser/devtools/styleinspector/cssruleview.xul
index 6ba8220ad0a7..058f478257f9 100644
--- a/browser/devtools/styleinspector/cssruleview.xul
+++ b/browser/devtools/styleinspector/cssruleview.xul
@@ -9,4 +9,16 @@
   <!ENTITY % inspectorDTD SYSTEM "chrome://browser/locale/devtools/styleinspector.dtd">
   %inspectorDTD;
 ]>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" title="&ruleViewTitle;">
+  <script type="application/javascript;version=1.8">
+    window.setPanel = function(panel, iframe) {
+      Components.utils.import("resource:///modules/devtools/StyleInspector.jsm");
+      this.ruleview = new RuleViewTool(panel, window, iframe);
+    }
+    window.onunload = function() {
+      if (this.ruleview) {
+        this.ruleview.destroy();
+      }
+    }
+  </script>
+</window>
diff --git a/browser/devtools/styleinspector/test/Makefile.in b/browser/devtools/styleinspector/test/Makefile.in
index ee9180408e4a..b923418b636f 100644
--- a/browser/devtools/styleinspector/test/Makefile.in
+++ b/browser/devtools/styleinspector/test/Makefile.in
@@ -16,27 +16,27 @@ MOCHITEST_BROWSER_FILES = \
   browser_bug683672.js \
   browser_styleinspector_bug_672746_default_styles.js \
   browser_styleinspector_bug_672744_search_filter.js \
-  browser_bug589375_keybindings.js \
+  $(filter awaiting-promise-based-init, browser_bug589375_keybindings.js) \
   browser_styleinspector_bug_689759_no_results_placeholder.js \
   browser_bug_692400_element_style.js \
   browser_csslogic_inherited.js \
+  browser_ruleview_734259_style_editor_link.js \
   browser_ruleview_editor.js \
   browser_ruleview_editor_changedvalues.js \
+  browser_ruleview_bug_703643_context_menu_copy.js \
+  browser_ruleview_focus.js \
   browser_ruleview_inherit.js \
   browser_ruleview_manipulation.js \
   browser_ruleview_override.js \
   browser_ruleview_ui.js \
   browser_ruleview_update.js \
-  browser_ruleview_focus.js \
   browser_bug705707_is_content_stylesheet.js \
   browser_bug722196_property_view_media_queries.js \
   browser_bug722196_rule_view_media_queries.js \
   browser_bug_592743_specificity.js \
-  browser_ruleview_bug_703643_context_menu_copy.js \
-  browser_computedview_bug_703643_context_menu_copy.js \
-  browser_ruleview_734259_style_editor_link.js \
-  browser_computedview_734259_style_editor_link.js \
   browser_bug722691_rule_view_increment.js \
+  browser_computedview_734259_style_editor_link.js \
+  browser_computedview_bug_703643_context_menu_copy.js\
   head.js \
   $(NULL)
 
diff --git a/browser/devtools/styleinspector/test/browser_bug589375_keybindings.js b/browser/devtools/styleinspector/test/browser_bug589375_keybindings.js
index 0e8bacbfbd0f..ecbd05aaa402 100644
--- a/browser/devtools/styleinspector/test/browser_bug589375_keybindings.js
+++ b/browser/devtools/styleinspector/test/browser_bug589375_keybindings.js
@@ -5,7 +5,9 @@
 // Tests that the key bindings work properly.
 
 let doc;
-let stylePanel;
+let inspector;
+let computedView;
+let iframe;
 
 function createDocument()
 {
@@ -14,38 +16,38 @@ function createDocument()
     '<span class="matches">Some styled text</span>' +
     '</div>';
   doc.title = "Style Inspector key binding test";
-  stylePanel = new ComputedViewPanel(window);
-  stylePanel.createPanel(doc.body, runStyleInspectorTests);
+
+  openInspector(openComputedView);
 }
 
-function runStyleInspectorTests()
+function openComputedView(aInspector)
 {
-  Services.obs.addObserver(SI_test, "StyleInspector-populated", false);
-  SI_inspectNode();
+  inspector = aInspector;
+  iframe = inspector._toolbox.frame;
+
+  Services.obs.addObserver(runTests, "StyleInspector-populated", false);
+
+  inspector.sidebar.select("computedview");
 }
 
-function SI_inspectNode()
+function runTests()
 {
+  Services.obs.removeObserver(runTests, "StyleInspector-populated");
+  computedView = getComputedView(inspector);
+
   var span = doc.querySelector(".matches");
   ok(span, "captain, we have the matches span");
 
-  let htmlTree = stylePanel.cssHtmlTree;
-  stylePanel.selectNode(span);
+  inspector.selection.setNode(span);
 
-  is(span, htmlTree.viewedElement,
+  is(span, computedView.viewedElement,
     "style inspector node matches the selected node");
-  is(htmlTree.viewedElement, stylePanel.cssLogic.viewedElement,
+  is(computedView.viewedElement, computedView.cssLogic.viewedElement,
      "cssLogic node matches the cssHtmlTree node");
-}
-
-function SI_test()
-{
-  Services.obs.removeObserver(SI_test, "StyleInspector-populated", false);
 
   info("checking keybindings");
 
-  let iframe = stylePanel.iframe;
-  let searchbar = stylePanel.cssHtmlTree.searchField;
+  let searchbar = computedView.searchField;
   let propView = getFirstVisiblePropertyView();
   let rulesTable = propView.matchedSelectorsContainer;
   let matchedExpander = propView.matchedExpander;
@@ -59,7 +61,7 @@ function SI_test()
     testKey(iframe.contentWindow, "VK_RETURN", rulesTable);
 
     checkHelpLinkKeybinding();
-    stylePanel.destroy();
+    computedView.destroy();
     finishUp();
   });
 
@@ -76,13 +78,13 @@ function SI_test()
     info("window is focused");
     info("focusing search filter");
     searchbar.focus();
-  }, stylePanel.iframe.contentWindow);
+  }, iframe.contentWindow);
 }
 
 function getFirstVisiblePropertyView()
 {
   let propView = null;
-  stylePanel.cssHtmlTree.propertyViews.some(function(aPropView) {
+  computedView.propertyViews.some(function(aPropView) {
     if (aPropView.visible) {
       propView = aPropView;
       return true;
@@ -107,7 +109,6 @@ function testKey(aContext, aVirtKey, aRulesTable)
 function checkHelpLinkKeybinding()
 {
   info("checking help link keybinding");
-  let iframe = stylePanel.iframe;
   let propView = getFirstVisiblePropertyView();
 
   info("check that MDN link is opened on \"F1\"");
@@ -121,7 +122,7 @@ function checkHelpLinkKeybinding()
 
 function finishUp()
 {
-  doc = stylePanel = null;
+  doc = inspector = iframe = computedView = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_bug683672.js b/browser/devtools/styleinspector/test/browser_bug683672.js
index fc0388cce2d1..bd9064df0deb 100644
--- a/browser/devtools/styleinspector/test/browser_bug683672.js
+++ b/browser/devtools/styleinspector/test/browser_bug683672.js
@@ -5,7 +5,9 @@
 // Tests that the style inspector works properly
 
 let doc;
-let stylePanel;
+let inspector;
+let div;
+let computedView;
 
 const TEST_URI = "http://example.com/browser/browser/devtools/styleinspector/test/browser_bug683672.html";
 
@@ -25,9 +27,24 @@ function tabLoaded()
 {
   browser.removeEventListener("load", tabLoaded, true);
   doc = content.document;
-  // ok(StyleInspector.isEnabled, "style inspector preference is enabled");
-  stylePanel = new ComputedViewPanel(window);
-  stylePanel.createPanel(doc.body, runTests);
+  openInspector(selectNode);
+}
+
+function selectNode(aInspector)
+{
+  inspector = aInspector;
+
+  div = content.document.getElementById("test");
+  ok(div, "captain, we have the div");
+
+  inspector.selection.setNode(div);
+
+  inspector.sidebar.once("computedview-ready", function() {
+    computedView = getComputedView(inspector);
+
+    inspector.sidebar.select("computedview");
+    runTests();
+  });
 }
 
 function runTests()
@@ -36,25 +53,17 @@ function runTests()
   //testUnmatchedSelectors();
 
   info("finishing up");
-  stylePanel.destroy();
   finishUp();
 }
 
 function testMatchedSelectors()
 {
   info("checking selector counts, matched rules and titles");
-  let div = content.document.getElementById("test");
-  ok(div, "captain, we have the div");
 
-  info("selecting the div");
-  stylePanel.selectNode(div);
-
-  let htmlTree = stylePanel.cssHtmlTree;
-
-  is(div, htmlTree.viewedElement,
+  is(div, computedView.viewedElement,
       "style inspector node matches the selected node");
 
-  let propertyView = new PropertyView(htmlTree, "color");
+  let propertyView = new PropertyView(computedView, "color");
   let numMatchedSelectors = propertyView.propertyInfo.matchedSelectors.length;
 
   is(numMatchedSelectors, 6,
@@ -71,14 +80,12 @@ function testUnmatchedSelectors()
   ok(body, "captain, we have a body");
 
   info("selecting content.document.body");
-  stylePanel.selectNode(body);
+  inspector.selection.setNode(body);
 
-  let htmlTree = stylePanel.cssHtmlTree;
-
-  is(body, htmlTree.viewedElement,
+  is(body, computedView.viewedElement,
       "style inspector node matches the selected node");
 
-  let propertyView = new PropertyView(htmlTree, "color");
+  let propertyView = new PropertyView(computedView, "color");
   let numUnmatchedSelectors = propertyView.propertyInfo.unmatchedSelectors.length;
 
   is(numUnmatchedSelectors, 13,
@@ -90,7 +97,7 @@ function testUnmatchedSelectors()
 
 function finishUp()
 {
-  doc = stylePanel = null;
+  doc = inspector = div = computedView = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js b/browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js
index c2f94a24c69d..9fe1b464a514 100644
--- a/browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js
+++ b/browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js
@@ -6,7 +6,7 @@
 // property view.
 
 let doc;
-let stylePanel;
+let computedView;
 
 const TEST_URI = "http://example.com/browser/browser/devtools/styleinspector/" +
   "test/browser_bug722196_identify_media_queries.html";
@@ -22,18 +22,27 @@ function docLoaded()
 {
   browser.removeEventListener("load", docLoaded, true);
   doc = content.document;
-  stylePanel = new ComputedViewPanel(window);
-  stylePanel.createPanel(doc.body, checkSheets);
+
+  openInspector(selectNode);
 }
 
-function checkSheets()
+function selectNode(aInspector)
 {
   var div = doc.querySelector("div");
   ok(div, "captain, we have the div");
 
-  stylePanel.selectNode(div);
+  aInspector.selection.setNode(div);
 
-  let cssLogic = stylePanel.cssLogic;
+  aInspector.sidebar.once("computedview-ready", function() {
+    aInspector.sidebar.select("computedview");
+    computedView = getComputedView(aInspector);
+    checkSheets();
+  });
+}
+
+function checkSheets()
+{
+  let cssLogic = computedView.cssLogic;
   cssLogic.processMatchedSelectors();
 
   let _strings = Services.strings
@@ -48,13 +57,12 @@ function checkSheets()
   is(cssLogic._matchedRules[1][0].source, source2,
     "rule.source gives correct output for rule 2");
 
-  stylePanel.destroy();
   finishUp();
 }
 
 function finishUp()
 {
-  doc = null;
+  doc = computedView = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_bug_692400_element_style.js b/browser/devtools/styleinspector/test/browser_bug_692400_element_style.js
index 56175d968d14..8a5653989a4e 100644
--- a/browser/devtools/styleinspector/test/browser_bug_692400_element_style.js
+++ b/browser/devtools/styleinspector/test/browser_bug_692400_element_style.js
@@ -5,21 +5,31 @@
 // Tests for selector text errors.
 
 let doc;
-let stylePanel;
+let computedView;
 
 function createDocument()
 {
   doc.body.innerHTML = "<div style='color:blue;'></div>";
 
   doc.title = "Style Inspector Selector Text Test";
-  stylePanel = new ComputedViewPanel(window);
 
-  Services.obs.addObserver(SI_checkText, "StyleInspector-populated", false);
+  openInspector(openComputedView);
+}
 
-  let span = doc.querySelector("div");
-  ok(span, "captain, we have the test div");
 
-  stylePanel.createPanel(span);
+function openComputedView(aInspector)
+{
+  let div = doc.querySelector("div");
+  ok(div, "captain, we have the test div");
+
+  aInspector.selection.setNode(div);
+
+  aInspector.sidebar.once("computedview-ready", function() {
+    aInspector.sidebar.select("computedview");
+    computedView = getComputedView(aInspector);
+
+    Services.obs.addObserver(SI_checkText, "StyleInspector-populated", false);
+  });
 }
 
 function SI_checkText()
@@ -27,7 +37,7 @@ function SI_checkText()
   Services.obs.removeObserver(SI_checkText, "StyleInspector-populated", false);
 
   let propertyView = null;
-  stylePanel.cssHtmlTree.propertyViews.some(function(aView) {
+  computedView.propertyViews.some(function(aView) {
     if (aView.name == "color") {
       propertyView = aView;
       return true;
@@ -56,13 +66,12 @@ function SI_checkText()
     ok(false, "getting the selector text should not raise an exception");
   }
 
-  stylePanel.destroy();
   finishUp();
 }
 
 function finishUp()
 {
-  doc = stylePanel = null;
+  doc = computedView = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_computedview_734259_style_editor_link.js b/browser/devtools/styleinspector/test/browser_computedview_734259_style_editor_link.js
index 3e6c40fbb6ec..0fcdfdf99336 100644
--- a/browser/devtools/styleinspector/test/browser_computedview_734259_style_editor_link.js
+++ b/browser/devtools/styleinspector/test/browser_computedview_734259_style_editor_link.js
@@ -3,8 +3,8 @@
  http://creativecommons.org/publicdomain/zero/1.0/ */
 
 let doc;
-let win;
-let stylePanel;
+let inspector;
+let computedView;
 
 function createDocument()
 {
@@ -27,12 +27,26 @@ function createDocument()
     '</div>';
   doc.title = "Rule view style editor link test";
 
+  openInspector(selectNode);
+}
+
+
+function selectNode(aInspector)
+{
+  inspector = aInspector;
+
   let span = doc.querySelector("span");
   ok(span, "captain, we have the span");
 
-  Services.obs.addObserver(testInlineStyle, "StyleInspector-populated", false);
-  stylePanel = new ComputedViewPanel(window);
-  stylePanel.createPanel(span);
+  aInspector.selection.setNode(span);
+
+  aInspector.sidebar.once("computedview-ready", function() {
+    aInspector.sidebar.select("computedview");
+
+    computedView = getComputedView(aInspector);
+
+    Services.obs.addObserver(testInlineStyle, "StyleInspector-populated", false);
+  });
 }
 
 function testInlineStyle()
@@ -46,7 +60,7 @@ function testInlineStyle()
         return;
       }
       info("window opened");
-      win = aSubject.QueryInterface(Ci.nsIDOMWindow);
+      let win = aSubject.QueryInterface(Ci.nsIDOMWindow);
       win.addEventListener("load", function windowLoad() {
         win.removeEventListener("load", windowLoad);
         info("window load completed");
@@ -67,35 +81,28 @@ function testInlineStyleSheet()
 {
   info("clicking an inline stylesheet");
 
-  Services.ww.registerNotification(function onWindow(aSubject, aTopic) {
-    if (aTopic != "domwindowopened") {
-      return;
-    }
-    info("window opened");
-    win = aSubject.QueryInterface(Ci.nsIDOMWindow);
-    win.addEventListener("load", function windowLoad() {
-      win.removeEventListener("load", windowLoad);
-      info("window load completed");
-      let windowType = win.document.documentElement.getAttribute("windowtype");
-      is(windowType, "Tools:StyleEditor", "style editor window is open");
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  let toolbox = gDevTools.openToolboxForTab(target, "styleeditor");
 
-      win.styleEditorChrome.addChromeListener({
-        onEditorAdded: function checkEditor(aChrome, aEditor) {
-          if (!aEditor.sourceEditor) {
-            aEditor.addActionListener({
-              onAttach: function (aEditor) {
-                aEditor.removeActionListener(this);
-                validateStyleEditorSheet(aEditor);
-              }
-            });
-          } else {
-            validateStyleEditorSheet(aEditor);
-          }
+  toolbox.once("styleeditor-ready", function(event, panel) {
+    let win = panel._panelWin;
+
+    win.styleEditorChrome.addChromeListener({
+      onEditorAdded: function checkEditor(aChrome, aEditor) {
+        if (!aEditor.sourceEditor) {
+          aEditor.addActionListener({
+            onAttach: function (aEditor) {
+              aEditor.removeActionListener(this);
+              validateStyleEditorSheet(aEditor);
+            }
+          });
+        } else {
+          validateStyleEditorSheet(aEditor);
         }
-      });
-      Services.ww.unregisterNotification(onWindow);
+      }
     });
   });
+
   let link = getLinkByIndex(1);
   link.click();
 }
@@ -106,18 +113,13 @@ function validateStyleEditorSheet(aEditor)
 
   let sheet = doc.styleSheets[0];
   is(aEditor.styleSheet, sheet, "loaded stylesheet matches document stylesheet");
-  info("closing window");
-  win.close();
 
-  stylePanel.destroy();
   finishUp();
 }
 
 function expandProperty(aIndex, aCallback)
 {
-  let iframe = stylePanel.iframe;
-  let contentDoc = iframe.contentDocument;
-  let contentWindow = iframe.contentWindow;
+  let contentDoc = computedView.styleDocument;
   let expando = contentDoc.querySelectorAll(".expandable")[aIndex];
   expando.click();
 
@@ -127,14 +129,14 @@ function expandProperty(aIndex, aCallback)
 
 function getLinkByIndex(aIndex)
 {
-  let contentDoc = stylePanel.iframe.contentDocument;
+  let contentDoc = computedView.styleDocument;
   let links = contentDoc.querySelectorAll(".rule-link .link");
   return links[aIndex];
 }
 
 function finishUp()
 {
-  doc = win = stylePanel = null;
+  doc = inspector = computedView = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_computedview_bug_703643_context_menu_copy.js b/browser/devtools/styleinspector/test/browser_computedview_bug_703643_context_menu_copy.js
index 4f7bad0a2410..4b1046446c3a 100644
--- a/browser/devtools/styleinspector/test/browser_computedview_bug_703643_context_menu_copy.js
+++ b/browser/devtools/styleinspector/test/browser_computedview_bug_703643_context_menu_copy.js
@@ -5,8 +5,8 @@
 // Tests that the style inspector works properly
 
 let doc;
-let stylePanel;
-let cssHtmlTree;
+let win;
+let computedView;
 
 XPCOMUtils.defineLazyGetter(this, "osString", function() {
   return Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
@@ -32,30 +32,42 @@ function createDocument()
     '</div>';
   doc.title = "Computed view context menu test";
 
+  openInspector(selectNode)
+}
+
+function selectNode(aInspector)
+{
   let span = doc.querySelector("span");
   ok(span, "captain, we have the span");
 
-  stylePanel = new ComputedViewPanel(window);
-  Services.obs.addObserver(runStyleInspectorTests, "StyleInspector-populated", false);
-  stylePanel.createPanel(span);
+  aInspector.selection.setNode(span);
+
+  aInspector.sidebar.once("computedview-ready", function() {
+    aInspector.sidebar.select("computedview");
+
+    computedView = getComputedView(aInspector);
+    win = aInspector.sidebar.getWindowForTab("computedview");
+
+    Services.obs.addObserver(runStyleInspectorTests,
+      "StyleInspector-populated", false);
+  });
 }
 
+
 function runStyleInspectorTests()
 {
-  Services.obs.removeObserver(runStyleInspectorTests, "StyleInspector-populated", false);
+  Services.obs.removeObserver(runStyleInspectorTests,
+    "StyleInspector-populated", false);
 
-  cssHtmlTree = stylePanel.cssHtmlTree;
-
-  let contentDocument = stylePanel.iframe.contentDocument;
+  let contentDocument = computedView.styleDocument;
   let prop = contentDocument.querySelector(".property-view");
   ok(prop, "captain, we have the property-view node");
 
   // We need the context menu to open in the correct place in order for
   // popupNode to be propertly set.
-  EventUtils.synthesizeMouse(prop, 1, 1, { type: "contextmenu", button: 2 },
-    stylePanel.iframe.contentWindow);
+  contextMenuClick(prop);
 
-  checkCopyProperty()
+  checkCopyProperty();
 }
 
 function checkCopyProperty()
@@ -67,7 +79,7 @@ function checkCopyProperty()
   SimpleTest.waitForClipboard(function CS_boundCopyPropCheck() {
       return checkClipboardData(expectedPattern);
     },
-    cssHtmlTree.siBoundCopyDeclaration,
+    computedView.siBoundCopyDeclaration,
     checkCopyPropertyName, function() {
       failedClipboard(expectedPattern, checkCopyPropertyName);
     });
@@ -82,7 +94,7 @@ function checkCopyPropertyName()
   SimpleTest.waitForClipboard(function CS_boundCopyPropNameCheck() {
       return checkClipboardData(expectedPattern);
     },
-    cssHtmlTree.siBoundCopyProperty,
+    computedView.siBoundCopyProperty,
     checkCopyPropertyValue, function() {
       failedClipboard(expectedPattern, checkCopyPropertyValue);
     });
@@ -97,7 +109,7 @@ function checkCopyPropertyValue()
   SimpleTest.waitForClipboard(function CS_boundCopyPropValueCheck() {
       return checkClipboardData(expectedPattern);
     },
-    cssHtmlTree.siBoundCopyPropertyValue,
+    computedView.siBoundCopyPropertyValue,
     checkCopySelection, function() {
       failedClipboard(expectedPattern, checkCopySelection);
     });
@@ -105,15 +117,14 @@ function checkCopyPropertyValue()
 
 function checkCopySelection()
 {
-  let contentDocument = stylePanel.iframe.contentDocument;
-  let contentWindow = stylePanel.iframe.contentWindow;
+  let contentDocument = computedView.styleDocument;
   let props = contentDocument.querySelectorAll(".property-view");
   ok(props, "captain, we have the property-view nodes");
 
   let range = document.createRange();
   range.setStart(props[0], 0);
   range.setEnd(props[3], 4);
-  contentWindow.getSelection().addRange(range);
+  win.getSelection().addRange(range);
 
   info("Checking that cssHtmlTree.siBoundCopy() " +
        " returns the correct clipboard value");
@@ -126,7 +137,7 @@ function checkCopySelection()
   SimpleTest.waitForClipboard(function CS_boundCopyCheck() {
       return checkClipboardData(expectedPattern);
     },
-    cssHtmlTree.siBoundCopy, closeStyleInspector, function() {
+    computedView.siBoundCopy, closeStyleInspector, function() {
       failedClipboard(expectedPattern, closeStyleInspector);
     });
 }
@@ -162,13 +173,12 @@ function failedClipboard(aExpectedPattern, aCallback)
 
 function closeStyleInspector()
 {
-  stylePanel.destroy();
   finishUp();
 }
 
 function finishUp()
 {
-  doc = stylePanel = cssHtmlTree = null;
+  computedView = doc = win = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.js b/browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.js
index 0d933c700e0f..86e36378bc38 100644
--- a/browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.js
+++ b/browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.js
@@ -5,6 +5,8 @@
 let win;
 let doc;
 let contentWindow;
+let inspector;
+let toolbox;
 
 let tempScope = {};
 Cu.import("resource://gre/modules/Services.jsm", tempScope);
@@ -31,41 +33,27 @@ function createDocument()
     '</div>';
   doc.title = "Rule view style editor link test";
 
-  openInspector();
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  toolbox = gDevTools.openToolboxForTab(target, "inspector");
+  toolbox.once("inspector-selected", function SE_selected(id, aInspector) {
+    inspector = aInspector;
+    inspector.sidebar.select("ruleview");
+    highlightNode();
+  });
 }
 
-function openInspector()
+function highlightNode()
 {
-  ok(window.InspectorUI, "InspectorUI variable exists");
-  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
-  ok(InspectorUI.store.isEmpty(), "Inspector.store is empty");
-
-  Services.obs.addObserver(inspectorUIOpen,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.openInspectorUI();
-}
-
-function inspectorUIOpen()
-{
-  Services.obs.removeObserver(inspectorUIOpen,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  // Make sure the inspector is open.
-  ok(InspectorUI.inspecting, "Inspector is highlighting");
-  ok(!InspectorUI.isSidebarOpen, "Inspector Sidebar is not open");
-  ok(!InspectorUI.store.isEmpty(), "InspectorUI.store is not empty");
-  is(InspectorUI.store.length, 1, "Inspector.store.length = 1");
-
   // Highlight a node.
   let div = content.document.getElementsByTagName("div")[0];
-  InspectorUI.inspectNode(div);
-  InspectorUI.stopInspecting();
-  is(InspectorUI.selection, div, "selection matches the div element");
 
-  InspectorUI.currentInspector.once("sidebaractivated-ruleview", testInlineStyle);
-
-  InspectorUI.sidebar.show();
-  InspectorUI.sidebar.activatePanel("ruleview");
+  inspector.selection.once("new-node", function() {
+    is(inspector.selection.node, div, "selection matches the div element");
+    testInlineStyle();
+  });
+  executeSoon(function() {
+    inspector.selection.setNode(div);
+  });
 }
 
 function testInlineStyle()
@@ -88,7 +76,10 @@ function testInlineStyle()
         testInlineStyleSheet();
       });
     });
-    EventUtils.synthesizeMouseAtCenter(getLinkByIndex(0), { }, contentWindow);
+
+    let link = getLinkByIndex(0);
+    link.scrollIntoView();
+    link.click();
   });
 }
 
@@ -96,41 +87,18 @@ function testInlineStyleSheet()
 {
   info("clicking an inline stylesheet");
 
-  Services.ww.registerNotification(function onWindow(aSubject, aTopic) {
-    if (aTopic != "domwindowopened") {
-      return;
-    }
-
-    win = aSubject.QueryInterface(Ci.nsIDOMWindow);
-    win.addEventListener("load", function windowLoad() {
-      win.removeEventListener("load", windowLoad);
-
-      let windowType = win.document.documentElement.getAttribute("windowtype");
-      is(windowType, "Tools:StyleEditor", "style editor window is open");
-
-      win.styleEditorChrome.addChromeListener({
-        onEditorAdded: function checkEditor(aChrome, aEditor) {
-          if (!aEditor.sourceEditor) {
-            aEditor.addActionListener({
-              onAttach: function (aEditor) {
-                aEditor.removeActionListener(this);
-                validateStyleEditorSheet(aEditor);
-              }
-            });
-          } else {
-            validateStyleEditorSheet(aEditor);
-          }
-        }
-      });
-
-      Services.ww.unregisterNotification(onWindow);
+  toolbox.once("styleeditor-ready", function(id, aToolbox) {
+    aToolbox.panelWindow.styleEditorChrome.addChromeListener({
+      onEditorAdded: validateStyleEditorSheet
     });
   });
 
-  EventUtils.synthesizeMouse(getLinkByIndex(1), 5, 5, { }, contentWindow);
+  let link = getLinkByIndex(1);
+  link.scrollIntoView();
+  link.click();
 }
 
-function validateStyleEditorSheet(aEditor)
+function validateStyleEditorSheet(aChrome, aEditor)
 {
   info("validating style editor stylesheet");
 
@@ -152,10 +120,8 @@ function getLinkByIndex(aIndex)
 
 function finishup()
 {
-  InspectorUI.sidebar.hide();
-  InspectorUI.closeInspectorUI();
   gBrowser.removeCurrentTab();
-  doc = contentWindow = win = null;
+  contentWindow = doc = inspector = toolbox = win = null;
   finish();
 }
 
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_bug_703643_context_menu_copy.js b/browser/devtools/styleinspector/test/browser_ruleview_bug_703643_context_menu_copy.js
index 0183314d1db2..62060b704a0a 100644
--- a/browser/devtools/styleinspector/test/browser_ruleview_bug_703643_context_menu_copy.js
+++ b/browser/devtools/styleinspector/test/browser_ruleview_bug_703643_context_menu_copy.js
@@ -6,16 +6,13 @@ let doc;
 let tempScope = {};
 Cu.import("resource:///modules/devtools/CssRuleView.jsm", tempScope);
 let inplaceEditor = tempScope._getInplaceEditorForSpan;
+let inspector;
+let win;
 
 XPCOMUtils.defineLazyGetter(this, "osString", function() {
   return Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
 });
 
-function ruleViewFrame()
-{
-  return InspectorUI.sidebar._tools["ruleview"].frame;
-}
-
 function createDocument()
 {
   doc.body.innerHTML = '<style type="text/css"> ' +
@@ -37,40 +34,28 @@ function createDocument()
     '</div>';
   doc.title = "Rule view context menu test";
 
-  openInspector();
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+  toolbox.once("inspector-selected", function SE_selected(id, aInspector) {
+    inspector = aInspector;
+    inspector.sidebar.select("ruleview");
+    win = inspector.sidebar.getWindowForTab("ruleview");
+    highlightNode();
+  });
 }
 
-function openInspector()
+function highlightNode()
 {
-  ok(window.InspectorUI, "InspectorUI variable exists");
-  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
-  ok(InspectorUI.store.isEmpty(), "Inspector.store is empty");
-
-  Services.obs.addObserver(inspectorUIOpen,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.openInspectorUI();
-}
-
-function inspectorUIOpen()
-{
-  Services.obs.removeObserver(inspectorUIOpen,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-
-  // Make sure the inspector is open.
-  ok(InspectorUI.inspecting, "Inspector is highlighting");
-  ok(!InspectorUI.isSidebarOpen, "Inspector Sidebar is not open");
-  ok(!InspectorUI.store.isEmpty(), "InspectorUI.store is not empty");
-  is(InspectorUI.store.length, 1, "Inspector.store.length = 1");
-
   // Highlight a node.
   let div = content.document.getElementsByTagName("div")[0];
-  InspectorUI.inspectNode(div);
-  InspectorUI.stopInspecting();
-  is(InspectorUI.selection, div, "selection matches the div element");
 
-  InspectorUI.currentInspector.once("sidebaractivated-ruleview", testClip)
-  InspectorUI.sidebar.show();
-  InspectorUI.sidebar.activatePanel("ruleview");
+  inspector.selection.once("new-node", function() {
+    is(inspector.selection.node, div, "selection matches the div element");
+    testClip();
+  });
+  executeSoon(function() {
+    inspector.selection.setNode(div);
+  });
 }
 
 function testClip()
@@ -95,7 +80,7 @@ function testClip()
 }
 
 function checkCopyRule() {
-  let contentDoc = ruleViewFrame().contentDocument;
+  let contentDoc = win.document;
   let props = contentDoc.querySelectorAll(".ruleview-property");
 
   is(props.length, 5, "checking property length");
@@ -109,8 +94,7 @@ function checkCopyRule() {
 
   // We need the context menu to open in the correct place in order for
   // popupNode to be propertly set.
-  EventUtils.synthesizeMouse(prop, 1, 1, { type: "contextmenu", button: 2 },
-    ruleViewFrame().contentWindow);
+  contextMenuClick(prop);
 
   ruleView()._boundCopyRule();
   let menu = contentDoc.querySelector("#rule-view-context-menu");
@@ -120,7 +104,7 @@ function checkCopyRule() {
 
 function checkCopyProperty()
 {
-  let contentDoc = ruleViewFrame().contentDocument;
+  let contentDoc = win.document;
   let props = contentDoc.querySelectorAll(".ruleview-property");
   let prop = props[2];
 
@@ -130,8 +114,7 @@ function checkCopyProperty()
 
   // We need the context menu to open in the correct place in order for
   // popupNode to be propertly set.
-  EventUtils.synthesizeMouse(prop, 1, 1, { type: "contextmenu", button: 2 },
-    ruleViewFrame().contentWindow);
+  contextMenuClick(prop);
 
   SimpleTest.waitForClipboard(function IUI_boundCopyPropCheck() {
     return checkClipboardData(expectedPattern);
@@ -174,7 +157,7 @@ function checkCopyPropertyValue()
 
 function checkCopySelection()
 {
-  let contentDoc = ruleViewFrame().contentDocument;
+  let contentDoc = win.document;
   let props = contentDoc.querySelectorAll(".ruleview-property");
   let values = contentDoc.querySelectorAll(".ruleview-propertycontainer");
 
@@ -182,7 +165,7 @@ function checkCopySelection()
   range.setStart(props[0], 0);
   range.setEnd(values[4], 2);
 
-  let selection = ruleViewFrame().contentWindow.getSelection();
+  let selection = win.getSelection();
   selection.addRange(range);
 
   info("Checking that _boundCopy() returns the correct " +
@@ -223,7 +206,7 @@ function testSimpleCopy()
 }
 
 function checkSimpleCopy() {
-  let contentDoc = ruleViewFrame().contentDocument;
+  let contentDoc = win.document;
   let props = contentDoc.querySelectorAll(".ruleview-code");
 
   is(props.length, 2, "checking property length");
@@ -234,8 +217,7 @@ function checkSimpleCopy() {
 
   // We need the context menu to open in the correct place in order for
   // popupNode to be propertly set.
-  EventUtils.synthesizeMouse(prop, 1, 1, { type: "contextmenu", button: 2 },
-    ruleViewFrame().contentWindow);
+  contextMenuClick(prop);
 
   ruleView()._boundCopy();
   let menu = contentDoc.querySelector("#rule-view-context-menu");
@@ -283,10 +265,8 @@ function failedClipboard(aExpectedPattern, aCallback)
 
 function finishup()
 {
-  InspectorUI.sidebar.hide();
-  InspectorUI.closeInspectorUI();
   gBrowser.removeCurrentTab();
-  doc = null;
+  doc = inspector = null;
   finish();
 }
 
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_focus.js b/browser/devtools/styleinspector/test/browser_ruleview_focus.js
index 10f38c31bf43..d9f49f57c2cc 100644
--- a/browser/devtools/styleinspector/test/browser_ruleview_focus.js
+++ b/browser/devtools/styleinspector/test/browser_ruleview_focus.js
@@ -9,39 +9,31 @@ let tempScope = {};
 Cu.import("resource:///modules/devtools/CssRuleView.jsm", tempScope);
 let inplaceEditor = tempScope._getInplaceEditorForSpan;
 let doc;
+let inspector;
 let stylePanel;
 
-function waitForRuleView(aCallback)
-{
-  InspectorUI.currentInspector.once("sidebaractivated-ruleview", aCallback);
-}
-
 function openRuleView()
 {
-  Services.obs.addObserver(function onOpened() {
-    Services.obs.removeObserver(onOpened,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  var target = TargetFactory.forTab(gBrowser.selectedTab);
+  let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+  toolbox.once("inspector-selected", function SE_selected(id, aInspector) {
+    inspector = aInspector;
+    inspector.sidebar.select("ruleview");
 
     // Highlight a node.
     let node = content.document.getElementsByTagName("h1")[0];
-    InspectorUI.inspectNode(node);
-    InspectorUI.stopInspecting();
-
-    // Open the rule view sidebar.
-    waitForRuleView(testFocus);
-
-    InspectorUI.sidebar.show();
-    InspectorUI.sidebar.activatePanel("ruleview");
-
-    testFocus();
-  }, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.openInspectorUI();
+    inspector.selection.once("new-node", testFocus);
+    executeSoon(function() {
+      inspector.selection.setNode(doc.body);
+    });
+  });
 }
 
 function testFocus()
 {
-  let ruleViewFrame = InspectorUI.sidebar._tools["ruleview"].frame;
-  let brace = ruleViewFrame.contentDocument.querySelectorAll(".ruleview-ruleclose")[0];
+  let win = inspector.sidebar.getWindowForTab("ruleview");
+  let brace = win.document.querySelectorAll(".ruleview-ruleclose")[0];
+
   waitForEditorFocus(brace.parentNode, function onNewElement(aEditor) {
     aEditor.input.value = "color";
     waitForEditorFocus(brace.parentNode, function onEditingValue(aEditor) {
@@ -65,9 +57,7 @@ function testFocus()
 
 function finishUp()
 {
-  InspectorUI.sidebar.hide();
-  InspectorUI.closeInspectorUI();
-  doc = stylePanel = null;
+  doc = inspector = stylePanel = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector.js b/browser/devtools/styleinspector/test/browser_styleinspector.js
index c397b2f20978..ea8e01203ee4 100644
--- a/browser/devtools/styleinspector/test/browser_styleinspector.js
+++ b/browser/devtools/styleinspector/test/browser_styleinspector.js
@@ -5,7 +5,8 @@
 // Tests that the style inspector works properly
 
 let doc;
-let stylePanel;
+let inspector;
+let computedView;
 
 function createDocument()
 {
@@ -26,8 +27,20 @@ function createDocument()
     '<p>Inspect using inspectstyle(document.querySelectorAll("span")[0])</p>' +
     '</div>';
   doc.title = "Style Inspector Test";
-  stylePanel = new ComputedViewPanel(window);
-  stylePanel.createPanel(doc.body, runStyleInspectorTests);
+
+  openInspector(openComputedView);
+}
+
+function openComputedView(aInspector)
+{
+  inspector = aInspector;
+
+  inspector.sidebar.once("computedview-ready", function() {
+    computedView = getComputedView(inspector);
+
+    inspector.sidebar.select("computedview");
+    runStyleInspectorTests();
+  });
 }
 
 function runStyleInspectorTests()
@@ -35,25 +48,22 @@ function runStyleInspectorTests()
   var spans = doc.querySelectorAll("span");
   ok(spans, "captain, we have the spans");
 
-  let htmlTree = stylePanel.cssHtmlTree;
-
   for (var i = 0, numSpans = spans.length; i < numSpans; i++) {
-    stylePanel.selectNode(spans[i]);
+    inspector.selection.setNode(spans[i]);
 
-    is(spans[i], htmlTree.viewedElement,
+    is(spans[i], computedView.viewedElement,
       "style inspector node matches the selected node");
-    is(htmlTree.viewedElement, stylePanel.cssLogic.viewedElement,
+    is(computedView.viewedElement, computedView.cssLogic.viewedElement,
        "cssLogic node matches the cssHtmlTree node");
   }
 
   SI_CheckProperty();
-  stylePanel.destroy();
   finishUp();
 }
 
 function SI_CheckProperty()
 {
-  let cssLogic = stylePanel.cssLogic;
+  let cssLogic = computedView.cssLogic;
   let propertyInfo = cssLogic.getPropertyInfo("color");
   ok(propertyInfo.matchedRuleCount > 0, "color property has matching rules");
   //ok(propertyInfo.unmatchedRuleCount > 0, "color property has unmatched rules");
@@ -61,7 +71,7 @@ function SI_CheckProperty()
 
 function finishUp()
 {
-  doc = stylePanel = null;
+  doc = computedView = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js b/browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js
index b73769233378..a7c48a0befa6 100644
--- a/browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js
+++ b/browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js
@@ -5,7 +5,8 @@
 // Tests that the search filter works properly.
 
 let doc;
-let stylePanel;
+let inspector;
+let computedView;
 
 function createDocument()
 {
@@ -14,9 +15,20 @@ function createDocument()
     '<span id="matches" class="matches">Some styled text</span>' +
     '</div>';
   doc.title = "Style Inspector Search Filter Test";
-  // ok(StyleInspector.isEnabled, "style inspector preference is enabled");
-  stylePanel = new ComputedViewPanel(window);
-  stylePanel.createPanel(doc.body, runStyleInspectorTests);
+
+  openInspector(openComputedView);
+}
+
+function openComputedView(aInspector)
+{
+  inspector = aInspector;
+
+  inspector.sidebar.once("computedview-ready", function() {
+    inspector.sidebar.select("computedview");
+    computedView = getComputedView(inspector);
+
+    runStyleInspectorTests();
+  });
 }
 
 function runStyleInspectorTests()
@@ -30,12 +42,11 @@ function SI_inspectNode()
   var span = doc.querySelector("#matches");
   ok(span, "captain, we have the matches span");
 
-  let htmlTree = stylePanel.cssHtmlTree;
-  stylePanel.selectNode(span);
+  inspector.selection.setNode(span);
 
-  is(span, htmlTree.viewedElement,
+  is(span, computedView.viewedElement,
     "style inspector node matches the selected node");
-  is(htmlTree.viewedElement, stylePanel.cssLogic.viewedElement,
+  is(computedView.viewedElement, computedView.cssLogic.viewedElement,
      "cssLogic node matches the cssHtmlTree node");
 }
 
@@ -45,32 +56,34 @@ function SI_toggleDefaultStyles()
 
   info("clearing \"only user styles\" checkbox");
 
-  let iframe = stylePanel.iframe;
-  let checkbox = iframe.contentDocument.querySelector(".onlyuserstyles");
+  let doc = computedView.styleDocument;
+  let checkbox = doc.querySelector(".onlyuserstyles");
   Services.obs.addObserver(SI_AddFilterText, "StyleInspector-populated", false);
-  EventUtils.synthesizeMouse(checkbox, 5, 5, {}, iframe.contentWindow);
+  checkbox.click();
 }
 
 function SI_AddFilterText()
 {
   Services.obs.removeObserver(SI_AddFilterText, "StyleInspector-populated", false);
 
-  let iframe = stylePanel.iframe;
-  let searchbar = iframe.contentDocument.querySelector(".searchfield");
+  let doc = computedView.styleDocument;
+  let searchbar = doc.querySelector(".searchfield");
   Services.obs.addObserver(SI_checkFilter, "StyleInspector-populated", false);
   info("setting filter text to \"color\"");
   searchbar.focus();
-  EventUtils.synthesizeKey("c", {}, iframe.contentWindow);
-  EventUtils.synthesizeKey("o", {}, iframe.contentWindow);
-  EventUtils.synthesizeKey("l", {}, iframe.contentWindow);
-  EventUtils.synthesizeKey("o", {}, iframe.contentWindow);
-  EventUtils.synthesizeKey("r", {}, iframe.contentWindow);
+
+  let win =computedView.styleWindow;
+  EventUtils.synthesizeKey("c", {}, win);
+  EventUtils.synthesizeKey("o", {}, win);
+  EventUtils.synthesizeKey("l", {}, win);
+  EventUtils.synthesizeKey("o", {}, win);
+  EventUtils.synthesizeKey("r", {}, win);
 }
 
 function SI_checkFilter()
 {
   Services.obs.removeObserver(SI_checkFilter, "StyleInspector-populated", false);
-  let propertyViews = stylePanel.cssHtmlTree.propertyViews;
+  let propertyViews = computedView.propertyViews;
 
   info("check that the correct properties are visible");
   propertyViews.forEach(function(propView) {
@@ -79,13 +92,12 @@ function SI_checkFilter()
       "span " + name + " property visibility check");
   });
 
-  stylePanel.destroy();
   finishUp();
 }
 
 function finishUp()
 {
-  doc = stylePanel = null;
+  doc = inspector = computedView = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js b/browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js
index c9a9913f3943..059134f19f07 100644
--- a/browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js
+++ b/browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js
@@ -5,7 +5,8 @@
 // Tests that the checkbox to show only user styles works properly.
 
 let doc;
-let stylePanel;
+let inspector;
+let computedView;
 
 function createDocument()
 {
@@ -14,9 +15,20 @@ function createDocument()
     '<span id="matches" class="matches">Some styled text</span>' +
     '</div>';
   doc.title = "Style Inspector Default Styles Test";
-  // ok(StyleInspector.isEnabled, "style inspector preference is enabled");
-  stylePanel = new ComputedViewPanel(window);
-  stylePanel.createPanel(doc.body, runStyleInspectorTests);
+
+  openInspector(openComputedView);
+}
+
+function openComputedView(aInspector)
+{
+  inspector = aInspector;
+
+  inspector.sidebar.once("computedview-ready", function() {
+    inspector.sidebar.select("computedview");
+    computedView = getComputedView(inspector);
+
+    runStyleInspectorTests();
+  });
 }
 
 function runStyleInspectorTests()
@@ -30,12 +42,11 @@ function SI_inspectNode()
   let span = doc.querySelector("#matches");
   ok(span, "captain, we have the matches span");
 
-  let htmlTree = stylePanel.cssHtmlTree;
-  stylePanel.selectNode(span);
+  inspector.selection.setNode(span);
 
-  is(span, htmlTree.viewedElement,
+  is(span, computedView.viewedElement,
     "style inspector node matches the selected node");
-  is(htmlTree.viewedElement, stylePanel.cssLogic.viewedElement,
+  is(computedView.viewedElement, computedView.cssLogic.viewedElement,
      "cssLogic node matches the cssHtmlTree node");
 }
 
@@ -53,10 +64,11 @@ function SI_check()
 function SI_toggleDefaultStyles()
 {
   // Click on the checkbox.
-  let iframe = stylePanel.iframe;
-  let checkbox = iframe.contentDocument.querySelector(".onlyuserstyles");
+  let doc = computedView.styleDocument;
+  let checkbox = doc.querySelector(".onlyuserstyles");
   Services.obs.addObserver(SI_checkDefaultStyles, "StyleInspector-populated", false);
-  EventUtils.synthesizeMouse(checkbox, 5, 5, {}, iframe.contentWindow);
+
+  checkbox.click();
 }
 
 function SI_checkDefaultStyles()
@@ -68,14 +80,13 @@ function SI_checkDefaultStyles()
   is(propertyVisible("background-color"), true,
       "span background-color property is visible");
 
-  stylePanel.destroy();
   finishUp();
 }
 
 function propertyVisible(aName)
 {
   info("Checking property visibility for " + aName);
-  let propertyViews = stylePanel.cssHtmlTree.propertyViews;
+  let propertyViews = computedView.propertyViews;
   for each (let propView in propertyViews) {
     if (propView.name == aName) {
       return propView.visible;
@@ -86,7 +97,7 @@ function propertyVisible(aName)
 
 function finishUp()
 {
-  doc = stylePanel = null;
+  doc = inspector = computedView = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js b/browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js
index b16871fa4f76..047bebf8f8e9 100644
--- a/browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js
+++ b/browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js
@@ -5,7 +5,8 @@
 // Tests that the no results placeholder works properly.
 
 let doc;
-let stylePanel;
+let inspector;
+let computedView;
 
 function createDocument()
 {
@@ -13,10 +14,23 @@ function createDocument()
     '.matches {color: #F00;}</style>' +
     '<span id="matches" class="matches">Some styled text</span>';
   doc.title = "Tests that the no results placeholder works properly";
-  stylePanel = new ComputedViewPanel(window);
-  stylePanel.createPanel(doc.body, runStyleInspectorTests);
+
+  openInspector(openComputedView);
 }
 
+function openComputedView(aInspector)
+{
+  inspector = aInspector;
+
+  inspector.sidebar.once("computedview-ready", function() {
+    inspector.sidebar.select("computedview");
+    computedView = getComputedView(inspector);
+
+    runStyleInspectorTests();
+  });
+}
+
+
 function runStyleInspectorTests()
 {
   Services.obs.addObserver(SI_AddFilterText, "StyleInspector-populated", false);
@@ -24,12 +38,11 @@ function runStyleInspectorTests()
   let span = doc.querySelector("#matches");
   ok(span, "captain, we have the matches span");
 
-  let htmlTree = stylePanel.cssHtmlTree;
-  stylePanel.selectNode(span);
+  inspector.selection.setNode(span);
 
-  is(span, htmlTree.viewedElement,
+  is(span, computedView.viewedElement,
     "style inspector node matches the selected node");
-  is(htmlTree.viewedElement, stylePanel.cssLogic.viewedElement,
+  is(computedView.viewedElement, computedView.cssLogic.viewedElement,
      "cssLogic node matches the cssHtmlTree node");
 }
 
@@ -37,15 +50,14 @@ function SI_AddFilterText()
 {
   Services.obs.removeObserver(SI_AddFilterText, "StyleInspector-populated", false);
 
-  let iframe = stylePanel.iframe;
-  let searchbar = stylePanel.cssHtmlTree.searchField;
+  let searchbar = computedView.searchField;
   let searchTerm = "xxxxx";
 
   Services.obs.addObserver(SI_checkPlaceholderVisible, "StyleInspector-populated", false);
   info("setting filter text to \"" + searchTerm + "\"");
   searchbar.focus();
   for each (let c in searchTerm) {
-    EventUtils.synthesizeKey(c, {}, iframe.contentWindow);
+    EventUtils.synthesizeKey(c, {}, computedView.styleWindow);
   }
 }
 
@@ -53,9 +65,9 @@ function SI_checkPlaceholderVisible()
 {
   Services.obs.removeObserver(SI_checkPlaceholderVisible, "StyleInspector-populated", false);
   info("SI_checkPlaceholderVisible called");
-  let placeholder = stylePanel.cssHtmlTree.noResults;
-  let iframe = stylePanel.iframe;
-  let display = iframe.contentWindow.getComputedStyle(placeholder).display;
+  let placeholder = computedView.noResults;
+  let win = computedView.styleWindow;
+  let display = win.getComputedStyle(placeholder).display;
 
   is(display, "block", "placeholder is visible");
 
@@ -64,32 +76,30 @@ function SI_checkPlaceholderVisible()
 
 function SI_ClearFilterText()
 {
-  let iframe = stylePanel.iframe;
-  let searchbar = stylePanel.cssHtmlTree.searchField;
+  let searchbar = computedView.searchField;
 
   Services.obs.addObserver(SI_checkPlaceholderHidden, "StyleInspector-populated", false);
   info("clearing filter text");
   searchbar.focus();
   searchbar.value = "";
-  EventUtils.synthesizeKey("c", {}, iframe.contentWindow);
+  EventUtils.synthesizeKey("c", {}, computedView.styleWindow);
 }
 
 function SI_checkPlaceholderHidden()
 {
   Services.obs.removeObserver(SI_checkPlaceholderHidden, "StyleInspector-populated", false);
-  let placeholder = stylePanel.cssHtmlTree.noResults;
-  let iframe = stylePanel.iframe;
-  let display = iframe.contentWindow.getComputedStyle(placeholder).display;
+  let placeholder = computedView.noResults;
+  let win = computedView.styleWindow;
+  let display = win.getComputedStyle(placeholder).display;
 
   is(display, "none", "placeholder is hidden");
 
-  stylePanel.destroy();
   finishUp();
 }
 
 function finishUp()
 {
-  doc = stylePanel = null;
+  doc = inspector = computedView = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/head.js b/browser/devtools/styleinspector/test/head.js
index cf2827811be8..7c2ee991d621 100644
--- a/browser/devtools/styleinspector/test/head.js
+++ b/browser/devtools/styleinspector/test/head.js
@@ -6,122 +6,36 @@
 let tempScope = {};
 Cu.import("resource:///modules/devtools/CssLogic.jsm", tempScope);
 Cu.import("resource:///modules/devtools/CssHtmlTree.jsm", tempScope);
-Cu.import("resource:///modules/HUDService.jsm", tempScope);
-let HUDService = tempScope.HUDService;
+Cu.import("resource:///modules/devtools/gDevTools.jsm", tempScope);
 let ConsoleUtils = tempScope.ConsoleUtils;
 let CssLogic = tempScope.CssLogic;
 let CssHtmlTree = tempScope.CssHtmlTree;
+let gDevTools = tempScope.gDevTools;
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
 
-function log(aMsg)
-{
-  dump("*** WebConsoleTest: " + aMsg + "\n");
-}
-
-function pprint(aObj)
-{
-  for (let prop in aObj) {
-    if (typeof aObj[prop] == "function") {
-      log("function " + prop);
-    }
-    else {
-      log(prop + ": " + aObj[prop]);
-    }
-  }
-}
-
-let tab, browser, hudId, hud, hudBox, filterBox, outputNode, cs;
+let browser, hudId, hud, hudBox, filterBox, outputNode, cs;
 
 function addTab(aURL)
 {
   gBrowser.selectedTab = gBrowser.addTab();
   content.location = aURL;
-  tab = gBrowser.selectedTab;
-  browser = gBrowser.getBrowserForTab(tab);
+  browser = gBrowser.getBrowserForTab(gBrowser.selectedTab);
 }
 
-function afterAllTabsLoaded(callback, win) {
-  win = win || window;
-
-  let stillToLoad = 0;
-
-  function onLoad() {
-    this.removeEventListener("load", onLoad, true);
-    stillToLoad--;
-    if (!stillToLoad)
-      callback();
-  }
-
-  for (let a = 0; a < win.gBrowser.tabs.length; a++) {
-    let browser = win.gBrowser.tabs[a].linkedBrowser;
-    if (browser.contentDocument.readyState != "complete") {
-      stillToLoad++;
-      browser.addEventListener("load", onLoad, true);
-    }
-  }
-
-  if (!stillToLoad)
-    callback();
-}
-
-/**
- * Check if a log entry exists in the HUD output node.
- *
- * @param {Element} aOutputNode
- *        the HUD output node.
- * @param {string} aMatchString
- *        the string you want to check if it exists in the output node.
- * @param {string} aMsg
- *        the message describing the test
- * @param {boolean} [aOnlyVisible=false]
- *        find only messages that are visible, not hidden by the filter.
- * @param {boolean} [aFailIfFound=false]
- *        fail the test if the string is found in the output node.
- * @param {string} aClass [optional]
- *        find only messages with the given CSS class.
- */
-function testLogEntry(aOutputNode, aMatchString, aMsg, aOnlyVisible,
-                      aFailIfFound, aClass)
+function openInspector(callback)
 {
-  let selector = ".hud-msg-node";
-  // Skip entries that are hidden by the filter.
-  if (aOnlyVisible) {
-    selector += ":not(.hud-filtered-by-type)";
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  let inspector = gDevTools.getPanelForTarget("inspector", target);
+  if (inspector && inspector.isReady) {
+    callback(inspector);
+  } else {
+    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+    toolbox.once("inspector-ready", function(event, panel) {
+      let inspector = gDevTools.getPanelForTarget("inspector", target);
+      callback(inspector);
+    });
   }
-  if (aClass) {
-    selector += "." + aClass;
-  }
-
-  let msgs = aOutputNode.querySelectorAll(selector);
-  let found = false;
-  for (let i = 0, n = msgs.length; i < n; i++) {
-    let message = msgs[i].textContent.indexOf(aMatchString);
-    if (message > -1) {
-      found = true;
-      break;
-    }
-
-    // Search the labels too.
-    let labels = msgs[i].querySelectorAll("label");
-    for (let j = 0; j < labels.length; j++) {
-      if (labels[j].getAttribute("value").indexOf(aMatchString) > -1) {
-        found = true;
-        break;
-      }
-    }
-  }
-
-  is(found, !aFailIfFound, aMsg);
-}
-
-/**
- * A convenience method to call testLogEntry().
- *
- * @param string aString
- *        The string to find.
- */
-function findLogEntry(aString)
-{
-  testLogEntry(outputNode, aString, "found " + aString);
 }
 
 function addStyle(aDocument, aString)
@@ -133,16 +47,6 @@ function addStyle(aDocument, aString)
   return node;
 }
 
-function openConsole()
-{
-  HUDService.activateHUDForContext(tab);
-}
-
-function closeConsole()
-{
-  HUDService.deactivateHUDForContext(tab);
-}
-
 function finishTest()
 {
   finish();
@@ -151,158 +55,25 @@ function finishTest()
 function tearDown()
 {
   try {
-    HUDService.deactivateHUDForContext(gBrowser.selectedTab);
+    let target = TargetFactory.forTab(gBrowser.selectedTab);
+    gDevTools.closeToolbox(target);
   }
   catch (ex) {
-    log(ex);
+    dump(ex);
   }
   while (gBrowser.tabs.length > 1) {
     gBrowser.removeCurrentTab();
   }
-  tab = browser = hudId = hud = filterBox = outputNode = cs = null;
+  browser = hudId = hud = filterBox = outputNode = cs = null;
 }
 
-/**
- * Shows the computed view in its own panel.
- */
-function ComputedViewPanel(aContext)
-{
-  this._init(aContext);
+function getComputedView(inspector) {
+  return inspector.sidebar.getWindowForTab("computedview").computedview.view;
 }
 
-ComputedViewPanel.prototype = {
-  _init: function CVP_init(aContext)
-  {
-    this.window = aContext;
-    this.document = this.window.document;
-    this.cssLogic = new CssLogic();
-    this.panelReady = false;
-    this.iframeReady = false;
-  },
-
-  /**
-   * Factory method to create the actual style panel
-   * @param {function} aCallback (optional) callback to fire when ready.
-   */
-  createPanel: function SI_createPanel(aSelection, aCallback)
-  {
-    let popupSet = this.document.getElementById("mainPopupSet");
-    let panel = this.document.createElement("panel");
-
-    panel.setAttribute("class", "styleInspector");
-    panel.setAttribute("orient", "vertical");
-    panel.setAttribute("ignorekeys", "true");
-    panel.setAttribute("noautofocus", "true");
-    panel.setAttribute("noautohide", "true");
-    panel.setAttribute("titlebar", "normal");
-    panel.setAttribute("close", "true");
-    panel.setAttribute("label", "Computed View");
-    panel.setAttribute("width", 350);
-    panel.setAttribute("height", this.window.screen.height / 2);
-
-    this._openCallback = aCallback;
-    this.selectedNode = aSelection;
-
-    let iframe = this.document.createElement("iframe");
-    let boundIframeOnLoad = function loadedInitializeIframe()
-    {
-      this.iframeReady = true;
-      this.iframe.removeEventListener("load", boundIframeOnLoad, true);
-      this.panel.openPopup(this.window.gBrowser.selectedBrowser, "end_before", 0, 0, false, false);
-    }.bind(this);
-
-    iframe.flex = 1;
-    iframe.setAttribute("tooltip", "aHTMLTooltip");
-    iframe.addEventListener("load", boundIframeOnLoad, true);
-    iframe.setAttribute("src", "chrome://browser/content/devtools/csshtmltree.xul");
-
-    panel.appendChild(iframe);
-    popupSet.appendChild(panel);
-
-    this._boundPopupShown = this.popupShown.bind(this);
-    panel.addEventListener("popupshown", this._boundPopupShown, false);
-
-    this.panel = panel;
-    this.iframe = iframe;
-
-    return panel;
-  },
-
-  /**
-   * Event handler for the popupshown event.
-   */
-  popupShown: function SI_popupShown()
-  {
-    this.panelReady = true;
-    this.cssHtmlTree = new CssHtmlTree(this);
-    let selectedNode = this.selectedNode || null;
-    this.cssLogic.highlight(selectedNode);
-    this.cssHtmlTree.highlight(selectedNode);
-    if (this._openCallback) {
-      this._openCallback();
-      delete this._openCallback;
-    }
-  },
-
-  isLoaded: function SI_isLoaded()
-  {
-    return this.iframeReady && this.panelReady;
-  },
-
-  /**
-   * Select from Path (via CssHtmlTree_pathClick)
-   * @param aNode The node to inspect.
-   */
-  selectFromPath: function SI_selectFromPath(aNode)
-  {
-    this.selectNode(aNode);
-  },
-
-  /**
-   * Select a node to inspect in the Style Inspector panel
-   * @param aNode The node to inspect.
-   */
-  selectNode: function SI_selectNode(aNode)
-  {
-    this.selectedNode = aNode;
-
-    if (this.isLoaded()) {
-      this.cssLogic.highlight(aNode);
-      this.cssHtmlTree.highlight(aNode);
-    }
-  },
-
-  /**
-   * Destroy the style panel, remove listeners etc.
-   */
-  destroy: function SI_destroy()
-  {
-    this.panel.hidePopup();
-
-    if (this.cssHtmlTree) {
-      this.cssHtmlTree.destroy();
-      delete this.cssHtmlTree;
-    }
-
-    if (this.iframe) {
-      this.iframe.parentNode.removeChild(this.iframe);
-      delete this.iframe;
-    }
-
-    delete this.cssLogic;
-    this.panel.removeEventListener("popupshown", this._boundPopupShown, false);
-    delete this._boundPopupShown;
-    this.panel.parentNode.removeChild(this.panel);
-    delete this.panel;
-    delete this.doc;
-    delete this.win;
-    delete CssHtmlTree.win;
-  },
-};
-
 function ruleView()
 {
-  return InspectorUI.sidebar._toolContext("ruleview").view;
+  return inspector.sidebar.getWindowForTab("ruleview").ruleview.view;
 }
 
 function waitForEditorFocus(aParent, aCallback)
@@ -329,6 +100,18 @@ function waitForEditorBlur(aEditor, aCallback)
   }, false);
 }
 
+function contextMenuClick(element) {
+  var evt = element.ownerDocument.createEvent('MouseEvents');
+
+  var button = 2;  // right click
+
+  evt.initMouseEvent('contextmenu', true, true,
+       element.ownerDocument.defaultView, 1, 0, 0, 0, 0, false,
+       false, false, false, button, null);
+
+  element.dispatchEvent(evt);
+}
+
 registerCleanupFunction(tearDown);
 
 waitForExplicitFinish();
diff --git a/browser/devtools/tilt/CmdTilt.jsm b/browser/devtools/tilt/CmdTilt.jsm
index ff6d84de1453..3c09b3772c13 100644
--- a/browser/devtools/tilt/CmdTilt.jsm
+++ b/browser/devtools/tilt/CmdTilt.jsm
@@ -7,6 +7,7 @@ this.EXPORTED_SYMBOLS = [ ];
 
 Components.utils.import("resource:///modules/devtools/gcli.jsm");
 Components.utils.import("resource:///modules/HUDService.jsm");
+Components.utils.import("resource:///modules/devtools/Tilt.jsm");
 
 
 /**
@@ -26,31 +27,32 @@ gcli.addCommand({
   name: 'tilt open',
   description: gcli.lookup("tiltOpenDesc"),
   manual: gcli.lookup("tiltOpenManual"),
-  params: [
-    {
-      name: "node",
-      type: "node",
-      defaultValue: null,
-      description: gcli.lookup("inspectNodeDesc"),
-      manual: gcli.lookup("inspectNodeManual")
-    }
-  ],
   exec: function(args, context) {
     let chromeWindow = context.environment.chromeDocument.defaultView;
-    let InspectorUI = chromeWindow.InspectorUI;
-    let Tilt = chromeWindow.Tilt;
+    let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
+    Tilt.initializeForCurrentTab();
+  }
+});
 
-    if (Tilt.currentInstance) {
-      Tilt.update(args.node);
-    } else {
-      let hudId = chromeWindow.HUDConsoleUI.getOpenHUD();
-      let hud = HUDService.getHudReferenceById(hudId);
 
-      if (hud && !hud.consolePanel) {
-        HUDService.deactivateHUDForContext(chromeWindow.gBrowser.selectedTab);
-      }
-      InspectorUI.openInspectorUI(args.node);
-      Tilt.initialize();
+/**
+ * 'tilt toggle' command
+ */
+gcli.addCommand({
+  name: "tilt toggle",
+  buttonId: "command-button-tilt",
+  buttonClass: "command-button",
+  hidden: true,
+  exec: function(args, context) {
+    let chromeWindow = context.environment.chromeDocument.defaultView;
+
+    if (TiltManager._instances.has(chromeWindow)) {
+      let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
+      Tilt.destroy(Tilt.currentWindowId);
+    }
+    else {
+      let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
+      Tilt.initializeForCurrentTab();
     }
   }
 });
@@ -81,8 +83,7 @@ gcli.addCommand({
   ],
   exec: function(args, context) {
     let chromeWindow = context.environment.chromeDocument.defaultView;
-    let Tilt = chromeWindow.Tilt;
-
+    let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
     if (Tilt.currentInstance) {
       Tilt.currentInstance.controller.arcball.translate([args.x, args.y]);
     }
@@ -122,8 +123,7 @@ gcli.addCommand({
   ],
   exec: function(args, context) {
     let chromeWindow = context.environment.chromeDocument.defaultView;
-    let Tilt = chromeWindow.Tilt;
-
+    let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
     if (Tilt.currentInstance) {
       Tilt.currentInstance.controller.arcball.rotate([args.x, args.y, args.z]);
     }
@@ -148,7 +148,7 @@ gcli.addCommand({
   ],
   exec: function(args, context) {
     let chromeWindow = context.environment.chromeDocument.defaultView;
-    let Tilt = chromeWindow.Tilt;
+    let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
 
     if (Tilt.currentInstance) {
       Tilt.currentInstance.controller.arcball.zoom(-args.zoom);
@@ -166,7 +166,7 @@ gcli.addCommand({
   manual: gcli.lookup("tiltResetManual"),
   exec: function(args, context) {
     let chromeWindow = context.environment.chromeDocument.defaultView;
-    let Tilt = chromeWindow.Tilt;
+    let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
 
     if (Tilt.currentInstance) {
       Tilt.currentInstance.controller.arcball.reset();
@@ -184,7 +184,7 @@ gcli.addCommand({
   manual: gcli.lookup("tiltCloseManual"),
   exec: function(args, context) {
     let chromeWindow = context.environment.chromeDocument.defaultView;
-    let Tilt = chromeWindow.Tilt;
+    let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
 
     Tilt.destroy(Tilt.currentWindowId);
   }
diff --git a/browser/devtools/tilt/Tilt.jsm b/browser/devtools/tilt/Tilt.jsm
index a32e80a39f38..debbe626a91c 100644
--- a/browser/devtools/tilt/Tilt.jsm
+++ b/browser/devtools/tilt/Tilt.jsm
@@ -48,7 +48,21 @@ Cu.import("resource:///modules/devtools/TiltGL.jsm");
 Cu.import("resource:///modules/devtools/TiltUtils.jsm");
 Cu.import("resource:///modules/devtools/TiltVisualizer.jsm");
 
-this.EXPORTED_SYMBOLS = ["Tilt"];
+this.EXPORTED_SYMBOLS = ["TiltManager"];
+
+this.TiltManager = {
+  _instances: new WeakMap(),
+  getTiltForBrowser: function(aChromeWindow)
+  {
+    if (this._instances.has(aChromeWindow)) {
+      return this._instances.get(aChromeWindow);
+    } else {
+      let tilt = new Tilt(aChromeWindow);
+      this._instances.set(aChromeWindow, tilt);
+      return tilt;
+    }
+  },
+}
 
 /**
  * Object managing instances of the visualizer.
@@ -72,6 +86,8 @@ this.Tilt = function Tilt(aWindow)
    * Shortcut for accessing notifications strings.
    */
   this.NOTIFICATIONS = TILT_NOTIFICATIONS;
+
+  this.setup();
 }
 
 Tilt.prototype = {
@@ -79,9 +95,16 @@ Tilt.prototype = {
   /**
    * Initializes a visualizer for the current tab.
    */
-  initialize: function T_initialize()
+  initializeForCurrentTab: function T_initializeForCurrentTab()
   {
+    let contentWindow = this.chromeWindow.gBrowser.selectedBrowser.contentWindow;
     let id = this.currentWindowId;
+    let self = this;
+
+    contentWindow.addEventListener("beforeunload", function onUnload() {
+      contentWindow.removeEventListener("beforeunload", onUnload, false);
+      self.destroy(id, true);
+    }, false);
 
     // if the visualizer for the current tab is already open, destroy it now
     if (this.visualizers[id]) {
@@ -94,7 +117,8 @@ Tilt.prototype = {
       chromeWindow: this.chromeWindow,
       contentWindow: this.chromeWindow.gBrowser.selectedBrowser.contentWindow,
       parentNode: this.chromeWindow.gBrowser.selectedBrowser.parentNode,
-      notifications: this.NOTIFICATIONS
+      notifications: this.NOTIFICATIONS,
+      tab: this.chromeWindow.gBrowser.selectedTab
     });
 
     // make sure the visualizer object was initialized properly
@@ -162,42 +186,6 @@ Tilt.prototype = {
     Services.obs.notifyObservers(null, TILT_NOTIFICATIONS.DESTROYED, null);
   },
 
-  /**
-   * Handles any supplementary post-initialization work, done immediately
-   * after a TILT_NOTIFICATIONS.INITIALIZING notification.
-   */
-  _whenInitializing: function T__whenInitializing()
-  {
-    this._whenShown();
-  },
-
-  /**
-   * Handles any supplementary post-destruction work, done immediately
-   * after a TILT_NOTIFICATIONS.DESTROYED notification.
-   */
-  _whenDestroyed: function T__whenDestroyed()
-  {
-    this._whenHidden();
-  },
-
-  /**
-   * Handles any necessary changes done when the Tilt surface is shown,
-   * after a TILT_NOTIFICATIONS.SHOWN notification.
-   */
-  _whenShown: function T__whenShown()
-  {
-    this.tiltButton.checked = true;
-  },
-
-  /**
-   * Handles any necessary changes done when the Tilt surface is hidden,
-   * after a TILT_NOTIFICATIONS.HIDDEN notification.
-   */
-  _whenHidden: function T__whenHidden()
-  {
-    this.tiltButton.checked = false;
-  },
-
   /**
    * Handles the event fired when a tab is selected.
    */
@@ -210,80 +198,16 @@ Tilt.prototype = {
     }
   },
 
-  /**
-   * A node was selected in the Inspector.
-   * Called from InspectorUI.
-   *
-   * @param {Element} aNode
-   *                  the newly selected node
-   */
-  update: function T_update(aNode) {
-    if (this.currentInstance) {
-      this.currentInstance.presenter.highlightNode(aNode, "moveIntoView");
-    }
-  },
-
   /**
    * Add the browser event listeners to handle state changes.
-   * Called from InspectorUI.
    */
   setup: function T_setup()
   {
-    if (this._setupFinished) {
-      return;
-    }
-
     // load the preferences from the devtools.tilt branch
     TiltVisualizer.Prefs.load();
 
-    // hide the button in the Inspector toolbar if Tilt is not enabled
-    this.tiltButton.hidden = !this.enabled;
-
-    // add the necessary observers to handle specific notifications
-    Services.obs.addObserver(
-      this._whenInitializing.bind(this), TILT_NOTIFICATIONS.INITIALIZING, false);
-    Services.obs.addObserver(
-      this._whenDestroyed.bind(this), TILT_NOTIFICATIONS.DESTROYED, false);
-    Services.obs.addObserver(
-      this._whenShown.bind(this), TILT_NOTIFICATIONS.SHOWN, false);
-    Services.obs.addObserver(
-      this._whenHidden.bind(this), TILT_NOTIFICATIONS.HIDDEN, false);
-
-    Services.obs.addObserver(function(aSubject, aTopic, aWinId) {
-      this.destroy(aWinId); }.bind(this),
-      this.chromeWindow.InspectorUI.INSPECTOR_NOTIFICATIONS.DESTROYED, false);
-
-    this.chromeWindow.gBrowser.tabContainer.addEventListener("TabSelect",
-      this._onTabSelect.bind(this), false);
-
-
-    // FIXME: this shouldn't be done here, see bug #705131
-    let onOpened = function() {
-      if (this.inspector && this.highlighter && this.currentInstance) {
-        this.inspector.stopInspecting();
-        this.inspectButton.disabled = true;
-        this.highlighter.hide();
-      }
-    }.bind(this);
-
-    let onClosed = function() {
-      if (this.inspector && this.highlighter) {
-        this.inspectButton.disabled = false;
-        this.highlighter.show();
-      }
-    }.bind(this);
-
-    Services.obs.addObserver(onOpened,
-      this.chromeWindow.InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-    Services.obs.addObserver(onClosed,
-      this.chromeWindow.InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
-    Services.obs.addObserver(onOpened,
-      TILT_NOTIFICATIONS.INITIALIZING, false);
-    Services.obs.addObserver(onClosed,
-      TILT_NOTIFICATIONS.DESTROYED, false);
-
-
-    this._setupFinished = true;
+    this.chromeWindow.gBrowser.tabContainer.addEventListener(
+      "TabSelect", this._onTabSelect.bind(this), false);
   },
 
   /**
@@ -311,35 +235,4 @@ Tilt.prototype = {
   {
     return this.visualizers[this.currentWindowId];
   },
-
-  /**
-   * Gets the current InspectorUI instance.
-   */
-  get inspector()
-  {
-    return this.chromeWindow.InspectorUI;
-  },
-
-  /**
-   * Gets the current Highlighter instance from the InspectorUI.
-   */
-  get highlighter()
-  {
-    return this.inspector.highlighter;
-  },
-
-  /**
-   * Gets the Tilt button in the Inspector toolbar.
-   */
-  get tiltButton()
-  {
-    return this.chromeWindow.document.getElementById("inspector-3D-button");
-  },
-
-  /**
-   * Gets the Inspect button in the Inspector toolbar.
-   */
-  get inspectButton() {
-    return this.chromeWindow.document.getElementById("inspector-inspect-toolbutton");
-  }
 };
diff --git a/browser/devtools/tilt/TiltVisualizer.jsm b/browser/devtools/tilt/TiltVisualizer.jsm
index 05d678ad8545..e577b8dfb0c0 100644
--- a/browser/devtools/tilt/TiltVisualizer.jsm
+++ b/browser/devtools/tilt/TiltVisualizer.jsm
@@ -51,6 +51,8 @@ const TILT_CRAFTER = "resource:///modules/devtools/TiltWorkerCrafter.js";
 const TILT_PICKER = "resource:///modules/devtools/TiltWorkerPicker.js";
 
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource:///modules/devtools/gDevTools.jsm");
+Cu.import("resource:///modules/devtools/Target.jsm");
 Cu.import("resource:///modules/devtools/TiltGL.jsm");
 Cu.import("resource:///modules/devtools/TiltMath.jsm");
 Cu.import("resource:///modules/devtools/TiltUtils.jsm");
@@ -98,6 +100,8 @@ this.TiltVisualizer = function TiltVisualizer(aProperties)
     aProperties.onError || null,
     aProperties.onLoad || null);
 
+  this.bindToInspector(aProperties.tab);
+
   /**
    * Visualization mouse and keyboard controller.
    */
@@ -132,6 +136,8 @@ TiltVisualizer.prototype = {
    */
   cleanup: function TV_cleanup()
   {
+    this.unbindInspector();
+
     if (this.controller) {
       TiltUtils.destroyObject(this.controller);
     }
@@ -144,7 +150,124 @@ TiltVisualizer.prototype = {
     TiltUtils.destroyObject(this);
     TiltUtils.clearCache();
     TiltUtils.gc(chromeWindow);
-  }
+  },
+
+  /**
+   * Listen to the inspector activity.
+   */
+  bindToInspector: function TV_bindToInspector(aTab)
+  {
+    this._browserTab = aTab;
+
+    this.onNewNodeFromInspector = this.onNewNodeFromInspector.bind(this);
+    this.onNewNodeFromTilt = this.onNewNodeFromTilt.bind(this);
+    this.onInspectorReady = this.onInspectorReady.bind(this);
+    this.onToolboxDestroyed = this.onToolboxDestroyed.bind(this);
+
+    gDevTools.on("inspector-ready", this.onInspectorReady);
+    gDevTools.on("toolbox-destroyed", this.onToolboxDestroyed);
+
+    Services.obs.addObserver(this.onNewNodeFromTilt,
+                             this.presenter.NOTIFICATIONS.HIGHLIGHTING,
+                             false);
+    Services.obs.addObserver(this.onNewNodeFromTilt,
+                             this.presenter.NOTIFICATIONS.UNHIGHLIGHTING,
+                             false);
+
+    let target = TargetFactory.forTab(aTab);
+    let inspector = gDevTools.getPanelForTarget("inspector", target);
+    if (inspector) {
+      this.inspector = inspector;
+      this.inspector.selection.on("new-node", this.onNewNodeFromInspector);
+      this.inspector.selection.on("detached", this.onNewNodeFromInspector);
+      this.onNewNodeFromInspector();
+    }
+  },
+
+  /**
+   * Unregister inspector event listeners.
+   */
+  unbindInspector: function TV_unbindInspector()
+  {
+    this._browserTab = null;
+
+    if (this.inspector) {
+      this.inspector.selection.off("new-node", this.onNewNodeFromInspector);
+      this.inspector.selection.off("detached", this.onNewNodeFromInspector);
+      this.inspector = null;
+    }
+
+    gDevTools.off("inspector-ready", this.onInspectorReady);
+    gDevTools.off("toolbox-destroyed", this.onToolboxDestroyed);
+
+    Services.obs.removeObserver(this.onNewNodeFromTilt,
+                                this.presenter.NOTIFICATIONS.HIGHLIGHTING);
+    Services.obs.removeObserver(this.onNewNodeFromTilt,
+                                this.presenter.NOTIFICATIONS.UNHIGHLIGHTING);
+  },
+
+  /**
+   * When a new inspector is started.
+   */
+  onInspectorReady: function TV_onInspectorReady(event, toolbox, panel)
+  {
+    if (toolbox.target.tab === this._browserTab) {
+      this.inspector = panel;
+      this.inspector.selection.on("new-node", this.onNewNodeFromInspector);
+      this.inspector.selection.on("detached", this.onNewNodeFromInspector);
+      this.onNewNodeFromTilt();
+    }
+  },
+
+  /**
+   * When the toolbox, therefor the inspector, is closed.
+   */
+  onToolboxDestroyed: function TV_onToolboxDestroyed(event, tab)
+  {
+    if (tab === this._browserTab &&
+        this.inspector) {
+      if (this.inspector.selection) {
+        this.inspector.selection.off("new-node", this.onNewNodeFromInspector);
+        this.inspector.selection.off("detached", this.onNewNodeFromInspector);
+      }
+      this.inspector = null;
+    }
+  },
+
+  /**
+   * When a new node is selected in the inspector.
+   */
+  onNewNodeFromInspector: function TV_onNewNodeFromInspector()
+  {
+    if (this.inspector &&
+        this.inspector.selection.reason != "tilt") {
+      let selection = this.inspector.selection;
+      let canHighlightNode = selection.isNode() &&
+                              selection.isConnected() &&
+                              selection.isElementNode();
+      if (canHighlightNode) {
+        this.presenter.highlightNode(selection.node);
+      } else {
+        this.presenter.highlightNodeFor(-1);
+      }
+    }
+  },
+
+  /**
+   * When a new node is selected in Tilt.
+   */
+  onNewNodeFromTilt: function TV_onNewNodeFromTilt()
+  {
+    if (!this.inspector) {
+      return;
+    }
+    let nodeIndex = this.presenter._currentSelection;
+    if (nodeIndex < 0) {
+      this.inspector.selection.setNode(null, "tilt");
+    }
+    let node = this.presenter._traverseData.nodes[nodeIndex];
+    this.inspector.selection.setNode(node, "tilt");
+  },
 };
 
 /**
@@ -172,7 +295,7 @@ TiltVisualizer.Presenter = function TV_Presenter(
   this.canvas = aCanvas;
 
   /**
-   * Save a reference to the top-level window, to access InspectorUI or Tilt.
+   * Save a reference to the top-level window, to access Tilt.
    */
   this.chromeWindow = aChromeWindow;
 
@@ -231,7 +354,6 @@ TiltVisualizer.Presenter = function TV_Presenter(
    * Variables holding information about the initial and current node selected.
    */
   this._currentSelection = -1; // the selected node index
-  this._initialSelection = false; // true if an initial selection was made
   this._initialMeshConfiguration = false; // true if the 3D mesh was configured
 
   /**
@@ -267,7 +389,6 @@ TiltVisualizer.Presenter.prototype = {
   _setup: function TVP__setup()
   {
     let renderer = this._renderer;
-    let inspector = this.chromeWindow.InspectorUI;
 
     // if the renderer was destroyed, don't continue setup
     if (!renderer || !renderer.context) {
@@ -283,9 +404,7 @@ TiltVisualizer.Presenter.prototype = {
     });
 
     // get the document zoom to properly scale the visualization
-    if (inspector.highlighter) {
-      this.transforms.zoom = inspector.highlighter.zoom;
-    }
+    this.transforms.zoom = this._getPageZoom();
 
     // bind the owner object to the necessary functions
     TiltUtils.bindObjectFunc(this, "^_on");
@@ -297,6 +416,17 @@ TiltVisualizer.Presenter.prototype = {
     this.canvas.focus();
   },
 
+  /**
+   * Get page zoom factor.
+   * @return {Number}
+   */
+  _getPageZoom: function TVP__getPageZoom() {
+    return this.contentWindow
+      .QueryInterface(Ci.nsIInterfaceRequestor)
+      .getInterface(Ci.nsIDOMWindowUtils)
+      .fullZoom;
+  },
+
   /**
    * The animation logic.
    */
@@ -553,16 +683,6 @@ TiltVisualizer.Presenter.prototype = {
       });
     }
 
-    // if there's no initial selection made, highlight the required node
-    if (!this._initialSelection) {
-      this._initialSelection = true;
-      this.highlightNode(this.chromeWindow.InspectorUI.selection);
-
-      if (this._currentSelection === 0) { // if the "html" node is selected
-        this._highlight.disabled = true;
-      }
-    }
-
     // configure the required mesh transformations and background only once
     if (!this._initialMeshConfiguration) {
       this._initialMeshConfiguration = true;
@@ -635,7 +755,7 @@ TiltVisualizer.Presenter.prototype = {
    */
   _onResize: function TVP_onResize(e)
   {
-    let zoom = this.chromeWindow.InspectorUI.highlighter.zoom;
+    let zoom = this._getPageZoom();
     let width = e.target.innerWidth * zoom;
     let height = e.target.innerHeight * zoom;
 
@@ -738,7 +858,6 @@ TiltVisualizer.Presenter.prototype = {
 
     let highlight = this._highlight;
     let info = this._traverseData.info[aNodeIndex];
-    let node = this._traverseData.nodes[aNodeIndex];
     let style = TiltVisualizerStyle.nodes;
 
     highlight.disabled = false;
@@ -759,10 +878,6 @@ TiltVisualizer.Presenter.prototype = {
 
     this._currentSelection = aNodeIndex;
 
-    this.chromeWindow.InspectorUI.inspectNode(node,
-      this.contentWindow.innerHeight < y ||
-      this.contentWindow.pageYOffset > 0);
-
     // if something is highlighted, make sure it's inside the current viewport;
     // the point which should be moved into view is considered the center [x, y]
     // position along the top edge of the currently selected node
@@ -846,7 +961,7 @@ TiltVisualizer.Presenter.prototype = {
       }
     }, false);
 
-    let zoom = this.chromeWindow.InspectorUI.highlighter.zoom;
+    let zoom = this._getPageZoom();
     let width = this._renderer.width * zoom;
     let height = this._renderer.height * zoom;
     x *= zoom;
@@ -1283,9 +1398,11 @@ TiltVisualizer.Controller.prototype = {
    */
   _onKeyPress: function TVC__onKeyPress(e)
   {
-    let tilt = this.presenter.chromeWindow.Tilt;
-
     if (e.keyCode === e.DOM_VK_ESCAPE) {
+      let mod = {};
+      Cu.import("resource:///modules/devtools/Tilt.jsm", mod);
+      let tilt =
+        mod.TiltManager.getTiltForBrowser(this.presenter.chromeWindow);
       e.preventDefault();
       e.stopPropagation();
       tilt.destroy(tilt.currentWindowId, true);
@@ -1304,7 +1421,7 @@ TiltVisualizer.Controller.prototype = {
    */
   _onResize: function TVC__onResize(e)
   {
-    let zoom = this.presenter.chromeWindow.InspectorUI.highlighter.zoom;
+    let zoom = this.presenter._getPageZoom();
     let width = e.target.innerWidth * zoom;
     let height = e.target.innerHeight * zoom;
 
diff --git a/browser/devtools/tilt/test/Makefile.in b/browser/devtools/tilt/test/Makefile.in
index 0083aa512956..83794742fb46 100644
--- a/browser/devtools/tilt/test/Makefile.in
+++ b/browser/devtools/tilt/test/Makefile.in
@@ -16,7 +16,6 @@ MOCHITEST_BROWSER_FILES = \
 	browser_tilt_02_notifications-seq.js \
 	browser_tilt_02_notifications.js \
 	browser_tilt_03_tab_switch.js \
-	browser_tilt_04_initialization-key.js \
 	browser_tilt_04_initialization.js \
 	browser_tilt_05_destruction-esc.js \
 	browser_tilt_05_destruction-url.js \
diff --git a/browser/devtools/tilt/test/browser_tilt_03_tab_switch.js b/browser/devtools/tilt/test/browser_tilt_03_tab_switch.js
index 62b599328b93..0ea5c886f4ec 100644
--- a/browser/devtools/tilt/test/browser_tilt_03_tab_switch.js
+++ b/browser/devtools/tilt/test/browser_tilt_03_tab_switch.js
@@ -26,22 +26,8 @@ function createTab1() {
 
   tab1 = createTab(function() {
     createTilt({
-      onInspectorOpen: function()
-      {
-        ok(Tilt.tiltButton.checked === false,
-          "The toolbar tilt button shouldn't be pressed before Tilt is open.");
-        ok(InspectorUI.inspecting,
-          "The Inspector should be inspecting for tab1.");
-        ok(InspectorUI.highlighter.hidden === false,
-          "The Highlighter should be visible for tab1.");
-      },
       onTiltOpen: function()
       {
-        ok(InspectorUI.inspecting === false,
-          "The Inspector should not be inspecting for tab1 after Tilt is open.");
-        ok(InspectorUI.highlighter.hidden,
-          "The Highlighter should not be visible for tab1 after Tilt is open.");
-
         createTab2();
       }
     }, false, function suddenDeath()
@@ -56,22 +42,8 @@ function createTab2() {
   tab2 = createTab(function() {
 
     createTilt({
-      onInspectorOpen: function()
-      {
-        ok(Tilt.tiltButton.checked === false,
-          "The toolbar tilt button shouldn't be pressed before Tilt is open.");
-        ok(InspectorUI.inspecting,
-          "The Inspector should be inspecting for tab2.");
-        ok(InspectorUI.highlighter.hidden === false,
-          "The Highlighter should be visible for tab2.");
-      },
       onTiltOpen: function()
       {
-        ok(InspectorUI.inspecting === false,
-          "The Inspector should not be inspecting for tab2 after Tilt is open.");
-        ok(InspectorUI.highlighter.hidden,
-          "The Highlighter should be visible for tab2 after Tilt is open.");
-
         testStep = 0;
         tabSelect();
       }
@@ -85,77 +57,28 @@ function createTab2() {
 
 let testSteps = [
   function step0() {
-    ok(Tilt.tiltButton.checked === true,
-      "The toolbar tilt button should have been pressed at step0 (tab 2).");
-    ok(InspectorUI.inspecting === false,
-      "The Inspector should not be inspecting at step0.");
-    ok(InspectorUI.highlighter.hidden,
-      "The Highlighter should be hidden at step0.");
-
     gBrowser.selectedTab = tab1;
   },
   function step1() {
-    ok(Tilt.tiltButton.checked === true,
-      "The toolbar tilt button should have been pressed at step1 (tab 1).");
-    ok(InspectorUI.inspecting === false,
-      "The Inspector should not be inspecting at step1.");
-    ok(InspectorUI.highlighter.hidden,
-      "The Highlighter should be hidden at step1.");
-
     gBrowser.selectedTab = tab0;
   },
   function step2() {
-    ok(Tilt.tiltButton.checked === false,
-      "The toolbar tilt button shouldn't have been pressed at step2 (tab 0).");
-    ok(InspectorUI.inspecting === false,
-      "The Inspector should not be inspecting at step2.");
-    is(InspectorUI.highlighter, null,
-      "The Highlighter should be dead while in step2.");
-
     gBrowser.selectedTab = tab1;
   },
   function step3() {
-    ok(Tilt.tiltButton.checked === true,
-      "The toolbar tilt button should have been pressed at step3 (tab 1).");
-    ok(InspectorUI.inspecting === false,
-      "The Inspector should not be inspecting at step3.");
-    ok(InspectorUI.highlighter.hidden,
-      "The Highlighter should be hidden at step3.");
-
     gBrowser.selectedTab = tab2;
   },
   function step4() {
-    ok(Tilt.tiltButton.checked === true,
-      "The toolbar tilt button should have been pressed at step4 (tab 2).");
-    ok(InspectorUI.inspecting === false,
-      "The Inspector should not be inspecting at step4.");
-    ok(InspectorUI.highlighter.hidden,
-      "The Highlighter should be hidden at step4.");
-
     Tilt.destroy(Tilt.currentWindowId);
     gBrowser.removeCurrentTab();
     tab2 = null;
   },
   function step5() {
-    ok(Tilt.tiltButton.checked === true,
-      "The toolbar tilt button should have been pressed at step5 (tab 1).");
-    ok(InspectorUI.inspecting === false,
-      "The Inspector should not be inspecting at step5.");
-    ok(InspectorUI.highlighter.hidden,
-      "The Highlighter should be hidden at step5.");
-
     Tilt.destroy(Tilt.currentWindowId);
     gBrowser.removeCurrentTab();
     tab1 = null;
   },
   function step6_cleanup() {
-    ok(Tilt.tiltButton.checked === false,
-      "The toolbar tilt button shouldn't have been pressed at step6 (tab 0).");
-    ok(InspectorUI.inspecting === false,
-      "The Inspector should not be inspecting at step6.");
-    is(InspectorUI.highlighter, null,
-      "The Highlighter should be dead while in step6.");
-
     cleanup();
   }
 ];
diff --git a/browser/devtools/tilt/test/browser_tilt_04_initialization-key.js b/browser/devtools/tilt/test/browser_tilt_04_initialization-key.js
deleted file mode 100644
index 0acd791dfd31..000000000000
--- a/browser/devtools/tilt/test/browser_tilt_04_initialization-key.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-let id;
-let tiltKey;
-let eventType;
-
-function test() {
-  if (!isTiltEnabled()) {
-    info("Skipping initialization key test because Tilt isn't enabled.");
-    return;
-  }
-  if (!isWebGLSupported()) {
-    info("Skipping initialization key test because WebGL isn't supported.");
-    return;
-  }
-
-  waitForExplicitFinish();
-
-  id = TiltUtils.getWindowId(gBrowser.selectedBrowser.contentWindow);
-  tiltKey = Tilt.tiltButton.getAttribute("accesskey");
-
-  if ("nsILocalFileMac" in Ci) {
-    eventType = { type: "keypress", ctrlKey: true };
-  } else {
-    eventType = { type: "keypress", altKey: true };
-  }
-
-  Services.obs.addObserver(onInspectorOpen, INSPECTOR_OPENED, false);
-  InspectorUI.toggleInspectorUI();
-}
-
-function suddenDeath() {
-  Services.obs.removeObserver(onTiltOpen, INITIALIZING);
-  cleanup();
-}
-
-function onInspectorOpen() {
-  Services.obs.removeObserver(onInspectorOpen, INSPECTOR_OPENED);
-
-  executeSoon(function() {
-    is(Tilt.visualizers[id], null,
-      "A instance of the visualizer shouldn't be initialized yet.");
-
-    info("Pressing the accesskey should open Tilt.");
-
-    Tilt.failureCallback = suddenDeath;
-
-    Services.obs.addObserver(onTiltOpen, INITIALIZING, false);
-    EventUtils.synthesizeKey(tiltKey, eventType);
-  });
-}
-
-function onTiltOpen() {
-  Services.obs.removeObserver(onTiltOpen, INITIALIZING);
-
-  executeSoon(function() {
-    ok(Tilt.visualizers[id] instanceof TiltVisualizer,
-      "A new instance of the visualizer wasn't created properly.");
-    ok(Tilt.visualizers[id].isInitialized(),
-      "The new instance of the visualizer wasn't initialized properly.");
-
-    info("Pressing the accesskey again should close Tilt.");
-
-    Services.obs.addObserver(onTiltClose, DESTROYED, false);
-    EventUtils.synthesizeKey(tiltKey, eventType);
-  });
-}
-
-function onTiltClose() {
-  is(Tilt.visualizers[id], null,
-    "The current instance of the visualizer wasn't destroyed properly.");
-
-  cleanup();
-}
-
-function cleanup() {
-  Tilt.failureCallback = null;
-  InspectorUI.closeInspectorUI();
-  finish();
-}
diff --git a/browser/devtools/tilt/test/browser_tilt_04_initialization.js b/browser/devtools/tilt/test/browser_tilt_04_initialization.js
index b4f34869c3da..314fb22e6645 100644
--- a/browser/devtools/tilt/test/browser_tilt_04_initialization.js
+++ b/browser/devtools/tilt/test/browser_tilt_04_initialization.js
@@ -21,10 +21,6 @@ function test() {
       "The unique window identifiers should match for the same window.");
 
     createTilt({
-      onInspectorOpen: function() {
-        is(Tilt.visualizers[id], null,
-          "A instance of the visualizer shouldn't be initialized yet.");
-      },
       onTiltOpen: function(instance)
       {
         is(document.activeElement, instance.presenter.canvas,
diff --git a/browser/devtools/tilt/test/browser_tilt_05_destruction-esc.js b/browser/devtools/tilt/test/browser_tilt_05_destruction-esc.js
index c3e1fbfb563a..503f7925451a 100644
--- a/browser/devtools/tilt/test/browser_tilt_05_destruction-esc.js
+++ b/browser/devtools/tilt/test/browser_tilt_05_destruction-esc.js
@@ -39,9 +39,6 @@ function finalize() {
   is(Tilt.visualizers[id], null,
     "The current instance of the visualizer wasn't destroyed properly.");
 
-  ok(InspectorUI.highlighter && InspectorUI.breadcrumbs,
-    "The Inspector should not close while Tilt is opened.");
-
   cleanup();
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_05_destruction.js b/browser/devtools/tilt/test/browser_tilt_05_destruction.js
index 0f78eb3aaa0e..a083fa1bcbc1 100644
--- a/browser/devtools/tilt/test/browser_tilt_05_destruction.js
+++ b/browser/devtools/tilt/test/browser_tilt_05_destruction.js
@@ -23,7 +23,7 @@ function test() {
         tiltOpened = true;
 
         Services.obs.addObserver(finalize, DESTROYED, false);
-        InspectorUI.closeInspectorUI();
+        Tilt.destroy(Tilt.currentWindowId);
       }
     }, false, function suddenDeath()
     {
diff --git a/browser/devtools/tilt/test/browser_tilt_arcball-reset-typeahead.js b/browser/devtools/tilt/test/browser_tilt_arcball-reset-typeahead.js
index f70223be9395..366bfa323180 100644
--- a/browser/devtools/tilt/test/browser_tilt_arcball-reset-typeahead.js
+++ b/browser/devtools/tilt/test/browser_tilt_arcball-reset-typeahead.js
@@ -31,7 +31,7 @@ function test() {
 
           Services.prefs.setBoolPref("accessibility.typeaheadfind", false);
           Services.obs.addObserver(cleanup, DESTROYED, false);
-          InspectorUI.closeInspectorUI();
+          Tilt.destroy(Tilt.currentWindowId);
         });
       }
     }, false, function suddenDeath()
diff --git a/browser/devtools/tilt/test/browser_tilt_arcball-reset.js b/browser/devtools/tilt/test/browser_tilt_arcball-reset.js
index 4d64d9be8de6..72e11236e679 100644
--- a/browser/devtools/tilt/test/browser_tilt_arcball-reset.js
+++ b/browser/devtools/tilt/test/browser_tilt_arcball-reset.js
@@ -29,7 +29,7 @@ function test() {
           info("Killing arcball reset test.");
 
           Services.obs.addObserver(cleanup, DESTROYED, false);
-          InspectorUI.closeInspectorUI();
+          Tilt.destroy(Tilt.currentWindowId);
         });
       }
     }, false, function suddenDeath()
diff --git a/browser/devtools/tilt/test/browser_tilt_picking.js b/browser/devtools/tilt/test/browser_tilt_picking.js
index ba7a0b968e7a..c79056a3b4cf 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking.js
@@ -34,7 +34,7 @@ function test() {
 
               pickDone = true;
               Services.obs.addObserver(cleanup, DESTROYED, false);
-              InspectorUI.closeInspectorUI();
+              Tilt.destroy(Tilt.currentWindowId);
             }
           });
         };
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_delete.js b/browser/devtools/tilt/test/browser_tilt_picking_delete.js
index 95e6b7c69339..c45d44b03446 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking_delete.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking_delete.js
@@ -65,7 +65,7 @@ function whenNodeRemoved() {
 
   executeSoon(function() {
     Services.obs.addObserver(cleanup, DESTROYED, false);
-    InspectorUI.closeInspectorUI();
+    Tilt.destroy(Tilt.currentWindowId);
   });
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight01-offs.js b/browser/devtools/tilt/test/browser_tilt_picking_highlight01-offs.js
index 4c3624d90a1d..abfd4f586ffd 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking_highlight01-offs.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking_highlight01-offs.js
@@ -64,7 +64,7 @@ function whenUnhighlighting() {
   executeSoon(function() {
     Services.obs.removeObserver(whenUnhighlighting, UNHIGHLIGHTING);
     Services.obs.addObserver(cleanup, DESTROYED, false);
-    InspectorUI.closeInspectorUI();
+    Tilt.destroy(Tilt.currentWindowId);
   });
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight01.js b/browser/devtools/tilt/test/browser_tilt_picking_highlight01.js
index b498d2ac07c6..82871270ef33 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking_highlight01.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking_highlight01.js
@@ -64,7 +64,7 @@ function whenUnhighlighting() {
   executeSoon(function() {
     Services.obs.removeObserver(whenUnhighlighting, UNHIGHLIGHTING);
     Services.obs.addObserver(cleanup, DESTROYED, false);
-    InspectorUI.closeInspectorUI();
+    Tilt.destroy(Tilt.currentWindowId);
   });
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js b/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js
index 9d873d1ea181..fc8d0fc51577 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js
@@ -59,7 +59,7 @@ function whenUnhighlighting() {
   executeSoon(function() {
     Services.obs.removeObserver(whenUnhighlighting, UNHIGHLIGHTING);
     Services.obs.addObserver(cleanup, DESTROYED, false);
-    InspectorUI.closeInspectorUI();
+    Tilt.destroy(Tilt.currentWindowId);
   });
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight03.js b/browser/devtools/tilt/test/browser_tilt_picking_highlight03.js
index 0412b76b586e..721189f65c37 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking_highlight03.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking_highlight03.js
@@ -59,7 +59,7 @@ function whenUnhighlighting() {
   executeSoon(function() {
     Services.obs.removeObserver(whenUnhighlighting, UNHIGHLIGHTING);
     Services.obs.addObserver(cleanup, DESTROYED, false);
-    InspectorUI.closeInspectorUI();
+    Tilt.destroy(Tilt.currentWindowId);
   });
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_miv.js b/browser/devtools/tilt/test/browser_tilt_picking_miv.js
index ebac1272174d..64b911a0020a 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking_miv.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking_miv.js
@@ -65,7 +65,7 @@ function whenBringingIntoView() {
   executeSoon(function() {
     Services.obs.removeObserver(whenHighlighting, HIGHLIGHTING);
     Services.obs.addObserver(cleanup, DESTROYED, false);
-    InspectorUI.closeInspectorUI();
+    Tilt.destroy(Tilt.currentWindowId);
   });
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_visualizer.js b/browser/devtools/tilt/test/browser_tilt_visualizer.js
index fbbcb737317e..0f25a04fd84e 100644
--- a/browser/devtools/tilt/test/browser_tilt_visualizer.js
+++ b/browser/devtools/tilt/test/browser_tilt_visualizer.js
@@ -19,7 +19,8 @@ function test() {
     chromeWindow: window,
     contentWindow: gBrowser.selectedBrowser.contentWindow,
     parentNode: gBrowser.selectedBrowser.parentNode,
-    inspectorUI: window.InspectorUI,
+    notifications: Tilt.NOTIFICATIONS,
+    tab: gBrowser.selectedTab,
 
     onError: function onWebGLError()
     {
diff --git a/browser/devtools/tilt/test/browser_tilt_zoom.js b/browser/devtools/tilt/test/browser_tilt_zoom.js
index 104bd113a05a..af6ac2c91414 100644
--- a/browser/devtools/tilt/test/browser_tilt_zoom.js
+++ b/browser/devtools/tilt/test/browser_tilt_zoom.js
@@ -19,16 +19,14 @@ function test() {
   waitForExplicitFinish();
 
   createTab(function() {
+    TiltUtils.setDocumentZoom(window, ZOOM);
+
     createTilt({
-      onInspectorOpen: function()
-      {
-        TiltUtils.setDocumentZoom(window, ZOOM);
-      },
       onTiltOpen: function(instance)
       {
         tiltOpened = true;
 
-        ok(isApprox(InspectorUI.highlighter.zoom, ZOOM),
+        ok(isApprox(instance.presenter._getPageZoom(), ZOOM),
           "The Highlighter zoom doesn't have the expected results.");
 
         ok(isApprox(instance.presenter.transforms.zoom, ZOOM),
@@ -75,7 +73,7 @@ function test() {
 
 
           Services.obs.addObserver(cleanup, DESTROYED, false);
-          InspectorUI.closeInspectorUI();
+          Tilt.destroy(Tilt.currentWindowId);
         });
       }
     }, false, function suddenDeath()
diff --git a/browser/devtools/tilt/test/head.js b/browser/devtools/tilt/test/head.js
index 83fe62c1a6c1..349cf6f6dc1f 100644
--- a/browser/devtools/tilt/test/head.js
+++ b/browser/devtools/tilt/test/head.js
@@ -3,11 +3,13 @@
 "use strict";
 
 let tempScope = {};
+Components.utils.import("resource:///modules/devtools/Tilt.jsm", tempScope);
 Components.utils.import("resource:///modules/devtools/TiltGL.jsm", tempScope);
 Components.utils.import("resource:///modules/devtools/TiltMath.jsm", tempScope);
 Components.utils.import("resource:///modules/devtools/TiltUtils.jsm", tempScope);
 Components.utils.import("resource:///modules/devtools/TiltVisualizer.jsm", tempScope);
 Components.utils.import("resource:///modules/devtools/LayoutHelpers.jsm", tempScope);
+let TiltManager = tempScope.TiltManager;
 let TiltGL = tempScope.TiltGL;
 let EPSILON = tempScope.EPSILON;
 let TiltMath = tempScope.TiltMath;
@@ -46,8 +48,7 @@ const DEFAULT_HTML = "data:text/html," +
     "<body>" +
   "</html>";
 
-const INSPECTOR_OPENED = InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED;
-const INSPECTOR_CLOSED = InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED;
+let Tilt = TiltManager.getTiltForBrowser(window);
 
 const INITIALIZING = Tilt.NOTIFICATIONS.INITIALIZING;
 const INITIALIZED = Tilt.NOTIFICATIONS.INITIALIZED;
@@ -143,30 +144,14 @@ function createTilt(callbacks, close, suddenDeath) {
                    ", autoclose param " + close +
           ", and sudden death handler " + typeof suddenDeath + ".");
 
+  handleFailure(suddenDeath);
+
   Services.prefs.setBoolPref("webgl.verbose", true);
   TiltUtils.Output.suppressAlerts = true;
 
-  info("Attempting to start the inspector.");
-  Services.obs.addObserver(onInspectorOpen, INSPECTOR_OPENED, false);
-  InspectorUI.toggleInspectorUI();
-
-  function onInspectorOpen() {
-    info("Inspector was opened.");
-    Services.obs.removeObserver(onInspectorOpen, INSPECTOR_OPENED);
-
-    executeSoon(function() {
-      if ("function" === typeof callbacks.onInspectorOpen) {
-        info("Calling 'onInspectorOpen'.");
-        callbacks.onInspectorOpen();
-      }
-      executeSoon(function() {
-        info("Attempting to start Tilt.");
-        Services.obs.addObserver(onTiltOpen, INITIALIZING, false);
-        handleFailure(suddenDeath);
-        Tilt.initialize();
-      });
-    });
-  }
+  info("Attempting to start Tilt.");
+  Services.obs.addObserver(onTiltOpen, INITIALIZING, false);
+  Tilt.initializeForCurrentTab();
 
   function onTiltOpen() {
     info("Tilt was opened.");
@@ -196,25 +181,6 @@ function createTilt(callbacks, close, suddenDeath) {
         info("Calling 'onTiltClose'.");
         callbacks.onTiltClose();
       }
-      if (close) {
-        executeSoon(function() {
-          info("Attempting to close the Inspector.");
-          Services.obs.addObserver(onInspectorClose, INSPECTOR_CLOSED, false);
-          InspectorUI.closeInspectorUI();
-        });
-      }
-    });
-  }
-
-  function onInspectorClose() {
-    info("Inspector was closed.");
-    Services.obs.removeObserver(onInspectorClose, INSPECTOR_CLOSED);
-
-    executeSoon(function() {
-      if ("function" === typeof callbacks.onInspectorClose) {
-        info("Calling 'onInspectorClose'.");
-        callbacks.onInspectorClose();
-      }
       if ("function" === typeof callbacks.onEnd) {
         info("Calling 'onEnd'.");
         callbacks.onEnd();
diff --git a/browser/devtools/webconsole/HUDService.jsm b/browser/devtools/webconsole/HUDService.jsm
index 5f901d74a713..e19212512444 100644
--- a/browser/devtools/webconsole/HUDService.jsm
+++ b/browser/devtools/webconsole/HUDService.jsm
@@ -13,6 +13,10 @@ const Cu = Components.utils;
 const CONSOLEAPI_CLASS_ID = "{b49c18f8-3379-4fc0-8c90-d7772c1a9ff3}";
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource:///modules/devtools/gDevTools.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
+                                  "resource:///modules/devtools/Target.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
                                   "resource://gre/modules/Services.jsm");
@@ -42,24 +46,6 @@ const HTML_NS = "http://www.w3.org/1999/xhtml";
 // The XUL namespace.
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-
-// Possible directions that can be passed to HUDService.animate().
-const ANIMATE_OUT = 0;
-const ANIMATE_IN = 1;
-
-// Minimum console height, in pixels.
-const MINIMUM_CONSOLE_HEIGHT = 150;
-
-// Minimum page height, in pixels. This prevents the Web Console from
-// remembering a height that covers the whole page.
-const MINIMUM_PAGE_HEIGHT = 50;
-
-// The default console height, as a ratio from the content window inner height.
-const DEFAULT_CONSOLE_HEIGHT = 0.33;
-
-// points to the file to load in the Web Console iframe.
-const UI_IFRAME_URL = "chrome://browser/content/devtools/webconsole.xul";
-
 ///////////////////////////////////////////////////////////////////////////
 //// The HUD service
 
@@ -67,13 +53,8 @@ function HUD_SERVICE()
 {
   // These methods access the "this" object, but they're registered as
   // event listeners. So we hammer in the "this" binding.
-  this.onTabClose = this.onTabClose.bind(this);
-  this.onTabSelect = this.onTabSelect.bind(this);
   this.onWindowUnload = this.onWindowUnload.bind(this);
 
-  // Remembers the last console height, in pixels.
-  this.lastConsoleHeight = Services.prefs.getIntPref("devtools.hud.height");
-
   /**
    * Keeps a reference for each HeadsUpDisplay that is created
    */
@@ -111,19 +92,15 @@ HUD_SERVICE.prototype =
    *
    * @param nsIDOMElement aTab
    *        The xul:tab element.
-   * @param boolean aAnimated
-   *        True if you want to animate the opening of the Web console.
-   * @param object aOptions
-   *        Options for the Web Console:
-   *        - host
-   *          Server to connect to.
-   *        - port
-   *          Port to connect to.
+   * @param nsIDOMElement aIframe
+   *        The iframe element into which to place the web console.
+   * @param RemoteTarget aTarget
+   *        The target that the web console will connect to.
    * @return object
    *         The new HeadsUpDisplay instance.
    */
-  activateHUDForContext:
-  function HS_activateHUDForContext(aTab, aAnimated, aOptions)
+  activateHUDForContext: function HS_activateHUDForContext(aTab, aIframe,
+                                                           aTarget)
   {
     let hudId = "hud_" + aTab.linkedPanel;
     if (hudId in this.hudReferences) {
@@ -135,19 +112,11 @@ HUD_SERVICE.prototype =
     let window = aTab.ownerDocument.defaultView;
     let gBrowser = window.gBrowser;
 
-    gBrowser.tabContainer.addEventListener("TabClose", this.onTabClose, false);
-    gBrowser.tabContainer.addEventListener("TabSelect", this.onTabSelect, false);
     window.addEventListener("unload", this.onWindowUnload, false);
 
-    let hud = new WebConsole(aTab, aOptions);
+    let hud = new WebConsole(aTab, aIframe, aTarget);
     this.hudReferences[hudId] = hud;
 
-    if (!aAnimated || hud.consolePanel) {
-      this.disableAnimation(hudId);
-    }
-
-    HeadsUpDisplayUICommands.refreshCommand();
-
     return hud;
   },
 
@@ -156,21 +125,15 @@ HUD_SERVICE.prototype =
    *
    * @param nsIDOMElement aTab
    *        The xul:tab element you want to enable the Web Console for.
-   * @param boolean aAnimated
-   *        True if you want to animate the closing of the Web console.
    * @return void
    */
-  deactivateHUDForContext: function HS_deactivateHUDForContext(aTab, aAnimated)
+  deactivateHUDForContext: function HS_deactivateHUDForContext(aTab)
   {
     let hudId = "hud_" + aTab.linkedPanel;
     if (!(hudId in this.hudReferences)) {
       return;
     }
 
-    if (!aAnimated) {
-      this.storeHeight(hudId);
-    }
-
     let hud = this.getHudReferenceById(hudId);
     let document = hud.chromeDocument;
 
@@ -194,16 +157,12 @@ HUD_SERVICE.prototype =
 
       let gBrowser = window.gBrowser;
       let tabContainer = gBrowser.tabContainer;
-      tabContainer.removeEventListener("TabClose", this.onTabClose, false);
-      tabContainer.removeEventListener("TabSelect", this.onTabSelect, false);
 
       this.suspend();
     }
 
     let contentWindow = aTab.linkedBrowser.contentWindow;
     contentWindow.focus();
-
-    HeadsUpDisplayUICommands.refreshCommand();
   },
 
   /**
@@ -255,7 +214,7 @@ HUD_SERVICE.prototype =
   shutdown: function HS_shutdown()
   {
     for (let hud of this.hudReferences) {
-      this.deactivateHUDForContext(hud.tab, false);
+      this.deactivateHUDForContext(hud.tab);
     }
   },
 
@@ -330,28 +289,6 @@ HUD_SERVICE.prototype =
     return sequencer(aInt);
   },
 
-  /**
-   * onTabClose event handler function
-   *
-   * @param aEvent
-   * @returns void
-   */
-  onTabClose: function HS_onTabClose(aEvent)
-  {
-    this.deactivateHUDForContext(aEvent.target, false);
-  },
-
-  /**
-   * onTabSelect event handler function
-   *
-   * @param aEvent
-   * @returns void
-   */
-  onTabSelect: function HS_onTabSelect(aEvent)
-  {
-    HeadsUpDisplayUICommands.refreshCommand();
-  },
-
   /**
    * Called whenever a browser window closes. Cleans up any consoles still
    * around.
@@ -369,125 +306,12 @@ HUD_SERVICE.prototype =
     let gBrowser = window.gBrowser;
     let tabContainer = gBrowser.tabContainer;
 
-    tabContainer.removeEventListener("TabClose", this.onTabClose, false);
-    tabContainer.removeEventListener("TabSelect", this.onTabSelect, false);
-
     let tab = tabContainer.firstChild;
     while (tab != null) {
-      this.deactivateHUDForContext(tab, false);
+      this.deactivateHUDForContext(tab);
       tab = tab.nextSibling;
     }
   },
-
-  /**
-   * Animates the Console appropriately.
-   *
-   * @param string aHUDId The ID of the console.
-   * @param string aDirection Whether to animate the console appearing
-   *        (ANIMATE_IN) or disappearing (ANIMATE_OUT).
-   * @param function aCallback An optional callback, which will be called with
-   *        the "transitionend" event passed as a parameter once the animation
-   *        finishes.
-   */
-  animate: function HS_animate(aHUDId, aDirection, aCallback)
-  {
-    let hudBox = this.getHudReferenceById(aHUDId).iframe;
-    if (!hudBox.hasAttribute("animated")) {
-      if (aCallback) {
-        aCallback();
-      }
-      return;
-    }
-
-    switch (aDirection) {
-      case ANIMATE_OUT:
-        hudBox.style.height = 0;
-        break;
-      case ANIMATE_IN:
-        this.resetHeight(aHUDId);
-        break;
-    }
-
-    if (aCallback) {
-      hudBox.addEventListener("transitionend", aCallback, false);
-    }
-  },
-
-  /**
-   * Disables all animation for a console, for unit testing. After this call,
-   * the console will instantly take on a reasonable height, and the close
-   * animation will not occur.
-   *
-   * @param string aHUDId The ID of the console.
-   */
-  disableAnimation: function HS_disableAnimation(aHUDId)
-  {
-    let hudBox = HUDService.hudReferences[aHUDId].iframe;
-    if (hudBox.hasAttribute("animated")) {
-      hudBox.removeAttribute("animated");
-      this.resetHeight(aHUDId);
-    }
-  },
-
-  /**
-   * Reset the height of the Web Console.
-   *
-   * @param string aHUDId The ID of the Web Console.
-   */
-  resetHeight: function HS_resetHeight(aHUDId)
-  {
-    let HUD = this.hudReferences[aHUDId];
-    let innerHeight = HUD.tab.linkedBrowser.clientHeight;
-    let chromeWindow = HUD.chromeWindow;
-    if (!HUD.consolePanel) {
-      let splitterStyle = chromeWindow.getComputedStyle(HUD.splitter, null);
-      innerHeight += parseInt(splitterStyle.height) +
-                     parseInt(splitterStyle.borderTopWidth) +
-                     parseInt(splitterStyle.borderBottomWidth) +
-                     parseInt(splitterStyle.marginTop) +
-                     parseInt(splitterStyle.marginBottom);
-    }
-
-    let boxStyle = chromeWindow.getComputedStyle(HUD.iframe, null);
-    innerHeight += parseInt(boxStyle.height) +
-                   parseInt(boxStyle.borderTopWidth) +
-                   parseInt(boxStyle.borderBottomWidth);
-
-    let height = this.lastConsoleHeight > 0 ? this.lastConsoleHeight :
-      Math.ceil(innerHeight * DEFAULT_CONSOLE_HEIGHT);
-
-    if ((innerHeight - height) < MINIMUM_PAGE_HEIGHT) {
-      height = innerHeight - MINIMUM_PAGE_HEIGHT;
-    }
-
-    if (isNaN(height) || height < MINIMUM_CONSOLE_HEIGHT) {
-      height = MINIMUM_CONSOLE_HEIGHT;
-    }
-
-    HUD.iframe.style.height = height + "px";
-  },
-
-  /**
-   * Remember the height of the given Web Console, such that it can later be
-   * reused when other Web Consoles are open.
-   *
-   * @param string aHUDId The ID of the Web Console.
-   */
-  storeHeight: function HS_storeHeight(aHUDId)
-  {
-    let hudBox = this.hudReferences[aHUDId].iframe;
-    let window = hudBox.ownerDocument.defaultView;
-    let style = window.getComputedStyle(hudBox, null);
-    let height = parseInt(style.height);
-    height += parseInt(style.borderTopWidth);
-    height += parseInt(style.borderBottomWidth);
-    this.lastConsoleHeight = height;
-
-    let pref = Services.prefs.getIntPref("devtools.hud.height");
-    if (pref > -1) {
-      Services.prefs.setIntPref("devtools.hud.height", height);
-    }
-  },
 };
 
 
@@ -500,21 +324,36 @@ HUD_SERVICE.prototype =
  *
  * @param nsIDOMElement aTab
  *        The xul:tab for which you want the WebConsole object.
- * @param object aOptions
- *        Web Console options: host and port, for the remote Web console.
+ * @param nsIDOMElement aIframe
+ *        iframe into which we should create the WebConsole UI.
+ * @param RemoteTarget aTarget
+ *        The target that the web console will connect to.
  */
-function WebConsole(aTab, aOptions = {})
+function WebConsole(aTab, aIframe, aTarget)
 {
   this.tab = aTab;
+  if (this.tab == null) {
+    throw new Error('Missing tab');
+  }
+
+  this.iframe = aIframe;
+  if (this.iframe == null) {
+    console.trace();
+    throw new Error('Missing iframe');
+  }
+
   this.chromeDocument = this.tab.ownerDocument;
   this.chromeWindow = this.chromeDocument.defaultView;
   this.hudId = "hud_" + this.tab.linkedPanel;
 
-  this.remoteHost = aOptions.host;
-  this.remotePort = aOptions.port;
+  this.target = aTarget;
 
   this._onIframeLoad = this._onIframeLoad.bind(this);
-  this._initUI();
+
+  this.iframe.className = "web-console-frame";
+  this.iframe.addEventListener("load", this._onIframeLoad, true);
+
+  this.positionConsole();
 }
 
 WebConsole.prototype = {
@@ -535,12 +374,6 @@ WebConsole.prototype = {
    */
   get lastFinishedRequestCallback() HUDService.lastFinishedRequestCallback,
 
-  /**
-   * The xul:panel that holds the Web Console when it is positioned as a window.
-   * @type nsIDOMElement
-   */
-  consolePanel: null,
-
   /**
    * Getter for the xul:popupset that holds any popups we open.
    * @type nsIDOMElement
@@ -561,28 +394,6 @@ WebConsole.prototype = {
 
   get gViewSourceUtils() this.chromeWindow.gViewSourceUtils,
 
-  /**
-   * Initialize the Web Console UI. This method sets up the iframe.
-   * @private
-   */
-  _initUI: function WC__initUI()
-  {
-    this.splitter = this.chromeDocument.createElement("splitter");
-    this.splitter.className = "devtools-horizontal-splitter";
-
-    this.iframe = this.chromeDocument.createElement("iframe");
-    this.iframe.setAttribute("id", this.hudId);
-    this.iframe.className = "web-console-frame";
-    this.iframe.setAttribute("animated", "true");
-    this.iframe.setAttribute("tooltip", "aHTMLTooltip");
-    this.iframe.style.height = 0;
-    this.iframe.addEventListener("load", this._onIframeLoad, true);
-    this.iframe.setAttribute("src", UI_IFRAME_URL);
-
-    let position = Services.prefs.getCharPref("devtools.webconsole.position");
-    this.positionConsole(position);
-  },
-
   /**
    * The "load" event handler for the Web Console iframe.
    * @private
@@ -591,144 +402,8 @@ WebConsole.prototype = {
   {
     this.iframe.removeEventListener("load", this._onIframeLoad, true);
 
-    let position = Services.prefs.getCharPref("devtools.webconsole.position");
-
     this.iframeWindow = this.iframe.contentWindow.wrappedJSObject;
-    this.ui = new this.iframeWindow.WebConsoleFrame(this, position);
-  },
-
-  /**
-   * Create a panel to open the web console if it should float above
-   * the content in its own window.
-   * @private
-   */
-  _createOwnWindowPanel: function WC__createOwnWindowPanel()
-  {
-    if (this.consolePanel) {
-      return;
-    }
-
-    let width = 0;
-    try {
-      width = Services.prefs.getIntPref("devtools.webconsole.width");
-    }
-    catch (ex) {}
-
-    if (width < 1) {
-      width = this.iframe.clientWidth || this.chromeWindow.innerWidth;
-    }
-
-    let height = this.iframe.clientHeight;
-
-    let top = 0;
-    try {
-      top = Services.prefs.getIntPref("devtools.webconsole.top");
-    }
-    catch (ex) {}
-
-    let left = 0;
-    try {
-      left = Services.prefs.getIntPref("devtools.webconsole.left");
-    }
-    catch (ex) {}
-
-    let panel = this.chromeDocument.createElementNS(XUL_NS, "panel");
-
-    let config = { id: "console_window_" + this.hudId,
-                   label: this.getPanelTitle(),
-                   titlebar: "normal",
-                   noautohide: "true",
-                   norestorefocus: "true",
-                   close: "true",
-                   flex: "1",
-                   hudId: this.hudId,
-                   width: width,
-                   position: "overlap",
-                   top: top,
-                   left: left,
-                 };
-
-    for (let attr in config) {
-      panel.setAttribute(attr, config[attr]);
-    }
-
-    panel.classList.add("web-console-panel");
-
-    let onPopupShown = (function HUD_onPopupShown() {
-      panel.removeEventListener("popupshown", onPopupShown, false);
-
-      // Make sure that the HUDBox size updates when the panel is resized.
-
-      let height = panel.clientHeight;
-
-      this.iframe.style.height = "auto";
-      this.iframe.flex = 1;
-
-      panel.setAttribute("height", height);
-    }).bind(this);
-
-    panel.addEventListener("popupshown", onPopupShown,false);
-
-    let onPopupHidden = (function HUD_onPopupHidden(aEvent) {
-      if (aEvent.target != panel) {
-        return;
-      }
-
-      panel.removeEventListener("popuphidden", onPopupHidden, false);
-
-      let width = 0;
-      try {
-        width = Services.prefs.getIntPref("devtools.webconsole.width");
-      }
-      catch (ex) { }
-
-      if (width > 0) {
-        Services.prefs.setIntPref("devtools.webconsole.width", panel.clientWidth);
-      }
-
-      // Are we destroying the HUD or repositioning it?
-      if (this.consoleWindowUnregisterOnHide) {
-        HUDService.deactivateHUDForContext(this.tab, false);
-      }
-    }).bind(this);
-
-    panel.addEventListener("popuphidden", onPopupHidden, false);
-
-    let lastIndex = -1;
-
-    if (this.outputNode && this.outputNode.getIndexOfFirstVisibleRow) {
-      lastIndex = this.outputNode.getIndexOfFirstVisibleRow() +
-                  this.outputNode.getNumberOfVisibleRows() - 1;
-    }
-
-    if (this.splitter.parentNode) {
-      this.splitter.parentNode.removeChild(this.splitter);
-    }
-
-    this._beforePositionConsole("window", lastIndex);
-
-    panel.appendChild(this.iframe);
-
-    let space = this.chromeDocument.createElement("spacer");
-    space.flex = 1;
-
-    let bottomBox = this.chromeDocument.createElement("hbox");
-
-    let resizer = this.chromeDocument.createElement("resizer");
-    resizer.setAttribute("dir", "bottomend");
-    resizer.setAttribute("element", config.id);
-
-    bottomBox.appendChild(space);
-    bottomBox.appendChild(resizer);
-
-    panel.appendChild(bottomBox);
-
-    this.mainPopupSet.appendChild(panel);
-
-    panel.openPopup(null, "overlay", left, top, false, false);
-
-    this.consolePanel = panel;
-    this.consoleWindowUnregisterOnHide = true;
+    this.ui = new this.iframeWindow.WebConsoleFrame(this);
   },
 
   /**
@@ -743,44 +418,13 @@ WebConsole.prototype = {
     return l10n.getFormatStr("webConsoleWindowTitleAndURL", [url]);
   },
 
-  positions: {
-    above: 0, // the childNode index
-    below: 2,
-    window: null
-  },
-
   consoleWindowUnregisterOnHide: true,
 
   /**
    * Position the Web Console UI.
-   *
-   * @param string aPosition
-   *        The desired Web Console UI location: above, below or window.
    */
-  positionConsole: function WC_positionConsole(aPosition)
+  positionConsole: function WC_positionConsole()
   {
-    if (!(aPosition in this.positions)) {
-      throw new Error("Incorrect argument: " + aPosition +
-        ". Cannot position Web Console");
-    }
-
-    if (aPosition == "window") {
-      this._createOwnWindowPanel();
-      return;
-    }
-
-    let height = this.iframe.clientHeight;
-
-    // get the node position index
-    let nodeIdx = this.positions[aPosition];
-    let nBox = this.chromeDocument.getElementById(this.tab.linkedPanel);
-    let node = nBox.childNodes[nodeIdx];
-
-    // check to see if console is already positioned in aPosition
-    if (node == this.iframe) {
-      return;
-    }
-
     let lastIndex = -1;
 
     if (this.outputNode && this.outputNode.getIndexOfFirstVisibleRow) {
@@ -788,45 +432,18 @@ WebConsole.prototype = {
                   this.outputNode.getNumberOfVisibleRows() - 1;
     }
 
-    // remove the console and splitter and reposition
-    if (this.splitter.parentNode) {
-      this.splitter.parentNode.removeChild(this.splitter);
-    }
-
-    this._beforePositionConsole(aPosition, lastIndex);
-
-    if (aPosition == "below") {
-      nBox.appendChild(this.splitter);
-      nBox.appendChild(this.iframe);
-    }
-    else {
-      nBox.insertBefore(this.splitter, node);
-      nBox.insertBefore(this.iframe, this.splitter);
-    }
-
-    if (this.consolePanel) {
-      // must destroy the consolePanel
-      this.consoleWindowUnregisterOnHide = false;
-      this.consolePanel.hidePopup();
-      this.consolePanel.parentNode.removeChild(this.consolePanel);
-      this.consolePanel = null;   // remove this as we're not in panel anymore
-      this.iframe.removeAttribute("flex");
-      this.iframe.removeAttribute("height");
-      this.iframe.style.height = height + "px";
-    }
+    this._beforePositionConsole(lastIndex);
   },
 
   /**
    * Common code that needs to execute before the Web Console is repositioned.
    * @private
-   * @param string aPosition
-   *        The new position: "above", "below" or "window".
    * @param number aLastIndex
    *        The last visible message in the console output before repositioning
    *        occurred.
    */
   _beforePositionConsole:
-  function WC__beforePositionConsole(aPosition, aLastIndex)
+  function WC__beforePositionConsole(aLastIndex)
   {
     if (!this.ui) {
       return;
@@ -835,14 +452,11 @@ WebConsole.prototype = {
     let onLoad = function() {
       this.iframe.removeEventListener("load", onLoad, true);
       this.iframeWindow = this.iframe.contentWindow.wrappedJSObject;
-      this.ui.positionConsole(aPosition, this.iframeWindow);
+      this.ui.positionConsole(this.iframeWindow);
 
       if (aLastIndex > -1 && aLastIndex < this.outputNode.getRowCount()) {
         this.outputNode.ensureIndexIsVisible(aLastIndex);
       }
-
-      this._currentUIPosition = aPosition;
-      Services.prefs.setCharPref("devtools.webconsole.position", aPosition);
     }.bind(this);
 
     this.iframe.addEventListener("load", onLoad, true);
@@ -858,16 +472,6 @@ WebConsole.prototype = {
     return this.ui ? this.ui.jsterm : null;
   },
 
-  /**
-   * The close button handler.
-   */
-  onCloseButton: function WC_onCloseButton()
-  {
-    HUDService.animate(this.hudId, ANIMATE_OUT, function() {
-      HUDService.deactivateHUDForContext(this.tab, true);
-    }.bind(this));
-  },
-
   /**
    * The clear output button handler.
    * @private
@@ -877,22 +481,6 @@ WebConsole.prototype = {
     this.chromeWindow.DeveloperToolbar.resetErrorsCount(this.tab);
   },
 
-  /**
-   * Handler for page location changes. If the Web Console is
-   * opened in a panel the panel title is updated.
-   *
-   * @param string aURI
-   *        New page location.
-   * @param string aTitle
-   *        New page title.
-   */
-  onLocationChange: function WC_onLocationChange(aURI, aTitle)
-  {
-    if (this.consolePanel) {
-      this.consolePanel.label = this.getPanelTitle();
-    }
-  },
-
   /**
    * Alias for the WebConsoleFrame.setFilterState() method.
    * @see webconsole.js::WebConsoleFrame.setFilterState()
@@ -945,14 +533,14 @@ WebConsole.prototype = {
     let styleSheets = this.tab.linkedBrowser.contentWindow.document.styleSheets;
     for each (let style in styleSheets) {
       if (style.href == aSourceURL) {
-        let SEM = this.chromeWindow.StyleEditor.StyleEditorManager;
-        let win = SEM.getEditorForWindow(this.chromeWindow.content.window);
-        if (win) {
-          SEM.selectEditor(win, style, aSourceLine);
-        }
-        else {
-          this.chromeWindow.StyleEditor.openChrome(style, aSourceLine);
-        }
+        let target = TargetFactory.forTab(this.tab);
+        let gDevTools = this.chromeWindow.gDevTools;
+        let toolbox = gDevTools.getToolboxForTarget(target);
+        toolbox.once("styleeditor-selected",
+          function _onStyleEditorReady(aEvent, aPanel) {
+            aPanel.selectStyleSheet(style, aSourceLine);
+          });
+        toolbox.selectTool("styleeditor");
         return;
       }
     }
@@ -977,9 +565,7 @@ WebConsole.prototype = {
     let popupset = this.mainPopupSet;
     let panels = popupset.querySelectorAll("panel[hudId=" + this.hudId + "]");
     for (let panel of panels) {
-      if (panel != this.consolePanel) {
-        panel.hidePopup();
-      }
+      panel.hidePopup();
     }
 
     let onDestroy = function WC_onDestroyUI() {
@@ -995,10 +581,6 @@ WebConsole.prototype = {
         this.iframe.parentNode.removeChild(this.iframe);
       }
 
-      if (this.splitter.parentNode) {
-        this.splitter.parentNode.removeChild(this.splitter);
-      }
-
       aOnDestroy && aOnDestroy();
     }.bind(this);
 
@@ -1016,53 +598,11 @@ WebConsole.prototype = {
 //////////////////////////////////////////////////////////////////////////
 
 var HeadsUpDisplayUICommands = {
-  refreshCommand: function UIC_refreshCommand() {
-    var window = HUDService.currentContext();
-    if (!window) {
-      return;
-    }
-
-    let command = window.document.getElementById("Tools:WebConsole");
-    if (this.getOpenHUD() != null) {
-      command.setAttribute("checked", true);
-    } else {
-      command.setAttribute("checked", false);
-    }
-  },
-
   toggleHUD: function UIC_toggleHUD(aOptions)
   {
     var window = HUDService.currentContext();
-    var gBrowser = window.gBrowser;
-    var linkedBrowser = gBrowser.selectedTab.linkedBrowser;
-    var tabId = gBrowser.getNotificationBox(linkedBrowser).getAttribute("id");
-    var hudId = "hud_" + tabId;
-    var ownerDocument = gBrowser.selectedTab.ownerDocument;
-    var hud = ownerDocument.getElementById(hudId);
-    var hudRef = HUDService.hudReferences[hudId];
-
-    if (hudRef && hud) {
-      if (hudRef.consolePanel) {
-        hudRef.consolePanel.hidePopup();
-      }
-      else {
-        HUDService.storeHeight(hudId);
-
-        HUDService.animate(hudId, ANIMATE_OUT, function() {
-          // If the user closes the console while the console is animating away,
-          // then these callbacks will queue up, but all the callbacks after the
-          // first will have no console to operate on. This test handles this
-          // case gracefully.
-          if (ownerDocument.getElementById(hudId)) {
-            HUDService.deactivateHUDForContext(gBrowser.selectedTab, true);
-          }
-        });
-      }
-    }
-    else {
-      HUDService.activateHUDForContext(gBrowser.selectedTab, true, aOptions);
-      HUDService.animate(hudId, ANIMATE_IN);
-    }
+    let target = TargetFactory.forTab(window.gBrowser.selectedTab);
+    gDevTools.toggleToolboxForTarget(target, "webconsole");
   },
 
   toggleRemoteHUD: function UIC_toggleRemoteHUD()
@@ -1144,8 +684,5 @@ var WebConsoleObserver = {
   },
 };
 
-
-XPCOMUtils.defineLazyGetter(this, "HUDService", function () {
-  return new HUD_SERVICE();
-});
+const HUDService = new HUD_SERVICE();
 
diff --git a/browser/devtools/webconsole/Makefile.in b/browser/devtools/webconsole/Makefile.in
index ed66e5a9fb71..4e820ee84038 100644
--- a/browser/devtools/webconsole/Makefile.in
+++ b/browser/devtools/webconsole/Makefile.in
@@ -15,6 +15,7 @@ EXTRA_JS_MODULES = \
 		PropertyPanel.jsm \
 		NetworkPanel.jsm \
 		AutocompletePopup.jsm \
+		WebConsolePanel.jsm \
 		$(NULL)
 
 TEST_DIRS = test
diff --git a/browser/devtools/webconsole/WebConsolePanel.jsm b/browser/devtools/webconsole/WebConsolePanel.jsm
new file mode 100644
index 000000000000..feec3d7a4ae3
--- /dev/null
+++ b/browser/devtools/webconsole/WebConsolePanel.jsm
@@ -0,0 +1,102 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = [ "WebConsoleDefinition" ];
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "Services",
+                                  "resource://gre/modules/Services.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils",
+                                  "resource://gre/modules/devtools/WebConsoleUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "HUDService",
+                                  "resource:///modules/HUDService.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "EventEmitter",
+                                  "resource:///modules/devtools/EventEmitter.jsm");
+
+const STRINGS_URI = "chrome://browser/locale/devtools/webconsole.properties";
+let l10n = new WebConsoleUtils.l10n(STRINGS_URI);
+
+/**
+ * The external API allowing us to be registered with DevTools.jsm
+ */
+this.WebConsoleDefinition = {
+  id: "webconsole",
+  key: l10n.getStr("cmd.commandkey"),
+  accesskey: l10n.getStr("webConsoleCmd.accesskey"),
+  modifiers: Services.appinfo.OS == "Darwin" ? "accel,alt" : "accel,shift",
+  ordinal: 0,
+  icon: "chrome://browser/skin/devtools/webconsole-tool-icon.png",
+  url: "chrome://browser/content/devtools/webconsole.xul",
+  label: l10n.getStr("ToolboxWebconsole.label"),
+  isTargetSupported: function(target) {
+    return true;
+  },
+  build: function(iframeWindow, toolbox) {
+    return new WebConsolePanel(iframeWindow, toolbox);
+  }
+};
+
+/**
+ * A DevToolPanel that controls the Web Console.
+ */
+function WebConsolePanel(iframeWindow, toolbox) {
+  this._frameWindow = iframeWindow;
+  this._toolbox = toolbox;
+  new EventEmitter(this);
+
+  let tab = this._toolbox._getHostTab();
+  let parentDoc = iframeWindow.document.defaultView.parent.document;
+  let iframe = parentDoc.getElementById("toolbox-panel-iframe-webconsole");
+  this.hud = HUDService.activateHUDForContext(tab, iframe, toolbox.target);
+
+  let hudId = this.hud.hudId;
+  let onOpen = function _onWebConsoleOpen(aSubject)
+  {
+    aSubject.QueryInterface(Ci.nsISupportsString);
+    if (hudId == aSubject.data) {
+      Services.obs.removeObserver(onOpen, "web-console-created");
+      this.setReady();
+    }
+  }.bind(this);
+
+  Services.obs.addObserver(onOpen, "web-console-created", false);
+}
+
+WebConsolePanel.prototype = {
+  get target() this._toolbox.target,
+
+  _isReady: false,
+  get isReady() this._isReady,
+
+  destroy: function WCP_destroy()
+  {
+    let hudId = this.hud.hudId;
+
+    let onClose = function _onWebConsoleClose(aSubject)
+    {
+      aSubject.QueryInterface(Ci.nsISupportsString);
+      if (hudId == aSubject.data) {
+        Services.obs.removeObserver(onClose, "web-console-destroyed");
+        this.emit("destroyed");
+      }
+    }.bind(this);
+
+    Services.obs.addObserver(onClose, "web-console-destroyed", false);
+    HUDService.deactivateHUDForContext(this.hud.tab, false);
+  },
+
+  setReady: function WCP_setReady()
+  {
+    this._isReady = true;
+    this.emit("ready");
+  },
+}
diff --git a/browser/devtools/webconsole/test/Makefile.in b/browser/devtools/webconsole/test/Makefile.in
index 28e16c392af6..859962aa4c68 100644
--- a/browser/devtools/webconsole/test/Makefile.in
+++ b/browser/devtools/webconsole/test/Makefile.in
@@ -46,7 +46,6 @@ MOCHITEST_BROWSER_FILES = \
 	browser_webconsole_property_provider.js \
 	browser_webconsole_bug_587617_output_copy.js \
 	browser_webconsole_bug_585237_line_limit.js \
-	browser_webconsole_bug_581231_close_button.js \
 	browser_webconsole_bug_582201_duplicate_errors.js \
 	browser_webconsole_bug_580454_timestamp_l10n.js \
 	browser_webconsole_netlogging.js \
@@ -61,7 +60,6 @@ MOCHITEST_BROWSER_FILES = \
 	browser_webconsole_bug_601352_scroll.js \
 	browser_webconsole_bug_592442_closing_brackets.js \
 	browser_webconsole_bug_593003_iframe_wrong_hud.js \
-	browser_webconsole_bug_601909_remember_height.js \
 	browser_webconsole_bug_613013_console_api_iframe.js \
 	browser_webconsole_bug_597756_reopen_closed_tab.js \
 	browser_webconsole_bug_600183_charset.js \
@@ -92,11 +90,9 @@ MOCHITEST_BROWSER_FILES = \
 	browser_webconsole_bug_632275_getters_document_width.js \
 	browser_webconsole_bug_644419_log_limits.js \
 	browser_webconsole_bug_646025_console_file_location.js \
-	browser_webconsole_position_ui.js \
 	browser_webconsole_bug_642615_autocomplete.js \
 	browser_webconsole_bug_585991_autocomplete_popup.js \
 	browser_webconsole_bug_585991_autocomplete_keys.js \
-	browser_webconsole_bug_663443_panel_title.js \
 	browser_webconsole_bug_660806_history_nav.js \
 	browser_webconsole_bug_651501_document_body_autocomplete.js \
 	browser_webconsole_bug_653531_highlighter_console_helper.js \
@@ -106,13 +102,11 @@ MOCHITEST_BROWSER_FILES = \
 	browser_webconsole_bug_658368_time_methods.js \
 	browser_webconsole_bug_764572_output_open_url.js \
 	browser_webconsole_bug_622303_persistent_filters.js \
-        browser_webconsole_bug_770099_bad_policyuri.js \
-        browser_webconsole_bug_770099_violation.js \
+	browser_webconsole_bug_770099_bad_policyuri.js \
+	browser_webconsole_bug_770099_violation.js \
 	browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js \
-	browser_webconsole_window_zombie.js \
 	browser_cached_messages.js \
 	browser_bug664688_sandbox_update_after_navigation.js \
-	browser_webconsole_menustatus.js \
 	browser_result_format_as_string.js \
 	browser_webconsole_bug_737873_mixedcontent.js \
 	browser_output_breaks_after_console_dir_uninspectable.js \
@@ -202,10 +196,10 @@ MOCHITEST_BROWSER_FILES += \
 	test-bug-658368-time-methods.html \
 	test-webconsole-error-observer.html \
 	test-for-of.html \
-        test_bug_770099_violation.html \
-        test_bug_770099_violation.html^headers^ \
-        test_bug_770099_bad_policy_uri.html \
-        test_bug_770099_bad_policy_uri.html^headers^ \
+	test_bug_770099_violation.html \
+	test_bug_770099_violation.html^headers^ \
+	test_bug_770099_bad_policy_uri.html \
+	test_bug_770099_bad_policy_uri.html^headers^ \
 	test-result-format-as-string.html \
 	test-bug-737873-mixedcontent.html \
 	$(NULL)
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_581231_close_button.js b/browser/devtools/webconsole/test/browser_webconsole_bug_581231_close_button.js
deleted file mode 100644
index afe62c8a21f1..000000000000
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_581231_close_button.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- *
- * Contributor(s):
- *  Patrick Walton <pcwalton@mozilla.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Tests that the Web Console close button functions.
-
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
-
-function test() {
-  addTab(TEST_URI);
-  browser.addEventListener("load", function onLoad() {
-    browser.removeEventListener("load", onLoad, true);
-    openConsole(null, testCloseButton);
-  }, true);
-}
-
-function testCloseButton(hud) {
-  let hudId = hud.hudId;
-  HUDService.disableAnimation(hudId);
-  waitForFocus(function() {
-    let closeButton = hud.ui.closeButton;
-    ok(closeButton != null, "we have the close button");
-
-    EventUtils.synthesizeMouse(closeButton, 2, 2, {}, hud.iframeWindow);
-
-    ok(!(hudId in HUDService.hudReferences), "the console is closed when " +
-       "the close button is pressed");
-
-    finishTest();
-  }, hud.iframeWindow);
-}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js b/browser/devtools/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
index f1e40dfaa3cc..c5fe4505af0d 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
@@ -44,18 +44,20 @@ function tab2Loaded(aEvent) {
 
   function openConsoles() {
     try {
-      HUDService.activateHUDForContext(tab1);
+      let target1 = TargetFactory.forTab(tab1);
+      gDevTools.openToolboxForTab(target1, "webconsole");
     }
     catch (ex) {
-      ok(false, "HUDService.activateHUDForContext(tab1) exception: " + ex);
+      ok(false, "gDevTools.openToolboxForTab(target1) exception: " + ex);
       noErrors = false;
     }
 
     try {
-      HUDService.activateHUDForContext(tab2);
+      let target2 = TargetFactory.forTab(tab2);
+      gDevTools.openToolboxForTab(target2, "webconsole");
     }
     catch (ex) {
-      ok(false, "HUDService.activateHUDForContext(tab2) exception: " + ex);
+      ok(false, "gDevTools.openToolboxForTab(target2) exception: " + ex);
       noErrors = false;
     }
   }
@@ -74,18 +76,20 @@ function tab2Loaded(aEvent) {
     Services.obs.addObserver(onWebConsoleClose, "web-console-destroyed", false);
 
     try {
-      HUDService.deactivateHUDForContext(tab1);
+      let target1 = TargetFactory.forTab(tab1);
+      gDevTools.closeToolbox(target1);
     }
     catch (ex) {
-      ok(false, "HUDService.deactivateHUDForContext(tab1) exception: " + ex);
+      ok(false, "gDevTools.closeToolbox(target1) exception: " + ex);
       noErrors = false;
     }
 
     try {
-      HUDService.deactivateHUDForContext(tab2);
+      let target2 = TargetFactory.forTab(tab2);
+      gDevTools.closeToolbox(target2);
     }
     catch (ex) {
-      ok(false, "HUDService.deactivateHUDForContext(tab2) exception: " + ex);
+      ok(false, "gDevTools.closeToolbox(target2) exception: " + ex);
       noErrors = false;
     }
   }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_601909_remember_height.js b/browser/devtools/webconsole/test/browser_webconsole_bug_601909_remember_height.js
deleted file mode 100644
index de8649179159..000000000000
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_601909_remember_height.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- *
- * Contributor(s):
- *  Mihai Șucan <mihai.sucan@gmail.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Minimum console height, in pixels.
-const MINIMUM_CONSOLE_HEIGHT = 150;
-
-// Minimum page height, in pixels. This prevents the Web Console from
-// remembering a height that covers the whole page.
-const MINIMUM_PAGE_HEIGHT = 50;
-const HEIGHT_PREF = "devtools.hud.height";
-
-let hud, newHeight, height, innerHeight, testDriver;
-
-function testGen()
-{
-  height = parseInt(hud.style.height);
-
-  toggleConsole();
-  yield;
-
-  is(newHeight, height, "same height after reopening the console");
-  is(Services.prefs.getIntPref(HEIGHT_PREF), HUDService.lastConsoleHeight,
-    "pref is correct");
-
-  setHeight(Math.ceil(innerHeight * 0.5));
-  toggleConsole();
-  yield;
-
-  is(newHeight, height, "same height after reopening the console");
-  is(Services.prefs.getIntPref(HEIGHT_PREF), HUDService.lastConsoleHeight,
-    "pref is correct");
-
-  setHeight(MINIMUM_CONSOLE_HEIGHT - 1);
-  toggleConsole();
-  yield;
-
-  is(newHeight, MINIMUM_CONSOLE_HEIGHT, "minimum console height is respected");
-  is(Services.prefs.getIntPref(HEIGHT_PREF), HUDService.lastConsoleHeight,
-    "pref is correct");
-
-  setHeight(innerHeight - MINIMUM_PAGE_HEIGHT + 1);
-  toggleConsole();
-  yield;
-
-  is(newHeight, innerHeight - MINIMUM_PAGE_HEIGHT,
-    "minimum page height is respected");
-  is(Services.prefs.getIntPref(HEIGHT_PREF), HUDService.lastConsoleHeight,
-    "pref is correct");
-
-  setHeight(Math.ceil(innerHeight * 0.6));
-  Services.prefs.setIntPref(HEIGHT_PREF, -1);
-  toggleConsole();
-  yield;
-
-  is(newHeight, height, "same height after reopening the console");
-  is(Services.prefs.getIntPref(HEIGHT_PREF), -1, "pref is not updated");
-
-  closeConsole();
-  HUDService.lastConsoleHeight = 0;
-  Services.prefs.setIntPref(HEIGHT_PREF, 0);
-
-  hud = testDriver = null;
-  executeSoon(finishTest);
-
-  yield;
-}
-
-function toggleConsole()
-{
-  closeConsole(null, function() {
-    openConsole(null, function() {
-      let hudId = HUDService.getHudIdByWindow(content);
-      hud = HUDService.hudReferences[hudId].iframe;
-      newHeight = parseInt(hud.style.height);
-
-      testDriver.next();
-    });
-  });
-}
-
-function setHeight(aHeight)
-{
-  height = aHeight;
-  hud.style.height = height + "px";
-}
-
-function test()
-{
-  addTab("data:text/html;charset=utf-8,Web Console test for bug 601909");
-  browser.addEventListener("load", function onLoad() {
-    browser.removeEventListener("load", onLoad, true);
-    innerHeight = content.innerHeight;
-    openConsole(null, function(aHud) {
-      hud = aHud.iframe;
-      testDriver = testGen();
-      testDriver.next();
-    });
-  }, true);
-}
-
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js b/browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js
index 5623f52b2cb2..d22a50c9b3ec 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js
@@ -46,7 +46,6 @@ function startTest()
   let win2 = tabs[runCount*2 + 1].linkedBrowser.contentWindow;
   let hudId2 = HUDService.getHudIdByWindow(win2);
   huds[1] = HUDService.hudReferences[hudId2];
-  HUDService.disableAnimation(hudId2);
 
   if (runCount == 0) {
     menuitems[1] = huds[1].ui.rootElement.querySelector("#saveBodies");
@@ -115,7 +114,6 @@ function onpopupshown2b(aEvent)
       let win1 = tabs[runCount*2].linkedBrowser.contentWindow;
       let hudId1 = HUDService.getHudIdByWindow(win1);
       huds[0] = HUDService.hudReferences[hudId1];
-      HUDService.disableAnimation(hudId1);
 
       info("iframe1 height " + huds[0].iframe.clientHeight);
       info("iframe1 root height " + huds[0].ui.rootElement.clientHeight);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js b/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
index 9e451d0ca175..1fd615fb9556 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-let prefService = Services.prefs;
-
 let prefs = {
   "net": [
     "network",
@@ -28,7 +26,7 @@ function test() {
   // Set all prefs to true
   for (let category in prefs) {
     prefs[category].forEach(function(pref) {
-      prefService.setBoolPref("devtools.webconsole.filter." + pref, true);
+      Services.prefs.setBoolPref("devtools.webconsole.filter." + pref, true);
     });
   }
 
@@ -107,12 +105,11 @@ function onConsoleReopen2(hud) {
   // Clear prefs
   for (let category in prefs) {
     prefs[category].forEach(function(pref) {
-      prefService.clearUserPref("devtools.webconsole.filter." + pref);
+      Services.prefs.clearUserPref("devtools.webconsole.filter." + pref);
     });
   }
 
-  prefs = prefService = null;
-  gBrowser.removeCurrentTab();
+  prefs = null;
   finishTest();
 }
 
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js b/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
index 4eeaec88a687..22eba17a0454 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
@@ -44,18 +44,17 @@ function setupHighlighterTests()
 {
   let h1 = content.document.querySelector("h1");
   ok(h1, "we have the header node");
-  Services.obs.addObserver(runSelectionTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
-  InspectorUI.toggleInspectorUI();
+
+  openInspector(runSelectionTests);
 }
 
-function runSelectionTests()
+function runSelectionTests(aInspector)
 {
-  Services.obs.removeObserver(runSelectionTests,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  aInspector.highlighter.unlock();
+  aInspector.highlighter.outline.setAttribute("disable-transitions", "true");
 
   executeSoon(function() {
-    InspectorUI.highlighter.addListener("nodeselected", performTestComparisons);
+    aInspector.selection.once("new-node", performTestComparisons);
     let h1 = content.document.querySelector("h1");
     EventUtils.synthesizeMouse(h1, 2, 2, {type: "mousemove"}, content);
   });
@@ -63,19 +62,24 @@ function runSelectionTests()
 
 function performTestComparisons()
 {
-  InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons);
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  let inspector = gDevTools.getPanelForTarget("inspector", target);
+  inspector.highlighter.lock();
 
-  InspectorUI.stopInspecting();
+  let isHighlighting =
+    !(inspector.highlighter.outline.getAttribute("hidden") == "true");
+
+  ok(isHighlighting, "inspector is highlighting");
 
   let h1 = content.document.querySelector("h1");
-  is(InspectorUI.highlighter.node, h1, "node selected");
-  is(InspectorUI.selection, h1, "selection matches node");
+  is(inspector.selection.node, h1, "selection matches node");
 
   openConsole(gBrowser.selectedTab, performWebConsoleTests);
 }
 
 function performWebConsoleTests(hud)
 {
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
   let jsterm = hud.jsterm;
   outputNode = hud.outputNode;
 
@@ -112,7 +116,8 @@ function performWebConsoleTests(hud)
       let node = outputNode.querySelector(".webconsole-msg-output");
       isnot(node.textContent.indexOf("bug653531"), -1,
             "correct output for $0.textContent");
-      is(InspectorUI.selection.textContent, "bug653531",
+      let inspector = gDevTools.getPanelForTarget("inspector", target);
+      is(inspector.selection.node.textContent, "bug653531",
          "node successfully updated");
 
       executeSoon(finishUp);
@@ -122,7 +127,6 @@ function performWebConsoleTests(hud)
 }
 
 function finishUp() {
-  InspectorUI.closeInspectorUI();
   finishTest();
 }
 
@@ -130,8 +134,8 @@ function test()
 {
   waitForExplicitFinish();
   gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
+    gBrowser.selectedBrowser.removeEventListener("load", onLoad, true);
     waitForFocus(createDocument, content);
   }, true);
 
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js b/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
index 0f685f88e672..ade0c09363ae 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
@@ -21,10 +21,11 @@ function consoleOpened(HUD)
 
   let jsterm = HUD.jsterm;
   let popup = jsterm.autocompletePopup;
-  popup._panel.addEventListener("popupshown", function() {
-    popup._panel.removeEventListener("popupshown", arguments.callee, false);
+  let onShown = function() {
     ok(false, "popup shown");
-  }, false);
+  };
+
+  popup._panel.addEventListener("popupshown", onShown, false);
 
   ok(!popup.isOpen, "popup is not open");
 
@@ -41,6 +42,7 @@ function consoleOpened(HUD)
 
   executeSoon(function() {
     ok(!popup.isOpen, "popup is not open");
+    popup._panel.removeEventListener("popupshown", onShown, false);
     executeSoon(finishTest);
   });
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_663443_panel_title.js b/browser/devtools/webconsole/test/browser_webconsole_bug_663443_panel_title.js
deleted file mode 100644
index b485165d7069..000000000000
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_663443_panel_title.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const TEST_URI = "data:text/html;charset=utf-8,<p>test for bug 663443. test1";
-
-const POSITION_PREF = "devtools.webconsole.position";
-const POSITION_WINDOW = "window";
-
-function consoleOpened() {
-  document.removeEventListener("popupshown", consoleOpened, false);
-
-  let HUD = HUDService.getHudByWindow(content);
-  ok(HUD.consolePanel, "Web Console opened in a panel");
-
-  let waitForTitleChange = {
-    name: "panel title change",
-    validatorFn: function() {
-      return HUD.consolePanel.label.indexOf("test2") > -1;
-    },
-    successFn: testEnd,
-    failureFn: testEnd,
-  };
-
-  waitForSuccess({
-    name: "initial panel title",
-    validatorFn: function() {
-      return HUD.consolePanel.label.indexOf("test1") > -1;
-    },
-    successFn: function() {
-      content.location = "data:text/html;charset=utf-8,<p>test2 for bug 663443";
-      waitForSuccess(waitForTitleChange);
-    },
-    failureFn: testEnd,
-  });
-}
-
-function testEnd() {
-  closeConsole(null, finishTest);
-}
-
-function test() {
-  addTab(TEST_URI);
-  browser.addEventListener("load", function onLoad() {
-    browser.removeEventListener("load", onLoad, true);
-
-    Services.prefs.setCharPref(POSITION_PREF, POSITION_WINDOW);
-
-    registerCleanupFunction(function() {
-      Services.prefs.clearUserPref(POSITION_PREF);
-    });
-  
-    document.addEventListener("popupshown", consoleOpened, false);
-
-    openConsole();
-  }, true);
-}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js b/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
index 48614c9cc024..e3d214aa5282 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
@@ -39,7 +39,9 @@ function testViewSource(aHud)
       nodes = hud.outputNode.querySelectorAll(selector);
       is(nodes.length, 2, "correct number of css messages");
 
-      Services.ww.registerNotification(observer);
+      let target = TargetFactory.forTab(gBrowser.selectedTab);
+      let toolbox = gDevTools.getToolboxForTarget(target);
+      toolbox.once("styleeditor-selected", onStyleEditorReady);
 
       EventUtils.sendMouseEvent({ type: "click" }, nodes[0]);
     },
@@ -47,88 +49,75 @@ function testViewSource(aHud)
   });
 }
 
-let observer = {
-  observe: function(aSubject, aTopic, aData)
-  {
-    if (aTopic != "domwindowopened") {
-      return;
-    }
-    Services.ww.unregisterNotification(observer);
-    info("Style Editor window was opened in response to clicking " +
-         "the location node");
+function onStyleEditorReady(aEvent, aPanel)
+{
+  info(aEvent + " event fired");
 
-    function sheetForNode(aNode)
-    {
-      let href = aNode.getAttribute("title");
-      let sheet, i = 0;
-      while((sheet = content.document.styleSheets[i++])) {
-        if (sheet.href == href) {
-          return sheet;
-        }
+  SEC = aPanel.styleEditorChrome;
+  let win = aPanel.panelWindow;
+  ok(win, "Style Editor Window is defined");
+  ok(SEC, "Style Editor Chrome is defined");
+
+  function sheetForNode(aNode)
+  {
+    let href = aNode.getAttribute("title");
+    let sheet, i = 0;
+    while((sheet = content.document.styleSheets[i++])) {
+      if (sheet.href == href) {
+        return sheet;
       }
     }
+  }
 
-    executeSoon(function() {
-      let styleEditorWin = window.StyleEditor.StyleEditorManager
-                          .getEditorForWindow(content.window);
-      ok(styleEditorWin, "Style Editor window is defined");
+  waitForFocus(function() {
+    info("style editor window focused");
 
-      waitForFocus(function() {
-        SEC = styleEditorWin.styleEditorChrome;
-        ok(SEC, "Style Editor Chrome is defined");
+    let sheet = sheetForNode(nodes[0]);
+    ok(sheet, "sheet found");
+    let line = nodes[0].sourceLine;
+    ok(line, "found source line");
 
-        let sheet = sheetForNode(nodes[0]);
-        ok(sheet, "sheet found");
-        let line = nodes[0].sourceLine;
-        ok(line, "found source line");
+    checkStyleEditorForSheetAndLine(sheet, line - 1, function() {
+      info("first check done");
 
-        checkStyleEditorForSheetAndLine(sheet, line - 1, function() {
-          let sheet = sheetForNode(nodes[1]);
-          ok(sheet, "sheet found");
-          let line = nodes[1].sourceLine;
-          ok(line, "found source line");
+      let target = TargetFactory.forTab(gBrowser.selectedTab);
+      let toolbox = gDevTools.getToolboxForTarget(target);
 
-          EventUtils.sendMouseEvent({ type: "click" }, nodes[1]);
+      let sheet = sheetForNode(nodes[1]);
+      ok(sheet, "sheet found");
+      let line = nodes[1].sourceLine;
+      ok(line, "found source line");
+
+      toolbox.once("webconsole-selected", function(aEvent) {
+        info(aEvent + " event fired");
+
+        toolbox.once("styleeditor-selected", function() {
+          info(aEvent + " event fired");
 
           checkStyleEditorForSheetAndLine(sheet, line - 1, function() {
-            window.StyleEditor.toggle();
+            info("second check done");
             finishTest();
           });
         });
-      }, styleEditorWin);
+
+        EventUtils.sendMouseEvent({ type: "click" }, nodes[1]);
+      });
+
+      toolbox.selectTool("webconsole");
     });
-  }
-};
+  }, win);
+}
 
 function checkStyleEditorForSheetAndLine(aStyleSheet, aLine, aCallback)
 {
-  let editor = null;
-
-  let performLineCheck = {
-    name: "source editor load",
-    validatorFn: function()
-    {
-      return editor.sourceEditor;
-    },
-    successFn: function()
-    {
-      is(editor.sourceEditor.getCaretPosition().line, aLine,
-         "correct line is selected");
-      is(SEC.selectedStyleSheetIndex, editor.styleSheetIndex,
-         "correct stylesheet is selected in the editor");
-
-      executeSoon(aCallback);
-    },
-    failureFn: aCallback,
-  };
-
+  let foundEditor = null;
   waitForSuccess({
-    name: "editor for stylesheet",
+    name: "style editor for stylesheet",
     validatorFn: function()
     {
-      for (let item of SEC.editors) {
-        if (item.styleSheet == aStyleSheet) {
-          editor = item;
+      for (let editor of SEC.editors) {
+        if (editor.styleSheet == aStyleSheet) {
+          foundEditor = editor;
           return true;
         }
       }
@@ -136,8 +125,31 @@ function checkStyleEditorForSheetAndLine(aStyleSheet, aLine, aCallback)
     },
     successFn: function()
     {
-      waitForSuccess(performLineCheck);
+      performLineCheck(foundEditor, aLine, aCallback);
     },
     failureFn: finishTest,
   });
 }
+
+function performLineCheck(aEditor, aLine, aCallback)
+{
+  function checkForCorrectState()
+  {
+    is(aEditor.sourceEditor.getCaretPosition().line, aLine,
+       "correct line is selected");
+    is(SEC.selectedStyleSheetIndex, aEditor.styleSheetIndex,
+       "correct stylesheet is selected in the editor");
+
+    aCallback && executeSoon(aCallback);
+  }
+
+  waitForSuccess({
+    name: "source editor load",
+    validatorFn: function()
+    {
+      return aEditor.sourceEditor;
+    },
+    successFn: checkForCorrectState,
+    failureFn: finishTest,
+  });
+}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_menustatus.js b/browser/devtools/webconsole/test/browser_webconsole_menustatus.js
deleted file mode 100644
index 794122beefce..000000000000
--- a/browser/devtools/webconsole/test/browser_webconsole_menustatus.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-function test() {
-  var tab1 = gBrowser.addTab();
-  var tab2 = gBrowser.addTab();
-  gBrowser.selectedTab = tab2;
-
-  openConsole(tab2, function() {
-    let cmd = document.getElementById("Tools:WebConsole");
-    is(cmd.getAttribute("checked"), "true", "<command Tools:WebConsole> is checked.");
-
-    gBrowser.selectedTab = tab1;
-
-    is(cmd.getAttribute("checked"), "false", "<command Tools:WebConsole> is unchecked after tab switch.");
-
-    gBrowser.selectedTab = tab2;
-
-    is(cmd.getAttribute("checked"), "true", "<command Tools:WebConsole> is checked.");
-
-    closeConsole(tab2, function() {
-      is(cmd.getAttribute("checked"), "false", "<command Tools:WebConsole> is checked once closed.");
-
-      gBrowser.removeTab(tab1);
-      gBrowser.removeTab(tab2);
-
-      finish();
-    });
-  });
-}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_position_ui.js b/browser/devtools/webconsole/test/browser_webconsole_position_ui.js
deleted file mode 100644
index 3639b9a86ae3..000000000000
--- a/browser/devtools/webconsole/test/browser_webconsole_position_ui.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const TEST_URI = "data:text/html;charset=utf-8,<p>test for bug 577721";
-
-const POSITION_PREF = "devtools.webconsole.position";
-const TOP_PREF = "devtools.webconsole.top";
-const LEFT_PREF = "devtools.webconsole.left";
-const WIDTH_PREF = "devtools.webconsole.width";
-const HEIGHT_PREF = "devtools.hud.height";
-
-let hudRef, boxHeight, panelWidth;
-
-function test() {
-  addTab(TEST_URI);
-  browser.addEventListener("load", function onLoad() {
-    browser.removeEventListener("load", onLoad, true);
-    openConsole(null, consoleOpened);
-  }, true);
-  registerCleanupFunction(testEnd);
-}
-
-function testEnd() {
-  hudRef = null;
-  Services.prefs.clearUserPref(POSITION_PREF);
-  Services.prefs.clearUserPref(WIDTH_PREF);
-  Services.prefs.clearUserPref(HEIGHT_PREF);
-  Services.prefs.clearUserPref(TOP_PREF);
-  Services.prefs.clearUserPref(LEFT_PREF);
-}
-
-function waitForPosition(aPosition, aCallback) {
-  waitForSuccess({
-    name: "web console position changed to '" + aPosition + "'",
-    validatorFn: function()
-    {
-      return hudRef._currentUIPosition == aPosition;
-    },
-    successFn: executeSoon.bind(null, aCallback),
-    failureFn: finishTest,
-  });
-}
-
-function consoleOpened(aHudRef) {
-  hudRef = aHudRef;
-  testMenuitems();
-
-  let hudBox = hudRef.iframe;
-
-  is(hudBox.parentNode.childNodes[2].getAttribute("id"), hudRef.hudId,
-     "initial console position is correct");
-
-  is(hudRef.ui.positionMenuitems.below.getAttribute("checked"), "true",
-     "position menu checkbox is below");
-  is(Services.prefs.getCharPref(POSITION_PREF), "below", "pref is below");
-
-  executeSoon(function() {
-    hudRef.positionConsole("above");
-    waitForPosition("above", onPositionAbove);
-  });
-}
-
-function onPositionAbove() {
-  let hudBox = hudRef.iframe;
-
-  let id = hudBox.parentNode.childNodes[0].getAttribute("id");
-  is(id, hudRef.hudId, "above position is correct");
-
-  is(hudRef.ui.positionMenuitems.above.getAttribute("checked"), "true",
-     "position menu checkbox is above");
-  is(Services.prefs.getCharPref(POSITION_PREF), "above", "pref is above");
-
-  boxHeight = content.innerHeight * 0.5;
-  panelWidth = content.innerWidth * 0.5;
-
-  hudBox.style.height = boxHeight + "px";
-
-  boxHeight = hudBox.clientHeight;
-
-  Services.prefs.setIntPref(WIDTH_PREF, panelWidth);
-  Services.prefs.setIntPref(TOP_PREF, 50);
-  Services.prefs.setIntPref(LEFT_PREF, 51);
-
-  executeSoon(function() {
-    hudRef.positionConsole("window");
-    waitForPosition("window", onPositionWindow);
-  });
-}
-
-function onPositionWindow() {
-  let hudBox = hudRef.iframe;
-
-  let id = hudBox.parentNode.getAttribute("id");
-  is(id, "console_window_" + hudRef.hudId, "window position is correct");
-  is(Services.prefs.getCharPref(POSITION_PREF), "window", "pref is window");
-
-  let diffHeight = Math.abs(hudBox.clientHeight - boxHeight);
-  ok(diffHeight < 8, "hudBox height is correct");
-
-  let consolePanel = hudRef.consolePanel;
-
-  is(consolePanel.getAttribute("width"), panelWidth, "panel width is correct");
-  is(consolePanel.getAttribute("top"), 50, "panel top position is correct");
-  is(consolePanel.getAttribute("left"), 51, "panel left position is correct");
-
-  let panelHeight = parseInt(consolePanel.getAttribute("height"));
-  let boxWidth = hudBox.clientWidth;
-  boxHeight = hudBox.clientHeight;
-
-  hudRef.consolePanel.sizeTo(panelWidth - 15, panelHeight - 13);
-
-  let popupBoxObject = consolePanel.popupBoxObject;
-  let screenX = popupBoxObject.screenX;
-  let screenY = popupBoxObject.screenY;
-  consolePanel.moveTo(screenX - 11, screenY - 13);
-
-  isnot(hudBox.clientWidth, boxWidth, "hudBox width was updated");
-  isnot(hudBox.clientHeight, boxHeight, "hudBox height was updated");
-
-  isnot(popupBoxObject.screenX, screenX, "panel screenX was updated");
-  isnot(popupBoxObject.screenY, screenY, "panel screenY was updated");
-
-  panelWidth = consolePanel.clientWidth;
-  boxHeight = hudBox.clientHeight;
-
-  executeSoon(function() {
-    hudRef.positionConsole("below");
-    waitForPosition("below", onPositionBelow);
-  });
-}
-
-function onPositionBelow() {
-  let hudBox = hudRef.iframe;
-
-  let id = hudBox.parentNode.childNodes[2].getAttribute("id");
-  is(id, hudRef.hudId, "below position is correct after reopen");
-
-  let diffHeight = Math.abs(hudBox.clientHeight - boxHeight);
-  // dump("Diffheight: " + diffHeight + " clientHeight: " + hudBox.clientHeight + " boxHeight: " + boxHeight + "\n");
-  // XXX TODO bug 702707
-  ok(diffHeight < 8, "hudBox height is still correct");
-
-  is(Services.prefs.getCharPref(POSITION_PREF), "below", "pref is below");
-
-  // following three disabled due to bug 674562
-  // is(Services.prefs.getIntPref(WIDTH_PREF), panelWidth, "width pref updated - bug 674562");
-  // isnot(Services.prefs.getIntPref(TOP_PREF), 50, "top location pref updated - bug 674562");
-  // isnot(Services.prefs.getIntPref(LEFT_PREF), 51, "left location pref updated - bug 674562");
-
-  Services.obs.addObserver(onConsoleClose, "web-console-destroyed", false);
-
-  // Close the window console via the toolbar button
-  let btn = hudRef.ui.closeButton;
-  executeSoon(function() {
-    EventUtils.synthesizeMouse(btn, 2, 2, {}, hudRef.iframeWindow);
-  });
-}
-
-function onConsoleClose()
-{
-  Services.obs.removeObserver(onConsoleClose, "web-console-destroyed");
-
-  executeSoon(function() {
-    hudRef = null;
-    openConsole(null, onConsoleReopen);
-  });
-}
-
-function onConsoleReopen(aHudRef) {
-  let hudBox = aHudRef.iframe;
-
-  let id = hudBox.parentNode.childNodes[2].getAttribute("id");
-  is(id, aHudRef.hudId, "below position is correct after another reopen");
-
-  is(aHudRef.ui.positionMenuitems.below.getAttribute("checked"), "true",
-     "position menu checkbox is below");
-
-  executeSoon(finishTest);
-}
-
-function testMenuitems() {
-  let positionConsole = hudRef.positionConsole;
-  is(typeof positionConsole, "function", "positionConsole() is available");
-
-  let param = null;
-  hudRef.positionConsole = function(aPosition) {
-    param = aPosition;
-  };
-
-  // Make sure the menuitems call the correct method.
-
-  hudRef.ui.positionMenuitems.above.doCommand();
-
-  is(param, "above", "menuitem for above positioning calls positionConsole() correctly");
-
-  hudRef.ui.positionMenuitems.below.doCommand();
-
-  is(param, "below", "menuitem for below positioning calls positionConsole() correctly");
-
-  hudRef.ui.positionMenuitems.window.doCommand();
-
-  is(param, "window", "menuitem for window positioning calls positionConsole() correctly");
-
-  hudRef.positionConsole = positionConsole;
-}
-
diff --git a/browser/devtools/webconsole/test/browser_webconsole_window_zombie.js b/browser/devtools/webconsole/test/browser_webconsole_window_zombie.js
deleted file mode 100644
index d4ce62aa41fd..000000000000
--- a/browser/devtools/webconsole/test/browser_webconsole_window_zombie.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const TEST_URI = "data:text/html;charset=utf-8,<p>test for bug 577721";
-
-const POSITION_PREF = "devtools.webconsole.position";
-
-function test() {
-  addTab(TEST_URI);
-  browser.addEventListener("load", function onLoad() {
-    browser.removeEventListener("load", onLoad, true);
-    openConsole(null, consoleOpened);
-  }, true);
-  registerCleanupFunction(testEnd);
-}
-
-function testEnd() {
-  Services.prefs.clearUserPref(POSITION_PREF);
-}
-
-function consoleOpened(hudRef) {
-  let hudBox = hudRef.HUDBox;
-
-  // listen for the panel popupshown event.
-  document.addEventListener("popupshown", function popupShown() {
-    document.removeEventListener("popupshown", popupShown, false);
-
-    ok(hudRef.consolePanel, "console is in a panel");
-
-    Services.obs.addObserver(function onWebConsoleClose() {
-      Services.obs.removeObserver(onWebConsoleClose, "web-console-destroyed");
-      executeSoon(finishTest);
-    }, "web-console-destroyed", false);
-
-    // Close the window console via the menu item
-    let menu = document.getElementById("webConsole");
-    menu.click();
-  }, false);
-
-  hudRef.positionConsole("window");
-}
diff --git a/browser/devtools/webconsole/test/head.js b/browser/devtools/webconsole/test/head.js
index 4e285568d715..c556de529a68 100644
--- a/browser/devtools/webconsole/test/head.js
+++ b/browser/devtools/webconsole/test/head.js
@@ -8,6 +8,11 @@ Cu.import("resource:///modules/HUDService.jsm", tempScope);
 let HUDService = tempScope.HUDService;
 Cu.import("resource://gre/modules/devtools/WebConsoleUtils.jsm", tempScope);
 let WebConsoleUtils = tempScope.WebConsoleUtils;
+Cu.import("resource:///modules/devtools/gDevTools.jsm", tempScope);
+let gDevTools = tempScope.gDevTools;
+Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
+let TargetFactory = tempScope.TargetFactory;
+
 const WEBCONSOLE_STRINGS_URI = "chrome://browser/locale/devtools/webconsole.properties";
 let WCU_l10n = new WebConsoleUtils.l10n(WEBCONSOLE_STRINGS_URI);
 
@@ -32,8 +37,7 @@ let tab, browser, hudId, hud, hudBox, filterBox, outputNode, cs;
 
 function addTab(aURL)
 {
-  gBrowser.selectedTab = gBrowser.addTab();
-  content.location.assign(aURL);
+  gBrowser.selectedTab = gBrowser.addTab(aURL);
   tab = gBrowser.selectedTab;
   browser = gBrowser.getBrowserForTab(tab);
 }
@@ -133,23 +137,24 @@ function findLogEntry(aString)
  *        Optional function to invoke after the Web Console completes
  *        initialization (web-console-created).
  */
-function openConsole(aTab, aCallback)
+function openConsole(aTab, aCallback = function() { })
 {
-  function onWebConsoleOpen(aSubject, aTopic)
+  function onWebConsoleOpen(aEvent, aPanel)
   {
-    if (aTopic == "web-console-created") {
-      Services.obs.removeObserver(onWebConsoleOpen, "web-console-created");
-      aSubject.QueryInterface(Ci.nsISupportsString);
-      let hud = HUDService.getHudReferenceById(aSubject.data);
-      executeSoon(aCallback.bind(null, hud));
-    }
+    executeSoon(aCallback.bind(null, aPanel.hud));
   }
 
-  if (aCallback) {
-    Services.obs.addObserver(onWebConsoleOpen, "web-console-created", false);
+  let target = TargetFactory.forTab(aTab || tab);
+  let toolbox = gDevTools.getToolboxForTarget(target);
+  if (toolbox) {
+    toolbox.once("webconsole-selected", onWebConsoleOpen);
+    toolbox.selectTool("webconsole");
+  }
+  else {
+    let target = TargetFactory.forTab(aTab || tab);
+    toolbox = gDevTools.openToolboxForTab(target, "webconsole");
+    toolbox.once("webconsole-selected", onWebConsoleOpen);
   }
-
-  HUDService.activateHUDForContext(aTab || tab);
 }
 
 /**
@@ -162,23 +167,27 @@ function openConsole(aTab, aCallback)
  *        Optional function to invoke after the Web Console completes
  *        closing (web-console-destroyed).
  */
-function closeConsole(aTab, aCallback)
+function closeConsole(aTab, aCallback = function() { })
 {
-  function onWebConsoleClose(aSubject, aTopic)
-  {
-    if (aTopic == "web-console-destroyed") {
-      Services.obs.removeObserver(onWebConsoleClose, "web-console-destroyed");
-      aSubject.QueryInterface(Ci.nsISupportsString);
-      let hudId = aSubject.data;
-      executeSoon(aCallback.bind(null, hudId));
+  let target = TargetFactory.forTab(aTab || tab);
+  let toolbox = gDevTools.getToolboxForTarget(target);
+  if (toolbox) {
+    let panel = gDevTools.getPanelForTarget("webconsole", target);
+    if (panel) {
+      let hudId = panel.hud.hudId;
+      panel.once("destroyed", function() {
+        executeSoon(aCallback.bind(null, hudId));
+      });
+    }
+    else {
+      toolbox.once("destroyed", aCallback.bind(null, null));
     }
-  }
 
-  if (aCallback) {
-    Services.obs.addObserver(onWebConsoleClose, "web-console-destroyed", false);
+    toolbox.destroy();
+  }
+  else {
+    aCallback();
   }
-
-  HUDService.deactivateHUDForContext(aTab || tab);
 }
 
 /**
@@ -250,7 +259,8 @@ function finishTest()
 
 function tearDown()
 {
-  HUDService.deactivateHUDForContext(gBrowser.selectedTab);
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+  gDevTools.closeToolbox(target);
   while (gBrowser.tabs.length > 1) {
     gBrowser.removeCurrentTab();
   }
@@ -307,3 +317,17 @@ function waitForSuccess(aOptions)
 
   wait(aOptions.validatorFn, aOptions.successFn, aOptions.failureFn);
 }
+
+function openInspector(aCallback, aTab = gBrowser.selectedTab)
+{
+  let target = TargetFactory.forTab(aTab);
+  let inspector = gDevTools.getPanelForTarget("inspector", target);
+  if (inspector && inspector.isReady) {
+    aCallback(inspector);
+  } else {
+    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
+    toolbox.once("inspector-ready", function _onSelect(aEvent, aPanel) {
+      aCallback(aPanel);
+    });
+  }
+}
diff --git a/browser/devtools/webconsole/webconsole.js b/browser/devtools/webconsole/webconsole.js
index 4116fa3f2e07..973c06a27d5b 100644
--- a/browser/devtools/webconsole/webconsole.js
+++ b/browser/devtools/webconsole/webconsole.js
@@ -177,10 +177,8 @@ const PREF_CONNECTION_TIMEOUT = "devtools.debugger.remote-timeout";
  *
  * @param object aWebConsoleOwner
  *        The WebConsole owner object.
- * @param string aPosition
- *        Tells the UI location for the Web Console.
  */
-function WebConsoleFrame(aWebConsoleOwner, aPosition)
+function WebConsoleFrame(aWebConsoleOwner)
 {
   this.owner = aWebConsoleOwner;
   this.hudId = this.owner.hudId;
@@ -191,7 +189,6 @@ function WebConsoleFrame(aWebConsoleOwner, aPosition)
   this._networkRequests = {};
 
   this._toggleFilter = this._toggleFilter.bind(this);
-  this._onPositionConsoleCommand = this._onPositionConsoleCommand.bind(this);
   this._flushMessageQueue = this._flushMessageQueue.bind(this);
   this._connectionTimeout = this._connectionTimeout.bind(this);
 
@@ -200,7 +197,7 @@ function WebConsoleFrame(aWebConsoleOwner, aPosition)
 
   this._initDefaultFilterPrefs();
   this._commandController = new CommandController(this);
-  this.positionConsole(aPosition, window);
+  this.positionConsole(window);
 
   this.jsterm = new JSTerm(this);
   this.jsterm.inputNode.focus();
@@ -373,10 +370,7 @@ WebConsoleFrame.prototype = {
    */
   _initConnection: function WCF__initConnection()
   {
-    this.proxy = new WebConsoleConnectionProxy(this, {
-      host: this.owner.remoteHost,
-      port: this.owner.remotePort,
-    });
+    this.proxy = new WebConsoleConnectionProxy(this, this.owner.target);
 
     let timeout = Services.prefs.getIntPref(PREF_CONNECTION_TIMEOUT);
     this._connectTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
@@ -439,7 +433,6 @@ WebConsoleFrame.prototype = {
     this.inputNode = doc.querySelector(".jsterm-input-node");
 
     this._setFilterTextBoxEvents();
-    this._initPositionUI();
     this._initFilterButtons();
 
     let fontSize = Services.prefs.getIntPref("devtools.webconsole.fontSize");
@@ -483,10 +476,6 @@ WebConsoleFrame.prototype = {
                                        !this.getFilterState("network");
     }.bind(this));
 
-    this.closeButton = doc.getElementById("webconsole-close-button");
-    this.closeButton.addEventListener("command",
-                                      this.owner.onCloseButton.bind(this.owner));
-
     let clearButton = doc.getElementsByClassName("webconsole-clear-console-button")[0];
     clearButton.addEventListener("command", function WCF__onClearButton() {
       this.owner._onClearButton();
@@ -544,31 +533,6 @@ WebConsoleFrame.prototype = {
     this.filterBox.addEventListener("input", onChange, false);
   },
 
-  /**
-   * Initialize the UI for re-positioning the console
-   * @private
-   */
-  _initPositionUI: function WCF__initPositionUI()
-  {
-    let doc = this.document;
-
-    let itemAbove = doc.querySelector("menuitem[consolePosition='above']");
-    itemAbove.addEventListener("command", this._onPositionConsoleCommand, false);
-
-    let itemBelow = doc.querySelector("menuitem[consolePosition='below']");
-    itemBelow.addEventListener("command", this._onPositionConsoleCommand, false);
-
-    let itemWindow = doc.querySelector("menuitem[consolePosition='window']");
-    itemWindow.addEventListener("command", this._onPositionConsoleCommand, false);
-
-    this.positionMenuitems = {
-      last: null,
-      above: itemAbove,
-      below: itemBelow,
-      window: itemWindow,
-    };
-  },
-
   /**
    * Creates one of the filter buttons on the toolbar.
    *
@@ -615,19 +579,6 @@ WebConsoleFrame.prototype = {
     Services.obs.notifyObservers(id, "web-console-created", null);
   },
 
-  /**
-   * Handle the "command" event for the buttons that allow the user to
-   * reposition the Web Console UI.
-   *
-   * @private
-   * @param nsIDOMEvent aEvent
-   */
-  _onPositionConsoleCommand: function WCF__onPositionConsoleCommand(aEvent)
-  {
-    let position = aEvent.target.getAttribute("consolePosition");
-    this.owner.positionConsole(position);
-  },
-
   /**
    * Position the console in a different location.
    *
@@ -635,15 +586,12 @@ WebConsoleFrame.prototype = {
    * instance that owns this iframe. You need to call this if you write
    * a different owner or you manually reposition the iframe.
    *
-   * @param string aPosition
-   *        The new Web Console iframe location: "above" (the page), "below" or
-   *        "window".
    * @param object aNewWindow
    *        Repositioning causes the iframe to reload - bug 254144. You need to
    *        provide the new window object so we can reinitialize the UI as
    *        needed.
    */
-  positionConsole: function WCF_positionConsole(aPosition, aNewWindow)
+  positionConsole: function WCF_positionConsole(aNewWindow)
   {
     this.window = aNewWindow;
     this.document = this.window.document;
@@ -657,14 +605,6 @@ WebConsoleFrame.prototype = {
     this._initUI();
     this.jsterm && this.jsterm._initUI();
 
-    this.closeButton.hidden = aPosition == "window";
-
-    this.positionMenuitems[aPosition].setAttribute("checked", true);
-    if (this.positionMenuitems.last) {
-      this.positionMenuitems.last.setAttribute("checked", false);
-    }
-    this.positionMenuitems.last = this.positionMenuitems[aPosition];
-
     if (oldOutputNode && oldOutputNode.childNodes.length) {
       let parentNode = this.outputNode.parentNode;
       parentNode.replaceChild(oldOutputNode, this.outputNode);
@@ -1791,7 +1731,9 @@ WebConsoleFrame.prototype = {
   onLocationChange: function WCF_onLocationChange(aURI, aTitle)
   {
     this.contentLocation = aURI;
-    this.owner.onLocationChange(aURI, aTitle);
+    if (this.owner.onLocationChange) {
+      this.owner.onLocationChange(aURI, aTitle);
+    }
   },
 
   /**
@@ -4028,14 +3970,13 @@ CommandController.prototype = {
  * @constructor
  * @param object aWebConsole
  *        The Web Console instance that owns this connection proxy.
- * @param object aOptions
- *        Connection options: host and port.
+ * @param RemoteTarget aTarget
+ *        The target that the console will connect to.
  */
-function WebConsoleConnectionProxy(aWebConsole, aOptions = {})
+function WebConsoleConnectionProxy(aWebConsole, aTarget)
 {
   this.owner = aWebConsole;
-  this.remoteHost = aOptions.host;
-  this.remotePort = aOptions.port;
+  this.target = aTarget;
 
   this._onPageError = this._onPageError.bind(this);
   this._onConsoleAPICall = this._onConsoleAPICall.bind(this);
@@ -4111,16 +4052,17 @@ WebConsoleConnectionProxy.prototype = {
    */
   connect: function WCCP_connect(aCallback)
   {
-    let transport;
-    if (this.remoteHost) {
-      transport = debuggerSocketConnect(this.remoteHost, this.remotePort);
+    // TODO: convert the non-remote path to use the target API as well.
+    let transport, client;
+    if (this.target.isRemote) {
+      client = this.client = this.target.client;
     }
     else {
       this.initServer();
       transport = DebuggerServer.connectPipe();
-    }
 
-    let client = this.client = new DebuggerClient(transport);
+      client = this.client = new DebuggerClient(transport);
+    }
 
     client.addListener("pageError", this._onPageError);
     client.addListener("consoleAPICall", this._onConsoleAPICall);
@@ -4129,6 +4071,18 @@ WebConsoleConnectionProxy.prototype = {
     client.addListener("fileActivity", this._onFileActivity);
     client.addListener("locationChange", this._onLocationChange);
 
+    if (this.target.isRemote) {
+      this._consoleActor = this.target.form.consoleActor;
+      if (!this.target.chrome) {
+        this.owner.onLocationChange(this.target.url, this.target.name);
+      }
+
+      let listeners = ["PageError", "ConsoleAPI", "NetworkActivity",
+                       "FileActivity", "LocationChange"];
+      this.client.attachConsole(this._consoleActor, listeners,
+                                this._onAttachConsole.bind(this, aCallback));
+      return;
+    }
     client.connect(function(aType, aTraits) {
       client.listTabs(this._onListTabs.bind(this, aCallback));
     }.bind(this));
@@ -4145,32 +4099,7 @@ WebConsoleConnectionProxy.prototype = {
    */
   _onListTabs: function WCCP__onListTabs(aCallback, aResponse)
   {
-    let selectedTab;
-
-    if (this.remoteHost) {
-      this.owner._connectTimer.cancel();
-
-      let tabs = [];
-      for (let tab of aResponse.tabs) {
-        tabs.push(tab.title);
-      }
-
-      tabs.push(l10n.getStr("listTabs.globalConsoleActor"));
-
-      let selected = {};
-      let result = Services.prompt.select(null,
-        l10n.getStr("remoteWebConsoleSelectTabTitle"),
-        l10n.getStr("remoteWebConsoleSelectTabMessage"),
-        tabs.length, tabs, selected);
-
-      if (result && selected.value < aResponse.tabs.length) {
-        selectedTab = aResponse.tabs[selected.value];
-      }
-    }
-    else {
-      selectedTab = aResponse.tabs[aResponse.selected];
-    }
-
+    let selectedTab = aResponse.tabs[aResponse.selected];
     if (selectedTab) {
       this._consoleActor = selectedTab.consoleActor;
       this.owner.onLocationChange(selectedTab.url, selectedTab.title);
@@ -4403,7 +4332,9 @@ WebConsoleConnectionProxy.prototype = {
     this.client.removeListener("locationChange", this._onLocationChange);
 
     try {
-      this.client.close(onDisconnect);
+      if (!this.target.isRemote) {
+        this.client.close(onDisconnect);
+      }
     }
     catch (ex) {
       Cu.reportError("Web Console disconnect exception: " + ex);
diff --git a/browser/devtools/webconsole/webconsole.xul b/browser/devtools/webconsole/webconsole.xul
index ff602c90dd42..9669d1a46ce7 100644
--- a/browser/devtools/webconsole/webconsole.xul
+++ b/browser/devtools/webconsole/webconsole.xul
@@ -63,12 +63,6 @@
   <vbox class="hud-outer-wrapper" flex="1">
     <vbox class="hud-console-wrapper" flex="1">
       <toolbar class="hud-console-filter-toolbar devtools-toolbar" mode="full">
-#ifdef XP_MACOSX
-        <toolbarbutton id="webconsole-close-button"
-                       class="devtools-closebutton"
-                       tooltiptext="&btnClose.tooltip;"/>
-#endif
-
         <toolbarbutton label="&btnPageNet.label;" type="menu-button"
                        category="net" class="devtools-toolbarbutton webconsole-filter-button"
                        tooltiptext="&btnPageNet.tooltip;">
@@ -119,29 +113,10 @@
 
         <spacer flex="1"/>
 
-        <toolbarbutton label="&btnPosition.label;" type="menu"
-                       class="devtools-toolbarbutton"
-                       tooltiptext="&btnPosition.tooltip;">
-          <menupopup>
-            <menuitem label="&positionMenu.above;" type="checkbox"
-                      autocheck="false" consolePosition="above"/>
-            <menuitem label="&positionMenu.below;" type="checkbox"
-                      autocheck="false" consolePosition="below"/>
-            <menuitem label="&positionMenu.window;" type="checkbox"
-                      autocheck="false" consolePosition="window"/>
-          </menupopup>
-        </toolbarbutton>
-
         <textbox class="compact hud-filter-box devtools-searchinput" type="search"
                  placeholder="&filterBox.placeholder;"/>
         <toolbarbutton class="webconsole-clear-console-button devtools-toolbarbutton"
                        label="&btnClear.label;" tooltiptext="&btnClear.tooltip;"/>
-
-#ifndef XP_MACOSX
-        <toolbarbutton id="webconsole-close-button"
-                       class="devtools-closebutton"
-                       tooltiptext="&btnClose.tooltip;"/>
-#endif
       </toolbar>
       <richlistbox class="hud-output-node" orient="vertical" flex="1"
                    seltype="multiple" context="output-contextmenu"
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 29b51d7a96e7..fad262527ba9 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -198,19 +198,15 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY webDeveloperMenu.label       "Web Developer">
 <!ENTITY webDeveloperMenu.accesskey   "W">
 
+<!ENTITY devtoolsConnect.label        "Connect…">
+<!ENTITY devtoolsConnect.accesskey    "e">
+
 <!ENTITY errorConsoleCmd.label        "Error Console">
 <!ENTITY errorConsoleCmd.accesskey    "C">
 <!ENTITY errorConsoleCmd.commandkey   "j">
 
-<!ENTITY webConsoleCmd.label          "Web Console">
-<!ENTITY webConsoleCmd.accesskey      "W">
-<!ENTITY webConsoleCmd.commandkey     "k">
 <!ENTITY remoteWebConsoleCmd.label    "Remote Web Console">
 
-<!ENTITY inspectMenu.label            "Inspect">
-<!ENTITY inspectMenu.accesskey        "I">
-<!ENTITY inspectMenu.commandkey       "I">
-
 <!ENTITY inspectContextMenu.label     "Inspect Element">
 <!ENTITY inspectContextMenu.accesskey "Q">
 
@@ -233,40 +229,15 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
-<!ENTITY inspectCloseButton.tooltiptext "Close Inspector">
-<!ENTITY inspectSidebarCloseButton.tooltiptext "Close sidebar">
-
 <!ENTITY devToolbarCloseButton.tooltiptext "Close Developer Toolbar">
 <!ENTITY devToolbarMenu.label              "Developer Toolbar">
 <!ENTITY devToolbarMenu.accesskey          "v">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
+<!ENTITY devToolbarToolsButton.label       "Toggle Toolbox">
 <!ENTITY devToolbarOtherToolsButton.label  "More Tools">
 
-<!ENTITY inspectorHTMLCopyInner.label       "Copy Inner HTML">
-<!ENTITY inspectorHTMLCopyInner.accesskey   "I">
-
-<!ENTITY inspectorHTMLCopyOuter.label       "Copy Outer HTML">
-<!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
-
-<!ENTITY inspectorHTMLDelete.label          "Delete Node">
-<!ENTITY inspectorHTMLDelete.accesskey      "D">
-
-<!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
-  -  alternate view for the Inspector, creating a 3D visualization of the
-  -  webpage. -->
-<!ENTITY inspect3DViewButton.label     "3D View">
-<!ENTITY inspect3DViewButton.accesskey "W">
-
-<!ENTITY inspectStyleButton.label     "Style">
-<!ENTITY inspectStyleButton.accesskey "S">
-
-<!-- LOCALIZATION NOTE (styleeditor.label): This menu item label appears
-  -  in the Tools menu. -->
-<!ENTITY styleeditor.label            "Style Editor">
-<!ENTITY styleeditor.accesskey        "y">
-<!ENTITY styleeditor.keycode          "VK_F7">
-<!ENTITY styleeditor.keytext          "F7">
+<!ENTITY devToolbox.accesskey              "B">
 
 <!ENTITY getMoreDevtoolsCmd.label        "Get More Tools">
 <!ENTITY getMoreDevtoolsCmd.accesskey    "M">
@@ -634,15 +605,6 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY addonBarCloseButton.tooltip  "Close Add-on Bar">
 <!ENTITY toggleAddonBarCmd.key        "/">
 
-<!-- LOCALIZATION NOTE (markupButton.arialabel): The markup button is the button
-located in front of the breadcrumbs display in the inspector toolbar. The button
-doesn't display any label, but exposes a label to screen-readers with "aria-label".
--->
-<!ENTITY markupButton.arialabel          "Markup">
-<!-- LOCALIZATION NOTE (markupButton.accesskey): The key bound to the Markup panel's
-toolbar button -->
-<!ENTITY markupButton.accesskey          "M">
-
 <!ENTITY socialToolbar.title        "Social Toolbar Button">
 <!ENTITY social.notLoggedIn.label   "Not logged in">
 
diff --git a/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd b/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd
new file mode 100644
index 000000000000..c00aa6a5ce46
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd
@@ -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/. -->
+
+<!-- LOCALIZATION NOTE : FILE This file contains the Remove Connection strings.
+  - The Remote Connection window can be start by running the command:
+  - `devtools connect`
+  - -->
+
+<!ENTITY title      "Connect">
+<!ENTITY host       "Host:">
+<!ENTITY port       "Port:">
+<!ENTITY connect    "Connect">
+<!ENTITY connecting "Connecting…">
+<!ENTITY availability "Available remote objects:">
diff --git a/browser/locales/en-US/chrome/browser/devtools/debugger.properties b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
index c9687bb29078..5c2d9cab6e7a 100644
--- a/browser/locales/en-US/chrome/browser/devtools/debugger.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
@@ -19,6 +19,14 @@ confirmTabSwitch.buttonSwitch.accessKey=S
 confirmTabSwitch.buttonOpen=Open anyway
 confirmTabSwitch.buttonOpen.accessKey=O
 
+# LOCALIZATION NOTE (open.commandkey): The key used to open the debugger in
+# combination to e.g. ctrl + shift
+open.commandkey=S
+
+# LOCALIZATION NOTE (debuggerMenu.accesskey): The access key used to open the
+# debugger.
+debuggerMenu.accesskey=D
+
 # LOCALIZATION NOTE (chromeDebuggerWindowTitle): The title displayed for the
 # chrome (browser) debugger window.
 chromeDebuggerWindowTitle=Browser Debugger
@@ -173,6 +181,11 @@ watchExpressionsScopeLabel=Watch expressions
 # the global scope.
 globalScopeLabel=Global
 
+# LOCALIZATION NOTE (ToolboxDebugger.label):
+# This string is displayed in the title of the tab when the debugger is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+ToolboxDebugger.label=Debugger
+
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel=:
diff --git a/browser/locales/en-US/chrome/browser/devtools/inspector.dtd b/browser/locales/en-US/chrome/browser/devtools/inspector.dtd
new file mode 100644
index 000000000000..897552ca002a
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/devtools/inspector.dtd
@@ -0,0 +1,10 @@
+<!ENTITY inspectorHTMLCopyInner.label       "Copy Inner HTML">
+<!ENTITY inspectorHTMLCopyInner.accesskey   "I">
+
+<!ENTITY inspectorHTMLCopyOuter.label       "Copy Outer HTML">
+<!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
+
+<!ENTITY inspectorHTMLDelete.label          "Delete Node">
+<!ENTITY inspectorHTMLDelete.accesskey      "D">
+
+<!ENTITY inspector.selectButton.tooltip     "Select element with mouse">
diff --git a/browser/locales/en-US/chrome/browser/devtools/inspector.properties b/browser/locales/en-US/chrome/browser/devtools/inspector.properties
index 13cb5e1b9e84..c4989cab16c2 100644
--- a/browser/locales/en-US/chrome/browser/devtools/inspector.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/inspector.properties
@@ -14,38 +14,22 @@
 # LOCALIZATION NOTE (confirmNavigationAway): Used in the Inspector tool, when
 # the user tries to navigate away from a web page, to confirm the change of
 # page.
-confirmNavigationAway.message=Leaving this page will close the Inspector and the changes you have made will be lost.
+confirmNavigationAway.message2=If you leave this page, the changes you have made will be lost.
 confirmNavigationAway.buttonLeave=Leave Page
 confirmNavigationAway.buttonLeaveAccesskey=L
 confirmNavigationAway.buttonStay=Stay on Page
 confirmNavigationAway.buttonStayAccesskey=S
 
 breadcrumbs.siblings=Siblings
-# LOCALIZATION NOTE (htmlPanel): Used in the Inspector tool's openInspectorUI
-# method when registering the HTML panel.
-
-# LOCALIZATION NOTE (inspectButtonWithShortcutKey.tooltip):
-# This button appears in the Inspector Toolbar. inspectButton is stateful,
-# if it's pressed users can select an element with the mouse.
-# %S is the keyboard shortcut.
-inspectButtonWithShortcutKey.tooltip=Select element with mouse (%S)
-
-# LOCALIZATION NOTE (inspectButton.tooltip):
-# Same as inspectButtonWithShortcutKey.tooltip but used when an add-on
-# overrides the shortcut key.
-inspectButton.tooltip=Select element with mouse
-
-# LOCALIZATION NOTE (markupButton.*):
-# This button is the button located at the beginning of the breadcrumbs
-# in the inspector toolbar. Its tooltip is built dynamically.
-# markupButton.tooltip is used on Mac.
-# On Windows and Linux, we use markupButton.tooltipWithAccesskey, where we append
-# the keyboard shortcut.
-markupButton.tooltip=Markup Panel
-markupButton.tooltipWithAccesskey=Markup Panel (%S)
-
 
 # LOCALIZATION NOTE (nodeMenu.tooltiptext)
 # This menu appears in the Infobar (on top of the highlighted node) once
 # the node is selected.
 nodeMenu.tooltiptext=Node operations
+
+
+# LOCALIZATION NOTE (inspector.*)
+# Used for the menuitem in the tool menu
+inspector.label=Inspector
+inspector.commandkey=I
+inspector.accesskey=I
diff --git a/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd b/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd
index e88902ff4a49..53aaf605c553 100644
--- a/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd
@@ -16,6 +16,7 @@
   -  The text appears on the bottom right corner of the layout view when
   -  the corresponding box is hovered. -->
 
+<!ENTITY title                  "Box Model">
 <!ENTITY margins.tooltip        "margins">
 <!ENTITY borders.tooltip        "borders">
 <!ENTITY padding.tooltip        "padding">
diff --git a/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd b/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd
index 6ac78727fa23..7210060e0c1d 100644
--- a/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd
@@ -117,9 +117,3 @@
   -  the same name in browser.dtd.
   -->
 <!ENTITY errorConsoleCmd.commandkey   "j">
-
-<!-- LOCALIZATION NOTE (webConsoleCmd.commandkey): This command key launches
-  -  the browser WebConsole, the key should be identical to the property of
-  -  the same name in browser.dtd.
-  -->
-<!ENTITY webConsoleCmd.commandkey     "k">
diff --git a/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties b/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties
index 2e08c8d07c3b..dca0bc6d81c9 100644
--- a/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties
@@ -52,6 +52,14 @@ saveStyleSheet.title=Save style sheet
 # LOCALIZATION NOTE  (saveStyleSheet.title): This is the *.css filter title
 saveStyleSheet.filter=CSS files
 
+# LOCALIZATION NOTE  (open.commandkey): This the key to use in
+# conjunction with shift to open the style editor
+open.commandkey=VK_F7
+
+# LOCALIZATION NOTE (open.accesskey): The access key used to open the style
+# editor.
+open.accesskey=y
+
 # LOCALIZATION NOTE  (saveStyleSheet.commandkey): This the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
 saveStyleSheet.commandkey=S
@@ -66,3 +74,7 @@ undo.commandkey=Z
 # platforms) to Redo a change in the editor.
 redo.commandkey=Z
 
+# LOCALIZATION NOTE (ToolboxStyleEditor.label):
+# This string is displayed in the title of the tab when the debugger is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+ToolboxStyleEditor.label=Style Editor
diff --git a/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd b/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
index f9f86b819139..e28e4e07b416 100644
--- a/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
@@ -41,3 +41,7 @@
 <!ENTITY matched               "Matched">
 <!ENTITY parentMatch           "Parent Match">
 <!ENTITY unmatched             "Unmatched">
+
+<!-- FIXME: notes -->
+<!ENTITY computedViewTitle     "Computed">
+<!ENTITY ruleViewTitle         "Rules">
diff --git a/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties b/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
index 5eab4a7b9913..5f7f1861025d 100644
--- a/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
@@ -36,13 +36,6 @@ rule.sourceElement=element
 # e.g "Inherited from body#bodyID"
 rule.inheritedFrom=Inherited from %S
 
-# LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
-# sidebar of the Highlighter for the style inspector button.
-# "Computed" refers to the Computed Style of the element.
-style.highlighter.button.label2=Computed
-style.highlighter.accesskey2=C
-style.highlighter.button.tooltip2=Inspect element computed styles
-
 # LOCALIZATION NOTE (helpLinkTitle): For each style property
 # the user can hover it and get a help link button which allows one to
 # quickly jump to the documentation from the Mozilla Developer Network site.
@@ -126,12 +119,6 @@ rule.contextmenu.copypropertyvalue=Copy property value
 # view's context menu copy property value access key.
 rule.contextmenu.copypropertyvalue.accesskey=U
 
-# LOCALIZATION NOTE (ruleView.*): Button label, accesskey and tooltip text
-# associated with the Highlighter's CSS Rule View in the Style Sidebar.
-ruleView.label=Rules
-ruleView.accesskey=R
-ruleView.tooltiptext=View and Edit CSS
-
 # LOCALIZATION NOTE (ruleView.empty): Text displayed when the highlighter is
 # first opened and there's no node selected in the rule view.
 rule.empty=No element selected.
diff --git a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
new file mode 100644
index 000000000000..29b63269353b
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
@@ -0,0 +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/. -->
+
+<!ENTITY window.title  "Developer Tools">
+
+<!ENTITY closeCmd.key  "W">
diff --git a/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd b/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd
index b72bd488a518..e442518b66ce 100644
--- a/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd
@@ -60,30 +60,9 @@
 <!ENTITY btnConsoleWarnings     "Warnings">
 <!ENTITY btnConsoleLog          "Log">
 
-<!-- LOCALIZATION NOTE (btnPosition.label): The label shown for the menu which
-  -  allows the user to toggle between the Web Console positioning types. -->
-<!ENTITY btnPosition.label     "Position">
-
-<!-- LOCALIZATION NOTE (btnPosition.tooltip): The tooltip shown when the user
-  -  hovers the Position button in the Web Console toolbar. -->
-<!ENTITY btnPosition.tooltip   "Position the Web Console above or below the document">
-
-<!-- LOCALIZATION NOTE (positionMenu.above): When this option is selected the
-  -  Web Console interface is displayed above the web page. -->
-<!ENTITY positionMenu.above    "Above">
-
-<!-- LOCALIZATION NOTE (positionMenu.below): When this option is selected the
-  -  Web Console interface is displayed below the web page. -->
-<!ENTITY positionMenu.below    "Below">
-
-<!-- LOCALIZATION NOTE (positionMenu.window): When this option is selected the
-  -  Web Console interface is displayed in a floating panel. -->
-<!ENTITY positionMenu.window   "Window">
-
 <!ENTITY filterBox.placeholder "Filter">
 <!ENTITY btnClear.label        "Clear">
 <!ENTITY btnClear.tooltip      "Clear the Web Console output">
-<!ENTITY btnClose.tooltip      "Close the Web Console">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
diff --git a/browser/locales/en-US/chrome/browser/devtools/webconsole.properties b/browser/locales/en-US/chrome/browser/devtools/webconsole.properties
index 68b02d014377..75784473847f 100644
--- a/browser/locales/en-US/chrome/browser/devtools/webconsole.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/webconsole.properties
@@ -32,6 +32,8 @@ close.button=Close
 close.accesskey=C
 update.button=Update
 update.accesskey=U
+cmd.commandkey=k
+webConsoleCmd.accesskey=W
 # LOCALIZATION NOTE FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
 #
 # The "PropertyPanel" is used to display a JS object to the user.
@@ -166,6 +168,12 @@ remoteWebConsoleSelectTabMessage=Select one of the tabs you want to attach to, o
 # global console in the tabs selection.
 listTabs.globalConsoleActor=*Global Console*
 
+# LOCALIZATION NOTE (ToolboxWebconsole.label):
+# This string is displayed in the title of the tab when the web console is
+# displayed inside the developer tools window it is probably the same string
+# as webConsoleWindowTitleAndURL before the '-'
+ToolboxWebconsole.label=Web Console
+
 # LOCALIZATION NOTE (longStringEllipsis): The string displayed after a long
 # string. This string is clickable such that the rest of the string is retrieved
 # from the server.
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 1cde24633f19..eb46acb04180 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -37,6 +37,9 @@
     locale/browser/devtools/sourceeditor.dtd          (%chrome/browser/devtools/sourceeditor.dtd)
     locale/browser/devtools/layoutview.dtd            (%chrome/browser/devtools/layoutview.dtd)
     locale/browser/devtools/responsiveUI.properties   (%chrome/browser/devtools/responsiveUI.properties)
+    locale/browser/devtools/toolbox.dtd            (%chrome/browser/devtools/toolbox.dtd)
+    locale/browser/devtools/inspector.dtd          (%chrome/browser/devtools/inspector.dtd)
+    locale/browser/devtools/connection-screen.dtd  (%chrome/browser/devtools/connection-screen.dtd)
     locale/browser/newTab.dtd                      (%chrome/browser/newTab.dtd)
     locale/browser/newTab.properties               (%chrome/browser/newTab.properties)
     locale/browser/openLocation.dtd                (%chrome/browser/openLocation.dtd)
diff --git a/browser/makefiles.sh b/browser/makefiles.sh
index 762153c4b980..2931b979c177 100644
--- a/browser/makefiles.sh
+++ b/browser/makefiles.sh
@@ -39,7 +39,7 @@ browser/components/tabview/Makefile
 browser/components/thumbnails/Makefile
 browser/devtools/Makefile
 browser/devtools/debugger/Makefile
-browser/devtools/highlighter/Makefile
+browser/devtools/inspector/Makefile
 browser/devtools/scratchpad/Makefile
 browser/devtools/shared/Makefile
 browser/devtools/sourceeditor/Makefile
@@ -119,7 +119,7 @@ if [ "$ENABLE_TESTS" ]; then
     browser/components/test/Makefile
     browser/components/thumbnails/test/Makefile
     browser/devtools/debugger/test/Makefile
-    browser/devtools/highlighter/test/Makefile
+    browser/devtools/inspector/test/Makefile
     browser/devtools/scratchpad/test/Makefile
     browser/devtools/shared/test/Makefile
     browser/devtools/sourceeditor/test/Makefile
diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css
index 4c9964a0f79f..4bf94b8d4b96 100644
--- a/browser/themes/gnomestripe/browser.css
+++ b/browser/themes/gnomestripe/browser.css
@@ -1970,51 +1970,26 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
 
 /* Highlighter */
 
-#highlighter-outline {
+.highlighter-outline {
   box-shadow: 0 0 0 1px black;
   outline: 1px dashed white;
   outline-offset: -1px;
 }
 
-#highlighter-outline[locked]  {
+.highlighter-outline[locked]  {
   box-shadow: 0 0 0 1px rgba(0,0,0,0.3);
   outline-color: rgba(255,255,255,0.7);
 }
 
-/* Highlighter toolbar */
+/* Developer toolbar */
 
-#inspector-inspect-toolbutton {
-  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#inspector-inspect-toolbutton[checked=true] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#inspector-toolbar,
 #developer-toolbar {
   border-top: 1px solid hsla(210, 8%, 5%, .65);
 }
 
-#devtools-side-splitter {
-  -moz-appearance: none;
-  border: 0;
-  -moz-border-start: 1px solid #242b33;
-  min-width: 0;
-  width: 3px;
-  background-color: transparent;
-  -moz-margin-end: -3px;
-  position: relative;
-}
-
-#devtools-sidebar-box {
-  background-color: -moz-Field;
-}
-
 /* Highlighter - Node Infobar */
 
-#highlighter-nodeinfobar {
+.highlighter-nodeinfobar {
   color: hsl(200, 100%, 65%);
   border: 1px solid hsla(210, 19%, 63%, .5);
   border-radius: 3px;
@@ -2023,21 +1998,21 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
 
 /* Highlighter - Node Infobar - text */
 
-#highlighter-nodeinfobar-text {
+.highlighter-nodeinfobar-text {
   /* 100% - size of the buttons and margins */
   max-width: calc(100% - 2 * (26px + 6px));
   padding-bottom: 1px;
 }
 
-html|*#highlighter-nodeinfobar-tagname {
+html|*.highlighter-nodeinfobar-tagname {
   color: white;
 }
 
-html|*#highlighter-nodeinfobar-id {
+html|*.highlighter-nodeinfobar-id {
   color: hsl(90, 79%, 52%);
 }
 
-html|*#highlighter-nodeinfobar-pseudo-classes {
+html|*.highlighter-nodeinfobar-pseudo-classes {
   color: hsl(20, 100%, 70%);
 }
 
@@ -2051,7 +2026,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   min-height: 26px;
 }
 
-#highlighter-nodeinfobar-inspectbutton {
+.highlighter-nodeinfobar-inspectbutton {
   -moz-border-end-width: 1px;
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
   -moz-margin-end: 6px;
@@ -2059,26 +2034,26 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-#highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
+.highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
 }
 
-#highlighter-nodeinfobar-inspectbutton:active:hover,
-#highlighter-nodeinfobar-container:not([locked]) >  #highlighter-nodeinfobar >  #highlighter-nodeinfobar-inspectbutton {
+.highlighter-nodeinfobar-inspectbutton:active:hover,
+.highlighter-nodeinfobar-container:not([locked]) >  .highlighter-nodeinfobar >  .highlighter-nodeinfobar-inspectbutton {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-#highlighter-nodeinfobar-menu {
+.highlighter-nodeinfobar-menu {
   -moz-border-start-width: 1px;
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
   -moz-margin-start: 6px;
 }
 
-#highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
+.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
 }
 
-#highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
+.highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
   -moz-appearance: none !important;
   list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
   -moz-box-align: center;
@@ -2097,7 +2072,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   background-repeat: no-repeat;
 }
 
-#highlighter-nodeinfobar-arrow-top {
+.highlighter-nodeinfobar-arrow-top {
   margin-bottom: -8px;
   margin-top: 8px;
   border-right-color: hsla(210, 19%, 63%, .5);
@@ -2105,7 +2080,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   background-image: -moz-linear-gradient(bottom left, transparent 50%, hsl(209, 18%, 30%) 50%);
 }
 
-#highlighter-nodeinfobar-arrow-bottom {
+.highlighter-nodeinfobar-arrow-bottom {
   margin-top: -8px;
   margin-bottom: 8px;
   border-left-color: hsla(210, 19%, 63%, .5);
@@ -2113,12 +2088,12 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   background-image: -moz-linear-gradient(top right, transparent 50%, hsl(210, 24%, 16%) 50%);
 }
 
-#highlighter-nodeinfobar-container[position="top"] > #highlighter-nodeinfobar,
-#highlighter-nodeinfobar-container[position="overlap"] > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
+.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar {
   box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
 }
 
-#highlighter-nodeinfobar-container[hide-arrow] > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
   margin: 7px 0;
 }
 
@@ -2148,259 +2123,6 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   font-size: 120%;
 }
 
-/* Highlighter toolbar - breadcrumbs */
-
-#inspector-breadcrumbs {
-  -moz-margin-end: 3px;
-  /* A fake 1px-shadow is included in the border-images of the
-     inspector-breadcrumbs-buttons, to match toolbar-buttons style.
-     This negative margin compensate the extra row of pixels created
-     by the shadow.*/
-  margin-bottom: -1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up,
-#inspector-breadcrumbs > .scrollbutton-down {
-  -moz-appearance: none;
-  border: 1px solid hsla(210,8%,5%,.45);
-  background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
-  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
-  margin: 0 0 1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up {
-  -moz-border-start-width: 0;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
-  border-color: hsla(210,8%,5%,.6);
-  background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
-  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
-  -moz-image-region: rect(0px 14px 16px 7px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
-  -moz-appearance: none;
-  list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
-  -moz-image-region: rect(0px 7px 16px 0px);
-  margin: 0 5px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
-  opacity: 0.5;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
-  transform: scaleX(-1);
-}
-
-.inspector-breadcrumbs-button {
-  -moz-appearance: none;
-  background-color: transparent;
-  border-style: solid;
-  border-width: 1px 13px 2px 13px;
-  color: hsl(210,30%,85%);
-  width: 85px; /* Can't use max-width. See bug 723132 */
-  /* The content of the button can be larger than the button */
-  overflow: hidden;
-  min-height: 25px;
-
-  margin: 0 -11px 0 0;
-  padding: 0 9px;
-}
-
-.inspector-breadcrumbs-button:-moz-focusring > label {
-  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
-  color: hsl(208,100%,60%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
-  color: hsl(205,100%,70%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
-  color: hsl(20, 100%, 70%);
-}
-
-.inspector-breadcrumbs-id,
-.inspector-breadcrumbs-classes {
-  color: #8d99a6;
-}
-
-.inspector-breadcrumbs-pseudo-classes {
-  color: hsl(20, 100%, 85%);
-}
-
-/* Highlighter toolbar - breadcrumbs - LTR */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
-  margin-left: 0;
-  border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]),
-.inspector-breadcrumbs-button:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked][siblings-menu-open],
-.inspector-breadcrumbs-button[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]),
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked],
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
-  border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked],
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - breadcrumbs - RTL */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
-  margin-right: 0;
-  border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked][siblings-menu-open]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - HTML Tree */
-
-#inspector-treepanel-toolbutton {
-  list-style-image: url("chrome://browser/skin/devtools/treepanel-button.png");
-  -moz-margin-end: 0;
-  -moz-image-region: rect(0px 18px 16px 0px);
-}
-
-#inspector-treepanel-toolbutton[checked] {
-  -moz-image-region: rect(0px 36px 16px 18px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl),
-#inspector-treepanel-toolbutton:-moz-locale-dir(ltr) {
-  border-radius: 3px 0 0 3px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr),
-#inspector-treepanel-toolbutton:-moz-locale-dir(rtl) {
-  border-radius: 0 3px 3px 0;
-}
-
-/* Highlight toolbar - Option menu */
-
-#inspector-option-toolbarbutton:-moz-focusring {
-  outline: 1px dotted hsla(210,30%,85%,0.4);
-  outline-offset: -2px;
-}
-
 html|*#gcli-tooltip-frame,
 html|*#gcli-output-frame {
   padding: 0;
@@ -2584,33 +2306,13 @@ html|*#gcli-output-frame {
   background: rgba(0,0,0,.4);
 }
 
-#developer-toolbar-webconsole {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#developer-toolbar-inspector {
-  -moz-image-region: rect(16px, 16px, 32px, 0);
-}
-
-#developer-toolbar-styleeditor {
-  -moz-image-region: rect(32px, 16px, 48px, 0);
-}
-
-#developer-toolbar-debugger {
-  -moz-image-region: rect(48px, 16px, 64px, 0);
-}
-
-#developer-toolbar-other-tools {
-  -moz-image-region: rect(64px, 16px, 80px, 0);
-}
-
-#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
-  display: none;
+#developer-toolbar-toolbox-button {
+  -moz-image-region: rect(64px, 22px, 80px, 0);
 }
 
 /* Error counter */
 
-#developer-toolbar-webconsole[error-count]:before {
+#developer-toolbar-toolbox-button[error-count]:before {
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
diff --git a/browser/themes/gnomestripe/devtools/command-responsivemode.png b/browser/themes/gnomestripe/devtools/command-responsivemode.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbfa599048c1065c7250a5cd74b9684724f3ded3
GIT binary patch
literal 1083
zcmV-B1jPG^P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn000C6Nkl<Zc-qyL
zZAevj9LN9X$h<4O&Glf*%BNah3|g&BTO-FTGBsO4PaCvw=xodCrlOb;F*k=pDYFnW
zn>{UzO0owih;|zVdoglM>cwC%#$YhU7`2<(IQxCw_q6}zaJu(MZ+h|J_xtPTd++so
zJ)EP$j~+kQsO_iXh4I1^PauOVU#LN7^a3-A^a_`}z>Ffl2!DBj8D(s0Nm}ydo%?w`
z1C|$%K~_Ed?*r@^4a|ZIqePKEM~O04@0yv_{;d@_;0<JuwF}q{-Y+ei5I@%Me;ROX
zpIOics%z_$qUGVhC5rq3n!adBj+Tc5mnfsSDl@SEwgr48)#YaH`eHL@T_o9S3e49_
zmYVZdE%OxzKd^md?E)Hryn!LJc4+vYbeVOWwQy|U*gmu1JmBv-nCs;15a=;aA7}DA
z;O|1r-Q)~8^7QQjGF!f}fRSIGx2XN=yMdY`>)&V(-Q&D#&MBA{H!e9*c-hF?ynud0
z0rdcTU;pKdDbv%?b`mDedI7r69h@D(B~J%9eDWKJJx`wn%xb=20i!Uu@Rh0)MK3Jg
zkQtZtRyrom^7F(u58YBg_5l5e0_p(w9cURlCe9HBIDK#iaBpMI&bMJF4xjuAxL?)t
zI6L$7S-`8GUbBEvv@?5ATWC<e<%#lb$7AA*0v7KNDWLm$0W|=7@7eRI@~>xN$HduD
z0DbP@G<lK_YkBO%;gg?%hdg~2u=k1uP{5?JgGDdC_xWVG#f`<pd8B~W>k8<;UO*MV
z{`b&ug}m`JIagxh>?nXfcW?@DZ)U!gvss|$^vO?vdmnTCoPEwbeHJit_XP`}fQ6s*
z|Bw~zD#>lUIEaa}@lO2&J}<=SzFt5OV8^v5`1Q#@JXdh|GQo)vT=H~Q3l5+B2%_Xa
zcK9q{M%_6J7%R5Vjhp>;8m|8*%qyH>Z2T;BUc;Gvs`S81x~~_o4PbX62Oj{t?sEq{
zM7gj^=oZ}kd&DhYAq+Tt7LZZhYXPI6G7Hzfj@$;vy|(jM`|RLx-1jHzzFxpq;8uWq
z3-N*<yY6!bM~QNv<-_j&Ac#Frp9Q4vIB5Z6WlbP=&pD+d1^DFIAjQmCJ4>De65-H~
zDBvR?yAS6m_-vn9aD<HE*%dgNugLc#A$lGTeHM_mwZ{Spn_HL5b)FpY%wN$p)p)ll
z%~-cLLoR_7IP@b5*aBqV77Mn|Ea)OfV?py3xkCnGggy({(rtn4+OMpfy3<bu4*mZN
zxE~%Wl^6Ta3&_|7Jb3u1O=hPTm_Z(Qo|`hi^8zzUp8nEP$~qsUmLImffDE$sHJ%{&
zJ(9ozMx75ogS<Is#dvdW(R_K<&li@)NIo*i{tKm$=he1VCV&6{002ovPDHLkV1ncB
B5lR36

literal 0
HcmV?d00001

diff --git a/browser/themes/gnomestripe/devtools/command-scratchpad.png b/browser/themes/gnomestripe/devtools/command-scratchpad.png
new file mode 100644
index 0000000000000000000000000000000000000000..5131ca5cbc6176c96a66f4a56d81fed95c4c9327
GIT binary patch
literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#30006HNkl<Zc-qC5
zPfHt76vbV+5d8}7Tofs2(W;=((r?mDX;F!&U_`-w1(zjaD@B7+1ec|v7^+rcocx)n
z7%gc*P=uDEO^iak2VUTLnAf><<KoAhcjuhp+<`Eut5&OZ^$kt`%Y*0dJ)l&%9noq7
z=ijTeJD=BS_X1NY?JlsQ((e3kwdMuNmD}i_t5U@1w+bD#3gE%<%hL5st)xQ7DPO!Q
zS8_)GQs|<+00t9@&FvN`)~wZ3V0ka&x6AdBR#X1suyFEBu3cKq3ycesK&z?1CzJwO
zP5Cq79B4H!FqTSZyEndWKdFH;<}RqfQpVr!v-3D(?t=2C{=v};JC8HwE_i`aAzHS;
z8FLr>8xR($B+hXcl>Z_8WH5KZ3k-u@FY|OgvDx-7;DMJ4%mXj$_lD)+ftT{%L2m!>
zc~~AEczJ;#!)Q4Kc;KZ1AAwn9A%uB&DPJ%gD=F{-gWy{-)$wJ0<8cj~F%N<Yd;q&%
zw#UxnjCl~0KLF`mzR%9%jCl~eKtGT-91(^rBA5q31!fI%4CX;l-Z$hK%!A+s-fZn8
z+dr?awFZHE@Yqm+ndDx&)0M|Pcx))2@pAcIS04A^vEc<?%iA6h1|1B*V?zaE!fXgJ
z8_Ih^It0(=-U9N8e<{OPTHv<}$R~bU=I^w?Z|DDB-y~$7(gHvKnQIi9v>5+`=kEaG
WYW7HKLO22d0000<MNUMnLSTZG<`g>s

literal 0
HcmV?d00001

diff --git a/browser/themes/gnomestripe/devtools/command-tilt.png b/browser/themes/gnomestripe/devtools/command-tilt.png
new file mode 100644
index 0000000000000000000000000000000000000000..f816bba59cedb2fb2069b4d0a4ff09225e99cdb7
GIT binary patch
literal 1668
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
O0000<MNUMnLSTYCryzI$

literal 0
HcmV?d00001

diff --git a/browser/themes/gnomestripe/devtools/common.css b/browser/themes/gnomestripe/devtools/common.css
index c2a1feb63781..59b66d44b4b4 100644
--- a/browser/themes/gnomestripe/devtools/common.css
+++ b/browser/themes/gnomestripe/devtools/common.css
@@ -188,6 +188,65 @@
   position: relative;
 }
 
+/* In-tools sidebar */
+
+.devtools-sidebar-tabs {
+  -moz-appearance: none;
+  margin: 0;
+}
+
+.devtools-sidebar-tabs > tabpanels {
+  -moz-appearance: none;
+  padding: 0;
+  border: 0;
+}
+
+.devtools-sidebar-tabs > tabs {
+  -moz-appearance: none;
+  position: static;
+  box-shadow: 0 1px 0 0 hsla(210, 16%, 76%, .2) inset;
+  background-image: linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
+  color: hsl(210,30%,85%);
+  margin-bottom: 0;
+  padding: 0;
+}
+
+.devtools-sidebar-tabs > tabs > .tabs-right,
+.devtools-sidebar-tabs > tabs > .tabs-left {
+  display: none;
+}
+
+.devtools-sidebar-tabs > tabs > tab {
+  -moz-appearance: none;
+  padding: 0;
+  margin: 0;
+  min-width: 78px;
+  min-height: 22px;
+  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+  text-align: center;
+  color: inherit;
+  -moz-box-flex: 1;
+  border-width: 0;
+  -moz-border-end-width: 1px;
+  border-color: hsla(210,8%,5%,.6);
+  border-style: solid;
+  background: transparent;
+  border-radius: 0;
+}
+
+.devtools-sidebar-tabs > tabs > tab:-moz-focusring {
+  position: static;
+}
+
+.devtools-sidebar-tabs > tabs > tab:last-of-type {
+  -moz-border-end-width: 0;
+}
+
+.devtools-sidebar-tabs > tabs > tab[selected=true] {
+  background-image: linear-gradient(to bottom, hsl(201,45%,34%), hsl(205,44%,22%));
+  color: white !important;
+}
+
 /* Theme */
 
 .devtools-theme-background {
diff --git a/browser/themes/gnomestripe/devtools/dock-bottom.png b/browser/themes/gnomestripe/devtools/dock-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..83842f236ef5ede55a268e67077532fc1764746f
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0YFJa
zK~y-6#gn~C13?spzuCWlN(=#wCY?p<l>U^m#7D5O5DN<nAI8GMLM$wN1jRC8vyGMA
z7J@}2RftI-u(La3lMTzdNrV(0xNz@f&Y64eFhXn1Dlk@J0~UZ&syRSu8qN|<2n>Kh
zIOvAfv{}Bpy}3APx_hQ+E}SZkWA*&<`f+)6eGl{!f$e6~t!l(Liq(<<1g?8r1-8-x
zYak{7r)TG5uj2=R%rNc4gZ=u`<HLqwm=ai@?Enx!1mJc2H?8rLIt9z?_#@yb#hD3^
z+$f+Z1iL`?eFad=PWDUS>oaHojd>f8ks77z^u{G13$|4$*j7bGs-Kr9=kg|q0LGK>
zJ!#C#^DL;Ww?9D5ENB?E+8#=&7+4reskqhl&@coLT5IghS{Xqd*vZ(+Lj?5D1oFGv
d7ytene*n2yf``D{mBs)7002ovPDHLkV1mh##`^#O

literal 0
HcmV?d00001

diff --git a/browser/themes/gnomestripe/devtools/dock-side.png b/browser/themes/gnomestripe/devtools/dock-side.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a940bc1e4e50a63d1522fc5604cb2cf44b05e82
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0dYx0
zK~y-6#gn^A13?&tzkg#^qGBXPiUd)DAZTgt4PpYmfM6lMl7fg>Soj`_MNAq&5H*Pw
z3NaSm5~HhonXzzJ)=Nxb;lR(pFz4{i;f!dl`O7l?qz1YG%z?BC4ESSq&?uk@+}IDb
zmoEP>v9Y$YoX=&4Baui)s&b{;oSmCr0WJcAWG<IYYNY9Usv~wLlQDoq*q{gG1z=%u
z$tn~}RlorTFV9bty)knn5I<S=nTP;%gP#E)zJNlpbf7gwz!hNvn0m78lOI4NY(QWD
z+-t3G)ni>p<EdxB>5G}8!KIdEm%}dK3<Q*VtcT0tv@H9mT^?Zr*Wb-(JY_hIs~}Cc
zFJ_K~2#$Xxn3<j&-`U-3MdPVgV8|yp{FOk1tCaE#!(e-BvtLB=AFi&~_$pFL!F!=T
zs(iP)wytd3_FPXrIIedajQ_MxQ`j$}-`j|2t%=6d{XhmG4aC~v2AKfYXev&lb|?S-
a8{Yua!lFpTFEAhg0000<MNUMnLSTZp`P~Wt

literal 0
HcmV?d00001

diff --git a/browser/themes/gnomestripe/devtools/dock-window.png b/browser/themes/gnomestripe/devtools/dock-window.png
new file mode 100644
index 0000000000000000000000000000000000000000..29d3b319a99a3c8b2ded8fbd8ae8d70970c792a2
GIT binary patch
literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0)I(F
zK~y-6rBlyKR8bf`_rCk)jc*)B#2=&c!!Zn76qwRNa|(i>c7@u?RTxEB5kmh%P)N(7
zT`i)>qChBuC?O1glu}BRT7)w?m6JZ7^WK|x@7KZt6L)^g?{Ln6^PP_o5q2_c>!Lii
zyS#bd-dMmeN|lt`l7tX4lU@8dJw1~ZTfxg0`;K&Xo;;DNPjID(6VZPrn#PsmdUAYh
zB6F$#%FV3;C3UsYhK6LEy?HzKJCj{p*M;VT{nd~Po|5K)))u{`Wq*Zfnzf=b(G)p<
z_DnjRZjb#~%9_zwGAcA?Umv(JH}vrCYXIw;3_Ji$PoKX!To;X+j^hMGJRVPVcXu66
z)hEnSgTp0QR>3a@gTYw<;{dj%Y#BzN*_Sd1fVh-0l1e4*sSnc&Ev;>zZ{5DLTo%++
zC=~LyAp?LCLKKO}Q$*lWN=PY-wr%I%O^gg{oM$x7lx0~40DT()({(-KoVy?*A(bL2
zRnas}8$hn6y1E{K-O=9G7&1$aMj{cL^NkQS>B_}rt1(<!8q{^Ypok!_(In3=7JUFt
zHkT``ILhnq>kR<t0KfqtZ+k2p3P1pofc4SI8S=bhK`5n|5W-ot)=B`>T<Gmt8XSBa
zud1pPuICkq2<eW4bnbLdaq!7AV`TWHUlC0>qhsUw?BddbV4M?U%x!GkWjq>saY$!;
z?aSA1`kHMU05Kv$G9L3nC5AsaHMKHu?dk-88~_UlSYl;mHGl8^13J~!S!k$_>rx?j
zOoz(>2iWMk0_4cV$KdSTd=9{S0P<fgm=>-rFDnc035UZ`-}m+HPRBWCQb}w1SN@Zm
k|31GNV>|suz9Tk(KRCWA;;1x%9RL6T07*qoM6N<$g8X4xGynhq

literal 0
HcmV?d00001

diff --git a/browser/themes/gnomestripe/devtools/inspector.css b/browser/themes/gnomestripe/devtools/inspector.css
new file mode 100644
index 000000000000..054658534278
--- /dev/null
+++ b/browser/themes/gnomestripe/devtools/inspector.css
@@ -0,0 +1,214 @@
+#inspector-inspect-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#inspector-inspect-toolbutton[checked=true] {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+/* Highlighter toolbar - breadcrumbs */
+
+#inspector-breadcrumbs {
+  -moz-margin-end: 3px;
+  /* A fake 1px-shadow is included in the border-images of the
+     inspector-breadcrumbs-buttons, to match toolbar-buttons style.
+     This negative margin compensate the extra row of pixels created
+     by the shadow.*/
+  margin-bottom: -1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up,
+#inspector-breadcrumbs > .scrollbutton-down {
+  -moz-appearance: none;
+  border: 1px solid hsla(210,8%,5%,.45);
+  background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
+  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
+  margin: 0 0 1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
+  border-color: hsla(210,8%,5%,.6);
+  background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
+  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
+  -moz-image-region: rect(0px 14px 16px 7px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
+  -moz-appearance: none;
+  list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
+  -moz-image-region: rect(0px 7px 16px 0px);
+  margin: 0 5px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+  opacity: 0.5;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
+  transform: scaleX(-1);
+}
+
+.inspector-breadcrumbs-button {
+  -moz-appearance: none;
+  background-color: transparent;
+  border-style: solid;
+  border-width: 1px 13px 2px 13px;
+  color: hsl(210,30%,85%);
+  width: 85px; /* Can't use max-width. See bug 723132 */
+  /* The content of the button can be larger than the button */
+  overflow: hidden;
+  min-height: 25px;
+
+  margin: 0 -11px 0 0;
+  padding: 0 9px;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > label {
+  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
+  color: hsl(208,100%,60%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
+  color: hsl(205,100%,70%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
+  color: hsl(20, 100%, 70%);
+}
+
+.inspector-breadcrumbs-id,
+.inspector-breadcrumbs-classes {
+  color: #8d99a6;
+}
+
+.inspector-breadcrumbs-pseudo-classes {
+  color: hsl(20, 100%, 85%);
+}
+
+/* Highlighter toolbar - breadcrumbs - LTR */
+
+.inspector-breadcrumbs-button {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
+  border-left-width: 0;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
+  border-right-width: 0;
+}
+
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+/* Highlighter toolbar - breadcrumbs - RTL */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
+  border-right-width: 0;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  border-left-width: 0;
+}
+
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
+}
diff --git a/browser/themes/gnomestripe/devtools/layout-background.png b/browser/themes/gnomestripe/devtools/layout-background.png
deleted file mode 100644
index 6991cc0f2ab221e7488be16c3f9e4aa4d6228e73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 981
zcmV;`11kK9P)<h;3K|Lk000e1NJLTq000vJ000sQ1^@s6xeVoL00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+yxsDEjaStXd3_k17b-;
zK~y-)Rg}wa+(r;ZPj|D~<P6Cfiqcpy3~Q5Bwt@FqWgp~Q@)h|?$$;U<j5vHXo3HLH
z1P_pHRiSXJ?!gs*|MTzfT5DcjUbw%%r|UY5F|=(<S(emw&Ew-E08tdNZ5!wFnX)W#
z&JjfsNs=&*BayY1d7gQEe57q#(ljN@GK?`S%R-iA^nFi~BzW)9TJ!MmfDi&91byF=
z=Q&N&Ag|XeNs^$orYH)u)_nf_nK+K=x{i16-m$JL(=@Sd8^bUVLLh{|IF3xygb;%L
zevd565-BB3(=d)ByWI|B4Axrq`#tNr5<)--aZ@`@6Mf&4rYQhT(_pPd{yfDPLmbCg
zYf(y(Wf=h1>y@%BDT)H`J*U$N?>)QSj&)sG*Oe^Gn5Kznx7)F88^#!>X+mpFmSrr<
zf^&}3>BKM$EXzU&fxhpNQW8QS%QA!zeEIT)BuS7_6mhv+`1<uLLI}F9V_jF8rr~%z
z^8EZvmSt?)hEj@US*WUt!{Gpcl#*px5JDhB2vk*t)|z>qQA#n6BUM!)gy8AviMp=o
z`~HSOUDv$4ydZ>l`<0Z;^Ncjc;JrsFMb~xA^Gs0`SZjHGeWk8zq?Fv>-}CzVij<PR
z?|FK9;>V94L{Y@U!vj$ip?>-8)BB(N2q8Ee4h+M9bMD4g2!YGxf>H`=Ek#i<jw4x?
zA*IAQhm?}&a5%7S+s*!M+sN~rbzK>Tfh0+Y<Cr*(QA)9G8|%8FwWe)bmSws1BJVxc
z+BY|(#Cy-OEUfE_F@|9n0GQ_)=NunDe#ALP*L5UGf>H`&3?T$$*L4iTK;QQ_&Z??H
zDaC%jrz}f`VW21qwr%74_wRIFhf<0pNl4R_JkN2?p+5cj*ZZH~g%ED1Ow+`&EO_s^
zySpQbB8)Kr9FIqwbN`!}rs>U1t@RC!d7jy}4XrhC9N+5C&(BzENz)W#3~8Dogur``
zbB;XEk>~T7IF6a;nd9+zi=U=x$n%`@`Hc4-V+>VQF^(f`+cJ(L)>^#x0DSxQ?M+$R
zw)B0E5Q4kAJC4WW4GVy2n#i(@%jH5{*J!PA&hg>H2SNz!b~}oqK>hmZkM~g&aXOvo
z`=0Cdddn^EJ^THhWmy=8;TBWZ>lLLGLWtYqaUA&%hHv{do)ciN00000NkvXXu0mjf
DG;`Ue

diff --git a/browser/themes/gnomestripe/devtools/layout-buttons.png b/browser/themes/gnomestripe/devtools/layout-buttons.png
deleted file mode 100644
index 8705bc51475de5e6759371cc30a32e67187f455a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0004oNkl<Zc-rli
z&q@Mu6h?nCxvizE3iDr!dJM}PeXA_el)ysG3{$Y6f_6Pgw8~ep@5Bsuj1<L1Em|D7
z^WA&AR~gVvCX-*~PaF^vo>*HF4|i4HQFuB3#bx}l_*jrJ4(_VH;~JMbe0AA!TePMr
zwT0zI8wYo`Z_M+90}k#LUQLlHcH=q!3+nHE99;8p{A-sk40-+udd!$_2aFUpL$t6H
z&lU#iZ2~n}bOr}^%1<BN>NzR4W{_mYd^=#M@B*}`rG@=qc?_t@=!J7QxKW?Jmn%J!
z1)c+HGWDLAG2afjQ&`u})6}A#Ew>LKqsI)hIJi+?G+eqkVo`WRWcedKy;BYI?SP)b
zGyOc5dfpas@+f5Vm|+%&Jn9EjwP?UX90-;VwY<uV`E~#=*@?bgO}vTs8PKaSi-SAm
z8>d>>_jbz<Kus2%!Lb8&@;3@A;&?$SIJk5CijM67^(>zQyp4VTTtU~R^6f=nc73l{
p$6eJAU$BJOT9O3rs{a4K;U}VSGM><Zg2Dg*002ovPDHLkV1gOT${7Fv

diff --git a/browser/themes/gnomestripe/devtools/layoutview.css b/browser/themes/gnomestripe/devtools/layoutview.css
index 4d653c5c5e0c..552c9841e848 100644
--- a/browser/themes/gnomestripe/devtools/layoutview.css
+++ b/browser/themes/gnomestripe/devtools/layoutview.css
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 body {
-  background: url(layout-background.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
+  background: url(layout-background-grid.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
   color: hsl(210,100%,85%);
   border-top: 1px solid black;
   -moz-box-sizing: border-box;
@@ -42,17 +42,3 @@ body {
   border-style: solid;
   border-color: hsl(210,100%,85%);
 }
-
-#togglebutton {
-  background-image: url(layout-buttons.png);
-  width: 16px;
-  height: 16px;
-}
-
-body.open {
-  background: url(layout-background-grid.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
-}
-
-body.open > #header > #togglebutton {
-  background-position: -16px 0;
-}
diff --git a/browser/themes/gnomestripe/devtools/toolbox.css b/browser/themes/gnomestripe/devtools/toolbox.css
new file mode 100644
index 000000000000..13b5b4997a52
--- /dev/null
+++ b/browser/themes/gnomestripe/devtools/toolbox.css
@@ -0,0 +1,99 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#toolbox-tabs {
+  margin: 0;
+}
+
+#toolbox-dock-bottom {
+  list-style-image: url("chrome://browser/skin/devtools/dock-bottom.png");
+}
+
+#toolbox-dock-side {
+  list-style-image: url("chrome://browser/skin/devtools/dock-side.png");
+}
+
+#toolbox-dock-window {
+  list-style-image: url("chrome://browser/skin/devtools/dock-window.png");
+}
+
+.command-button {
+  margin: 0 10px;
+  width: 16px;
+  height: 32px;
+  background-repeat: no-repeat;
+  background-position: center center;
+}
+
+#command-button-responsive {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 16, 16, 0);
+}
+#command-button-responsive:hover {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 32, 16, 16);
+}
+#command-button-responsive:hover:active {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 48, 16, 32);
+}
+#command-button-responsive.toggled {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 64, 16, 48);
+}
+
+#command-button-tilt {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 16, 16, 0);
+}
+#command-button-tilt:hover {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 32, 16, 16);
+}
+
+#command-button-tilt:hover:active {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 48, 16, 32);
+}
+
+#command-button-tilt.toggled {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 64, 16, 48);
+}
+
+#command-button-scratchpad {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 16, 16, 0);
+}
+
+#command-button-scratchpad:hover {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 32, 16, 16);
+}
+
+#command-button-scratchpad:hover:active {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 48, 16, 32);
+}
+
+
+/* Tabs */
+
+.devtools-tabbar {
+  -moz-appearance: none;
+  background-image: linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
+  color: hsl(210,30%,85%);
+  padding: 4px 3px 3px;
+  box-shadow: 0 -3px 0 0 rgb(20,20,20) inset, 0 -4px 0 0 rgba(0,0,0,0.8) inset;
+}
+
+.devtools-tab {
+  -moz-appearance: none;
+  min-width: 78px;
+  min-height: 22px;
+  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+  border-radius: 3px 3px 0 0;
+  color: inherit;
+  border-style: solid;
+  border-color: transparent;
+  border-width: 1px 1px 0;
+  margin: 0 5px;
+  padding: 0 10px 1px;
+}
+
+.devtools-tab[selected=true] {
+  border-color: hsla(210,8%,5%,.6);
+  background-color: rgb(20,20,20);
+  text-shadow: none;
+  color: white;
+}
diff --git a/browser/themes/gnomestripe/devtools/treepanel-button.png b/browser/themes/gnomestripe/devtools/treepanel-button.png
deleted file mode 100644
index 2a8802216bf178bc05813fc592df30d91cd49415..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq001Na000mO1^@s6e(T*M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!$4Nv%RCwCVR$FTmK@^_Z-89vNv{qwm
zODndik(x^}`U{GbLJ)lr5%fv)L45Of_%7H-U%enj2$F&~P-`(Ips`Au*oIzAYMV46
zo88&*oRE}pd&&6Lz{d=kbG|)u_M2~(a?Z&?`cX$mPdkjq03LwSBHjWN0eL`GTreKx
z95A>5$VXf7@J4<aQ^f@h;7i0O@1F^rJ|eS&^!K?xqhqlLFwOq6u=3M08XAZ@R3$3I
zV=!wbk(wVPC;SC_L7hWGLr#-fB^e@&#T<J<^!G1!$v73Q=}hX?v?(NtIowu|0=?5e
zewyBdxhVsT#he{a$feolW-)1+CXoTgV$Kc?X`Y@g+&H}T?ncM3104YOE}Aky9IG%c
z05(KTv1rUmsM1HYw&TF15T{Gy9`7O2?sgJIwP}ho(ssB&y8TPsf1xO9imIL-wNV6$
zl2S_g;*-yAgo0;XGOhpmEnT`ee(9mb$&$#!$M1EWyLS7j!{La?@R$~#na<|NG=&mu
zTSZtqIXpaUf~MAGhysBCZm5$@<gy|UO-*&ISFK2`QkB#ct!qlz<vi+d-@UIij$=z;
z>|UBGmWoNkFo+B=7IV;tniNex>IV$MLwpTQ?d3;XfCB6w1LF^KBG>F_-H+(p2QOJ&
z=qI(xQRtVtI}78ax~0>Nl`T>!E)#AoiVyU?eDUP^NF>}Y)8d&gNiBBy>KiD0o`@X+
zKN@h;xZ3NDl3s619>&;gX6pGB`uZ^*7F{f;GZYN!hRMn@1&xHm8XO%J4nbWvOz@*T
z@kMnecO^Mh8sUTIEo&lI=TSuM#9t*0SwF(qy|hy<SET(2V?{sG1U0YSx^s70@S}ZC
zDa0?sxMsh#XlAy=v#FcgezgCMW)ZWtM!8ku_JZIKbn6sM(vp`Wc2l<p($AA9cGT74
j|L|<*AGFVpzXA*Z|5Kl~6^V5Y00000NkvXXu0mjflR<IX

diff --git a/browser/themes/gnomestripe/jar.mn b/browser/themes/gnomestripe/jar.mn
index 4fb4850ef75f..f10067a6a654 100644
--- a/browser/themes/gnomestripe/jar.mn
+++ b/browser/themes/gnomestripe/jar.mn
@@ -105,6 +105,9 @@ browser.jar:
   skin/classic/browser/devtools/common.css            (devtools/common.css)
   skin/classic/browser/devtools/arrows.png            (devtools/arrows.png)
   skin/classic/browser/devtools/commandline.png       (devtools/commandline.png)
+  skin/classic/browser/devtools/command-responsivemode.png (devtools/command-responsivemode.png)
+  skin/classic/browser/devtools/command-scratchpad.png (devtools/command-scratchpad.png)
+  skin/classic/browser/devtools/command-tilt.png      (devtools/command-tilt.png)
   skin/classic/browser/devtools/alerticon-warning.png (devtools/alerticon-warning.png)
   skin/classic/browser/devtools/goto-mdn.png          (devtools/goto-mdn.png)
   skin/classic/browser/devtools/csshtmltree.css       (devtools/csshtmltree.css)
@@ -153,11 +156,8 @@ browser.jar:
   skin/classic/browser/devtools/itemArrow-ltr.png     (devtools/itemArrow-ltr.png)
   skin/classic/browser/devtools/inspect-button.png    (devtools/inspect-button.png)
   skin/classic/browser/devtools/dropmarker.png        (devtools/dropmarker.png)
-  skin/classic/browser/devtools/treepanel-button.png  (devtools/treepanel-button.png)
-  skin/classic/browser/devtools/layout-background.png (devtools/layout-background.png)
   skin/classic/browser/devtools/layout-background-grid.png (devtools/layout-background-grid.png)
   skin/classic/browser/devtools/layoutview.css        (devtools/layoutview.css)
-  skin/classic/browser/devtools/layout-buttons.png    (devtools/layout-buttons.png)
   skin/classic/browser/devtools/debugger-collapse.png  (devtools/debugger-collapse.png)
   skin/classic/browser/devtools/debugger-expand.png    (devtools/debugger-expand.png)
   skin/classic/browser/devtools/debugger-pause.png     (devtools/debugger-pause.png)
@@ -169,7 +169,12 @@ browser.jar:
   skin/classic/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
   skin/classic/browser/devtools/responsive-background.png (devtools/responsive-background.png)
   skin/classic/browser/devtools/tools-icons-small.png     (devtools/tools-icons-small.png)
+  skin/classic/browser/devtools/dock-bottom.png           (devtools/dock-bottom.png)
+  skin/classic/browser/devtools/dock-side.png             (devtools/dock-side.png)
+  skin/classic/browser/devtools/dock-window.png           (devtools/dock-window.png)
   skin/classic/browser/devtools/floating-scrollbars.css   (devtools/floating-scrollbars.css)
+  skin/classic/browser/devtools/inspector.css             (devtools/inspector.css)
+  skin/classic/browser/devtools/toolbox.css               (devtools/toolbox.css)
 #ifdef MOZ_SERVICES_SYNC
   skin/classic/browser/sync-16-throbber.png
   skin/classic/browser/sync-16.png
diff --git a/browser/themes/pinstripe/browser.css b/browser/themes/pinstripe/browser.css
index a4c6ed912e6a..614317940f3c 100644
--- a/browser/themes/pinstripe/browser.css
+++ b/browser/themes/pinstripe/browser.css
@@ -3368,58 +3368,35 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 /* Highlighter */
 
-#highlighter-outline {
+.highlighter-outline {
   box-shadow: 0 0 0 1px black;
   outline: 1px dashed white;
   outline-offset: -1px;
 }
 
-#highlighter-outline[locked]  {
+.highlighter-outline[locked]  {
   box-shadow: 0 0 0 1px rgba(0,0,0,0.3);
   outline-color: rgba(255,255,255,0.7);
 }
 
-/* Highlighter toolbar */
+/* Developer toolbar */
 
-#inspector-inspect-toolbutton {
-  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#inspector-inspect-toolbutton[checked=true] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#inspector-toolbar,
 #developer-toolbar {
   border-top: 1px solid hsla(210, 8%, 5%, .65);
   padding-top: 4px;
   padding-bottom: 4px;
 }
 
-#inspector-toolbar:-moz-locale-dir(ltr),
 #developer-toolbar:-moz-locale-dir(ltr) {
   padding-left: 2px;
   padding-right: 16px; /* use -moz-padding-end when/if bug 631729 gets fixed */
 }
 
-#inspector-toolbar:-moz-locale-dir(rtl),
 #developer-toolbar:-moz-locale-dir(rtl) {
   padding-left: 4px;
   padding-right: 18px; /* use -moz-padding-end when/if bug 631729 gets fixed */
 }
 
-#devtools-side-splitter {
-  background-image: none !important;
-  border: 0;
-  -moz-border-start: 1px solid #242b33;
-  min-width: 0;
-  width: 3px;
-  background-color: transparent;
-  -moz-margin-end: -3px;
-  position: relative;
-}
-
 /* Lion Fullscreen window styling */
 @media (-moz-mac-lion-theme) {
   #navigator-toolbox[inFullscreen][tabsontop="true"]:not(:-moz-lwtheme)::before {
@@ -3434,13 +3411,9 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   }
 }
 
-#devtools-sidebar-box {
-  background-color: -moz-Field;
-}
-
 /* Highlighter - Node Infobar */
 
-#highlighter-nodeinfobar {
+.highlighter-nodeinfobar {
   color: hsl(200, 100%, 65%);
   border: 1px solid hsla(210, 19%, 63%, .5);
   border-radius: 3px;
@@ -3449,21 +3422,21 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 /* Highlighter - Node Infobar - text */
 
-#highlighter-nodeinfobar-text {
+.highlighter-nodeinfobar-text {
   /* 100% - size of the buttons + margins */
   max-width: calc(100% - 2 * (26px + 6px));
   padding-bottom: 1px;
 }
 
-html|*#highlighter-nodeinfobar-tagname {
+html|*.highlighter-nodeinfobar-tagname {
   color: white;
 }
 
-html|*#highlighter-nodeinfobar-id {
+html|*.highlighter-nodeinfobar-id {
   color: hsl(90, 79%, 52%);
 }
 
-html|*#highlighter-nodeinfobar-pseudo-classes {
+html|*.highlighter-nodeinfobar-pseudo-classes {
   color: hsl(20, 100%, 70%);
 }
 
@@ -3478,7 +3451,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   background-color: transparent;
 }
 
-#highlighter-nodeinfobar-inspectbutton {
+.highlighter-nodeinfobar-inspectbutton {
   -moz-border-end-width: 1px;
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
   -moz-margin-end: 6px;
@@ -3486,26 +3459,26 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-#highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
+.highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
 }
 
-#highlighter-nodeinfobar-inspectbutton:active:hover,
-#highlighter-nodeinfobar-container:not([locked]) >  #highlighter-nodeinfobar >  #highlighter-nodeinfobar-inspectbutton {
+.highlighter-nodeinfobar-inspectbutton:active:hover,
+.highlighter-nodeinfobar-container:not([locked]) >  .highlighter-nodeinfobar >  .highlighter-nodeinfobar-inspectbutton {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-#highlighter-nodeinfobar-menu {
+.highlighter-nodeinfobar-menu {
   -moz-border-start-width: 1px;
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
   -moz-margin-start: 6px;
 }
 
-#highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
+.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
 }
 
-#highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
+.highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
   -moz-appearance: none !important;
   list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
   -moz-box-align: center;
@@ -3524,7 +3497,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   background-repeat: no-repeat;
 }
 
-#highlighter-nodeinfobar-arrow-top {
+.highlighter-nodeinfobar-arrow-top {
   margin-bottom: -8px;
   margin-top: 8px;
   border-right-color: hsla(210, 19%, 63%, .5);
@@ -3532,7 +3505,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   background-image: -moz-linear-gradient(bottom left, transparent 50%, hsl(209, 18%, 30%) 50%);
 }
 
-#highlighter-nodeinfobar-arrow-bottom {
+.highlighter-nodeinfobar-arrow-bottom {
   margin-top: -8px;
   margin-bottom: 8px;
   border-left-color: hsla(210, 19%, 63%, .5);
@@ -3540,12 +3513,12 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   background-image: -moz-linear-gradient(top right, transparent 50%, hsl(210, 24%, 16%) 50%);
 }
 
-#highlighter-nodeinfobar-container[position="top"] > #highlighter-nodeinfobar,
-#highlighter-nodeinfobar-container[position="overlap"] > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
+.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar {
   box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
 }
 
-#highlighter-nodeinfobar-container[hide-arrow] > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
   margin: 7px 0;
 }
 
@@ -3575,256 +3548,6 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   font-size: 120%;
 }
 
-/* Highlighter toolbar - breadcrumbs */
-
-#inspector-breadcrumbs {
-  -moz-margin-end: 3px;
-  /* A fake 1px-shadow is included in the border-images of the
-     inspector-breadcrumbs-buttons, to match toolbar-buttons style.
-     This negative margin compensate the extra row of pixels created
-     by the shadow.*/
-  margin-bottom: -1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up,
-#inspector-breadcrumbs > .scrollbutton-down {
-  -moz-appearance: none;
-  border: 1px solid hsla(210,8%,5%,.45);
-  background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
-  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
-  margin: 0 0 1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up {
-  -moz-border-start-width: 0;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
-  border-color: hsla(210,8%,5%,.6);
-  background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
-  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
-  -moz-appearance: none;
-  list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
-  -moz-image-region: rect(0px 7px 16px 0px);
-  margin: 0 5px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
-  opacity: 0.5;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
-  -moz-image-region: rect(0px 14px 16px 7px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
-  transform: scaleX(-1);
-}
-
-.inspector-breadcrumbs-button {
-  -moz-appearance: none;
-  border-style: solid;
-  border-width: 1px 13px 2px 13px;
-  color: hsl(210,30%,85%);
-  width: 85px; /* Can't use max-width. See bug 723132 */
-  /* The content of the button can be larger than the button */
-  overflow: hidden;
-  min-height: 25px;
-
-  margin: 0 -11px 0 0;
-  padding: 0 9px;
-}
-
-.inspector-breadcrumbs-button:-moz-focusring > label {
-  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
-  color: hsl(208,100%,60%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
-  color: hsl(205,100%,70%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
-  color: hsl(20, 100%, 70%);
-}
-
-.inspector-breadcrumbs-id,
-.inspector-breadcrumbs-classes {
-  color: #8d99a6;
-}
-
-.inspector-breadcrumbs-pseudo-classes {
-  color: hsl(20, 100%, 85%);
-}
-
-/* Highlighter toolbar - breadcrumbs - LTR */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
-  border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]),
-.inspector-breadcrumbs-button:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked][siblings-menu-open],
-.inspector-breadcrumbs-button[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]),
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked],
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
-  border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked],
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - breadcrumbs - RTL */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
-  border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked][siblings-menu-open]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - HTML Tree */
-
-#inspector-treepanel-toolbutton {
-  list-style-image: url("chrome://browser/skin/devtools/treepanel-button.png");
-  -moz-margin-end: 0;
-  -moz-image-region: rect(0px 18px 16px 0px);
-}
-
-#inspector-treepanel-toolbutton[checked] {
-  -moz-image-region: rect(0px 36px 16px 18px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl),
-#inspector-treepanel-toolbutton:-moz-locale-dir(ltr) {
-  border-radius: @toolbarbuttonCornerRadius@ 0 0 @toolbarbuttonCornerRadius@;
-}
-
-#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr),
-#inspector-treepanel-toolbutton:-moz-locale-dir(rtl) {
-  border-radius: 0 @toolbarbuttonCornerRadius@ @toolbarbuttonCornerRadius@ 0;
-}
-
-/* Highlight toolbar - Option menu */
-
-#inspector-option-toolbarbutton:-moz-focusring {
-  outline: 1px dotted hsla(210,30%,85%,0.4);
-  outline-offset: -2px;
-}
-
 html|*#gcli-tooltip-frame,
 html|*#gcli-output-frame {
   padding: 0;
@@ -4003,33 +3726,13 @@ html|*#gcli-output-frame {
   text-shadow: 0 0 6px hsl(208,100%,60%);
 }
 
-#developer-toolbar-webconsole {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#developer-toolbar-inspector {
-  -moz-image-region: rect(16px, 16px, 32px, 0);
-}
-
-#developer-toolbar-styleeditor {
-  -moz-image-region: rect(32px, 16px, 48px, 0);
-}
-
-#developer-toolbar-debugger {
-  -moz-image-region: rect(48px, 16px, 64px, 0);
-}
-
-#developer-toolbar-other-tools {
+#developer-toolbar-toolbox-button {
   -moz-image-region: rect(64px, 16px, 80px, 0);
 }
 
-#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
 /* Error counter */
 
-#developer-toolbar-webconsole[error-count]:before {
+#developer-toolbar-toolbox-button[error-count]:before {
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
diff --git a/browser/themes/pinstripe/devtools/command-responsivemode.png b/browser/themes/pinstripe/devtools/command-responsivemode.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbfa599048c1065c7250a5cd74b9684724f3ded3
GIT binary patch
literal 1083
zcmV-B1jPG^P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn000C6Nkl<Zc-qyL
zZAevj9LN9X$h<4O&Glf*%BNah3|g&BTO-FTGBsO4PaCvw=xodCrlOb;F*k=pDYFnW
zn>{UzO0owih;|zVdoglM>cwC%#$YhU7`2<(IQxCw_q6}zaJu(MZ+h|J_xtPTd++so
zJ)EP$j~+kQsO_iXh4I1^PauOVU#LN7^a3-A^a_`}z>Ffl2!DBj8D(s0Nm}ydo%?w`
z1C|$%K~_Ed?*r@^4a|ZIqePKEM~O04@0yv_{;d@_;0<JuwF}q{-Y+ei5I@%Me;ROX
zpIOics%z_$qUGVhC5rq3n!adBj+Tc5mnfsSDl@SEwgr48)#YaH`eHL@T_o9S3e49_
zmYVZdE%OxzKd^md?E)Hryn!LJc4+vYbeVOWwQy|U*gmu1JmBv-nCs;15a=;aA7}DA
z;O|1r-Q)~8^7QQjGF!f}fRSIGx2XN=yMdY`>)&V(-Q&D#&MBA{H!e9*c-hF?ynud0
z0rdcTU;pKdDbv%?b`mDedI7r69h@D(B~J%9eDWKJJx`wn%xb=20i!Uu@Rh0)MK3Jg
zkQtZtRyrom^7F(u58YBg_5l5e0_p(w9cURlCe9HBIDK#iaBpMI&bMJF4xjuAxL?)t
zI6L$7S-`8GUbBEvv@?5ATWC<e<%#lb$7AA*0v7KNDWLm$0W|=7@7eRI@~>xN$HduD
z0DbP@G<lK_YkBO%;gg?%hdg~2u=k1uP{5?JgGDdC_xWVG#f`<pd8B~W>k8<;UO*MV
z{`b&ug}m`JIagxh>?nXfcW?@DZ)U!gvss|$^vO?vdmnTCoPEwbeHJit_XP`}fQ6s*
z|Bw~zD#>lUIEaa}@lO2&J}<=SzFt5OV8^v5`1Q#@JXdh|GQo)vT=H~Q3l5+B2%_Xa
zcK9q{M%_6J7%R5Vjhp>;8m|8*%qyH>Z2T;BUc;Gvs`S81x~~_o4PbX62Oj{t?sEq{
zM7gj^=oZ}kd&DhYAq+Tt7LZZhYXPI6G7Hzfj@$;vy|(jM`|RLx-1jHzzFxpq;8uWq
z3-N*<yY6!bM~QNv<-_j&Ac#Frp9Q4vIB5Z6WlbP=&pD+d1^DFIAjQmCJ4>De65-H~
zDBvR?yAS6m_-vn9aD<HE*%dgNugLc#A$lGTeHM_mwZ{Spn_HL5b)FpY%wN$p)p)ll
z%~-cLLoR_7IP@b5*aBqV77Mn|Ea)OfV?py3xkCnGggy({(rtn4+OMpfy3<bu4*mZN
zxE~%Wl^6Ta3&_|7Jb3u1O=hPTm_Z(Qo|`hi^8zzUp8nEP$~qsUmLImffDE$sHJ%{&
zJ(9ozMx75ogS<Is#dvdW(R_K<&li@)NIo*i{tKm$=he1VCV&6{002ovPDHLkV1ncB
B5lR36

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/devtools/command-scratchpad.png b/browser/themes/pinstripe/devtools/command-scratchpad.png
new file mode 100644
index 0000000000000000000000000000000000000000..5131ca5cbc6176c96a66f4a56d81fed95c4c9327
GIT binary patch
literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#30006HNkl<Zc-qC5
zPfHt76vbV+5d8}7Tofs2(W;=((r?mDX;F!&U_`-w1(zjaD@B7+1ec|v7^+rcocx)n
z7%gc*P=uDEO^iak2VUTLnAf><<KoAhcjuhp+<`Eut5&OZ^$kt`%Y*0dJ)l&%9noq7
z=ijTeJD=BS_X1NY?JlsQ((e3kwdMuNmD}i_t5U@1w+bD#3gE%<%hL5st)xQ7DPO!Q
zS8_)GQs|<+00t9@&FvN`)~wZ3V0ka&x6AdBR#X1suyFEBu3cKq3ycesK&z?1CzJwO
zP5Cq79B4H!FqTSZyEndWKdFH;<}RqfQpVr!v-3D(?t=2C{=v};JC8HwE_i`aAzHS;
z8FLr>8xR($B+hXcl>Z_8WH5KZ3k-u@FY|OgvDx-7;DMJ4%mXj$_lD)+ftT{%L2m!>
zc~~AEczJ;#!)Q4Kc;KZ1AAwn9A%uB&DPJ%gD=F{-gWy{-)$wJ0<8cj~F%N<Yd;q&%
zw#UxnjCl~0KLF`mzR%9%jCl~eKtGT-91(^rBA5q31!fI%4CX;l-Z$hK%!A+s-fZn8
z+dr?awFZHE@Yqm+ndDx&)0M|Pcx))2@pAcIS04A^vEc<?%iA6h1|1B*V?zaE!fXgJ
z8_Ih^It0(=-U9N8e<{OPTHv<}$R~bU=I^w?Z|DDB-y~$7(gHvKnQIi9v>5+`=kEaG
WYW7HKLO22d0000<MNUMnLSTZG<`g>s

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/devtools/command-tilt.png b/browser/themes/pinstripe/devtools/command-tilt.png
new file mode 100644
index 0000000000000000000000000000000000000000..f816bba59cedb2fb2069b4d0a4ff09225e99cdb7
GIT binary patch
literal 1668
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
O0000<MNUMnLSTYCryzI$

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/devtools/common.css b/browser/themes/pinstripe/devtools/common.css
index c8cfa326c108..7fa892e45758 100644
--- a/browser/themes/pinstripe/devtools/common.css
+++ b/browser/themes/pinstripe/devtools/common.css
@@ -203,6 +203,60 @@
   position: relative;
 }
 
+/* In-tools sidebar */
+
+.devtools-sidebar-tabs {
+  -moz-appearance: none;
+  margin: 0;
+}
+
+.devtools-sidebar-tabs > tabpanels {
+  padding: 0;
+}
+
+.devtools-sidebar-tabs > tabs {
+  -moz-appearance: none;
+  position: static;
+  box-shadow: 0 1px 0 0 hsla(210, 16%, 76%, .2) inset;
+  background-image: url(background-noise-toolbar.png), linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
+  color: hsl(210,30%,85%);
+  margin-bottom: 0;
+  padding: 0;
+}
+
+.devtools-sidebar-tabs > tabs > .tabs-right,
+.devtools-sidebar-tabs > tabs > .tabs-left {
+  display: none;
+}
+
+.devtools-sidebar-tabs > tabs > tab {
+  -moz-appearance: none;
+  padding: 0;
+  min-width: 78px;
+  min-height: 22px;
+  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+  text-align: center;
+  color: inherit;
+  -moz-box-flex: 1;
+  border-width: 0;
+  -moz-border-end-width: 1px;
+  border-color: hsla(210,8%,5%,.6);
+  border-style: solid;
+}
+
+.devtools-sidebar-tabs > tabs > tab:-moz-focusring {
+  position: static;
+}
+
+.devtools-sidebar-tabs > tabs > tab:last-of-type {
+  -moz-border-end-width: 0;
+}
+
+.devtools-sidebar-tabs > tabs > tab[selected=true] {
+  background-image: url(background-noise-toolbar.png), linear-gradient(to bottom, hsl(201,45%,34%), hsl(205,44%,22%));
+  color: white !important;
+}
+
 /* Theme */
 
 .devtools-theme-background {
diff --git a/browser/themes/pinstripe/devtools/dock-bottom.png b/browser/themes/pinstripe/devtools/dock-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..83842f236ef5ede55a268e67077532fc1764746f
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0YFJa
zK~y-6#gn~C13?spzuCWlN(=#wCY?p<l>U^m#7D5O5DN<nAI8GMLM$wN1jRC8vyGMA
z7J@}2RftI-u(La3lMTzdNrV(0xNz@f&Y64eFhXn1Dlk@J0~UZ&syRSu8qN|<2n>Kh
zIOvAfv{}Bpy}3APx_hQ+E}SZkWA*&<`f+)6eGl{!f$e6~t!l(Liq(<<1g?8r1-8-x
zYak{7r)TG5uj2=R%rNc4gZ=u`<HLqwm=ai@?Enx!1mJc2H?8rLIt9z?_#@yb#hD3^
z+$f+Z1iL`?eFad=PWDUS>oaHojd>f8ks77z^u{G13$|4$*j7bGs-Kr9=kg|q0LGK>
zJ!#C#^DL;Ww?9D5ENB?E+8#=&7+4reskqhl&@coLT5IghS{Xqd*vZ(+Lj?5D1oFGv
d7ytene*n2yf``D{mBs)7002ovPDHLkV1mh##`^#O

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/devtools/dock-side.png b/browser/themes/pinstripe/devtools/dock-side.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a940bc1e4e50a63d1522fc5604cb2cf44b05e82
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0dYx0
zK~y-6#gn^A13?&tzkg#^qGBXPiUd)DAZTgt4PpYmfM6lMl7fg>Soj`_MNAq&5H*Pw
z3NaSm5~HhonXzzJ)=Nxb;lR(pFz4{i;f!dl`O7l?qz1YG%z?BC4ESSq&?uk@+}IDb
zmoEP>v9Y$YoX=&4Baui)s&b{;oSmCr0WJcAWG<IYYNY9Usv~wLlQDoq*q{gG1z=%u
z$tn~}RlorTFV9bty)knn5I<S=nTP;%gP#E)zJNlpbf7gwz!hNvn0m78lOI4NY(QWD
z+-t3G)ni>p<EdxB>5G}8!KIdEm%}dK3<Q*VtcT0tv@H9mT^?Zr*Wb-(JY_hIs~}Cc
zFJ_K~2#$Xxn3<j&-`U-3MdPVgV8|yp{FOk1tCaE#!(e-BvtLB=AFi&~_$pFL!F!=T
zs(iP)wytd3_FPXrIIedajQ_MxQ`j$}-`j|2t%=6d{XhmG4aC~v2AKfYXev&lb|?S-
a8{Yua!lFpTFEAhg0000<MNUMnLSTZp`P~Wt

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/devtools/dock-window.png b/browser/themes/pinstripe/devtools/dock-window.png
new file mode 100644
index 0000000000000000000000000000000000000000..29d3b319a99a3c8b2ded8fbd8ae8d70970c792a2
GIT binary patch
literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0)I(F
zK~y-6rBlyKR8bf`_rCk)jc*)B#2=&c!!Zn76qwRNa|(i>c7@u?RTxEB5kmh%P)N(7
zT`i)>qChBuC?O1glu}BRT7)w?m6JZ7^WK|x@7KZt6L)^g?{Ln6^PP_o5q2_c>!Lii
zyS#bd-dMmeN|lt`l7tX4lU@8dJw1~ZTfxg0`;K&Xo;;DNPjID(6VZPrn#PsmdUAYh
zB6F$#%FV3;C3UsYhK6LEy?HzKJCj{p*M;VT{nd~Po|5K)))u{`Wq*Zfnzf=b(G)p<
z_DnjRZjb#~%9_zwGAcA?Umv(JH}vrCYXIw;3_Ji$PoKX!To;X+j^hMGJRVPVcXu66
z)hEnSgTp0QR>3a@gTYw<;{dj%Y#BzN*_Sd1fVh-0l1e4*sSnc&Ev;>zZ{5DLTo%++
zC=~LyAp?LCLKKO}Q$*lWN=PY-wr%I%O^gg{oM$x7lx0~40DT()({(-KoVy?*A(bL2
zRnas}8$hn6y1E{K-O=9G7&1$aMj{cL^NkQS>B_}rt1(<!8q{^Ypok!_(In3=7JUFt
zHkT``ILhnq>kR<t0KfqtZ+k2p3P1pofc4SI8S=bhK`5n|5W-ot)=B`>T<Gmt8XSBa
zud1pPuICkq2<eW4bnbLdaq!7AV`TWHUlC0>qhsUw?BddbV4M?U%x!GkWjq>saY$!;
z?aSA1`kHMU05Kv$G9L3nC5AsaHMKHu?dk-88~_UlSYl;mHGl8^13J~!S!k$_>rx?j
zOoz(>2iWMk0_4cV$KdSTd=9{S0P<fgm=>-rFDnc035UZ`-}m+HPRBWCQb}w1SN@Zm
k|31GNV>|suz9Tk(KRCWA;;1x%9RL6T07*qoM6N<$g8X4xGynhq

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/devtools/inspector.css b/browser/themes/pinstripe/devtools/inspector.css
new file mode 100644
index 000000000000..0c105cfe4b35
--- /dev/null
+++ b/browser/themes/pinstripe/devtools/inspector.css
@@ -0,0 +1,229 @@
+%include ../shared.inc
+%filter substitution
+
+#inspector-inspect-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#inspector-inspect-toolbutton[checked=true] {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#inspector-toolbar {
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
+
+#inspector-toolbar:-moz-locale-dir(ltr) {
+  padding-left: 2px;
+  padding-right: 16px; /* use -moz-padding-end when/if bug 631729 gets fixed */
+}
+
+#inspector-toolbar:-moz-locale-dir(rtl) {
+  padding-left: 4px;
+  padding-right: 18px; /* use -moz-padding-end when/if bug 631729 gets fixed */
+}
+
+#inspector-breadcrumbs {
+  -moz-margin-end: 3px;
+  /* A fake 1px-shadow is included in the border-images of the
+     inspector-breadcrumbs-buttons, to match toolbar-buttons style.
+     This negative margin compensate the extra row of pixels created
+     by the shadow.*/
+  margin-bottom: -1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up,
+#inspector-breadcrumbs > .scrollbutton-down {
+  -moz-appearance: none;
+  border: 1px solid hsla(210,8%,5%,.45);
+  background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
+  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
+  margin: 0 0 1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
+  border-color: hsla(210,8%,5%,.6);
+  background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
+  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
+  -moz-appearance: none;
+  list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
+  -moz-image-region: rect(0px 7px 16px 0px);
+  margin: 0 5px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+  opacity: 0.5;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
+  -moz-image-region: rect(0px 14px 16px 7px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
+  transform: scaleX(-1);
+}
+
+.inspector-breadcrumbs-button {
+  -moz-appearance: none;
+  border-style: solid;
+  border-width: 1px 13px 2px 13px;
+  color: hsl(210,30%,85%);
+  width: 85px; /* Can't use max-width. See bug 723132 */
+  /* The content of the button can be larger than the button */
+  overflow: hidden;
+  min-height: 25px;
+
+  margin: 0 -11px 0 0;
+  padding: 0 9px;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > label {
+  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
+  color: hsl(208,100%,60%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
+  color: hsl(205,100%,70%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
+  color: hsl(20, 100%, 70%);
+}
+
+.inspector-breadcrumbs-id,
+.inspector-breadcrumbs-classes {
+  color: #8d99a6;
+}
+
+.inspector-breadcrumbs-pseudo-classes {
+  color: hsl(20, 100%, 85%);
+}
+
+/* Highlighter toolbar - breadcrumbs - LTR */
+
+.inspector-breadcrumbs-button {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
+  border-left-width: 0;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
+  border-right-width: 0;
+}
+
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+/* Highlighter toolbar - breadcrumbs - RTL */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
+  border-right-width: 0;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  border-left-width: 0;
+}
+
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
+}
diff --git a/browser/themes/pinstripe/devtools/layout-background.png b/browser/themes/pinstripe/devtools/layout-background.png
deleted file mode 100644
index 6991cc0f2ab221e7488be16c3f9e4aa4d6228e73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 981
zcmV;`11kK9P)<h;3K|Lk000e1NJLTq000vJ000sQ1^@s6xeVoL00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+yxsDEjaStXd3_k17b-;
zK~y-)Rg}wa+(r;ZPj|D~<P6Cfiqcpy3~Q5Bwt@FqWgp~Q@)h|?$$;U<j5vHXo3HLH
z1P_pHRiSXJ?!gs*|MTzfT5DcjUbw%%r|UY5F|=(<S(emw&Ew-E08tdNZ5!wFnX)W#
z&JjfsNs=&*BayY1d7gQEe57q#(ljN@GK?`S%R-iA^nFi~BzW)9TJ!MmfDi&91byF=
z=Q&N&Ag|XeNs^$orYH)u)_nf_nK+K=x{i16-m$JL(=@Sd8^bUVLLh{|IF3xygb;%L
zevd565-BB3(=d)ByWI|B4Axrq`#tNr5<)--aZ@`@6Mf&4rYQhT(_pPd{yfDPLmbCg
zYf(y(Wf=h1>y@%BDT)H`J*U$N?>)QSj&)sG*Oe^Gn5Kznx7)F88^#!>X+mpFmSrr<
zf^&}3>BKM$EXzU&fxhpNQW8QS%QA!zeEIT)BuS7_6mhv+`1<uLLI}F9V_jF8rr~%z
z^8EZvmSt?)hEj@US*WUt!{Gpcl#*px5JDhB2vk*t)|z>qQA#n6BUM!)gy8AviMp=o
z`~HSOUDv$4ydZ>l`<0Z;^Ncjc;JrsFMb~xA^Gs0`SZjHGeWk8zq?Fv>-}CzVij<PR
z?|FK9;>V94L{Y@U!vj$ip?>-8)BB(N2q8Ee4h+M9bMD4g2!YGxf>H`=Ek#i<jw4x?
zA*IAQhm?}&a5%7S+s*!M+sN~rbzK>Tfh0+Y<Cr*(QA)9G8|%8FwWe)bmSws1BJVxc
z+BY|(#Cy-OEUfE_F@|9n0GQ_)=NunDe#ALP*L5UGf>H`&3?T$$*L4iTK;QQ_&Z??H
zDaC%jrz}f`VW21qwr%74_wRIFhf<0pNl4R_JkN2?p+5cj*ZZH~g%ED1Ow+`&EO_s^
zySpQbB8)Kr9FIqwbN`!}rs>U1t@RC!d7jy}4XrhC9N+5C&(BzENz)W#3~8Dogur``
zbB;XEk>~T7IF6a;nd9+zi=U=x$n%`@`Hc4-V+>VQF^(f`+cJ(L)>^#x0DSxQ?M+$R
zw)B0E5Q4kAJC4WW4GVy2n#i(@%jH5{*J!PA&hg>H2SNz!b~}oqK>hmZkM~g&aXOvo
z`=0Cdddn^EJ^THhWmy=8;TBWZ>lLLGLWtYqaUA&%hHv{do)ciN00000NkvXXu0mjf
DG;`Ue

diff --git a/browser/themes/pinstripe/devtools/layout-buttons.png b/browser/themes/pinstripe/devtools/layout-buttons.png
deleted file mode 100644
index 8705bc51475de5e6759371cc30a32e67187f455a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0004oNkl<Zc-rli
z&q@Mu6h?nCxvizE3iDr!dJM}PeXA_el)ysG3{$Y6f_6Pgw8~ep@5Bsuj1<L1Em|D7
z^WA&AR~gVvCX-*~PaF^vo>*HF4|i4HQFuB3#bx}l_*jrJ4(_VH;~JMbe0AA!TePMr
zwT0zI8wYo`Z_M+90}k#LUQLlHcH=q!3+nHE99;8p{A-sk40-+udd!$_2aFUpL$t6H
z&lU#iZ2~n}bOr}^%1<BN>NzR4W{_mYd^=#M@B*}`rG@=qc?_t@=!J7QxKW?Jmn%J!
z1)c+HGWDLAG2afjQ&`u})6}A#Ew>LKqsI)hIJi+?G+eqkVo`WRWcedKy;BYI?SP)b
zGyOc5dfpas@+f5Vm|+%&Jn9EjwP?UX90-;VwY<uV`E~#=*@?bgO}vTs8PKaSi-SAm
z8>d>>_jbz<Kus2%!Lb8&@;3@A;&?$SIJk5CijM67^(>zQyp4VTTtU~R^6f=nc73l{
p$6eJAU$BJOT9O3rs{a4K;U}VSGM><Zg2Dg*002ovPDHLkV1gOT${7Fv

diff --git a/browser/themes/pinstripe/devtools/layoutview.css b/browser/themes/pinstripe/devtools/layoutview.css
index 4d653c5c5e0c..552c9841e848 100644
--- a/browser/themes/pinstripe/devtools/layoutview.css
+++ b/browser/themes/pinstripe/devtools/layoutview.css
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 body {
-  background: url(layout-background.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
+  background: url(layout-background-grid.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
   color: hsl(210,100%,85%);
   border-top: 1px solid black;
   -moz-box-sizing: border-box;
@@ -42,17 +42,3 @@ body {
   border-style: solid;
   border-color: hsl(210,100%,85%);
 }
-
-#togglebutton {
-  background-image: url(layout-buttons.png);
-  width: 16px;
-  height: 16px;
-}
-
-body.open {
-  background: url(layout-background-grid.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
-}
-
-body.open > #header > #togglebutton {
-  background-position: -16px 0;
-}
diff --git a/browser/themes/pinstripe/devtools/toolbox.css b/browser/themes/pinstripe/devtools/toolbox.css
new file mode 100644
index 000000000000..cb8a8b632a97
--- /dev/null
+++ b/browser/themes/pinstripe/devtools/toolbox.css
@@ -0,0 +1,99 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#toolbox-tabs {
+  margin: 0;
+}
+
+#toolbox-dock-bottom {
+  list-style-image: url("chrome://browser/skin/devtools/dock-bottom.png");
+}
+
+#toolbox-dock-side {
+  list-style-image: url("chrome://browser/skin/devtools/dock-side.png");
+}
+
+#toolbox-dock-window {
+  list-style-image: url("chrome://browser/skin/devtools/dock-window.png");
+}
+
+.command-button {
+  margin: 0 10px;
+  width: 16px;
+  height: 32px;
+  background-repeat: no-repeat;
+  background-position: center center;
+}
+
+#command-button-responsive {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 16, 16, 0);
+}
+#command-button-responsive:hover {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 32, 16, 16);
+}
+#command-button-responsive:hover:active {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 48, 16, 32);
+}
+#command-button-responsive.toggled {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 64, 16, 48);
+}
+
+#command-button-tilt {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 16, 16, 0);
+}
+#command-button-tilt:hover {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 32, 16, 16);
+}
+
+#command-button-tilt:hover:active {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 48, 16, 32);
+}
+
+#command-button-tilt.toggled {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 64, 16, 48);
+}
+
+#command-button-scratchpad {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 16, 16, 0);
+}
+
+#command-button-scratchpad:hover {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 32, 16, 16);
+}
+
+#command-button-scratchpad:hover:active {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 48, 16, 32);
+}
+
+
+/* Tabs */
+
+.devtools-tabbar {
+  -moz-appearance: none;
+  background-image: url(background-noise-toolbar.png), linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
+  color: hsl(210,30%,85%);
+  padding: 4px 3px 3px;
+  box-shadow: 0 -3px 0 0 rgb(20,20,20) inset, 0 -4px 0 0 rgba(0,0,0,0.8) inset;
+}
+
+.devtools-tab {
+  -moz-appearance: none;
+  min-width: 78px;
+  min-height: 22px;
+  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+  border-radius: @toolbarbuttonCornerRadius@ @toolbarbuttonCornerRadius@ 0 0;
+  color: inherit;
+  border-style: solid;
+  border-color: transparent;
+  border-width: 1px 1px 0;
+  margin: 0 5px;
+  padding: 0 10px 1px;
+}
+
+.devtools-tab[selected=true] {
+  border-color: hsla(210,8%,5%,.6);
+  background-color: rgb(20,20,20);
+  text-shadow: none;
+  color: white;
+}
diff --git a/browser/themes/pinstripe/devtools/treepanel-button.png b/browser/themes/pinstripe/devtools/treepanel-button.png
deleted file mode 100644
index 2a8802216bf178bc05813fc592df30d91cd49415..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq001Na000mO1^@s6e(T*M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!$4Nv%RCwCVR$FTmK@^_Z-89vNv{qwm
zODndik(x^}`U{GbLJ)lr5%fv)L45Of_%7H-U%enj2$F&~P-`(Ips`Au*oIzAYMV46
zo88&*oRE}pd&&6Lz{d=kbG|)u_M2~(a?Z&?`cX$mPdkjq03LwSBHjWN0eL`GTreKx
z95A>5$VXf7@J4<aQ^f@h;7i0O@1F^rJ|eS&^!K?xqhqlLFwOq6u=3M08XAZ@R3$3I
zV=!wbk(wVPC;SC_L7hWGLr#-fB^e@&#T<J<^!G1!$v73Q=}hX?v?(NtIowu|0=?5e
zewyBdxhVsT#he{a$feolW-)1+CXoTgV$Kc?X`Y@g+&H}T?ncM3104YOE}Aky9IG%c
z05(KTv1rUmsM1HYw&TF15T{Gy9`7O2?sgJIwP}ho(ssB&y8TPsf1xO9imIL-wNV6$
zl2S_g;*-yAgo0;XGOhpmEnT`ee(9mb$&$#!$M1EWyLS7j!{La?@R$~#na<|NG=&mu
zTSZtqIXpaUf~MAGhysBCZm5$@<gy|UO-*&ISFK2`QkB#ct!qlz<vi+d-@UIij$=z;
z>|UBGmWoNkFo+B=7IV;tniNex>IV$MLwpTQ?d3;XfCB6w1LF^KBG>F_-H+(p2QOJ&
z=qI(xQRtVtI}78ax~0>Nl`T>!E)#AoiVyU?eDUP^NF>}Y)8d&gNiBBy>KiD0o`@X+
zKN@h;xZ3NDl3s619>&;gX6pGB`uZ^*7F{f;GZYN!hRMn@1&xHm8XO%J4nbWvOz@*T
z@kMnecO^Mh8sUTIEo&lI=TSuM#9t*0SwF(qy|hy<SET(2V?{sG1U0YSx^s70@S}ZC
zDa0?sxMsh#XlAy=v#FcgezgCMW)ZWtM!8ku_JZIKbn6sM(vp`Wc2l<p($AA9cGT74
j|L|<*AGFVpzXA*Z|5Kl~6^V5Y00000NkvXXu0mjflR<IX

diff --git a/browser/themes/pinstripe/jar.mn b/browser/themes/pinstripe/jar.mn
index 600584c99e53..e69772656f95 100644
--- a/browser/themes/pinstripe/jar.mn
+++ b/browser/themes/pinstripe/jar.mn
@@ -173,6 +173,9 @@ browser.jar:
 * skin/classic/browser/devtools/common.css                  (devtools/common.css)
   skin/classic/browser/devtools/arrows.png                  (devtools/arrows.png)
   skin/classic/browser/devtools/commandline.png             (devtools/commandline.png)
+  skin/classic/browser/devtools/command-responsivemode.png  (devtools/command-responsivemode.png)
+  skin/classic/browser/devtools/command-scratchpad.png      (devtools/command-scratchpad.png)
+  skin/classic/browser/devtools/command-tilt.png            (devtools/command-tilt.png)
   skin/classic/browser/devtools/alerticon-warning.png       (devtools/alerticon-warning.png)
   skin/classic/browser/devtools/goto-mdn.png                (devtools/goto-mdn.png)
   skin/classic/browser/devtools/csshtmltree.css             (devtools/csshtmltree.css)
@@ -223,11 +226,8 @@ browser.jar:
   skin/classic/browser/devtools/background-noise-toolbar.png (devtools/background-noise-toolbar.png)
   skin/classic/browser/devtools/inspect-button.png          (devtools/inspect-button.png)
   skin/classic/browser/devtools/dropmarker.png              (devtools/dropmarker.png)
-  skin/classic/browser/devtools/treepanel-button.png        (devtools/treepanel-button.png)
-  skin/classic/browser/devtools/layout-background.png       (devtools/layout-background.png)
   skin/classic/browser/devtools/layout-background-grid.png  (devtools/layout-background-grid.png)
   skin/classic/browser/devtools/layoutview.css              (devtools/layoutview.css)
-  skin/classic/browser/devtools/layout-buttons.png          (devtools/layout-buttons.png)
   skin/classic/browser/devtools/debugger-collapse.png       (devtools/debugger-collapse.png)
   skin/classic/browser/devtools/debugger-expand.png         (devtools/debugger-expand.png)
   skin/classic/browser/devtools/debugger-pause.png          (devtools/debugger-pause.png)
@@ -239,7 +239,12 @@ browser.jar:
   skin/classic/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
   skin/classic/browser/devtools/responsive-background.png   (devtools/responsive-background.png)
   skin/classic/browser/devtools/tools-icons-small.png       (devtools/tools-icons-small.png)
+  skin/classic/browser/devtools/dock-bottom.png             (devtools/dock-bottom.png)
+  skin/classic/browser/devtools/dock-side.png               (devtools/dock-side.png)
+  skin/classic/browser/devtools/dock-window.png             (devtools/dock-window.png)
   skin/classic/browser/devtools/floating-scrollbars.css     (devtools/floating-scrollbars.css)
+* skin/classic/browser/devtools/inspector.css               (devtools/inspector.css)
+* skin/classic/browser/devtools/toolbox.css                 (devtools/toolbox.css)
 #ifdef MOZ_SERVICES_SYNC
   skin/classic/browser/sync-throbber.png
   skin/classic/browser/sync-16.png
diff --git a/browser/themes/winstripe/browser.css b/browser/themes/winstripe/browser.css
index b45ccb6932d4..96d3b972ad3a 100644
--- a/browser/themes/winstripe/browser.css
+++ b/browser/themes/winstripe/browser.css
@@ -2652,50 +2652,26 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 
 /* Highlighter */
 
-#highlighter-outline {
+.highlighter-outline {
   box-shadow: 0 0 0 1px black;
   outline: 1px dashed white;
   outline-offset: -1px;
 }
 
-#highlighter-outline[locked]  {
+.highlighter-outline[locked]  {
   box-shadow: 0 0 0 1px rgba(0,0,0,0.3);
   outline-color: rgba(255,255,255,0.7);
 }
 
-/* Highlighter toolbar */
+/* Developer toolbar */
 
-#inspector-inspect-toolbutton {
-  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#inspector-inspect-toolbutton[checked=true] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#inspector-toolbar,
 #developer-toolbar {
   border-top: 1px solid hsla(211,68%,6%,.65) !important;
 }
 
-#devtools-side-splitter {
-  border: 0;
-  -moz-border-start: 1px solid #242b33;
-  min-width: 0;
-  width: 3px;
-  background-color: transparent;
-  -moz-margin-end: -3px;
-  position: relative;
-}
-
-#devtools-sidebar-box {
-  background-color: -moz-Field;
-}
-
 /* Highlighter - Node Infobar */
 
-#highlighter-nodeinfobar {
+.highlighter-nodeinfobar {
   color: hsl(200, 100%, 65%);
   border: 1px solid hsla(210, 19%, 63%, .5);
   border-radius: 3px;
@@ -2704,21 +2680,21 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 
 /* Highlighter - Node Infobar - text */
 
-#highlighter-nodeinfobar-text {
+.highlighter-nodeinfobar-text {
   /* 100% - size of the buttons and margins */
   max-width: calc(100% - 2 * (26px + 6px));
   padding-bottom: 1px;
 }
 
-html|*#highlighter-nodeinfobar-tagname {
+html|*.highlighter-nodeinfobar-tagname {
   color: white;
 }
 
-html|*#highlighter-nodeinfobar-id {
+html|*.highlighter-nodeinfobar-id {
   color: hsl(90, 79%, 52%);
 }
 
-html|*#highlighter-nodeinfobar-pseudo-classes {
+html|*.highlighter-nodeinfobar-pseudo-classes {
   color: hsl(20, 100%, 70%);
 }
 
@@ -2733,7 +2709,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   background-color: transparent;
 }
 
-#highlighter-nodeinfobar-inspectbutton {
+.highlighter-nodeinfobar-inspectbutton {
   -moz-border-end-width: 1px;
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
   -moz-margin-end: 6px;
@@ -2741,26 +2717,26 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-#highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
+.highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
 }
 
-#highlighter-nodeinfobar-inspectbutton:active:hover,
-#highlighter-nodeinfobar-container:not([locked]) >  #highlighter-nodeinfobar >  #highlighter-nodeinfobar-inspectbutton {
+.highlighter-nodeinfobar-inspectbutton:active:hover,
+.highlighter-nodeinfobar-container:not([locked]) >  .highlighter-nodeinfobar >  .highlighter-nodeinfobar-inspectbutton {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-#highlighter-nodeinfobar-menu {
+.highlighter-nodeinfobar-menu {
   -moz-border-start-width: 1px;
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
   -moz-margin-start: 6px;
 }
 
-#highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
+.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
 }
 
-#highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
+.highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
   -moz-appearance: none !important;
   list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
   -moz-box-align: center;
@@ -2779,7 +2755,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   background-repeat: no-repeat;
 }
 
-#highlighter-nodeinfobar-arrow-top {
+.highlighter-nodeinfobar-arrow-top {
   margin-bottom: -8px;
   margin-top: 8px;
   border-right-color: hsla(210, 19%, 63%, .5);
@@ -2787,7 +2763,7 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   background-image: -moz-linear-gradient(bottom left, transparent 50%, hsl(209, 18%, 30%) 50%);
 }
 
-#highlighter-nodeinfobar-arrow-bottom {
+.highlighter-nodeinfobar-arrow-bottom {
   margin-top: -8px;
   margin-bottom: 8px;
   border-left-color: hsla(210, 19%, 63%, .5);
@@ -2795,12 +2771,12 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   background-image: -moz-linear-gradient(top right, transparent 50%, hsl(210, 24%, 16%) 50%);
 }
 
-#highlighter-nodeinfobar-container[position="top"] > #highlighter-nodeinfobar,
-#highlighter-nodeinfobar-container[position="overlap"] > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
+.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar {
   box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
 }
 
-#highlighter-nodeinfobar-container[hide-arrow] > #highlighter-nodeinfobar {
+.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
   margin: 7px 0;
 }
 
@@ -2830,261 +2806,6 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   font-size: 120%;
 }
 
-/* Highlighter toolbar - breadcrumbs */
-
-#inspector-breadcrumbs {
-  -moz-margin-end: 3px;
-  /* A fake 1px-shadow is included in the border-images of the
-     inspector-breadcrumbs-buttons, to match toolbar-buttons style.
-     This negative margin compensate the extra row of pixels created
-     by the shadow.*/
-  margin: -1px 0;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up,
-#inspector-breadcrumbs > .scrollbutton-down {
-  -moz-appearance: none;
-  border: 1px solid hsla(210,8%,5%,.45);
-  background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
-  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
-  margin: 1px 0 1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up {
-  -moz-border-start-width: 0;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
-  border-color: hsla(210,8%,5%,.6);
-  background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
-  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
-  -moz-appearance: none;
-  list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
-  -moz-image-region: rect(0px 7px 16px 0px);
-  margin: 0 5px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
-  opacity: 0.5;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
-  -moz-image-region: rect(0px 14px 16px 7px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
-  transform: scaleX(-1);
-}
-
-.inspector-breadcrumbs-button {
-  -moz-appearance: none;
-  background-color: transparent;
-  border-style: solid;
-  border-width: 2px 13px;
-  outline: none;
-  color: hsl(210,30%,85%);
-  width: 85px; /* Can't use max-width. See bug 723132 */
-  /* The content of the button can be larger than the button */
-  overflow: hidden;
-  min-height: 25px;
-  margin: 0 -11px 0 0;
-  padding: 0 9px;
-}
-
-.inspector-breadcrumbs-button:-moz-focusring > .button-box {
-  border-width: 0;
-}
-
-.inspector-breadcrumbs-button:-moz-focusring > label {
-  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
-  color: hsl(200,100%,60%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
-  color: hsl(200,100%,70%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
-  color: hsl(20, 100%, 70%);
-}
-
-.inspector-breadcrumbs-id,
-.inspector-breadcrumbs-classes {
-  color: #8d99a6;
-}
-
-.inspector-breadcrumbs-pseudo-classes {
-  color: hsl(20, 100%, 85%);
-}
-
-/* Highlighter toolbar - breadcrumbs - LTR */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
-  border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]),
-.inspector-breadcrumbs-button:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked][siblings-menu-open],
-.inspector-breadcrumbs-button[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]),
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked],
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 2 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
-  border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked],
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - breadcrumbs - RTL */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
-  border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked][siblings-menu-open]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 2 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked]:-moz-locale-dir(rtl),
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - HTML Tree */
-
-#inspector-treepanel-toolbutton {
-  list-style-image: url("chrome://browser/skin/devtools/treepanel-button.png");
-  -moz-margin-end: 0;
-  -moz-image-region: rect(0px 18px 16px 0px);
-}
-
-#inspector-treepanel-toolbutton[checked] {
-  -moz-image-region: rect(0px 36px 16px 18px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl),
-#inspector-treepanel-toolbutton:-moz-locale-dir(ltr) {
-  border-radius: 3px 0 0 3px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr),
-#inspector-treepanel-toolbutton:-moz-locale-dir(rtl) {
-  border-radius: 0 3px 3px 0;
-}
-
-/* Highlight toolbar - Option menu */
-
-#inspector-option-toolbarbutton:-moz-focusring {
-  outline: 1px dotted hsla(210,30%,85%,0.4);
-  outline-offset: -2px;
-}
-
 html|*#gcli-tooltip-frame,
 html|*#gcli-output-frame {
   padding: 0;
@@ -3268,33 +2989,13 @@ html|*#gcli-output-frame {
   background: rgba(0,0,0,.4);
 }
 
-#developer-toolbar-webconsole {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#developer-toolbar-inspector {
-  -moz-image-region: rect(16px, 16px, 32px, 0);
-}
-
-#developer-toolbar-styleeditor {
-  -moz-image-region: rect(32px, 16px, 48px, 0);
-}
-
-#developer-toolbar-debugger {
-  -moz-image-region: rect(48px, 16px, 64px, 0);
-}
-
-#developer-toolbar-other-tools {
+#developer-toolbar-toolbox-button {
   -moz-image-region: rect(64px, 16px, 80px, 0);
 }
 
-#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
 /* Error counter */
 
-#developer-toolbar-webconsole[error-count]:before {
+#developer-toolbar-toolbox-button[error-count]:before {
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
diff --git a/browser/themes/winstripe/devtools/command-responsivemode.png b/browser/themes/winstripe/devtools/command-responsivemode.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbfa599048c1065c7250a5cd74b9684724f3ded3
GIT binary patch
literal 1083
zcmV-B1jPG^P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn000C6Nkl<Zc-qyL
zZAevj9LN9X$h<4O&Glf*%BNah3|g&BTO-FTGBsO4PaCvw=xodCrlOb;F*k=pDYFnW
zn>{UzO0owih;|zVdoglM>cwC%#$YhU7`2<(IQxCw_q6}zaJu(MZ+h|J_xtPTd++so
zJ)EP$j~+kQsO_iXh4I1^PauOVU#LN7^a3-A^a_`}z>Ffl2!DBj8D(s0Nm}ydo%?w`
z1C|$%K~_Ed?*r@^4a|ZIqePKEM~O04@0yv_{;d@_;0<JuwF}q{-Y+ei5I@%Me;ROX
zpIOics%z_$qUGVhC5rq3n!adBj+Tc5mnfsSDl@SEwgr48)#YaH`eHL@T_o9S3e49_
zmYVZdE%OxzKd^md?E)Hryn!LJc4+vYbeVOWwQy|U*gmu1JmBv-nCs;15a=;aA7}DA
z;O|1r-Q)~8^7QQjGF!f}fRSIGx2XN=yMdY`>)&V(-Q&D#&MBA{H!e9*c-hF?ynud0
z0rdcTU;pKdDbv%?b`mDedI7r69h@D(B~J%9eDWKJJx`wn%xb=20i!Uu@Rh0)MK3Jg
zkQtZtRyrom^7F(u58YBg_5l5e0_p(w9cURlCe9HBIDK#iaBpMI&bMJF4xjuAxL?)t
zI6L$7S-`8GUbBEvv@?5ATWC<e<%#lb$7AA*0v7KNDWLm$0W|=7@7eRI@~>xN$HduD
z0DbP@G<lK_YkBO%;gg?%hdg~2u=k1uP{5?JgGDdC_xWVG#f`<pd8B~W>k8<;UO*MV
z{`b&ug}m`JIagxh>?nXfcW?@DZ)U!gvss|$^vO?vdmnTCoPEwbeHJit_XP`}fQ6s*
z|Bw~zD#>lUIEaa}@lO2&J}<=SzFt5OV8^v5`1Q#@JXdh|GQo)vT=H~Q3l5+B2%_Xa
zcK9q{M%_6J7%R5Vjhp>;8m|8*%qyH>Z2T;BUc;Gvs`S81x~~_o4PbX62Oj{t?sEq{
zM7gj^=oZ}kd&DhYAq+Tt7LZZhYXPI6G7Hzfj@$;vy|(jM`|RLx-1jHzzFxpq;8uWq
z3-N*<yY6!bM~QNv<-_j&Ac#Frp9Q4vIB5Z6WlbP=&pD+d1^DFIAjQmCJ4>De65-H~
zDBvR?yAS6m_-vn9aD<HE*%dgNugLc#A$lGTeHM_mwZ{Spn_HL5b)FpY%wN$p)p)ll
z%~-cLLoR_7IP@b5*aBqV77Mn|Ea)OfV?py3xkCnGggy({(rtn4+OMpfy3<bu4*mZN
zxE~%Wl^6Ta3&_|7Jb3u1O=hPTm_Z(Qo|`hi^8zzUp8nEP$~qsUmLImffDE$sHJ%{&
zJ(9ozMx75ogS<Is#dvdW(R_K<&li@)NIo*i{tKm$=he1VCV&6{002ovPDHLkV1ncB
B5lR36

literal 0
HcmV?d00001

diff --git a/browser/themes/winstripe/devtools/command-scratchpad.png b/browser/themes/winstripe/devtools/command-scratchpad.png
new file mode 100644
index 0000000000000000000000000000000000000000..5131ca5cbc6176c96a66f4a56d81fed95c4c9327
GIT binary patch
literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#30006HNkl<Zc-qC5
zPfHt76vbV+5d8}7Tofs2(W;=((r?mDX;F!&U_`-w1(zjaD@B7+1ec|v7^+rcocx)n
z7%gc*P=uDEO^iak2VUTLnAf><<KoAhcjuhp+<`Eut5&OZ^$kt`%Y*0dJ)l&%9noq7
z=ijTeJD=BS_X1NY?JlsQ((e3kwdMuNmD}i_t5U@1w+bD#3gE%<%hL5st)xQ7DPO!Q
zS8_)GQs|<+00t9@&FvN`)~wZ3V0ka&x6AdBR#X1suyFEBu3cKq3ycesK&z?1CzJwO
zP5Cq79B4H!FqTSZyEndWKdFH;<}RqfQpVr!v-3D(?t=2C{=v};JC8HwE_i`aAzHS;
z8FLr>8xR($B+hXcl>Z_8WH5KZ3k-u@FY|OgvDx-7;DMJ4%mXj$_lD)+ftT{%L2m!>
zc~~AEczJ;#!)Q4Kc;KZ1AAwn9A%uB&DPJ%gD=F{-gWy{-)$wJ0<8cj~F%N<Yd;q&%
zw#UxnjCl~0KLF`mzR%9%jCl~eKtGT-91(^rBA5q31!fI%4CX;l-Z$hK%!A+s-fZn8
z+dr?awFZHE@Yqm+ndDx&)0M|Pcx))2@pAcIS04A^vEc<?%iA6h1|1B*V?zaE!fXgJ
z8_Ih^It0(=-U9N8e<{OPTHv<}$R~bU=I^w?Z|DDB-y~$7(gHvKnQIi9v>5+`=kEaG
WYW7HKLO22d0000<MNUMnLSTZG<`g>s

literal 0
HcmV?d00001

diff --git a/browser/themes/winstripe/devtools/command-tilt.png b/browser/themes/winstripe/devtools/command-tilt.png
new file mode 100644
index 0000000000000000000000000000000000000000..f816bba59cedb2fb2069b4d0a4ff09225e99cdb7
GIT binary patch
literal 1668
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
O0000<MNUMnLSTYCryzI$

literal 0
HcmV?d00001

diff --git a/browser/themes/winstripe/devtools/common.css b/browser/themes/winstripe/devtools/common.css
index 50bb5c020667..89ad2d02ab7a 100644
--- a/browser/themes/winstripe/devtools/common.css
+++ b/browser/themes/winstripe/devtools/common.css
@@ -209,6 +209,65 @@
   position: relative;
 }
 
+/* In-tools sidebar */
+
+.devtools-sidebar-tabs {
+  -moz-appearance: none;
+  margin: 0;
+}
+
+.devtools-sidebar-tabs > tabpanels {
+  -moz-appearance: none;
+  padding: 0;
+  border: 0;
+}
+
+.devtools-sidebar-tabs > tabs {
+  -moz-appearance: none;
+  position: static;
+  box-shadow: 0 1px 0 0 hsla(210, 16%, 76%, .2) inset;
+  background-image: linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
+  color: hsl(210,30%,85%);
+  margin-bottom: 0;
+  padding: 0;
+}
+
+.devtools-sidebar-tabs > tabs > .tabs-right,
+.devtools-sidebar-tabs > tabs > .tabs-left {
+  display: none;
+}
+
+.devtools-sidebar-tabs > tabs > tab {
+  -moz-appearance: none;
+  padding: 0;
+  margin: 0;
+  min-width: 78px;
+  min-height: 22px;
+  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+  text-align: center;
+  color: inherit;
+  -moz-box-flex: 1;
+  border-width: 0;
+  -moz-border-end-width: 1px;
+  border-color: hsla(210,8%,5%,.6);
+  border-style: solid;
+  background: transparent;
+  border-radius: 0;
+}
+
+.devtools-sidebar-tabs > tabs > tab:-moz-focusring {
+  position: static;
+}
+
+.devtools-sidebar-tabs > tabs > tab:last-of-type {
+  -moz-border-end-width: 0;
+}
+
+.devtools-sidebar-tabs > tabs > tab[selected=true] {
+  background-image: linear-gradient(to bottom, hsl(201,45%,34%), hsl(205,44%,22%));
+  color: white !important;
+}
+
 /* Theme */
 
 .devtools-theme-background {
diff --git a/browser/themes/winstripe/devtools/dock-bottom.png b/browser/themes/winstripe/devtools/dock-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..83842f236ef5ede55a268e67077532fc1764746f
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0YFJa
zK~y-6#gn~C13?spzuCWlN(=#wCY?p<l>U^m#7D5O5DN<nAI8GMLM$wN1jRC8vyGMA
z7J@}2RftI-u(La3lMTzdNrV(0xNz@f&Y64eFhXn1Dlk@J0~UZ&syRSu8qN|<2n>Kh
zIOvAfv{}Bpy}3APx_hQ+E}SZkWA*&<`f+)6eGl{!f$e6~t!l(Liq(<<1g?8r1-8-x
zYak{7r)TG5uj2=R%rNc4gZ=u`<HLqwm=ai@?Enx!1mJc2H?8rLIt9z?_#@yb#hD3^
z+$f+Z1iL`?eFad=PWDUS>oaHojd>f8ks77z^u{G13$|4$*j7bGs-Kr9=kg|q0LGK>
zJ!#C#^DL;Ww?9D5ENB?E+8#=&7+4reskqhl&@coLT5IghS{Xqd*vZ(+Lj?5D1oFGv
d7ytene*n2yf``D{mBs)7002ovPDHLkV1mh##`^#O

literal 0
HcmV?d00001

diff --git a/browser/themes/winstripe/devtools/dock-side.png b/browser/themes/winstripe/devtools/dock-side.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a940bc1e4e50a63d1522fc5604cb2cf44b05e82
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0dYx0
zK~y-6#gn^A13?&tzkg#^qGBXPiUd)DAZTgt4PpYmfM6lMl7fg>Soj`_MNAq&5H*Pw
z3NaSm5~HhonXzzJ)=Nxb;lR(pFz4{i;f!dl`O7l?qz1YG%z?BC4ESSq&?uk@+}IDb
zmoEP>v9Y$YoX=&4Baui)s&b{;oSmCr0WJcAWG<IYYNY9Usv~wLlQDoq*q{gG1z=%u
z$tn~}RlorTFV9bty)knn5I<S=nTP;%gP#E)zJNlpbf7gwz!hNvn0m78lOI4NY(QWD
z+-t3G)ni>p<EdxB>5G}8!KIdEm%}dK3<Q*VtcT0tv@H9mT^?Zr*Wb-(JY_hIs~}Cc
zFJ_K~2#$Xxn3<j&-`U-3MdPVgV8|yp{FOk1tCaE#!(e-BvtLB=AFi&~_$pFL!F!=T
zs(iP)wytd3_FPXrIIedajQ_MxQ`j$}-`j|2t%=6d{XhmG4aC~v2AKfYXev&lb|?S-
a8{Yua!lFpTFEAhg0000<MNUMnLSTZp`P~Wt

literal 0
HcmV?d00001

diff --git a/browser/themes/winstripe/devtools/dock-window.png b/browser/themes/winstripe/devtools/dock-window.png
new file mode 100644
index 0000000000000000000000000000000000000000..29d3b319a99a3c8b2ded8fbd8ae8d70970c792a2
GIT binary patch
literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0)I(F
zK~y-6rBlyKR8bf`_rCk)jc*)B#2=&c!!Zn76qwRNa|(i>c7@u?RTxEB5kmh%P)N(7
zT`i)>qChBuC?O1glu}BRT7)w?m6JZ7^WK|x@7KZt6L)^g?{Ln6^PP_o5q2_c>!Lii
zyS#bd-dMmeN|lt`l7tX4lU@8dJw1~ZTfxg0`;K&Xo;;DNPjID(6VZPrn#PsmdUAYh
zB6F$#%FV3;C3UsYhK6LEy?HzKJCj{p*M;VT{nd~Po|5K)))u{`Wq*Zfnzf=b(G)p<
z_DnjRZjb#~%9_zwGAcA?Umv(JH}vrCYXIw;3_Ji$PoKX!To;X+j^hMGJRVPVcXu66
z)hEnSgTp0QR>3a@gTYw<;{dj%Y#BzN*_Sd1fVh-0l1e4*sSnc&Ev;>zZ{5DLTo%++
zC=~LyAp?LCLKKO}Q$*lWN=PY-wr%I%O^gg{oM$x7lx0~40DT()({(-KoVy?*A(bL2
zRnas}8$hn6y1E{K-O=9G7&1$aMj{cL^NkQS>B_}rt1(<!8q{^Ypok!_(In3=7JUFt
zHkT``ILhnq>kR<t0KfqtZ+k2p3P1pofc4SI8S=bhK`5n|5W-ot)=B`>T<Gmt8XSBa
zud1pPuICkq2<eW4bnbLdaq!7AV`TWHUlC0>qhsUw?BddbV4M?U%x!GkWjq>saY$!;
z?aSA1`kHMU05Kv$G9L3nC5AsaHMKHu?dk-88~_UlSYl;mHGl8^13J~!S!k$_>rx?j
zOoz(>2iWMk0_4cV$KdSTd=9{S0P<fgm=>-rFDnc035UZ`-}m+HPRBWCQb}w1SN@Zm
k|31GNV>|suz9Tk(KRCWA;;1x%9RL6T07*qoM6N<$g8X4xGynhq

literal 0
HcmV?d00001

diff --git a/browser/themes/winstripe/devtools/inspector.css b/browser/themes/winstripe/devtools/inspector.css
new file mode 100644
index 000000000000..1b47e9f610f4
--- /dev/null
+++ b/browser/themes/winstripe/devtools/inspector.css
@@ -0,0 +1,218 @@
+#inspector-inspect-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#inspector-inspect-toolbutton[checked=true] {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+/* Highlighter toolbar - breadcrumbs */
+
+#inspector-breadcrumbs {
+  -moz-margin-end: 3px;
+  /* A fake 1px-shadow is included in the border-images of the
+     inspector-breadcrumbs-buttons, to match toolbar-buttons style.
+     This negative margin compensate the extra row of pixels created
+     by the shadow.*/
+  margin: -1px 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up,
+#inspector-breadcrumbs > .scrollbutton-down {
+  -moz-appearance: none;
+  border: 1px solid hsla(210,8%,5%,.45);
+  background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
+  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
+  margin: 1px 0 1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
+  border-color: hsla(210,8%,5%,.6);
+  background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
+  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
+  -moz-appearance: none;
+  list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
+  -moz-image-region: rect(0px 7px 16px 0px);
+  margin: 0 5px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+  opacity: 0.5;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
+  -moz-image-region: rect(0px 14px 16px 7px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
+  transform: scaleX(-1);
+}
+
+.inspector-breadcrumbs-button {
+  -moz-appearance: none;
+  background-color: transparent;
+  border-style: solid;
+  border-width: 2px 13px;
+  outline: none;
+  color: hsl(210,30%,85%);
+  width: 85px; /* Can't use max-width. See bug 723132 */
+  /* The content of the button can be larger than the button */
+  overflow: hidden;
+  min-height: 25px;
+  margin: 0 -11px 0 0;
+  padding: 0 9px;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > .button-box {
+  border-width: 0;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > label {
+  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
+  color: hsl(200,100%,60%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
+  color: hsl(200,100%,70%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
+  color: hsl(20, 100%, 70%);
+}
+
+.inspector-breadcrumbs-id,
+.inspector-breadcrumbs-classes {
+  color: #8d99a6;
+}
+
+.inspector-breadcrumbs-pseudo-classes {
+  color: hsl(20, 100%, 85%);
+}
+
+/* Highlighter toolbar - breadcrumbs - LTR */
+
+.inspector-breadcrumbs-button {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 2 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
+  border-left-width: 0;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
+  border-right-width: 0;
+}
+
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+/* Highlighter toolbar - breadcrumbs - RTL */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 2 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
+  border-right-width: 0;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  border-left-width: 0;
+}
+
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 2 13 2 13 fill stretch;
+}
diff --git a/browser/themes/winstripe/devtools/layout-background.png b/browser/themes/winstripe/devtools/layout-background.png
deleted file mode 100644
index 6991cc0f2ab221e7488be16c3f9e4aa4d6228e73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 981
zcmV;`11kK9P)<h;3K|Lk000e1NJLTq000vJ000sQ1^@s6xeVoL00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+yxsDEjaStXd3_k17b-;
zK~y-)Rg}wa+(r;ZPj|D~<P6Cfiqcpy3~Q5Bwt@FqWgp~Q@)h|?$$;U<j5vHXo3HLH
z1P_pHRiSXJ?!gs*|MTzfT5DcjUbw%%r|UY5F|=(<S(emw&Ew-E08tdNZ5!wFnX)W#
z&JjfsNs=&*BayY1d7gQEe57q#(ljN@GK?`S%R-iA^nFi~BzW)9TJ!MmfDi&91byF=
z=Q&N&Ag|XeNs^$orYH)u)_nf_nK+K=x{i16-m$JL(=@Sd8^bUVLLh{|IF3xygb;%L
zevd565-BB3(=d)ByWI|B4Axrq`#tNr5<)--aZ@`@6Mf&4rYQhT(_pPd{yfDPLmbCg
zYf(y(Wf=h1>y@%BDT)H`J*U$N?>)QSj&)sG*Oe^Gn5Kznx7)F88^#!>X+mpFmSrr<
zf^&}3>BKM$EXzU&fxhpNQW8QS%QA!zeEIT)BuS7_6mhv+`1<uLLI}F9V_jF8rr~%z
z^8EZvmSt?)hEj@US*WUt!{Gpcl#*px5JDhB2vk*t)|z>qQA#n6BUM!)gy8AviMp=o
z`~HSOUDv$4ydZ>l`<0Z;^Ncjc;JrsFMb~xA^Gs0`SZjHGeWk8zq?Fv>-}CzVij<PR
z?|FK9;>V94L{Y@U!vj$ip?>-8)BB(N2q8Ee4h+M9bMD4g2!YGxf>H`=Ek#i<jw4x?
zA*IAQhm?}&a5%7S+s*!M+sN~rbzK>Tfh0+Y<Cr*(QA)9G8|%8FwWe)bmSws1BJVxc
z+BY|(#Cy-OEUfE_F@|9n0GQ_)=NunDe#ALP*L5UGf>H`&3?T$$*L4iTK;QQ_&Z??H
zDaC%jrz}f`VW21qwr%74_wRIFhf<0pNl4R_JkN2?p+5cj*ZZH~g%ED1Ow+`&EO_s^
zySpQbB8)Kr9FIqwbN`!}rs>U1t@RC!d7jy}4XrhC9N+5C&(BzENz)W#3~8Dogur``
zbB;XEk>~T7IF6a;nd9+zi=U=x$n%`@`Hc4-V+>VQF^(f`+cJ(L)>^#x0DSxQ?M+$R
zw)B0E5Q4kAJC4WW4GVy2n#i(@%jH5{*J!PA&hg>H2SNz!b~}oqK>hmZkM~g&aXOvo
z`=0Cdddn^EJ^THhWmy=8;TBWZ>lLLGLWtYqaUA&%hHv{do)ciN00000NkvXXu0mjf
DG;`Ue

diff --git a/browser/themes/winstripe/devtools/layout-buttons.png b/browser/themes/winstripe/devtools/layout-buttons.png
deleted file mode 100644
index 8705bc51475de5e6759371cc30a32e67187f455a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0004oNkl<Zc-rli
z&q@Mu6h?nCxvizE3iDr!dJM}PeXA_el)ysG3{$Y6f_6Pgw8~ep@5Bsuj1<L1Em|D7
z^WA&AR~gVvCX-*~PaF^vo>*HF4|i4HQFuB3#bx}l_*jrJ4(_VH;~JMbe0AA!TePMr
zwT0zI8wYo`Z_M+90}k#LUQLlHcH=q!3+nHE99;8p{A-sk40-+udd!$_2aFUpL$t6H
z&lU#iZ2~n}bOr}^%1<BN>NzR4W{_mYd^=#M@B*}`rG@=qc?_t@=!J7QxKW?Jmn%J!
z1)c+HGWDLAG2afjQ&`u})6}A#Ew>LKqsI)hIJi+?G+eqkVo`WRWcedKy;BYI?SP)b
zGyOc5dfpas@+f5Vm|+%&Jn9EjwP?UX90-;VwY<uV`E~#=*@?bgO}vTs8PKaSi-SAm
z8>d>>_jbz<Kus2%!Lb8&@;3@A;&?$SIJk5CijM67^(>zQyp4VTTtU~R^6f=nc73l{
p$6eJAU$BJOT9O3rs{a4K;U}VSGM><Zg2Dg*002ovPDHLkV1gOT${7Fv

diff --git a/browser/themes/winstripe/devtools/layoutview.css b/browser/themes/winstripe/devtools/layoutview.css
index 4d653c5c5e0c..552c9841e848 100644
--- a/browser/themes/winstripe/devtools/layoutview.css
+++ b/browser/themes/winstripe/devtools/layoutview.css
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 body {
-  background: url(layout-background.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
+  background: url(layout-background-grid.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
   color: hsl(210,100%,85%);
   border-top: 1px solid black;
   -moz-box-sizing: border-box;
@@ -42,17 +42,3 @@ body {
   border-style: solid;
   border-color: hsl(210,100%,85%);
 }
-
-#togglebutton {
-  background-image: url(layout-buttons.png);
-  width: 16px;
-  height: 16px;
-}
-
-body.open {
-  background: url(layout-background-grid.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
-}
-
-body.open > #header > #togglebutton {
-  background-position: -16px 0;
-}
diff --git a/browser/themes/winstripe/devtools/toolbox.css b/browser/themes/winstripe/devtools/toolbox.css
new file mode 100644
index 000000000000..dae0d34be44c
--- /dev/null
+++ b/browser/themes/winstripe/devtools/toolbox.css
@@ -0,0 +1,103 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#toolbox-tabs {
+  margin: 0;
+}
+
+#toolbox-dock-bottom {
+  list-style-image: url("chrome://browser/skin/devtools/dock-bottom.png");
+}
+
+#toolbox-dock-side {
+  list-style-image: url("chrome://browser/skin/devtools/dock-side.png");
+}
+
+#toolbox-dock-window {
+  list-style-image: url("chrome://browser/skin/devtools/dock-window.png");
+}
+
+.command-button {
+  margin: 0 10px;
+  width: 16px;
+  height: 32px;
+  background-repeat: no-repeat;
+  background-position: center center;
+}
+
+#command-button-responsive {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 16, 16, 0);
+}
+#command-button-responsive:hover {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 32, 16, 16);
+}
+#command-button-responsive:hover:active {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 48, 16, 32);
+}
+#command-button-responsive.toggled {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 64, 16, 48);
+}
+
+#command-button-tilt {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 16, 16, 0);
+}
+#command-button-tilt:hover {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 32, 16, 16);
+}
+
+#command-button-tilt:hover:active {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 48, 16, 32);
+}
+
+#command-button-tilt.toggled {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 64, 16, 48);
+}
+
+#command-button-scratchpad {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 16, 16, 0);
+}
+
+#command-button-scratchpad:hover {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 32, 16, 16);
+}
+
+#command-button-scratchpad:hover:active {
+  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 48, 16, 32);
+}
+
+
+/* Tabs */
+
+.devtools-tabbar {
+  -moz-appearance: none;
+  background-image: linear-gradient(to bottom, hsl(209,18%,34%), hsl(210,24%,16%));
+  color: hsl(210,30%,85%);
+  padding: 4px 3px 3px;
+  box-shadow: 0 -3px 0 0 rgb(20,20,20) inset, 0 -4px 0 0 rgba(0,0,0,0.8) inset;
+}
+
+.devtools-tab {
+  -moz-appearance: none;
+  min-width: 78px;
+  min-height: 22px;
+  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
+  border-radius: 3px 3px 0 0;
+  color: inherit;
+  border-style: solid;
+  border-color: transparent;
+  border-width: 1px 1px 0;
+  margin: 0 5px;
+  padding: 0 10px 1px;
+}
+
+.devtools-tab[selected=true] {
+  border-color: hsla(210,8%,5%,.6);
+  background-color: rgb(20,20,20);
+  text-shadow: none;
+  color: white;
+}
+
+.devtools-tab > .radio-label-box {
+  -moz-margin-start: 0px
+}
diff --git a/browser/themes/winstripe/devtools/treepanel-button.png b/browser/themes/winstripe/devtools/treepanel-button.png
deleted file mode 100644
index 2a8802216bf178bc05813fc592df30d91cd49415..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq001Na000mO1^@s6e(T*M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!$4Nv%RCwCVR$FTmK@^_Z-89vNv{qwm
zODndik(x^}`U{GbLJ)lr5%fv)L45Of_%7H-U%enj2$F&~P-`(Ips`Au*oIzAYMV46
zo88&*oRE}pd&&6Lz{d=kbG|)u_M2~(a?Z&?`cX$mPdkjq03LwSBHjWN0eL`GTreKx
z95A>5$VXf7@J4<aQ^f@h;7i0O@1F^rJ|eS&^!K?xqhqlLFwOq6u=3M08XAZ@R3$3I
zV=!wbk(wVPC;SC_L7hWGLr#-fB^e@&#T<J<^!G1!$v73Q=}hX?v?(NtIowu|0=?5e
zewyBdxhVsT#he{a$feolW-)1+CXoTgV$Kc?X`Y@g+&H}T?ncM3104YOE}Aky9IG%c
z05(KTv1rUmsM1HYw&TF15T{Gy9`7O2?sgJIwP}ho(ssB&y8TPsf1xO9imIL-wNV6$
zl2S_g;*-yAgo0;XGOhpmEnT`ee(9mb$&$#!$M1EWyLS7j!{La?@R$~#na<|NG=&mu
zTSZtqIXpaUf~MAGhysBCZm5$@<gy|UO-*&ISFK2`QkB#ct!qlz<vi+d-@UIij$=z;
z>|UBGmWoNkFo+B=7IV;tniNex>IV$MLwpTQ?d3;XfCB6w1LF^KBG>F_-H+(p2QOJ&
z=qI(xQRtVtI}78ax~0>Nl`T>!E)#AoiVyU?eDUP^NF>}Y)8d&gNiBBy>KiD0o`@X+
zKN@h;xZ3NDl3s619>&;gX6pGB`uZ^*7F{f;GZYN!hRMn@1&xHm8XO%J4nbWvOz@*T
z@kMnecO^Mh8sUTIEo&lI=TSuM#9t*0SwF(qy|hy<SET(2V?{sG1U0YSx^s70@S}ZC
zDa0?sxMsh#XlAy=v#FcgezgCMW)ZWtM!8ku_JZIKbn6sM(vp`Wc2l<p($AA9cGT74
j|L|<*AGFVpzXA*Z|5Kl~6^V5Y00000NkvXXu0mjflR<IX

diff --git a/browser/themes/winstripe/jar.mn b/browser/themes/winstripe/jar.mn
index efa829dced60..7cfbef7ca4f4 100644
--- a/browser/themes/winstripe/jar.mn
+++ b/browser/themes/winstripe/jar.mn
@@ -133,7 +133,10 @@ browser.jar:
         skin/classic/browser/devtools/alerticon-warning.png         (devtools/alerticon-warning.png)
         skin/classic/browser/devtools/goto-mdn.png                  (devtools/goto-mdn.png)
         skin/classic/browser/devtools/csshtmltree.css               (devtools/csshtmltree.css)
-        skin/classic/browser/devtools/commandline.css                      (devtools/commandline.css)
+        skin/classic/browser/devtools/commandline.css               (devtools/commandline.css)
+        skin/classic/browser/devtools/command-responsivemode.png    (devtools/command-responsivemode.png)
+        skin/classic/browser/devtools/command-scratchpad.png        (devtools/command-scratchpad.png)
+        skin/classic/browser/devtools/command-tilt.png              (devtools/command-tilt.png)
         skin/classic/browser/devtools/markup-view.css               (devtools/markup-view.css)
         skin/classic/browser/devtools/orion.css                     (devtools/orion.css)
         skin/classic/browser/devtools/orion-container.css           (devtools/orion-container.css)
@@ -179,11 +182,8 @@ browser.jar:
         skin/classic/browser/devtools/itemArrow-ltr.png             (devtools/itemArrow-ltr.png)
         skin/classic/browser/devtools/inspect-button.png            (devtools/inspect-button.png)
         skin/classic/browser/devtools/dropmarker.png                (devtools/dropmarker.png)
-        skin/classic/browser/devtools/treepanel-button.png          (devtools/treepanel-button.png)
-        skin/classic/browser/devtools/layout-background.png         (devtools/layout-background.png)
         skin/classic/browser/devtools/layout-background-grid.png    (devtools/layout-background-grid.png)
         skin/classic/browser/devtools/layoutview.css                (devtools/layoutview.css)
-        skin/classic/browser/devtools/layout-buttons.png            (devtools/layout-buttons.png)
         skin/classic/browser/devtools/debugger-collapse.png         (devtools/debugger-collapse.png)
         skin/classic/browser/devtools/debugger-expand.png           (devtools/debugger-expand.png)
         skin/classic/browser/devtools/debugger-pause.png            (devtools/debugger-pause.png)
@@ -195,7 +195,12 @@ browser.jar:
         skin/classic/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
         skin/classic/browser/devtools/responsive-background.png     (devtools/responsive-background.png)
         skin/classic/browser/devtools/tools-icons-small.png         (devtools/tools-icons-small.png)
+        skin/classic/browser/devtools/dock-bottom.png               (devtools/dock-bottom.png)
+        skin/classic/browser/devtools/dock-side.png                 (devtools/dock-side.png)
+        skin/classic/browser/devtools/dock-window.png               (devtools/dock-window.png)
         skin/classic/browser/devtools/floating-scrollbars.css       (devtools/floating-scrollbars.css)
+        skin/classic/browser/devtools/inspector.css                 (devtools/inspector.css)
+        skin/classic/browser/devtools/toolbox.css                   (devtools/toolbox.css)
 #ifdef MOZ_SERVICES_SYNC
         skin/classic/browser/sync-throbber.png
         skin/classic/browser/sync-16.png
@@ -337,10 +342,13 @@ browser.jar:
         skin/classic/aero/browser/devtools/common.css                (devtools/common.css)
         skin/classic/aero/browser/devtools/arrows.png                (devtools/arrows.png)
         skin/classic/aero/browser/devtools/commandline.png           (devtools/commandline.png)
+        skin/classic/aero/browser/devtools/command-responsivemode.png (devtools/command-responsivemode.png)
+        skin/classic/aero/browser/devtools/command-scratchpad.png    (devtools/command-scratchpad.png)
+        skin/classic/aero/browser/devtools/command-tilt.png          (devtools/command-tilt.png)
         skin/classic/aero/browser/devtools/alerticon-warning.png     (devtools/alerticon-warning.png)
         skin/classic/aero/browser/devtools/goto-mdn.png              (devtools/goto-mdn.png)
         skin/classic/aero/browser/devtools/csshtmltree.css           (devtools/csshtmltree.css)
-        skin/classic/aero/browser/devtools/commandline.css                  (devtools/commandline.css)
+        skin/classic/aero/browser/devtools/commandline.css           (devtools/commandline.css)
         skin/classic/aero/browser/devtools/markup-view.css           (devtools/markup-view.css)
         skin/classic/aero/browser/devtools/orion.css                 (devtools/orion.css)
         skin/classic/aero/browser/devtools/orion-container.css       (devtools/orion-container.css)
@@ -386,11 +394,8 @@ browser.jar:
         skin/classic/aero/browser/devtools/itemArrow-ltr.png         (devtools/itemArrow-ltr.png)
         skin/classic/aero/browser/devtools/inspect-button.png        (devtools/inspect-button.png)
         skin/classic/aero/browser/devtools/dropmarker.png            (devtools/dropmarker.png)
-        skin/classic/aero/browser/devtools/treepanel-button.png      (devtools/treepanel-button.png)
-        skin/classic/aero/browser/devtools/layout-background.png     (devtools/layout-background.png)
         skin/classic/aero/browser/devtools/layout-background-grid.png (devtools/layout-background-grid.png)
         skin/classic/aero/browser/devtools/layoutview.css            (devtools/layoutview.css)
-        skin/classic/aero/browser/devtools/layout-buttons.png        (devtools/layout-buttons.png)
         skin/classic/aero/browser/devtools/debugger-collapse.png     (devtools/debugger-collapse.png)
         skin/classic/aero/browser/devtools/debugger-expand.png       (devtools/debugger-expand.png)
         skin/classic/aero/browser/devtools/debugger-pause.png        (devtools/debugger-pause.png)
@@ -402,7 +407,12 @@ browser.jar:
         skin/classic/aero/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
         skin/classic/aero/browser/devtools/responsive-background.png (devtools/responsive-background.png)
         skin/classic/aero/browser/devtools/tools-icons-small.png     (devtools/tools-icons-small.png)
+        skin/classic/aero/browser/devtools/dock-bottom.png           (devtools/dock-bottom.png)
+        skin/classic/aero/browser/devtools/dock-side.png             (devtools/dock-side.png)
+        skin/classic/aero/browser/devtools/dock-window.png           (devtools/dock-window.png)
         skin/classic/aero/browser/devtools/floating-scrollbars.css   (devtools/floating-scrollbars.css)
+        skin/classic/aero/browser/devtools/inspector.css             (devtools/inspector.css)
+        skin/classic/aero/browser/devtools/toolbox.css               (devtools/toolbox.css)
 #ifdef MOZ_SERVICES_SYNC
         skin/classic/aero/browser/sync-throbber.png
         skin/classic/aero/browser/sync-16.png
diff --git a/toolkit/devtools/webconsole/WebConsoleUtils.jsm b/toolkit/devtools/webconsole/WebConsoleUtils.jsm
index a3422a8827a8..af5763e6e3f9 100644
--- a/toolkit/devtools/webconsole/WebConsoleUtils.jsm
+++ b/toolkit/devtools/webconsole/WebConsoleUtils.jsm
@@ -28,6 +28,12 @@ XPCOMUtils.defineLazyServiceGetter(this, "gActivityDistributor",
                                    "@mozilla.org/network/http-activity-distributor;1",
                                    "nsIHttpActivityDistributor");
 
+XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
+                                  "resource:///modules/devtools/gDevTools.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
+                                  "resource:///modules/devtools/Target.jsm");
+
 this.EXPORTED_SYMBOLS = ["WebConsoleUtils", "JSPropertyProvider", "JSTermHelpers",
                          "PageErrorListener", "ConsoleAPIListener",
                          "NetworkResponseListener", "NetworkMonitor",
@@ -1564,7 +1570,12 @@ this.JSTermHelpers = function JSTermHelpers(aOwner)
   Object.defineProperty(aOwner.sandbox, "$0", {
     get: function() {
       try {
-        return aOwner.chromeWindow().InspectorUI.selection;
+        let window = aOwner.chromeWindow();
+        let target = TargetFactory.forTab(window.gBrowser.selectedTab);
+        let panel = gDevTools.getPanelForTarget("inspector", target);
+        if (panel) {
+          return panel.selection.node;
+        }
       }
       catch (ex) {
         aOwner.window.console.error(ex.message);

From c15d59f0f0bf88fcad7e3aa60a56f7f13c2ef526 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Sun, 25 Nov 2012 11:04:21 -0500
Subject: [PATCH 065/160] Add type specialized paths for instanceof to Ion, bug
 814861. r=pierron

---
 js/src/ion/CodeGenerator.cpp | 116 +++++++++++++++++++++++++++++++++++
 js/src/ion/CodeGenerator.h   |   3 +
 js/src/ion/IonBuilder.cpp    |  32 +++++++++-
 js/src/ion/LIR-Common.h      |  35 +++++++++++
 js/src/ion/LOpcodes.h        |   2 +
 js/src/ion/Lowering.cpp      |  17 ++++-
 js/src/ion/Lowering.h        |   1 +
 js/src/ion/MIR.h             |  28 ++++++++-
 js/src/ion/MOpcodes.h        |   1 +
 js/src/ion/TypePolicy.cpp    |   9 ++-
 js/src/ion/TypePolicy.h      |   4 +-
 11 files changed, 239 insertions(+), 9 deletions(-)

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index aa72a8851471..62071975c3e7 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -4213,6 +4213,122 @@ CodeGenerator::visitInArray(LInArray *lir)
     return true;
 }
 
+bool
+CodeGenerator::visitInstanceOfTypedO(LInstanceOfTypedO *ins)
+{
+    return emitInstanceOfTyped(ins, ins->mir()->prototypeObject());
+}
+
+bool
+CodeGenerator::visitInstanceOfTypedV(LInstanceOfTypedV *ins)
+{
+    return emitInstanceOfTyped(ins, ins->mir()->prototypeObject());
+}
+
+// Wrap IsDelegate, which takes a Value for the lhs of an instanceof.
+static bool
+IsDelegateObject(JSContext *cx, HandleObject protoObj, HandleObject obj, JSBool *res)
+{
+    bool nres;
+    if (!IsDelegate(cx, protoObj, ObjectValue(*obj), &nres))
+        return false;
+    *res = nres;
+    return true;
+}
+
+typedef bool (*IsDelegateObjectFn)(JSContext *, HandleObject, HandleObject, JSBool *);
+static const VMFunction IsDelegateObjectInfo = FunctionInfo<IsDelegateObjectFn>(IsDelegateObject);
+
+bool
+CodeGenerator::emitInstanceOfTyped(LInstruction *ins, RawObject prototypeObject)
+{
+    // This path implements fun_hasInstance when the function's prototype is
+    // known to be prototypeObject.
+
+    Label done;
+    Register output = ToRegister(ins->getDef(0));
+
+    // If the lhs is a primitive, the result is false.
+    Register objReg;
+    if (ins->isInstanceOfTypedV()) {
+        Label isObject;
+        ValueOperand lhsValue = ToValue(ins, LInstanceOfTypedV::LHS);
+        masm.branchTestObject(Assembler::Equal, lhsValue, &isObject);
+        masm.mov(Imm32(0), output);
+        masm.jump(&done);
+        masm.bind(&isObject);
+        objReg = masm.extractObject(lhsValue, output);
+    } else {
+        objReg = ToRegister(ins->toInstanceOfTypedO()->lhs());
+    }
+
+    // Crawl the lhs's prototype chain in a loop to search for prototypeObject.
+    // This follows the main loop of js::IsDelegate, though additionally breaks
+    // out of the loop on Proxy::LazyProto.
+
+    // Load the lhs's prototype.
+    masm.loadPtr(Address(objReg, JSObject::offsetOfType()), output);
+    masm.loadPtr(Address(output, offsetof(types::TypeObject, proto)), output);
+
+    Label testLazy;
+    {
+        Label loopPrototypeChain;
+        masm.bind(&loopPrototypeChain);
+
+        // Test for the target prototype object.
+        Label notPrototypeObject;
+        masm.branchPtr(Assembler::NotEqual, output, ImmGCPtr(prototypeObject), &notPrototypeObject);
+        masm.mov(Imm32(1), output);
+        masm.jump(&done);
+        masm.bind(&notPrototypeObject);
+
+        JS_ASSERT(uintptr_t(Proxy::LazyProto) == 1);
+
+        // Test for NULL or Proxy::LazyProto
+        masm.branchPtr(Assembler::BelowOrEqual, output, ImmWord(1), &testLazy);
+
+        // Load the current object's prototype.
+        masm.loadPtr(Address(output, JSObject::offsetOfType()), output);
+        masm.loadPtr(Address(output, offsetof(types::TypeObject, proto)), output);
+
+        masm.jump(&loopPrototypeChain);
+    }
+
+    // Make a VM call if an object with a lazy proto was found on the prototype
+    // chain. This currently occurs only for cross compartment wrappers, which
+    // we do not expect to be compared with non-wrapper functions from this
+    // compartment. Otherwise, we stopped on a NULL prototype and the output
+    // register is already correct.
+
+    OutOfLineCode *ool = oolCallVM(IsDelegateObjectInfo, ins,
+                                   (ArgList(), ImmGCPtr(prototypeObject), objReg),
+                                   StoreRegisterTo(output));
+
+    // Regenerate the original lhs object for the VM call.
+    Label regenerate, *lazyEntry;
+    if (objReg != output) {
+        lazyEntry = ool->entry();
+    } else {
+        masm.bind(&regenerate);
+        lazyEntry = &regenerate;
+        if (ins->isInstanceOfTypedV()) {
+            ValueOperand lhsValue = ToValue(ins, LInstanceOfTypedV::LHS);
+            objReg = masm.extractObject(lhsValue, output);
+        } else {
+            objReg = ToRegister(ins->toInstanceOfTypedO()->lhs());
+        }
+        JS_ASSERT(objReg == output);
+        masm.jump(ool->entry());
+    }
+
+    masm.bind(&testLazy);
+    masm.branchPtr(Assembler::Equal, output, ImmWord(1), lazyEntry);
+
+    masm.bind(&done);
+    masm.bind(ool->rejoin());
+    return true;
+}
+
 bool
 CodeGenerator::visitInstanceOfO(LInstanceOfO *ins)
 {
diff --git a/js/src/ion/CodeGenerator.h b/js/src/ion/CodeGenerator.h
index a286c5512b49..5436bd61ceb2 100644
--- a/js/src/ion/CodeGenerator.h
+++ b/js/src/ion/CodeGenerator.h
@@ -168,9 +168,12 @@ class CodeGenerator : public CodeGeneratorSpecific
     bool visitCallDeleteProperty(LCallDeleteProperty *lir);
     bool visitBitNotV(LBitNotV *lir);
     bool visitBitOpV(LBitOpV *lir);
+    bool emitInstanceOfTyped(LInstruction *ins, RawObject prototypeObject);
     bool emitInstanceOf(LInstruction *ins, Register rhs);
     bool visitIn(LIn *ins);
     bool visitInArray(LInArray *ins);
+    bool visitInstanceOfTypedO(LInstanceOfTypedO *ins);
+    bool visitInstanceOfTypedV(LInstanceOfTypedV *ins);
     bool visitInstanceOfO(LInstanceOfO *ins);
     bool visitInstanceOfV(LInstanceOfV *ins);
     bool visitFunctionBoundary(LFunctionBoundary *lir);
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index bba29b7adb1e..2ea2d9472198 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -6498,9 +6498,37 @@ IonBuilder::jsop_in_dense()
 bool
 IonBuilder::jsop_instanceof()
 {
-    MDefinition *proto = current->pop();
+    MDefinition *rhs = current->pop();
     MDefinition *obj = current->pop();
-    MInstanceOf *ins = new MInstanceOf(obj, proto);
+
+    TypeOracle::BinaryTypes types = oracle->binaryTypes(script_, pc);
+
+    // If this is an 'x instanceof function' operation and we can determine the
+    // exact function and prototype object being tested for, use a typed path.
+    do {
+        RawObject rhsObject = types.rhsTypes ? types.rhsTypes->getSingleton() : NULL;
+        if (!rhsObject || !rhsObject->isFunction() || rhsObject->isBoundFunction())
+            break;
+
+        types::TypeObject *rhsType = rhsObject->getType(cx);
+        if (!rhsType || rhsType->unknownProperties())
+            break;
+
+        types::HeapTypeSet *protoTypes =
+            rhsType->getProperty(cx, NameToId(cx->names().classPrototype), false);
+        RawObject protoObject = protoTypes ? protoTypes->getSingleton(cx) : NULL;
+        if (!protoObject)
+            break;
+
+        MInstanceOfTyped *ins = new MInstanceOfTyped(obj, protoObject);
+
+        current->add(ins);
+        current->push(ins);
+
+        return resumeAfter(ins);
+    } while (false);
+
+    MInstanceOf *ins = new MInstanceOf(obj, rhs);
 
     current->add(ins);
     current->push(ins);
diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h
index c240d7e40dc4..00b91ddc2b26 100644
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -3143,6 +3143,41 @@ class LIn : public LCallInstructionHelper<1, BOX_PIECES+1, 0>
     static const size_t RHS = BOX_PIECES;
 };
 
+class LInstanceOfTypedO : public LInstructionHelper<1, 1, 0>
+{
+  public:
+    LIR_HEADER(InstanceOfTypedO);
+    LInstanceOfTypedO(const LAllocation &lhs) {
+        setOperand(0, lhs);
+    }
+
+    MInstanceOfTyped *mir() const {
+        return mir_->toInstanceOfTyped();
+    }
+
+    const LAllocation *lhs() {
+        return getOperand(0);
+    }
+};
+
+class LInstanceOfTypedV : public LInstructionHelper<1, BOX_PIECES, 0>
+{
+  public:
+    LIR_HEADER(InstanceOfTypedV);
+    LInstanceOfTypedV() {
+    }
+
+    MInstanceOfTyped *mir() const {
+        return mir_->toInstanceOfTyped();
+    }
+
+    const LAllocation *lhs() {
+        return getOperand(LHS);
+    }
+
+    static const size_t LHS = 0;
+};
+
 class LInstanceOfO : public LInstructionHelper<1, 2, 2>
 {
   public:
diff --git a/js/src/ion/LOpcodes.h b/js/src/ion/LOpcodes.h
index d78634a2d3b3..be0918ca31c1 100644
--- a/js/src/ion/LOpcodes.h
+++ b/js/src/ion/LOpcodes.h
@@ -169,6 +169,8 @@
     _(Round)                        \
     _(In)                           \
     _(InArray)                      \
+    _(InstanceOfTypedO)             \
+    _(InstanceOfTypedV)             \
     _(InstanceOfO)                  \
     _(InstanceOfV)                  \
     _(InterruptCheck)               \
diff --git a/js/src/ion/Lowering.cpp b/js/src/ion/Lowering.cpp
index 0b1779eac961..a8a8e6ab4582 100644
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -1924,6 +1924,22 @@ LIRGenerator::visitIn(MIn *ins)
     return defineVMReturn(lir, ins) && assignSafepoint(lir, ins);
 }
 
+bool
+LIRGenerator::visitInstanceOfTyped(MInstanceOfTyped *ins)
+{
+    MDefinition *lhs = ins->getOperand(0);
+
+    JS_ASSERT(lhs->type() == MIRType_Value || lhs->type() == MIRType_Object);
+
+    if (lhs->type() == MIRType_Object) {
+        LInstanceOfTypedO *lir = new LInstanceOfTypedO(useRegister(lhs));
+        return define(lir, ins) && assignSafepoint(lir, ins);
+    }
+
+    LInstanceOfTypedV *lir = new LInstanceOfTypedV();
+    return useBox(lir, LInstanceOfTypedV::LHS, lhs) && define(lir, ins) && assignSafepoint(lir, ins);
+}
+
 bool
 LIRGenerator::visitInstanceOf(MInstanceOf *ins)
 {
@@ -1933,7 +1949,6 @@ LIRGenerator::visitInstanceOf(MInstanceOf *ins)
     JS_ASSERT(lhs->type() == MIRType_Value || lhs->type() == MIRType_Object);
     JS_ASSERT(rhs->type() == MIRType_Object);
 
-    // InstanceOf with non-object will always return false
     if (lhs->type() == MIRType_Object) {
         LInstanceOfO *lir = new LInstanceOfO(useRegister(lhs), useRegister(rhs), temp(), temp());
         return define(lir, ins) && assignSafepoint(lir, ins);
diff --git a/js/src/ion/Lowering.h b/js/src/ion/Lowering.h
index cfe005924f42..de9b93d1bf39 100644
--- a/js/src/ion/Lowering.h
+++ b/js/src/ion/Lowering.h
@@ -184,6 +184,7 @@ class LIRGenerator : public LIRGeneratorSpecific
     bool visitThrow(MThrow *ins);
     bool visitIn(MIn *ins);
     bool visitInArray(MInArray *ins);
+    bool visitInstanceOfTyped(MInstanceOfTyped *ins);
     bool visitInstanceOf(MInstanceOf *ins);
     bool visitFunctionBoundary(MFunctionBoundary *ins);
     bool visitSetDOMProperty(MSetDOMProperty *ins);
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index 372f0903e196..2a0081af31d9 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -5245,7 +5245,33 @@ class MInArray
     }
 };
 
-// Implementation for instanceof operator.
+// Implementation for instanceof operator with specific rhs.
+class MInstanceOfTyped
+  : public MUnaryInstruction,
+    public InstanceOfPolicy
+{
+    CompilerRootObject protoObj_;
+
+  public:
+    MInstanceOfTyped(MDefinition *obj, RawObject proto)
+      : MUnaryInstruction(obj)
+    {
+        protoObj_ = proto;
+        setResultType(MIRType_Boolean);
+    }
+
+    INSTRUCTION_HEADER(InstanceOfTyped);
+
+    TypePolicy *typePolicy() {
+        return this;
+    }
+
+    RawObject prototypeObject() {
+        return protoObj_;
+    }
+};
+
+// Implementation for instanceof operator with unknown rhs.
 class MInstanceOf
   : public MBinaryInstruction,
     public InstanceOfPolicy
diff --git a/js/src/ion/MOpcodes.h b/js/src/ion/MOpcodes.h
index b1e636011b1f..69e266af26f9 100644
--- a/js/src/ion/MOpcodes.h
+++ b/js/src/ion/MOpcodes.h
@@ -133,6 +133,7 @@ namespace ion {
     _(Floor)                                                                \
     _(Round)                                                                \
     _(In)                                                                   \
+    _(InstanceOfTyped)                                                      \
     _(InstanceOf)                                                           \
     _(InterruptCheck)                                                       \
     _(FunctionBoundary)                                                     \
diff --git a/js/src/ion/TypePolicy.cpp b/js/src/ion/TypePolicy.cpp
index 9da2a4db01c4..13fb0bd2d244 100644
--- a/js/src/ion/TypePolicy.cpp
+++ b/js/src/ion/TypePolicy.cpp
@@ -386,9 +386,12 @@ InstanceOfPolicy::adjustInputs(MInstruction *def)
        BoxPolicy<0>::staticAdjustInputs(def);
     }
 
-    // Unbox second operand forcefully to an object, 
-    // so it bailouts with other types
-    ObjectPolicy<1>::staticAdjustInputs(def);
+    if (def->numOperands() == 2) {
+        // Unbox second operand forcefully to an object,
+        // so it bailouts with other types
+        ObjectPolicy<1>::staticAdjustInputs(def);
+    }
+
     return true;
 }
 
diff --git a/js/src/ion/TypePolicy.h b/js/src/ion/TypePolicy.h
index 52e66b00947d..77d7eda0d411 100644
--- a/js/src/ion/TypePolicy.h
+++ b/js/src/ion/TypePolicy.h
@@ -190,8 +190,8 @@ class CallSetElementPolicy : public SingleObjectPolicy
     bool adjustInputs(MInstruction *def);
 };
 
-// First operand will be boxed to an Value (except for an object)
-// Second operand will forcefully be unboxed to an object
+// First operand will be boxed to a Value (except for an object)
+// Second operand (if specified) will forcefully be unboxed to an object
 class InstanceOfPolicy : public TypePolicy
 {
   public:

From d4c5256e4c6adbbcf588069ecb2220d7c3fe97ea Mon Sep 17 00:00:00 2001
From: Andrew McCreight <amccreight@mozilla.com>
Date: Fri, 23 Nov 2012 10:50:05 -0800
Subject: [PATCH 066/160] Bug 807713 - add warning comment for
 nsTObserverArray::ElementAt. r=sicking

---
 accessible/src/base/nsAccessiblePivot.cpp |  2 +-
 xpcom/glue/nsTObserverArray.h             | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/accessible/src/base/nsAccessiblePivot.cpp b/accessible/src/base/nsAccessiblePivot.cpp
index 8690a363e225..5a44ca43b8eb 100644
--- a/accessible/src/base/nsAccessiblePivot.cpp
+++ b/accessible/src/base/nsAccessiblePivot.cpp
@@ -61,7 +61,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsAccessiblePivot)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPosition)
   uint32_t i, length = tmp->mObservers.Length();
   for (i = 0; i < length; ++i) {
-    cb.NoteXPCOMChild(tmp->mObservers[i]);
+    cb.NoteXPCOMChild(tmp->mObservers.ElementAt(i));
   }
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
diff --git a/xpcom/glue/nsTObserverArray.h b/xpcom/glue/nsTObserverArray.h
index 3f254d9e8f11..67c50e201c0e 100644
--- a/xpcom/glue/nsTObserverArray.h
+++ b/xpcom/glue/nsTObserverArray.h
@@ -92,7 +92,8 @@ class nsAutoTObserverArray : protected nsTObserverArray_base {
     }
 
     // This method provides direct access to the i'th element of the array.
-    // The given index must be within the array bounds.
+    // The given index must be within the array bounds. If the underlying array
+    // may change during iteration, use an iterator instead of this function.
     // @param i  The index of an element in the array.
     // @return   A reference to the i'th element of the array.
     elem_type& ElementAt(index_type i) {
@@ -118,15 +119,9 @@ class nsAutoTObserverArray : protected nsTObserverArray_base {
       return mArray.SafeElementAt(i, def);
     }
 
-    // Shorthand for ElementAt(i)
-    elem_type& operator[](index_type i) {
-      return ElementAt(i);
-    }
-
-    // Shorthand for ElementAt(i)
-    const elem_type& operator[](index_type i) const {
-      return ElementAt(i);
-    }
+    // No operator[] is provided because the point of this class is to support
+    // allow modifying the array during iteration, and ElementAt() is not safe
+    // in those conditions.
 
     //
     // Search methods
@@ -392,7 +387,7 @@ ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback,
   aFlags |= CycleCollectionEdgeNameArrayFlag;
   size_t length = aField.Length();
   for (size_t i = 0; i < length; ++i) {
-    ImplCycleCollectionTraverse(aCallback, aField[i], aName, aFlags);
+    ImplCycleCollectionTraverse(aCallback, aField.ElementAt(i), aName, aFlags);
   }
 }
 

From 38f26d4ead2683b63190fb6413061bad5783984f Mon Sep 17 00:00:00 2001
From: Till Schneidereit <tschneidereit@gmail.com>
Date: Sat, 24 Nov 2012 16:06:06 +0100
Subject: [PATCH 067/160] Bug 814729 - Add getSelfHostedValue function to JS
 shell. r=shu

---
 js/src/jscntxt.cpp       |  9 ++++-----
 js/src/jscntxt.h         |  2 +-
 js/src/shell/js.cpp      | 22 ++++++++++++++++++++++
 js/src/vm/GlobalObject.h |  6 +++++-
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 7d3e3eb59d39..ad4a6e29ade8 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -444,8 +444,7 @@ JSRuntime::cloneSelfHostedFunctionScript(JSContext *cx, Handle<PropertyName*> na
 }
 
 bool
-JSRuntime::cloneSelfHostedValue(JSContext *cx, Handle<PropertyName*> name, HandleObject holder,
-                                MutableHandleValue vp)
+JSRuntime::cloneSelfHostedValue(JSContext *cx, Handle<PropertyName*> name, MutableHandleValue vp)
 {
     RootedValue funVal(cx);
     if (!getUnclonedSelfHostedValue(cx, name, &funVal))
@@ -458,15 +457,15 @@ JSRuntime::cloneSelfHostedValue(JSContext *cx, Handle<PropertyName*> name, Handl
      */
     if (cx->global() == selfHostedGlobal_) {
         vp.set(funVal);
-    } else if (funVal.toObject().isFunction()){
+    } else if (funVal.isObject() && funVal.toObject().isFunction()) {
         RootedFunction fun(cx, funVal.toObject().toFunction());
         RootedObject clone(cx, CloneFunctionObject(cx, fun, cx->global(), fun->getAllocKind()));
         if (!clone)
             return false;
         vp.set(ObjectValue(*clone));
+    } else {
+        vp.set(UndefinedValue());
     }
-    DebugOnly<bool> ok = JS_DefinePropertyById(cx, holder, NameToId(name), vp, NULL, NULL, 0);
-    JS_ASSERT(ok);
     return true;
 }
 
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 3b4ad085ccad..603b9d3b7bf9 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -560,7 +560,7 @@ struct JSRuntime : js::RuntimeFriendFields
     bool cloneSelfHostedFunctionScript(JSContext *cx, js::Handle<js::PropertyName*> name,
                                        js::Handle<JSFunction*> targetFun);
     bool cloneSelfHostedValue(JSContext *cx, js::Handle<js::PropertyName*> name,
-                              js::HandleObject holder, js::MutableHandleValue vp);
+                              js::MutableHandleValue vp);
 
     /* Base address of the native stack for the current thread. */
     uintptr_t           nativeStackBase;
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 8d0648a63e98..e3adcbf1f298 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -3582,6 +3582,23 @@ GetMaxArgs(JSContext *cx, unsigned arg, jsval *vp)
     return true;
 }
 
+static JSBool
+GetSelfHostedValue(JSContext *cx, unsigned argc, jsval *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    if (argc != 1 || !args[0].isString()) {
+        JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_INVALID_ARGS,
+                             "getSelfHostedValue");
+        return false;
+    }
+    RootedAtom srcAtom(cx, ToAtom(cx, args[0]));
+    if (!srcAtom)
+        return false;
+    RootedPropertyName srcName(cx, srcAtom->asPropertyName());
+    return cx->runtime->cloneSelfHostedValue(cx, srcName, args.rval());
+}
+
 static JSFunctionSpecWithHelp shell_functions[] = {
     JS_FN_HELP("version", Version, 0, 0,
 "version([number])",
@@ -3894,6 +3911,11 @@ static JSFunctionSpecWithHelp shell_functions[] = {
 "  rooting hazards. This is helpful to reduce the time taken when interpreting\n"
 "  heavily numeric code."),
 
+    JS_FN_HELP("getSelfHostedValue", GetSelfHostedValue, 1, 0,
+"getSelfHostedValue()",
+"  Get a self-hosted value by its name. Note that these values don't get \n"
+"  cached, so repeatedly getting the same value creates multiple distinct clones."),
+
     JS_FS_HELP_END
 };
 #ifdef MOZ_PROFILING
diff --git a/js/src/vm/GlobalObject.h b/js/src/vm/GlobalObject.h
index 344d10dde197..379a171121f8 100644
--- a/js/src/vm/GlobalObject.h
+++ b/js/src/vm/GlobalObject.h
@@ -393,7 +393,11 @@ class GlobalObject : public JSObject
         if (HasDataProperty(cx, holder, id, value.address()))
             return true;
         Rooted<PropertyName*> rootedName(cx, name);
-        return cx->runtime->cloneSelfHostedValue(cx, rootedName, holder, value);
+        if (!cx->runtime->cloneSelfHostedValue(cx, rootedName, value))
+            return false;
+        mozilla::DebugOnly<bool> ok = JS_DefinePropertyById(cx, holder, id, value, NULL, NULL, 0);
+        JS_ASSERT(ok);
+        return true;
     }
 
     inline RegExpStatics *getRegExpStatics() const;

From 5ab939777a0cf1da6d90433a1f0baa5c1422cdd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Sun, 25 Nov 2012 14:39:11 -0800
Subject: [PATCH 068/160] Bug 814927 - gstreamer builds broken by Bug 814284
 [r=ehsan]

---
 content/media/DecoderTraits.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/content/media/DecoderTraits.cpp b/content/media/DecoderTraits.cpp
index b3a10d395e02..64dfa7456b15 100644
--- a/content/media/DecoderTraits.cpp
+++ b/content/media/DecoderTraits.cpp
@@ -10,6 +10,9 @@
 #ifdef MOZ_MEDIA_PLUGINS
 #include "MediaPluginHost.h"
 #endif
+#ifdef MOZ_GSTREAMER
+#include "mozilla/Preferences.h"
+#endif
 
 namespace mozilla
 {

From 0e97b98462346f2f75d29a684595b67d6ec44cf7 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Sun, 25 Nov 2012 14:40:28 -0800
Subject: [PATCH 069/160] Bug 814312 - Avoid PL_ArenaPool recycling in the
 layout engine.  r=roc.

--HG--
extra : rebase_source : 7aaa3d745583c595692f1effd933cc70931194ff
---
 layout/base/nsDisplayList.cpp   |  1 -
 layout/generic/nsLineLayout.cpp | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index ee7d328ed111..c3344fce3406 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -666,7 +666,6 @@ nsDisplayListBuilder::~nsDisplayListBuilder() {
 
   nsCSSRendering::EndFrameTreesLocked();
 
-  PL_FreeArenaPool(&mPool);
   PL_FinishArenaPool(&mPool);
   MOZ_COUNT_DTOR(nsDisplayListBuilder);
 }
diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp
index 9b10f1c03a82..0c7f6241d21b 100644
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -117,16 +117,6 @@ nsLineLayout::~nsLineLayout()
 
   NS_ASSERTION(nullptr == mRootSpan, "bad line-layout user");
 
-  // PL_FreeArenaPool takes our memory and puts in on a global free list so
-  // that the next time an arena makes an allocation it will not have to go
-  // all the way down to malloc.  This is desirable as this class is created
-  // and destroyed in a tight loop.
-  //
-  // I looked at the code.  It is not technically necessary to call
-  // PL_FinishArenaPool() after PL_FreeArenaPool(), but from an API
-  // standpoint, I think we are susposed to.  It will be very fast anyway,
-  // since PL_FreeArenaPool() has done all the work.
-  PL_FreeArenaPool(&mArena);
   PL_FinishArenaPool(&mArena);
 }
 

From 6247c94cd0e053c1fb21a9d3a7baca5faa69ca29 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Sun, 25 Nov 2012 14:00:31 -0500
Subject: [PATCH 070/160] Bug 793719 - Fix for D2D error on shutdown with
 VS2012. r=bas

---
 gfx/2d/2D.h                       | 1 +
 gfx/2d/DrawTargetD2D.cpp          | 9 +++++++++
 gfx/2d/DrawTargetD2D.h            | 1 +
 gfx/2d/Factory.cpp                | 6 ++++++
 gfx/thebes/gfxWindowsPlatform.cpp | 2 ++
 5 files changed, 19 insertions(+)

diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h
index 9e1c7f973cad..c780cb1aa621 100644
--- a/gfx/2d/2D.h
+++ b/gfx/2d/2D.h
@@ -926,6 +926,7 @@ public:
 
   static uint64_t GetD2DVRAMUsageDrawTarget();
   static uint64_t GetD2DVRAMUsageSourceSurface();
+  static void D2DCleanup();
 
 private:
   static ID3D10Device1 *mD3D10Device;
diff --git a/gfx/2d/DrawTargetD2D.cpp b/gfx/2d/DrawTargetD2D.cpp
index 2113435dfb0e..d82a5c9a5115 100644
--- a/gfx/2d/DrawTargetD2D.cpp
+++ b/gfx/2d/DrawTargetD2D.cpp
@@ -2686,6 +2686,15 @@ DrawTargetD2D::factory()
   return mFactory;
 }
 
+void
+DrawTargetD2D::CleanupD2D()
+{
+  if (mFactory) {
+    mFactory->Release();
+    mFactory = nullptr;
+  }
+}
+
 IDWriteFactory*
 DrawTargetD2D::GetDWriteFactory()
 {
diff --git a/gfx/2d/DrawTargetD2D.h b/gfx/2d/DrawTargetD2D.h
index 4575214beb11..1e8ed6350d7c 100644
--- a/gfx/2d/DrawTargetD2D.h
+++ b/gfx/2d/DrawTargetD2D.h
@@ -128,6 +128,7 @@ public:
   void PopCachedLayer(ID2D1RenderTarget *aRT);
 
   static ID2D1Factory *factory();
+  static void CleanupD2D();
   static TemporaryRef<ID2D1StrokeStyle> CreateStrokeStyleForOptions(const StrokeOptions &aStrokeOptions);
   static IDWriteFactory *GetDWriteFactory();
 
diff --git a/gfx/2d/Factory.cpp b/gfx/2d/Factory.cpp
index 8ebbf2527b30..f20ec2ffef50 100644
--- a/gfx/2d/Factory.cpp
+++ b/gfx/2d/Factory.cpp
@@ -441,6 +441,12 @@ Factory::GetD2DVRAMUsageSourceSurface()
   return DrawTargetD2D::mVRAMUsageSS;
 }
 
+void
+Factory::D2DCleanup()
+{
+  DrawTargetD2D::CleanupD2D();
+}
+
 #endif // XP_WIN
 
 TemporaryRef<DrawTarget>
diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index acc433934818..acb2479e9352 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -385,6 +385,8 @@ gfxWindowsPlatform::~gfxWindowsPlatform()
     }
 #endif
 
+    mozilla::gfx::Factory::D2DCleanup();
+
     /* 
      * Uninitialize COM 
      */ 

From 0832e7dfc7286ff8a6715da53c3034dcbaa0b86b Mon Sep 17 00:00:00 2001
From: Chuck Lee <chulee@mozilla.com>
Date: Fri, 23 Nov 2012 12:09:01 +0800
Subject: [PATCH 071/160] Bug 796277 - 0001.Save voicemail info in RIL.
 r=hsinyi

---
 dom/system/gonk/RILContentHelper.js    | 31 ++++++++++++++++++++------
 dom/system/gonk/RadioInterfaceLayer.js | 13 ++++++++++-
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/dom/system/gonk/RILContentHelper.js b/dom/system/gonk/RILContentHelper.js
index ba6c5449265c..b00edfeccfb4 100644
--- a/dom/system/gonk/RILContentHelper.js
+++ b/dom/system/gonk/RILContentHelper.js
@@ -60,7 +60,7 @@ const RIL_IPC_MSG_NAMES = [
   "RIL:SelectNetworkAuto",
   "RIL:CallStateChanged",
   "RIL:VoicemailNotification",
-  "RIL:VoicemailNumberChanged",
+  "RIL:VoicemailInfoChanged",
   "RIL:CallError",
   "RIL:CardLockResult",
   "RIL:USSDReceived",
@@ -123,7 +123,13 @@ MobileICCInfo.prototype = {
   mcc: 0,
   mnc: 0,
   spn: null,
-  msisdn: null,
+  msisdn: null
+};
+
+function MobileVoicemailInfo() {}
+MobileVoicemailInfo.prototype = {
+  number: null,
+  displayName: null
 };
 
 function MobileConnectionInfo() {}
@@ -241,6 +247,7 @@ function RILContentHelper() {
   this.iccInfo = new MobileICCInfo();
   this.voiceConnectionInfo = new MobileConnectionInfo();
   this.dataConnectionInfo = new MobileConnectionInfo();
+  this.voicemailInfo = new MobileVoicemailInfo();
 
   this.initRequests();
   this.initMessageListener(RIL_IPC_MSG_NAMES);
@@ -257,6 +264,7 @@ function RILContentHelper() {
   this.updateICCInfo(rilContext.icc, this.iccInfo);
   this.updateConnectionInfo(rilContext.voice, this.voiceConnectionInfo);
   this.updateConnectionInfo(rilContext.data, this.dataConnectionInfo);
+  this.updateVoicemailInfo(rilContext.voicemail, this.voicemailInfo);
 }
 
 RILContentHelper.prototype = {
@@ -271,6 +279,12 @@ RILContentHelper.prototype = {
                                     interfaces: [Ci.nsIMobileConnectionProvider,
                                                  Ci.nsIRILContentHelper]}),
 
+  updateVoicemailInfo: function updateVoicemailInfo(srcInfo, destInfo) {
+    for (let key in srcInfo) {
+      destInfo[key] = srcInfo[key];
+    }
+  },
+
   updateICCInfo: function updateICCInfo(srcInfo, destInfo) {
     for (let key in srcInfo) {
       destInfo[key] = srcInfo[key];
@@ -553,8 +567,12 @@ RILContentHelper.prototype = {
   _enumerateTelephonyCallbacks: null,
 
   voicemailStatus: null,
-  voicemailNumber: null,
-  voicemailDisplayName: null,
+  get voicemailNumber() {
+    return this.voicemailInfo.number;
+  },
+  get voicemailDisplayName() {
+    return this.voicemailInfo.displayName;
+  },
 
   registerCallback: function registerCallback(callbackType, callback) {
     let callbacks = this[callbackType];
@@ -797,9 +815,8 @@ RILContentHelper.prototype = {
       case "RIL:VoicemailNotification":
         this.handleVoicemailNotification(msg.json);
         break;
-      case "RIL:VoicemailNumberChanged":
-        this.voicemailNumber = msg.json.number;
-        this.voicemailDisplayName = msg.json.alphaId;
+      case "RIL:VoicemailInfoChanged":
+        this.updateVoicemailInfo(msg.json, this.voicemailInfo);
         break;
       case "RIL:CardLockResult":
         if (msg.json.success) {
diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index 87c10f744520..2c1032336351 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -194,6 +194,8 @@ function RadioInterfaceLayer() {
     radioState:     RIL.GECKO_RADIOSTATE_UNAVAILABLE,
     cardState:      RIL.GECKO_CARDSTATE_UNAVAILABLE,
     icc:            null,
+    voicemail:      {number: null,
+                     displayName: null},
 
     // These objects implement the nsIDOMMozMobileConnectionInfo interface,
     // although the actual implementation lives in the content process. So are
@@ -568,7 +570,7 @@ RadioInterfaceLayer.prototype = {
         }
         break;
       case "iccmbdn":
-        this._sendTargetMessage("voicemail", "RIL:VoicemailNumberChanged", message);
+        this.handleICCMbdn(message);
         break;
       case "USSDReceived":
         debug("USSDReceived " + JSON.stringify(message));
@@ -1477,6 +1479,15 @@ RadioInterfaceLayer.prototype = {
     }
   },
 
+  handleICCMbdn: function handleICCMbdn(message) {
+    let voicemail = this.rilContext.voicemail;
+
+    voicemail.number = message.number;
+    voicemail.displayName = message.alphaId;
+
+    this._sendTargetMessage("voicemail", "RIL:VoicemailInfoChanged", voicemail);
+  },
+
   handleICCInfoChange: function handleICCInfoChange(message) {
     let oldIcc = this.rilContext.icc;
     this.rilContext.icc = message;

From ece376f0ade588f755e03455e6154d7baa98896f Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 23 Nov 2012 14:52:39 -0500
Subject: [PATCH 072/160] Bug 814757 - Export all decoder reader headers;
 r=cpearce

---
 content/media/gstreamer/Makefile.in | 1 +
 content/media/ogg/Makefile.in       | 1 +
 content/media/omx/Makefile.in       | 1 +
 content/media/plugins/Makefile.in   | 1 +
 content/media/wave/Makefile.in      | 1 +
 content/media/webm/Makefile.in      | 1 +
 6 files changed, 6 insertions(+)

diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in
index 90d7f4e12b46..806dd6c4869b 100644
--- a/content/media/gstreamer/Makefile.in
+++ b/content/media/gstreamer/Makefile.in
@@ -17,6 +17,7 @@ LIBXUL_LIBRARY 	= 1
 
 EXPORTS		+= \
 		GStreamerDecoder.h \
+		GStreamerReader.h \
 		$(NULL)
 
 CPPSRCS		= \
diff --git a/content/media/ogg/Makefile.in b/content/media/ogg/Makefile.in
index 056cdb9b320a..76cf22507d97 100644
--- a/content/media/ogg/Makefile.in
+++ b/content/media/ogg/Makefile.in
@@ -18,6 +18,7 @@ LIBXUL_LIBRARY 	= 1
 EXPORTS		+= \
 		OggDecoder.h \
 		OggCodecState.h \
+		OggReader.h \
 		$(NULL)
 
 CPPSRCS		= \
diff --git a/content/media/omx/Makefile.in b/content/media/omx/Makefile.in
index 78cb00f703b0..c439db803b1e 100644
--- a/content/media/omx/Makefile.in
+++ b/content/media/omx/Makefile.in
@@ -15,6 +15,7 @@ LIBXUL_LIBRARY 	= 1
 
 EXPORTS		+= \
 		MediaOmxDecoder.h \
+		MediaOmxReader.h \
 		$(NULL)
 
 CPPSRCS		= \
diff --git a/content/media/plugins/Makefile.in b/content/media/plugins/Makefile.in
index 8bee356266cb..dc3d5839e9b4 100644
--- a/content/media/plugins/Makefile.in
+++ b/content/media/plugins/Makefile.in
@@ -17,6 +17,7 @@ EXPORTS		+= \
 		MPAPI.h \
 		MediaPluginHost.h \
 		MediaPluginDecoder.h \
+		MediaPluginReader.h \
 		$(NULL)
 
 CPPSRCS		= \
diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in
index 0e3266416b59..8c8adfa2195f 100644
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -17,6 +17,7 @@ LIBXUL_LIBRARY 	= 1
 
 EXPORTS		+= \
 		WaveDecoder.h \
+		WaveReader.h \
 		$(NULL)
 
 CPPSRCS		= \
diff --git a/content/media/webm/Makefile.in b/content/media/webm/Makefile.in
index 00c01209e110..7464c80f93a7 100644
--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@@ -17,6 +17,7 @@ LIBXUL_LIBRARY 	= 1
 
 EXPORTS		+= \
 		WebMDecoder.h \
+		WebMReader.h \
 		$(NULL)
 
 CPPSRCS		= \

From 97e302398eecf464ceea27e63311c393de2bcbf7 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Sat, 24 Nov 2012 11:48:10 -0500
Subject: [PATCH 073/160] Bug 814748 - Provide the ability to enable/disable
 xpcshell tests for per-window private browsing builds; r=ted

---
 config/writemozinfo.py | 3 +++
 configure.in           | 1 +
 2 files changed, 4 insertions(+)

diff --git a/config/writemozinfo.py b/config/writemozinfo.py
index d5ddc8557a9f..3a131e6ec678 100755
--- a/config/writemozinfo.py
+++ b/config/writemozinfo.py
@@ -65,6 +65,9 @@ def build_dict(env=os.environ):
 
     # crashreporter
     d["crashreporter"] = 'MOZ_CRASHREPORTER' in env and env['MOZ_CRASHREPORTER'] == '1'
+
+    # per-window private browsing
+    d["perwindowprivatebrowsing"] = 'MOZ_PER_WINDOW_PRIVATE_BROWSING' in env and env['MOZ_PER_WINDOW_PRIVATE_BROWSING'] == '1'
     return d
 
 #TODO: replace this with the json module when Python >= 2.6 is a requirement.
diff --git a/configure.in b/configure.in
index dadb9e9bef85..d8b471ef0801 100644
--- a/configure.in
+++ b/configure.in
@@ -8885,6 +8885,7 @@ MOZ_DEBUG=${MOZ_DEBUG} \
 MOZ_WIDGET_TOOLKIT=${MOZ_WIDGET_TOOLKIT} \
 UNIVERSAL_BINARY=${UNIVERSAL_BINARY} \
 MOZ_CRASHREPORTER=${MOZ_CRASHREPORTER} \
+MOZ_PER_WINDOW_PRIVATE_BROWSING=${MOZ_PER_WINDOW_PRIVATE_BROWSING} \
   $PYTHON ${_topsrcdir}/config/writemozinfo.py ./mozinfo.json.tmp
 if cmp -s ./mozinfo.json.tmp ./mozinfo.json; then
   rm ./mozinfo.json.tmp

From 5bd2fd314b5c2e31923e3779169c9533fd71251a Mon Sep 17 00:00:00 2001
From: Rob Wood <rwood@mozilla.com>
Date: Fri, 23 Nov 2012 07:04:12 -0800
Subject: [PATCH 074/160] Bug 814691 - Develop WebTelephony test to verify
 cannot have multiple calls on hold simultaneously and update manifest.
 r=davehunt

---
 dom/telephony/test/marionette/manifest.ini    |   1 +
 .../test/marionette/test_multiple_hold.js     | 289 ++++++++++++++++++
 2 files changed, 290 insertions(+)
 create mode 100644 dom/telephony/test/marionette/test_multiple_hold.js

diff --git a/dom/telephony/test/marionette/manifest.ini b/dom/telephony/test/marionette/manifest.ini
index a5e0c680be09..aaf8bb854c7a 100644
--- a/dom/telephony/test/marionette/manifest.ini
+++ b/dom/telephony/test/marionette/manifest.ini
@@ -36,4 +36,5 @@ disabled = Bug 806138
 [test_incoming_onstatechange.js]
 [test_outgoing_onstatechange.js]
 [test_redundant_operations.js]
+[test_multiple_hold.js]
 
diff --git a/dom/telephony/test/marionette/test_multiple_hold.js b/dom/telephony/test/marionette/test_multiple_hold.js
new file mode 100644
index 000000000000..888ad95ca721
--- /dev/null
+++ b/dom/telephony/test/marionette/test_multiple_hold.js
@@ -0,0 +1,289 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 15000;
+
+SpecialPowers.addPermission("telephony", true, document);
+
+let telephony = window.navigator.mozTelephony;
+let inNumber = "5555551111";
+let outNumber = "5555552222";
+let incomingCall;
+let outgoingCall;
+
+function verifyInitialState() {
+  log("Verifying initial state.");
+  ok(telephony);
+  is(telephony.active, null);
+  ok(telephony.calls);
+  is(telephony.calls.length, 0);
+
+  runEmulatorCmd("gsm list", function(result) {
+    log("Initial call list: " + result);
+    is(result[0], "OK");
+    simulateIncoming();
+  });
+}
+
+function simulateIncoming() {
+  log("Simulating an incoming call.");
+
+  telephony.onincoming = function onincoming(event) {
+    log("Received 'incoming' call event.");
+    incomingCall = event.call;
+    ok(incomingCall);
+    is(incomingCall.number, inNumber);
+    is(incomingCall.state, "incoming");
+
+    is(telephony.calls.length, 1);
+    is(telephony.calls[0], incomingCall);
+
+    runEmulatorCmd("gsm list", function(result) {
+      log("Call list is now: " + result);
+      is(result[0], "inbound from " + inNumber + " : incoming");
+      is(result[1], "OK");
+      answerIncoming();
+    });
+  };
+  runEmulatorCmd("gsm call " + inNumber);
+}
+
+function answerIncoming() {
+  log("Answering the incoming call.");
+
+  let gotConnecting = false;
+  incomingCall.onconnecting = function onconnectingIn(event) { 
+    log("Received 'connecting' call event for original (incoming) call.");
+    is(incomingCall, event.call);
+    is(incomingCall.state, "connecting");
+    gotConnecting = true;
+  };
+
+  incomingCall.onconnected = function onconnectedIn(event) {
+    log("Received 'connected' call event for original (incoming) call.");
+    is(incomingCall, event.call);
+    is(incomingCall.state, "connected");
+    ok(gotConnecting);
+    is(incomingCall, telephony.active);
+
+    runEmulatorCmd("gsm list", function(result) {
+      log("Call list is now: " + result);
+      is(result[0], "inbound from " + inNumber + " : active");
+      is(result[1], "OK");
+      holdCall();
+    });
+  };
+  incomingCall.answer();
+}
+
+// Put the original (incoming) call on hold
+function holdCall() {
+  log("Putting the original (incoming) call on hold.");
+
+  let gotHolding = false;
+  incomingCall.onholding = function onholding(event) {
+    log("Received 'holding' call event");
+    is(incomingCall, event.call);
+    is(incomingCall.state, "holding");
+    gotHolding = true;
+  };
+
+  incomingCall.onheld = function onheld(event) {
+    log("Received 'held' call event");
+    is(incomingCall, event.call);
+    is(incomingCall.state, "held");
+    ok(gotHolding);
+
+    is(telephony.active, null);
+    is(telephony.calls.length, 1);
+    is(telephony.calls[0], incomingCall);
+
+    runEmulatorCmd("gsm list", function(result) {
+      log("Call list is now: " + result);
+      is(result[0], "inbound from " + inNumber + " : held");
+      is(result[1], "OK");
+      dial();
+    });
+  };
+  incomingCall.hold();
+}
+
+// With one call on hold, make outgoing call
+function dial() {
+  log("Making an outgoing call (while have one call already held).");
+
+  outgoingCall = telephony.dial(outNumber);
+  ok(outgoingCall);
+  is(outgoingCall.number, outNumber);
+  is(outgoingCall.state, "dialing");
+  is(outgoingCall, telephony.active);
+  is(telephony.calls.length, 2);
+  is(telephony.calls[0], incomingCall);
+  is(telephony.calls[1], outgoingCall);
+
+  outgoingCall.onalerting = function onalerting(event) {
+    log("Received 'onalerting' call event.");
+    is(outgoingCall, event.call);
+    is(outgoingCall.state, "alerting");
+
+    runEmulatorCmd("gsm list", function(result) {
+      log("Call list is now: " + result);
+      is(result[0], "inbound from " + inNumber + " : held");
+      is(result[1], "outbound to  " + outNumber + " : ringing");
+      is(result[2], "OK");
+      answerOutgoing();
+    });
+  };
+}
+
+// Have the outgoing call answered
+function answerOutgoing() {
+  log("Answering the outgoing/2nd call");
+
+  // We get no "connecting" event when the remote party answers the call.
+  outgoingCall.onconnected = function onconnectedOut(event) {
+    log("Received 'connected' call event for outgoing/2nd call.");
+    is(outgoingCall, event.call);
+    is(outgoingCall.state, "connected");
+    is(outgoingCall, telephony.active);
+
+    runEmulatorCmd("gsm list", function(result) {
+      log("Call list is now: " + result);
+      is(result[0], "inbound from " + inNumber + " : held");
+      is(result[1], "outbound to  " + outNumber + " : active");
+      is(result[2], "OK");
+      holdSecondCall();
+    });
+  };
+  runEmulatorCmd("gsm accept " + outNumber);
+}
+
+// With one held call and one active, hold the active one; expect the first
+// (held) call to automatically become active, and the 2nd call to go on hold
+function holdSecondCall() {
+  let firstCallReconnected = false;
+  let secondCallHeld = false;
+
+  log("Putting the 2nd (outgoing) call on hold.");
+
+  // Since first call will become connected again, setup handler
+  incomingCall.onconnected = function onreconnected(event) {
+    log("Received 'connected' call event for original (incoming) call.");
+    is(incomingCall, event.call);
+    is(incomingCall.state, "connected");
+    is(incomingCall, telephony.active);
+    firstCallReconnected = true;
+    if (firstCallReconnected && secondCallHeld) {
+      verifyCalls();
+    }
+  };
+
+  // Handlers for holding 2nd call
+  let gotHolding = false;
+  outgoingCall.onholding = function onholdingOut(event) {
+    log("Received 'holding' call event for 2nd call.");
+    is(outgoingCall, event.call);
+    is(outgoingCall.state, "holding");
+    gotHolding = true;
+  };
+
+  outgoingCall.onheld = function onheldOut(event) {
+    log("Received 'held' call event for 2nd call.");
+    is(outgoingCall, event.call);
+    is(outgoingCall.state, "held");
+    ok(gotHolding);
+    secondCallHeld = true;
+    if (firstCallReconnected && secondCallHeld) {
+      verifyCalls();
+    }
+  };
+  outgoingCall.hold();
+}
+
+function verifyCalls() {
+  is(telephony.active, incomingCall);
+  is(telephony.calls.length, 2);
+  is(telephony.calls[0], incomingCall);
+  is(telephony.calls[1], outgoingCall);
+
+  runEmulatorCmd("gsm list", function(result) {
+    log("Call list is now: " + result);
+    is(result[0], "inbound from " + inNumber + " : active");
+    is(result[1], "outbound to  " + outNumber + " : held");
+    is(result[2], "OK");
+    hangUpIncoming();
+  });
+}
+
+// Hang-up the original incoming call, which is now active
+function hangUpIncoming() {
+  log("Hanging up the original incoming (now active) call.");
+
+  let gotDisconnecting = false;
+  incomingCall.ondisconnecting = function ondisconnectingIn(event) {
+    log("Received 'disconnecting' call event for original (incoming) call.");
+    is(incomingCall, event.call);
+    is(incomingCall.state, "disconnecting");
+    gotDisconnecting = true;
+  };
+
+  incomingCall.ondisconnected = function ondisconnectedIn(event) {
+    log("Received 'disconnected' call event for original (incoming) call.");
+    is(incomingCall, event.call);
+    is(incomingCall.state, "disconnected");
+    ok(gotDisconnecting);
+
+    // Now back to one call
+    is(telephony.active, null);
+    is(telephony.calls.length, 1);
+    is(telephony.calls[0], outgoingCall);
+
+    runEmulatorCmd("gsm list", function(result) {
+      log("Call list is now: " + result);
+      is(result[0], "outbound to  " + outNumber + " : held");
+      is(result[1], "OK");
+      hangUpOutgoing();
+    });
+  };
+  incomingCall.hangUp();
+}
+
+// Hang-up the remaining (outgoing) call, which is held
+function hangUpOutgoing() {
+  log("Hanging up the remaining (outgoing) held call.");
+
+  let gotDisconnecting = false;
+  outgoingCall.ondisconnecting = function ondisconnectingOut(event) {
+    log("Received 'disconnecting' call event for remaining (outgoing) call.");
+    is(outgoingCall, event.call);
+    is(outgoingCall.state, "disconnecting");
+    gotDisconnecting = true;
+  };
+
+  outgoingCall.ondisconnected = function ondisconnectedOut(event) {
+    log("Received 'disconnected' call event for remaining (outgoing) call.");
+    is(outgoingCall, event.call);
+    is(outgoingCall.state, "disconnected");
+    ok(gotDisconnecting);
+
+    // Now no calls
+    is(telephony.active, null);
+    is(telephony.calls.length, 0);
+
+    runEmulatorCmd("gsm list", function(result) {
+      log("Call list is now: " + result);
+      is(result[0], "OK");
+      cleanUp();
+    });
+  };
+  outgoingCall.hangUp();  
+}
+
+function cleanUp() {
+  telephony.onincoming = null;
+  SpecialPowers.removePermission("telephony", document);
+  finish();
+}
+
+// Start the test
+verifyInitialState();

From 21622775a8c18e9fb625747fc6c02d82c3005e38 Mon Sep 17 00:00:00 2001
From: Andres Hernandez <andres@appcoast.com>
Date: Fri, 23 Nov 2012 15:52:31 -0600
Subject: [PATCH 075/160] Bug 810180 - Convert browser_private_search.js to use
 the per-window PB APIs; r=ehsan

--HG--
rename : browser/components/search/test/browser_private_search.js => browser/components/search/test/browser_private_search_perwindowpb.js
---
 browser/components/search/test/Makefile.in    |  38 +++---
 .../browser_private_search_perwindowpb.js     | 115 ++++++++++++++++++
 2 files changed, 139 insertions(+), 14 deletions(-)
 create mode 100644 browser/components/search/test/browser_private_search_perwindowpb.js

diff --git a/browser/components/search/test/Makefile.in b/browser/components/search/test/Makefile.in
index f2a4b045e1c0..a133279ffe95 100644
--- a/browser/components/search/test/Makefile.in
+++ b/browser/components/search/test/Makefile.in
@@ -10,19 +10,29 @@ relativesrcdir  =  @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MOCHITEST_BROWSER_FILES = 	  browser_405664.js \
-	                  browser_addEngine.js \
-	                  browser_contextmenu.js \
-	                  testEngine.xml \
-	                  testEngine_mozsearch.xml \
-	                  testEngine.src \
-	                  browser_426329.js \
-	                  426329.xml \
-	                  browser_483086.js \
-	                  483086-1.xml \
-	                  483086-2.xml \
-	                  test.html \
-	                  browser_private_search.js \
-	                  $(NULL)
+MOCHITEST_BROWSER_FILES = \
+  browser_405664.js \
+  browser_addEngine.js \
+  browser_contextmenu.js \
+  testEngine.xml \
+  testEngine_mozsearch.xml \
+  testEngine.src \
+  browser_426329.js \
+  426329.xml \
+  browser_483086.js \
+  483086-1.xml \
+  483086-2.xml \
+  test.html \
+  $(NULL)
+
+ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING
+MOCHITEST_BROWSER_FILES += \
+  browser_private_search_perwindowpb.js \
+  $(NULL)
+else
+MOCHITEST_BROWSER_FILES += \
+  browser_private_search.js \
+  $(NULL)
+endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/search/test/browser_private_search_perwindowpb.js b/browser/components/search/test/browser_private_search_perwindowpb.js
new file mode 100644
index 000000000000..2c62df91b8ca
--- /dev/null
+++ b/browser/components/search/test/browser_private_search_perwindowpb.js
@@ -0,0 +1,115 @@
+// This test performs a search in a public window, then a different
+// search in a private window, and then checks in the public window
+// whether there is an autocomplete entry for the private search.
+
+function test() {
+  waitForExplicitFinish();
+
+  let engineURL =
+    "http://mochi.test:8888/browser/browser/components/search/test/";
+  let windowsToClose = [];
+  registerCleanupFunction(function() {
+    let engine = Services.search.getEngineByName("Bug 426329");
+    Services.search.removeEngine(engine);
+    windowsToClose.forEach(function(win) {
+      win.close();
+    });
+  });
+
+  function onPageLoad(aWin, aCallback) {
+    aWin.gBrowser.addEventListener("DOMContentLoaded", function load(aEvent) {
+      let doc = aEvent.originalTarget;
+      info(doc.location.href);
+      if (doc.location.href.indexOf(engineURL) != -1) {
+        aWin.gBrowser.removeEventListener("DOMContentLoaded", load, false);
+        aCallback();
+      }
+    }, false);
+  }
+
+  function performSearch(aWin, aIsPrivate, aCallback) {
+    let searchBar = aWin.BrowserSearch.searchBar;
+    ok(searchBar, "got search bar");
+    onPageLoad(aWin, aCallback);
+
+    searchBar.value = aIsPrivate ? "private test" : "public test";
+    searchBar.focus();
+    EventUtils.synthesizeKey("VK_RETURN", {}, aWin);
+  }
+
+  function addEngine(aCallback) {
+    function observer(aSub, aTopic, aData) {
+      switch (aData) {
+        case "engine-current":
+          ok(Services.search.currentEngine.name == "Bug 426329",
+             "currentEngine set");
+          aCallback();
+          break;
+      }
+    }
+
+    Services.obs.addObserver(observer, "browser-search-engine-modified", false);
+    Services.search.addEngine(
+      engineURL + "426329.xml", Ci.nsISearchEngine.DATA_XML,
+      "data:image/x-icon,%00", false);
+  }
+
+  function testOnWindow(aIsPrivate, aCallback) {
+    let win = OpenBrowserWindow({ private: aIsPrivate });
+    win.addEventListener("load", function onLoad() {
+      win.removeEventListener("load", onLoad, false);
+      windowsToClose.push(win);
+      executeSoon(function() aCallback(win));
+    }, false);
+  }
+
+  addEngine(function() {
+    testOnWindow(false, function(win) {
+      performSearch(win, false, function() {
+        testOnWindow(true, function(win) {
+          performSearch(win, true, function() {
+            testOnWindow(false, function(win) {
+              checkSearchPopup(win, finish);
+            });
+          });
+        });
+      });
+    });
+  });
+}
+
+function checkSearchPopup(aWin, aCallback) {
+  let searchBar = aWin.BrowserSearch.searchBar;
+  searchBar.value = "p";
+  searchBar.focus();
+
+  let popup = searchBar.textbox.popup;
+  popup.addEventListener("popupshowing", function showing() {
+    popup.removeEventListener("popupshowing", showing, false);
+
+    let entries = getMenuEntries(searchBar);
+    for (let i = 0; i < entries.length; i++) {
+      isnot(entries[0], "private test",
+            "shouldn't see private autocomplete entries");
+    }
+
+    searchBar.textbox.toggleHistoryPopup();
+    searchBar.value = "";
+    aCallback();
+  }, false);
+
+  searchBar.textbox.showHistoryPopup();
+}
+
+function getMenuEntries(searchBar) {
+  let entries = [];
+  let autocompleteMenu = searchBar.textbox.popup;
+  // Could perhaps pull values directly from the controller, but it seems
+  // more reliable to test the values that are actually in the tree?
+  let column = autocompleteMenu.tree.columns[0];
+  let numRows = autocompleteMenu.tree.view.rowCount;
+  for (let i = 0; i < numRows; i++) {
+    entries.push(autocompleteMenu.tree.view.getValueAt(i, column));
+  }
+  return entries;
+}

From 3352f00ed4cb9a87b9d52ea18c13dcbb45f90a90 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Fri, 23 Nov 2012 18:26:34 -0500
Subject: [PATCH 076/160] Ensure off thread compilations are properly canceled
 on new type barriers or monitored bytecodes, bug 813559. r=dvander

---
 js/src/jsinfer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index be879742a396..941e2b4f24ed 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -2008,7 +2008,7 @@ JITCodeHasCheck(HandleScript script, jsbytecode *pc, RecompileKind kind)
     }
 #endif
 
-    if (script->hasAnyIonScript())
+    if (script->hasAnyIonScript() || script->isIonCompilingOffThread())
         return false;
 
     return true;

From 68737361e86f4210965e6a02f3a67bb5df792ac4 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Fri, 23 Nov 2012 19:13:56 -0500
Subject: [PATCH 077/160] Count instruction and spill code bytes in Ion basic
 blocks, bug 814489. r=pierron

---
 js/src/ion/CodeGenerator.cpp | 80 +++++++++++++++++++++++++++++++-----
 js/src/ion/IonCode.h         | 23 ++++++++++-
 js/src/jsopcode.cpp          |  9 +++-
 3 files changed, 99 insertions(+), 13 deletions(-)

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index cc6fa67945b9..bd726ab9a69a 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -1435,6 +1435,70 @@ CodeGenerator::maybeCreateScriptCounts()
     return counts;
 }
 
+// Structure for managing the state tracked for a block by script counters.
+struct ScriptCountBlockState
+{
+    IonBlockCounts &block;
+    MacroAssembler &masm;
+
+    Sprinter printer;
+
+    uint32 instructionBytes = 0;
+    uint32 spillBytes = 0;
+
+    // Pointer to instructionBytes, spillBytes, or NULL, depending on the last
+    // instruction processed.
+    uint32 *last = NULL;
+    uint32 lastLength = masm.size();
+
+  public:
+    ScriptCountBlockState(IonBlockCounts *block, MacroAssembler *masm)
+      : block(*block), masm(*masm),
+        printer(GetIonContext()->cx),
+        instructionBytes(0), spillBytes(0), last(NULL), lastLength(0)
+    {
+    }
+
+    bool init()
+    {
+        if (!printer.init())
+            return false;
+
+        // Bump the hit count for the block at the start. This code is not
+        // included in either the text for the block or the instruction byte
+        // counts.
+        masm.inc64(AbsoluteAddress(block.addressOfHitCount()));
+
+        // Collect human readable assembly for the code generated in the block.
+        masm.setPrinter(&printer);
+
+        return true;
+    }
+
+    void visitInstruction(LInstruction *ins)
+    {
+        if (last)
+            *last += masm.size() - lastLength;
+        lastLength = masm.size();
+        last = ins->isMoveGroup() ? &spillBytes : &instructionBytes;
+
+        // Prefix stream of assembly instructions with their LIR instruction name.
+        printer.printf("[%s]\n", ins->opName());
+    }
+
+    ~ScriptCountBlockState()
+    {
+        masm.setPrinter(NULL);
+
+        if (last)
+            *last += masm.size() - lastLength;
+
+        block.setCode(printer.string());
+        block.setInstructionBytes(instructionBytes);
+        block.setSpillBytes(spillBytes);
+    }
+};
+
 bool
 CodeGenerator::generateBody()
 {
@@ -1451,19 +1515,18 @@ CodeGenerator::generateBody()
             return false;
         iter++;
 
-        mozilla::Maybe<Sprinter> printer;
+        mozilla::Maybe<ScriptCountBlockState> blockCounts;
         if (counts) {
-            masm.inc64(AbsoluteAddress(counts->block(i).addressOfHitCount()));
-            printer.construct(GetIonContext()->cx);
-            if (!printer.ref().init())
+            blockCounts.construct(&counts->block(i), &masm);
+            if (!blockCounts.ref().init())
                 return false;
-            masm.setPrinter(printer.addr());
         }
 
         for (; iter != current->end(); iter++) {
             IonSpew(IonSpew_Codegen, "instruction %s", iter->opName());
+
             if (counts)
-                printer.ref().printf("[%s]\n", iter->opName());
+                blockCounts.ref().visitInstruction(*iter);
 
             if (iter->safepoint() && pushedArgumentSlots_.length()) {
                 if (!markArgumentSlots(iter->safepoint()))
@@ -1475,11 +1538,6 @@ CodeGenerator::generateBody()
         }
         if (masm.oom())
             return false;
-
-        if (counts) {
-            counts->block(i).setCode(printer.ref().string());
-            masm.setPrinter(NULL);
-        }
     }
 
     JS_ASSERT(pushedArgumentSlots_.empty());
diff --git a/js/src/ion/IonCode.h b/js/src/ion/IonCode.h
index b08427975dac..1fb62f5f9f53 100644
--- a/js/src/ion/IonCode.h
+++ b/js/src/ion/IonCode.h
@@ -420,9 +420,14 @@ struct IonBlockCounts
     // Hit count for this block.
     uint64 hitCount_;
 
-    // Information about the code generated for this block.
+    // Text information about the code generated for this block.
     char *code_;
 
+    // Number of bytes of code generated in this block. Spill code is counted
+    // separately from other, instruction implementing code.
+    uint32 instructionBytes_;
+    uint32 spillBytes_;
+
   public:
 
     bool init(uint32 id, uint32 offset, uint32 numSuccessors) {
@@ -485,6 +490,22 @@ struct IonBlockCounts
     const char *code() const {
         return code_;
     }
+
+    void setInstructionBytes(uint32 bytes) {
+        instructionBytes_ = bytes;
+    }
+
+    uint32 instructionBytes() const {
+        return instructionBytes_;
+    }
+
+    void setSpillBytes(uint32 bytes) {
+        spillBytes_ = bytes;
+    }
+
+    uint32 spillBytes() const {
+        return spillBytes_;
+    }
 };
 
 // Execution information for a compiled script which may persist after the
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index 29867a81a1c7..ffcfd8dcba67 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -328,7 +328,8 @@ js_DumpPCCounts(JSContext *cx, HandleScript script, js::Sprinter *sp)
             Sprint(sp, "BB #%lu [%05u]", block.id(), block.offset());
             for (size_t j = 0; j < block.numSuccessors(); j++)
                 Sprint(sp, " -> #%lu", block.successor(j));
-            Sprint(sp, " :: %llu hits\n", block.hitCount());
+            Sprint(sp, " :: %llu hits %u instruction bytes %u spill bytes\n",
+                   block.hitCount(), block.instructionBytes(), block.spillBytes());
             Sprint(sp, "%s\n", block.code());
         }
         ionCounts = ionCounts->previous();
@@ -7209,6 +7210,12 @@ GetPCCountJSON(JSContext *cx, const ScriptAndCounts &sac, StringBuffer &buf)
                     return false;
                 buf.append(str);
 
+                AppendJSONProperty(buf, "instructionBytes");
+                NumberValueToStringBuffer(cx, Int32Value(block.instructionBytes()), buf);
+
+                AppendJSONProperty(buf, "spillBytes");
+                NumberValueToStringBuffer(cx, Int32Value(block.spillBytes()), buf);
+
                 buf.append('}');
             }
             buf.append(']');

From 2240950d92ac6ffade20d218ffa35596fe5b7c45 Mon Sep 17 00:00:00 2001
From: Mark Capella <markcapella@twcny.rr.com>
Date: Fri, 23 Nov 2012 19:40:07 -0500
Subject: [PATCH 078/160] Bug 711772 - Create custom two-line checkable list
 item for site settings dialog, r=wesj              Based on Margarets
 original patch

---
 .../android/base/CheckableLinearLayout.java   | 41 ++++++++++++
 mobile/android/base/GeckoApp.java             | 62 ++++++++++++-------
 mobile/android/base/Makefile.in               |  2 +
 .../resources/layout/site_setting_item.xml    | 53 ++++++++++++++++
 mobile/android/chrome/content/browser.js      |  9 +--
 5 files changed, 140 insertions(+), 27 deletions(-)
 create mode 100644 mobile/android/base/CheckableLinearLayout.java
 create mode 100644 mobile/android/base/resources/layout/site_setting_item.xml

diff --git a/mobile/android/base/CheckableLinearLayout.java b/mobile/android/base/CheckableLinearLayout.java
new file mode 100644
index 000000000000..392929331b2d
--- /dev/null
+++ b/mobile/android/base/CheckableLinearLayout.java
@@ -0,0 +1,41 @@
+package org.mozilla.gecko;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.CheckBox;
+import android.widget.Checkable;
+import android.widget.LinearLayout;
+
+
+public class CheckableLinearLayout extends LinearLayout implements Checkable {
+
+    private CheckBox mCheckBox;
+
+    public CheckableLinearLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public boolean isChecked() {
+        return mCheckBox != null ? mCheckBox.isChecked() : false;
+    }
+
+    public void setChecked(boolean isChecked) {
+        if (mCheckBox != null)
+            mCheckBox.setChecked(isChecked);
+    }
+
+    public void toggle() {
+        if (mCheckBox != null)
+            mCheckBox.toggle();
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        mCheckBox = (CheckBox) findViewById(R.id.checkbox);
+        mCheckBox.setClickable(false);
+    }
+}
+
+
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 80a4bcfc54d1..e97484f5ab18 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -27,6 +27,7 @@ import org.json.JSONObject;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -82,10 +83,12 @@ import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.AbsoluteLayout;
+import android.widget.CheckBox;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
+import android.widget.SimpleAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -1108,14 +1111,14 @@ abstract public class GeckoApp
     /**
      * @param aPermissions
      *        Array of JSON objects to represent site permissions.
-     *        Example: { type: "offline-app", setting: "Store Offline Data: Allow" }
+     *        Example: { type: "offline-app", setting: "Store Offline Data", value: "Allow" }
      */
     private void showSiteSettingsDialog(String aHost, JSONArray aPermissions) {
         final AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
         View customTitleView = getLayoutInflater().inflate(R.layout.site_setting_title, null);
         ((TextView) customTitleView.findViewById(R.id.title)).setText(R.string.site_settings_title);
-        ((TextView) customTitleView.findViewById(R.id.host)).setText(aHost);        
+        ((TextView) customTitleView.findViewById(R.id.host)).setText(aHost);
         builder.setCustomTitle(customTitleView);
 
         // If there are no permissions to clear, show the user a message about that.
@@ -1123,24 +1126,32 @@ abstract public class GeckoApp
         if (aPermissions.length() == 0) {
             builder.setMessage(R.string.site_settings_no_settings);
         } else {
-            // Eventually we should use a list adapter and custom checkable list items
-            // to make a two-line UI to match the mock-ups
-            CharSequence[] items = new CharSequence[aPermissions.length()];
-            boolean[] states = new boolean[aPermissions.length()];
+
+            ArrayList <HashMap<String, String>> itemList = new ArrayList <HashMap<String, String>>();
             for (int i = 0; i < aPermissions.length(); i++) {
                 try {
-                    items[i] = aPermissions.getJSONObject(i).getString("setting");
-                    // Make all the items checked by default.
-                    states[i] = true;
+                    JSONObject permObj = aPermissions.getJSONObject(i);
+                    HashMap<String, String> map = new HashMap<String, String>();
+                    map.put("setting", permObj.getString("setting"));
+                    map.put("value", permObj.getString("value"));
+                    itemList.add(map);
                 } catch (JSONException e) {
                     Log.w(LOGTAG, "Exception populating settings items.", e);
                 }
             }
-            builder.setMultiChoiceItems(items, states, new DialogInterface.OnMultiChoiceClickListener(){
-                public void onClick(DialogInterface dialog, int item, boolean state) {
-                    // Do nothing
-                }
-            });
+
+            // setMultiChoiceItems doesn't support using an adapter, so we're creating a hack with
+            // setSingleChoiceItems and changing the choiceMode below when we create the dialog
+            builder.setSingleChoiceItems(new SimpleAdapter(
+                GeckoApp.this,
+                itemList,
+                R.layout.site_setting_item,
+                new String[] { "setting", "value" },
+                new int[] { R.id.setting, R.id.value }
+                ), -1, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) { }
+                });
+
             builder.setPositiveButton(R.string.site_settings_clear, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int id) {
                     ListView listView = ((AlertDialog) dialog).getListView();
@@ -1148,12 +1159,12 @@ abstract public class GeckoApp
 
                     // An array of the indices of the permissions we want to clear
                     JSONArray permissionsToClear = new JSONArray();
-                    for (int i = 0; i < checkedItemPositions.size(); i++) {
-                        boolean checked = checkedItemPositions.get(i);
-                        if (checked)
+                    for (int i = 0; i < checkedItemPositions.size(); i++)
+                        if (checkedItemPositions.get(i))
                             permissionsToClear.put(i);
-                    }
-                    GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Permissions:Clear", permissionsToClear.toString()));
+
+                    GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent(
+                        "Permissions:Clear", permissionsToClear.toString()));
                 }
             });
         }
@@ -1161,12 +1172,21 @@ abstract public class GeckoApp
         builder.setNegativeButton(R.string.site_settings_cancel, new DialogInterface.OnClickListener(){
             public void onClick(DialogInterface dialog, int id) {
                 dialog.cancel();
-            }            
+            }
         });
 
         mMainHandler.post(new Runnable() {
             public void run() {
-                builder.create().show();
+                Dialog dialog = builder.create();
+                dialog.show();
+
+                ListView listView = ((AlertDialog) dialog).getListView();
+                if (listView != null) {
+                    listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
+                    int listSize = listView.getAdapter().getCount();
+                    for (int i = 0; i < listSize; i++)
+                        listView.setItemChecked(i, true);
+                }
             }
         });
     }
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 6ca1999b78ad..33a01cea9b71 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -57,6 +57,7 @@ FENNEC_JAVA_FILES = \
   CameraImageResultHandler.java \
   CameraVideoResultHandler.java \
   CanvasDelegate.java \
+  CheckableLinearLayout.java \
   SyncPreference.java \
   db/BrowserDB.java \
   db/LocalBrowserDB.java \
@@ -364,6 +365,7 @@ RES_LAYOUT = \
   res/layout/notification_icon_text.xml \
   res/layout/notification_progress.xml \
   res/layout/notification_progress_text.xml \
+  res/layout/site_setting_item.xml \
   res/layout/site_setting_title.xml \
   res/layout/setup_screen.xml \
   res/layout/shared_ui_components.xml \
diff --git a/mobile/android/base/resources/layout/site_setting_item.xml b/mobile/android/base/resources/layout/site_setting_item.xml
new file mode 100644
index 000000000000..24cba062cf7f
--- /dev/null
+++ b/mobile/android/base/resources/layout/site_setting_item.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<org.mozilla.gecko.CheckableLinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:paddingLeft="16dip"
+    android:paddingRight="12dip"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:focusable="false">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:gravity="center_vertical"
+        android:focusable="false">
+
+        <TextView
+            android:id="@+id/setting"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorAlertDialogListItem"
+            android:gravity="center_vertical|left"
+            android:singleLine="true"
+            android:ellipsize="marquee"/>
+
+        <TextView
+            android:id="@+id/value"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorAlertDialogListItem"
+            android:gravity="center_vertical|left"
+            android:singleLine="true"
+            android:ellipsize="marquee"/>
+
+    </LinearLayout>
+
+    <CheckBox
+        android:id="@+id/checkbox"
+        android:layout_width="35dip"
+        android:layout_height="wrap_content"
+        android:paddingRight="12dip"
+        android:gravity="center_vertical"
+        android:focusable="false"
+        android:clickable="false"/>
+
+</org.mozilla.gecko.CheckableLinearLayout>
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 8e84a1db04e8..831405a6bc20 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -6011,18 +6011,15 @@ var PermissionsHelper = {
                          "allowed" : "denied";
           let valueString = Strings.browser.GetStringFromName(typeStrings[valueKey]);
 
-          // If we implement a two-line UI, we will need to pass the label and
-          // value individually and let java handle the formatting
-          let setting = Strings.browser.formatStringFromName("siteSettings.labelToValue",
-                                                             [ label, valueString ], 2);
           permissions.push({
             type: type,
-            setting: setting
+            setting: label,
+            value: valueString
           });
         }
 
         // Keep track of permissions, so we know which ones to clear
-        this._currentPermissions = permissions; 
+        this._currentPermissions = permissions;
 
         let host;
         try {

From 8b53ecf1fd6f4d44457e9f4bb8552cb30d81247b Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Fri, 23 Nov 2012 19:48:45 -0500
Subject: [PATCH 079/160] Backed out changeset 68b3734f36e3 (bug 814489) for
 build failures.

---
 js/src/ion/CodeGenerator.cpp | 80 +++++-------------------------------
 js/src/ion/IonCode.h         | 23 +----------
 js/src/jsopcode.cpp          |  9 +---
 3 files changed, 13 insertions(+), 99 deletions(-)

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index bd726ab9a69a..cc6fa67945b9 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -1435,70 +1435,6 @@ CodeGenerator::maybeCreateScriptCounts()
     return counts;
 }
 
-// Structure for managing the state tracked for a block by script counters.
-struct ScriptCountBlockState
-{
-    IonBlockCounts &block;
-    MacroAssembler &masm;
-
-    Sprinter printer;
-
-    uint32 instructionBytes = 0;
-    uint32 spillBytes = 0;
-
-    // Pointer to instructionBytes, spillBytes, or NULL, depending on the last
-    // instruction processed.
-    uint32 *last = NULL;
-    uint32 lastLength = masm.size();
-
-  public:
-    ScriptCountBlockState(IonBlockCounts *block, MacroAssembler *masm)
-      : block(*block), masm(*masm),
-        printer(GetIonContext()->cx),
-        instructionBytes(0), spillBytes(0), last(NULL), lastLength(0)
-    {
-    }
-
-    bool init()
-    {
-        if (!printer.init())
-            return false;
-
-        // Bump the hit count for the block at the start. This code is not
-        // included in either the text for the block or the instruction byte
-        // counts.
-        masm.inc64(AbsoluteAddress(block.addressOfHitCount()));
-
-        // Collect human readable assembly for the code generated in the block.
-        masm.setPrinter(&printer);
-
-        return true;
-    }
-
-    void visitInstruction(LInstruction *ins)
-    {
-        if (last)
-            *last += masm.size() - lastLength;
-        lastLength = masm.size();
-        last = ins->isMoveGroup() ? &spillBytes : &instructionBytes;
-
-        // Prefix stream of assembly instructions with their LIR instruction name.
-        printer.printf("[%s]\n", ins->opName());
-    }
-
-    ~ScriptCountBlockState()
-    {
-        masm.setPrinter(NULL);
-
-        if (last)
-            *last += masm.size() - lastLength;
-
-        block.setCode(printer.string());
-        block.setInstructionBytes(instructionBytes);
-        block.setSpillBytes(spillBytes);
-    }
-};
-
 bool
 CodeGenerator::generateBody()
 {
@@ -1515,18 +1451,19 @@ CodeGenerator::generateBody()
             return false;
         iter++;
 
-        mozilla::Maybe<ScriptCountBlockState> blockCounts;
+        mozilla::Maybe<Sprinter> printer;
         if (counts) {
-            blockCounts.construct(&counts->block(i), &masm);
-            if (!blockCounts.ref().init())
+            masm.inc64(AbsoluteAddress(counts->block(i).addressOfHitCount()));
+            printer.construct(GetIonContext()->cx);
+            if (!printer.ref().init())
                 return false;
+            masm.setPrinter(printer.addr());
         }
 
         for (; iter != current->end(); iter++) {
             IonSpew(IonSpew_Codegen, "instruction %s", iter->opName());
-
             if (counts)
-                blockCounts.ref().visitInstruction(*iter);
+                printer.ref().printf("[%s]\n", iter->opName());
 
             if (iter->safepoint() && pushedArgumentSlots_.length()) {
                 if (!markArgumentSlots(iter->safepoint()))
@@ -1538,6 +1475,11 @@ CodeGenerator::generateBody()
         }
         if (masm.oom())
             return false;
+
+        if (counts) {
+            counts->block(i).setCode(printer.ref().string());
+            masm.setPrinter(NULL);
+        }
     }
 
     JS_ASSERT(pushedArgumentSlots_.empty());
diff --git a/js/src/ion/IonCode.h b/js/src/ion/IonCode.h
index 1fb62f5f9f53..b08427975dac 100644
--- a/js/src/ion/IonCode.h
+++ b/js/src/ion/IonCode.h
@@ -420,14 +420,9 @@ struct IonBlockCounts
     // Hit count for this block.
     uint64 hitCount_;
 
-    // Text information about the code generated for this block.
+    // Information about the code generated for this block.
     char *code_;
 
-    // Number of bytes of code generated in this block. Spill code is counted
-    // separately from other, instruction implementing code.
-    uint32 instructionBytes_;
-    uint32 spillBytes_;
-
   public:
 
     bool init(uint32 id, uint32 offset, uint32 numSuccessors) {
@@ -490,22 +485,6 @@ struct IonBlockCounts
     const char *code() const {
         return code_;
     }
-
-    void setInstructionBytes(uint32 bytes) {
-        instructionBytes_ = bytes;
-    }
-
-    uint32 instructionBytes() const {
-        return instructionBytes_;
-    }
-
-    void setSpillBytes(uint32 bytes) {
-        spillBytes_ = bytes;
-    }
-
-    uint32 spillBytes() const {
-        return spillBytes_;
-    }
 };
 
 // Execution information for a compiled script which may persist after the
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index ffcfd8dcba67..29867a81a1c7 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -328,8 +328,7 @@ js_DumpPCCounts(JSContext *cx, HandleScript script, js::Sprinter *sp)
             Sprint(sp, "BB #%lu [%05u]", block.id(), block.offset());
             for (size_t j = 0; j < block.numSuccessors(); j++)
                 Sprint(sp, " -> #%lu", block.successor(j));
-            Sprint(sp, " :: %llu hits %u instruction bytes %u spill bytes\n",
-                   block.hitCount(), block.instructionBytes(), block.spillBytes());
+            Sprint(sp, " :: %llu hits\n", block.hitCount());
             Sprint(sp, "%s\n", block.code());
         }
         ionCounts = ionCounts->previous();
@@ -7210,12 +7209,6 @@ GetPCCountJSON(JSContext *cx, const ScriptAndCounts &sac, StringBuffer &buf)
                     return false;
                 buf.append(str);
 
-                AppendJSONProperty(buf, "instructionBytes");
-                NumberValueToStringBuffer(cx, Int32Value(block.instructionBytes()), buf);
-
-                AppendJSONProperty(buf, "spillBytes");
-                NumberValueToStringBuffer(cx, Int32Value(block.spillBytes()), buf);
-
                 buf.append('}');
             }
             buf.append(']');

From fe062625263520b56545dfd452b1974985809ef6 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 23 Nov 2012 14:47:45 -0500
Subject: [PATCH 080/160] Bug 814756 - Disambiguate PacketQueue; r=cpearce

---
 content/media/ogg/OggCodecState.cpp |  2 +-
 content/media/ogg/OggCodecState.h   | 10 +++++-----
 content/media/webm/WebMReader.cpp   |  4 ++--
 content/media/webm/WebMReader.h     | 14 +++++++-------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/content/media/ogg/OggCodecState.cpp b/content/media/ogg/OggCodecState.cpp
index 279c30d5cdea..f5516ed712e2 100644
--- a/content/media/ogg/OggCodecState.cpp
+++ b/content/media/ogg/OggCodecState.cpp
@@ -194,7 +194,7 @@ void OggCodecState::ReleasePacket(ogg_packet* aPacket) {
   delete aPacket;
 }
 
-void PacketQueue::Append(ogg_packet* aPacket) {
+void OggPacketQueue::Append(ogg_packet* aPacket) {
   nsDeque::Push(aPacket);
 }
 
diff --git a/content/media/ogg/OggCodecState.h b/content/media/ogg/OggCodecState.h
index 516fab2763be..cbc6f1810cf3 100644
--- a/content/media/ogg/OggCodecState.h
+++ b/content/media/ogg/OggCodecState.h
@@ -38,7 +38,7 @@
 
 namespace mozilla {
 
-// Deallocates a packet, used in PacketQueue below.
+// Deallocates a packet, used in OggPacketQueue below.
 class OggPacketDeallocator : public nsDequeFunctor {
   virtual void* operator() (void* aPacket) {
     ogg_packet* p = static_cast<ogg_packet*>(aPacket);
@@ -58,10 +58,10 @@ class OggPacketDeallocator : public nsDequeFunctor {
 // frames/samples, reducing the amount of frames/samples we must decode to
 // determine start-time at a particular offset, and gives us finer control
 // over memory usage.
-class PacketQueue : private nsDeque {
+class OggPacketQueue : private nsDeque {
 public:
-  PacketQueue() : nsDeque(new OggPacketDeallocator()) {}
-  ~PacketQueue() { Erase(); }
+  OggPacketQueue() : nsDeque(new OggPacketDeallocator()) {}
+  ~OggPacketQueue() { Erase(); }
   bool IsEmpty() { return nsDeque::GetSize() == 0; }
   void Append(ogg_packet* aPacket);
   ogg_packet* PopFront() { return static_cast<ogg_packet*>(nsDeque::PopFront()); }
@@ -167,7 +167,7 @@ public:
 
   // Queue of as yet undecoded packets. Packets are guaranteed to have
   // a valid granulepos.
-  PacketQueue mPackets;
+  OggPacketQueue mPackets;
 
   // Is the bitstream active; whether we're decoding and playing this bitstream.
   bool mActive;
diff --git a/content/media/webm/WebMReader.cpp b/content/media/webm/WebMReader.cpp
index 7b9c1a5eab4b..a36f16110471 100644
--- a/content/media/webm/WebMReader.cpp
+++ b/content/media/webm/WebMReader.cpp
@@ -526,11 +526,11 @@ nsReturnRef<NesteggPacketHolder> WebMReader::NextPacket(TrackType aTrackType)
 {
   // The packet queue that packets will be pushed on if they
   // are not the type we are interested in.
-  PacketQueue& otherPackets = 
+  WebMPacketQueue& otherPackets =
     aTrackType == VIDEO ? mAudioPackets : mVideoPackets;
 
   // The packet queue for the type that we are interested in.
-  PacketQueue &packets =
+  WebMPacketQueue &packets =
     aTrackType == VIDEO ? mVideoPackets : mAudioPackets;
 
   // Flag to indicate that we do need to playback these types of
diff --git a/content/media/webm/WebMReader.h b/content/media/webm/WebMReader.h
index 728acb3601a8..2c07bb6a0d8b 100644
--- a/content/media/webm/WebMReader.h
+++ b/content/media/webm/WebMReader.h
@@ -62,13 +62,13 @@ class PacketQueueDeallocator : public nsDequeFunctor {
 // Typesafe queue for holding nestegg packets. It has
 // ownership of the items in the queue and will free them
 // when destroyed.
-class PacketQueue : private nsDeque {
+class WebMPacketQueue : private nsDeque {
  public:
-   PacketQueue()
+   WebMPacketQueue()
      : nsDeque(new PacketQueueDeallocator())
    {}
   
-  ~PacketQueue() {
+  ~WebMPacketQueue() {
     Reset();
   }
 
@@ -77,12 +77,12 @@ class PacketQueue : private nsDeque {
   }
   
   inline void Push(NesteggPacketHolder* aItem) {
-    NS_ASSERTION(aItem, "NULL pushed to PacketQueue");
+    NS_ASSERTION(aItem, "NULL pushed to WebMPacketQueue");
     nsDeque::Push(aItem);
   }
   
   inline void PushFront(NesteggPacketHolder* aItem) {
-    NS_ASSERTION(aItem, "NULL pushed to PacketQueue");
+    NS_ASSERTION(aItem, "NULL pushed to WebMPacketQueue");
     nsDeque::PushFront(aItem);
   }
 
@@ -199,8 +199,8 @@ private:
 
   // Queue of video and audio packets that have been read but not decoded. These
   // must only be accessed from the state machine thread.
-  PacketQueue mVideoPackets;
-  PacketQueue mAudioPackets;
+  WebMPacketQueue mVideoPackets;
+  WebMPacketQueue mAudioPackets;
 
   // Index of video and audio track to play
   uint32_t mVideoTrack;

From ce6c454a9336cd0013287888133bf4fe9830fd8e Mon Sep 17 00:00:00 2001
From: Nagarjuna Varma <junky.argonaut@gmail.com>
Date: Mon, 26 Nov 2012 18:04:47 -0500
Subject: [PATCH 081/160] Bug 810149: Telemetry to track time spent recursively
 scanning addon directories on startup. r=vdjeric

---
 toolkit/components/telemetry/Histograms.json | 6 ++++++
 toolkit/mozapps/extensions/XPIProvider.jsm   | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index cf8a3ed9e4a0..d1ac0d39c521 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -2468,5 +2468,11 @@
   "COMPONENTS_INTERFACES_ACCESSED_BY_CONTENT": {
     "kind": "flag",
     "description": "Whether content ever accesed Components.interfaces in this session"
+  },
+  "CHECK_ADDONS_MODIFIED_MS": {
+    "kind": "exponential",
+    "high": "5000",
+    "n_buckets": 15,
+    "description": "Time (ms) it takes to figure out extension last modified time"
   }
 }
diff --git a/toolkit/mozapps/extensions/XPIProvider.jsm b/toolkit/mozapps/extensions/XPIProvider.jsm
index 82fa9d8cd07b..9f668fd9b565 100644
--- a/toolkit/mozapps/extensions/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/XPIProvider.jsm
@@ -2986,7 +2986,11 @@ var XPIProvider = {
         Prefs.getBoolPref(PREF_INSTALL_DISTRO_ADDONS, true))
       updateDatabase = this.installDistributionAddons(manifests) || updateDatabase;
 
+    // Telemetry probe added around getInstallLocationStates() to check perf
+    let telemetryCaptureTime = new Date();
     let state = this.getInstallLocationStates();
+    let telemetry = Services.telemetry;
+    telemetry.getHistogramById("CHECK_ADDONS_MODIFIED_MS").add(new Date() - telemetryCaptureTime);
 
     if (!updateDatabase) {
       // If the state has changed then we must update the database

From dcd17e367ef8804710ac65df6372c1127862d563 Mon Sep 17 00:00:00 2001
From: Vladan Djeric <vdjeric@mozilla.com>
Date: Mon, 26 Nov 2012 18:21:04 -0500
Subject: [PATCH 082/160] Bug 813216: Make about:telemetry description
 consistent with other Telemetry descriptions. r=ttaubert

---
 toolkit/content/aboutTelemetry.js             | 19 +++++++++++++++++++
 toolkit/content/aboutTelemetry.xhtml          |  2 +-
 .../en-US/chrome/global/aboutTelemetry.dtd    |  5 -----
 .../chrome/global/aboutTelemetry.properties   | 14 +++++++++-----
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/toolkit/content/aboutTelemetry.js b/toolkit/content/aboutTelemetry.js
index 7d11d161e152..15f01d3de150 100644
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -13,11 +13,14 @@ Cu.import("resource://gre/modules/Services.jsm");
 const Telemetry = Services.telemetry;
 const bundle = Services.strings.createBundle(
   "chrome://global/locale/aboutTelemetry.properties");
+const brandBundle = Services.strings.createBundle(
+  "chrome://branding/locale/brand.properties");
 const TelemetryPing = Cc["@mozilla.org/base/telemetry-ping;1"].
   getService(Ci.nsIObserver);
 
 // Maximum height of a histogram bar (in em)
 const MAX_BAR_HEIGHT = 18;
+const PREF_TELEMETRY_SERVER_OWNER = "toolkit.telemetry.server_owner";
 const PREF_TELEMETRY_ENABLED = "toolkit.telemetry.enabled";
 const PREF_DEBUG_SLOW_SQL = "toolkit.telemetry.debugSlowSql";
 const PREF_SYMBOL_SERVER_URI = "profiler.symbolicationUrl";
@@ -598,6 +601,19 @@ function toggleSection(aEvent) {
   toggleLinks[1].classList.toggle("hidden");
 }
 
+/**
+ * Sets the text of the page header based on a config pref + bundle strings
+ */
+function setupPageHeader()
+{
+  let serverOwner = getPref(PREF_TELEMETRY_SERVER_OWNER, "Mozilla");
+  let brandName = brandBundle.GetStringFromName("brandFullName");
+  let subtitleText = bundle.formatStringFromName(
+    "pageSubtitle", [serverOwner, brandName], 2);
+
+  let subtitleElement = document.getElementById("page-subtitle");
+  subtitleElement.appendChild(document.createTextNode(subtitleText));
+}
 
 /**
  * Initializes load/unload, pref change and mouse-click listeners
@@ -645,6 +661,9 @@ function setupListeners() {
 function onLoad() {
   window.removeEventListener("load", onLoad);
 
+  // Set the text in the page header
+  setupPageHeader();
+
   // Set up event listeners
   setupListeners();
 
diff --git a/toolkit/content/aboutTelemetry.xhtml b/toolkit/content/aboutTelemetry.xhtml
index d3969ef292d7..3a93494f79ac 100644
--- a/toolkit/content/aboutTelemetry.xhtml
+++ b/toolkit/content/aboutTelemetry.xhtml
@@ -28,7 +28,7 @@
     <header id="page-description">
       <h1>&aboutTelemetry.pageTitle;</h1>
 
-      <h2>&aboutTelemetry.pageSubtitle;</h2>
+      <h2 id="page-subtitle"></h2>
 
       <p id="description-enabled">&aboutTelemetry.telemetryEnabled;</p>
       <p id="description-disabled">&aboutTelemetry.telemetryDisabled;</p>
diff --git a/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd b/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd
index 0a484d213a7b..8233a499fb18 100644
--- a/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd
+++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd
@@ -4,11 +4,6 @@
 
 <!ENTITY aboutTelemetry.pageTitle "Telemetry Data">
 
-<!ENTITY aboutTelemetry.pageSubtitle "
-  This page shows the performance and feature-use data collected by Telemetry.
-  This information is submitted anonymously to Mozilla to help improve &brandShortName;.
-">
-
 <!ENTITY aboutTelemetry.telemetryEnabled "
   Telemetry is <span>enabled</span>.
 ">
diff --git a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
index f259350ae336..3386dcb8c468 100644
--- a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
@@ -2,6 +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/.
 
+# Note to translators:
+# - %1$S will be replaced by brandFullName
+# - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
+pageSubtitle = This page shows the information about performance, hardware, usage and customizations collected by Telemetry. This information is submitted to %1$S to help improve %2$S.
+
 slowSqlMain = Slow SQL Statements on Main Thread
 
 slowSqlOther = Slow SQL Statements on Helper Threads
@@ -12,11 +17,10 @@ slowSqlAverage = Avg. Time (ms)
 
 slowSqlStatement = Statement
 
-# Note to translators: Please leave the %S specifiers in the translated string.
-# They will be replaced with values programmaticaly, e.g. "Hang Report #3 (5 seconds)"
-# - The first %S will be replaced with the number of the hang
-# - The second %S will be replaced with the duration of the hang
-hangTitle = Hang Report #%S (%S seconds)
+# Note to translators:
+# - The %1$S will be replaced with the number of the hang
+# - The %2$S will be replaced with the duration of the hang
+hangTitle = Hang Report #%1$S (%2$S seconds)
 
 stackTitle = Stack:
 

From ee12984cba1d77ed1925e7ee5229718628a86272 Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@mozilla.com>
Date: Mon, 26 Nov 2012 13:57:46 -0800
Subject: [PATCH 083/160] Add incremental barriers to addprop ICs (bug 811058,
 r=billm).

--HG--
extra : rebase_source : 518dcb987ddd2967ffd24e79afcee203d9d83820
---
 js/src/ion/Ion.cpp                | 16 +++++++++++++---
 js/src/ion/Ion.h                  |  3 ++-
 js/src/ion/IonCaches.cpp          |  5 ++++-
 js/src/ion/IonCompartment.h       | 13 +++++++++----
 js/src/ion/IonMacroAssembler.h    |  9 +++++++--
 js/src/ion/IonTypes.h             | 21 +++++++++++++++++++++
 js/src/ion/TypeOracle.h           | 21 ---------------------
 js/src/ion/arm/Trampoline-arm.cpp |  9 +++++++--
 js/src/ion/x64/Trampoline-x64.cpp |  9 +++++++--
 js/src/ion/x86/Trampoline-x86.cpp | 10 ++++++++--
 10 files changed, 78 insertions(+), 38 deletions(-)

diff --git a/js/src/ion/Ion.cpp b/js/src/ion/Ion.cpp
index 8530025e499c..cf4872817932 100644
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -187,8 +187,12 @@ IonRuntime::initialize(JSContext *cx)
     if (!enterJIT_)
         return false;
 
-    preBarrier_ = generatePreBarrier(cx);
-    if (!preBarrier_)
+    valuePreBarrier_ = generatePreBarrier(cx, MIRType_Value);
+    if (!valuePreBarrier_)
+        return false;
+
+    shapePreBarrier_ = generatePreBarrier(cx, MIRType_Shape);
+    if (!shapePreBarrier_)
         return false;
 
     for (VMFunction *fun = VMFunction::functions; fun; fun = fun->next) {
@@ -1916,11 +1920,17 @@ ion::FinishInvalidation(FreeOp *fop, JSScript *script)
 }
 
 void
-ion::MarkFromIon(JSRuntime *rt, Value *vp)
+ion::MarkValueFromIon(JSRuntime *rt, Value *vp)
 {
     gc::MarkValueUnbarriered(&rt->gcMarker, vp, "write barrier");
 }
 
+void
+ion::MarkShapeFromIon(JSRuntime *rt, Shape **shapep)
+{
+    gc::MarkShapeUnbarriered(&rt->gcMarker, shapep, "write barrier");
+}
+
 void
 ion::ForbidCompilation(JSContext *cx, JSScript *script)
 {
diff --git a/js/src/ion/Ion.h b/js/src/ion/Ion.h
index d8bcd20effc9..c1d70f32f288 100644
--- a/js/src/ion/Ion.h
+++ b/js/src/ion/Ion.h
@@ -269,7 +269,8 @@ void Invalidate(types::TypeCompartment &types, FreeOp *fop,
 void Invalidate(JSContext *cx, const Vector<types::RecompileInfo> &invalid, bool resetUses = true);
 bool Invalidate(JSContext *cx, JSScript *script, bool resetUses = true);
 
-void MarkFromIon(JSRuntime *rt, Value *vp);
+void MarkValueFromIon(JSRuntime *rt, Value *vp);
+void MarkShapeFromIon(JSRuntime *rt, Shape **shapep);
 
 void ToggleBarriers(JSCompartment *comp, bool needs);
 
diff --git a/js/src/ion/IonCaches.cpp b/js/src/ion/IonCaches.cpp
index a8543e7e41db..3ae8b8895ee6 100644
--- a/js/src/ion/IonCaches.cpp
+++ b/js/src/ion/IonCaches.cpp
@@ -1173,7 +1173,10 @@ IonCacheSetProperty::attachNativeAdding(JSContext *cx, IonScript *ion, JSObject
     masm.pop(object());     // restore object reg
 
     /* Changing object shape.  Write the object's new shape. */
-    masm.storePtr(ImmGCPtr(newShape), Address(object(), JSObject::offsetOfShape()));
+    Address shapeAddr(object(), JSObject::offsetOfShape());
+    if (cx->compartment->needsBarrier())
+        masm.callPreBarrier(shapeAddr, MIRType_Shape);
+    masm.storePtr(ImmGCPtr(newShape), shapeAddr);
 
     /* Set the value on the object. */
     if (obj->isFixedSlot(propShape->slot())) {
diff --git a/js/src/ion/IonCompartment.h b/js/src/ion/IonCompartment.h
index ba23c6d28fc5..1cfd8a01dd23 100644
--- a/js/src/ion/IonCompartment.h
+++ b/js/src/ion/IonCompartment.h
@@ -51,7 +51,8 @@ class IonRuntime
     IonCode *invalidator_;
 
     // Thunk that calls the GC pre barrier.
-    IonCode *preBarrier_;
+    IonCode *valuePreBarrier_;
+    IonCode *shapePreBarrier_;
 
     // Map VMFunction addresses to the IonCode of the wrapper.
     typedef WeakCache<const VMFunction *, IonCode *> VMWrapperMap;
@@ -63,7 +64,7 @@ class IonRuntime
     IonCode *generateBailoutTable(JSContext *cx, uint32 frameClass);
     IonCode *generateBailoutHandler(JSContext *cx);
     IonCode *generateInvalidator(JSContext *cx);
-    IonCode *generatePreBarrier(JSContext *cx);
+    IonCode *generatePreBarrier(JSContext *cx, MIRType type);
     IonCode *generateVMWrapper(JSContext *cx, const VMFunction &f);
 
   public:
@@ -127,8 +128,12 @@ class IonCompartment
         return rt->enterJIT_->as<EnterIonCode>();
     }
 
-    IonCode *preBarrier() {
-        return rt->preBarrier_;
+    IonCode *valuePreBarrier() {
+        return rt->valuePreBarrier_;
+    }
+    
+    IonCode *shapePreBarrier() {
+        return rt->shapePreBarrier_;
     }
 
     AutoFlushCache *flusher() {
diff --git a/js/src/ion/IonMacroAssembler.h b/js/src/ion/IonMacroAssembler.h
index 8ad65e15f1e8..b77aca7c030d 100644
--- a/js/src/ion/IonMacroAssembler.h
+++ b/js/src/ion/IonMacroAssembler.h
@@ -385,7 +385,10 @@ class MacroAssembler : public MacroAssemblerSpecific
 
     template <typename T>
     void callPreBarrier(const T &address, MIRType type) {
-        JS_ASSERT(type == MIRType_Value || type == MIRType_String || type == MIRType_Object);
+        JS_ASSERT(type == MIRType_Value ||
+                  type == MIRType_String ||
+                  type == MIRType_Object ||
+                  type == MIRType_Shape);
         Label done;
 
         if (type == MIRType_Value)
@@ -395,7 +398,9 @@ class MacroAssembler : public MacroAssemblerSpecific
         computeEffectiveAddress(address, PreBarrierReg);
 
         JSCompartment *compartment = GetIonContext()->compartment;
-        IonCode *preBarrier = compartment->ionCompartment()->preBarrier();
+        IonCode *preBarrier = (type == MIRType_Shape)
+                              ? compartment->ionCompartment()->shapePreBarrier()
+                              : compartment->ionCompartment()->valuePreBarrier();
 
         call(preBarrier);
         Pop(PreBarrierReg);
diff --git a/js/src/ion/IonTypes.h b/js/src/ion/IonTypes.h
index 3beda5b2e14f..192cf4e4084b 100644
--- a/js/src/ion/IonTypes.h
+++ b/js/src/ion/IonTypes.h
@@ -59,6 +59,27 @@ enum BailoutKind
     Bailout_CachedShapeGuard
 };
 
+// The ordering of this enumeration is important: Anything < Value is a
+// specialized type. Furthermore, anything < String has trivial conversion to
+// a number.
+enum MIRType
+{
+    MIRType_Undefined,
+    MIRType_Null,
+    MIRType_Boolean,
+    MIRType_Int32,
+    MIRType_Double,
+    MIRType_String,
+    MIRType_Object,
+    MIRType_Magic,
+    MIRType_Value,
+    MIRType_None,       // Invalid, used as a placeholder.
+    MIRType_Slots,      // A slots vector
+    MIRType_Elements,   // An elements vector
+    MIRType_StackFrame, // StackFrame pointer for OSR.
+    MIRType_Shape       // A Shape pointer.
+};
+
 #ifdef DEBUG
 // Track the pipeline of opcodes which has produced a snapshot.
 #define TRACK_SNAPSHOTS 1
diff --git a/js/src/ion/TypeOracle.h b/js/src/ion/TypeOracle.h
index 97ee0f2a6bbd..9fda19732309 100644
--- a/js/src/ion/TypeOracle.h
+++ b/js/src/ion/TypeOracle.h
@@ -13,27 +13,6 @@
 
 namespace js {
 namespace ion {
-
-// The ordering of this enumeration is important: Anything < Value is a
-// specialized type. Furthermore, anything < String has trivial conversion to
-// a number.
-enum MIRType
-{
-    MIRType_Undefined,
-    MIRType_Null,
-    MIRType_Boolean,
-    MIRType_Int32,
-    MIRType_Double,
-    MIRType_String,
-    MIRType_Object,
-    MIRType_Magic,
-    MIRType_Value,
-    MIRType_None,       // Invalid, used as a placeholder.
-    MIRType_Slots,      // A slots vector
-    MIRType_Elements,   // An elements vector
-    MIRType_StackFrame  // StackFrame pointer for OSR.
-};
-
 enum LazyArgumentsType {
     MaybeArguments = 0,
     DefinitelyArguments,
diff --git a/js/src/ion/arm/Trampoline-arm.cpp b/js/src/ion/arm/Trampoline-arm.cpp
index d7390a0f9925..43a7ddadb412 100644
--- a/js/src/ion/arm/Trampoline-arm.cpp
+++ b/js/src/ion/arm/Trampoline-arm.cpp
@@ -609,7 +609,7 @@ IonRuntime::generateVMWrapper(JSContext *cx, const VMFunction &f)
 }
 
 IonCode *
-IonRuntime::generatePreBarrier(JSContext *cx)
+IonRuntime::generatePreBarrier(JSContext *cx, MIRType type)
 {
     MacroAssembler masm;
 
@@ -623,7 +623,12 @@ IonRuntime::generatePreBarrier(JSContext *cx)
     masm.setupUnalignedABICall(2, r2);
     masm.passABIArg(r0);
     masm.passABIArg(r1);
-    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, MarkFromIon));
+    if (type == MIRType_Value) {
+        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, MarkValueFromIon));
+    } else {
+        JS_ASSERT(type == MIRType_Shape);
+        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, MarkShapeFromIon));
+    }
 
     masm.PopRegsInMask(save);
     masm.ret();
diff --git a/js/src/ion/x64/Trampoline-x64.cpp b/js/src/ion/x64/Trampoline-x64.cpp
index dc0718d26c45..0300612527be 100644
--- a/js/src/ion/x64/Trampoline-x64.cpp
+++ b/js/src/ion/x64/Trampoline-x64.cpp
@@ -517,7 +517,7 @@ IonRuntime::generateVMWrapper(JSContext *cx, const VMFunction &f)
 }
 
 IonCode *
-IonRuntime::generatePreBarrier(JSContext *cx)
+IonRuntime::generatePreBarrier(JSContext *cx, MIRType type)
 {
     MacroAssembler masm;
 
@@ -531,7 +531,12 @@ IonRuntime::generatePreBarrier(JSContext *cx)
     masm.setupUnalignedABICall(2, rax);
     masm.passABIArg(rcx);
     masm.passABIArg(rdx);
-    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, MarkFromIon));
+    if (type == MIRType_Value) {
+        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, MarkValueFromIon));
+    } else {
+        JS_ASSERT(type == MIRType_Shape);
+        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, MarkShapeFromIon));
+    }
 
     masm.PopRegsInMask(regs);
     masm.ret();
diff --git a/js/src/ion/x86/Trampoline-x86.cpp b/js/src/ion/x86/Trampoline-x86.cpp
index b7bae586f436..d87f77d89446 100644
--- a/js/src/ion/x86/Trampoline-x86.cpp
+++ b/js/src/ion/x86/Trampoline-x86.cpp
@@ -544,7 +544,7 @@ IonRuntime::generateVMWrapper(JSContext *cx, const VMFunction &f)
 }
 
 IonCode *
-IonRuntime::generatePreBarrier(JSContext *cx)
+IonRuntime::generatePreBarrier(JSContext *cx, MIRType type)
 {
     MacroAssembler masm;
 
@@ -558,7 +558,13 @@ IonRuntime::generatePreBarrier(JSContext *cx)
     masm.setupUnalignedABICall(2, eax);
     masm.passABIArg(ecx);
     masm.passABIArg(edx);
-    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, MarkFromIon));
+
+    if (type == MIRType_Value) {
+        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, MarkValueFromIon));
+    } else {
+        JS_ASSERT(type == MIRType_Shape);
+        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, MarkShapeFromIon));
+    }
 
     masm.PopRegsInMask(save);
     masm.ret();

From 0007c3409d6ee08f53e8fee8dfb449708ded016f Mon Sep 17 00:00:00 2001
From: Gregor Wagner <anygregor@gmail.com>
Date: Mon, 26 Nov 2012 15:33:34 -0800
Subject: [PATCH 084/160] Bug 815398 - Settings: set navigator.mozSettings to
 null if we don't have read or write permission. r=bent

---
 dom/settings/SettingsManager.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dom/settings/SettingsManager.js b/dom/settings/SettingsManager.js
index 416132989ce3..4f2c0ebeb736 100644
--- a/dom/settings/SettingsManager.js
+++ b/dom/settings/SettingsManager.js
@@ -342,6 +342,7 @@ SettingsManager.prototype = {
 
     if (!this.hasReadPrivileges && !this.hasWritePrivileges) {
       Cu.reportError("NO SETTINGS PERMISSION FOR: " + aWindow.document.nodePrincipal.origin + "\n");
+      return null;
     }
   },
 

From f62573e4e6036ca8bdfcc4f3899657c2fcb4681c Mon Sep 17 00:00:00 2001
From: Ethan Hugg <ethanhugg@gmail.com>
Date: Mon, 26 Nov 2012 09:47:18 -0800
Subject: [PATCH 085/160] Bug 814164 - Disable builder run of ice_unittest
 r=jesup

---
 media/mtransport/test/ice_unittest.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/media/mtransport/test/ice_unittest.cpp b/media/mtransport/test/ice_unittest.cpp
index 7c44f211b6fb..e024b655ffff 100644
--- a/media/mtransport/test/ice_unittest.cpp
+++ b/media/mtransport/test/ice_unittest.cpp
@@ -304,6 +304,11 @@ TEST_F(IceTest, TestSendReceive) {
 
 int main(int argc, char **argv)
 {
+#ifdef LINUX
+  // This test can cause intermittent oranges on the builders on Linux
+  CHECK_ENVIRONMENT_FLAG("MOZ_WEBRTC_TESTS")
+#endif
+
   test_utils = new MtransportTestUtils();
   NSS_NoDB_Init(nullptr);
   NSS_SetDomesticPolicy();

From 2829ae846ab356931766d5c6bb3b90f4844157b8 Mon Sep 17 00:00:00 2001
From: Marty Rosenberg <mrosenberg@mozilla.com>
Date: Mon, 26 Nov 2012 19:06:41 -0500
Subject: [PATCH 086/160] Finally fix the second stack alignment check (second
 half of 3136d5ea2399) (bug 810996, bug 807156, r=djvj)

---
 js/src/ion/IonCaches.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/src/ion/IonCaches.cpp b/js/src/ion/IonCaches.cpp
index 3ae8b8895ee6..b0d44fca1086 100644
--- a/js/src/ion/IonCaches.cpp
+++ b/js/src/ion/IonCaches.cpp
@@ -1020,7 +1020,6 @@ IonCacheSetProperty::attachSetterCall(JSContext *cx, IonScript *ion,
 
     // Ensure stack is aligned.
     DebugOnly<uint32> initialStack = masm.framePushed();
-    masm.checkStackAlignment();
 
     Label success, exception;
 

From 3af56bb4e0bba984bd2e2b11d2e6d3d050854cb9 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@mozilla.com>
Date: Mon, 26 Nov 2012 16:47:59 -0800
Subject: [PATCH 087/160] Bug 815044: Make js_DecompileScript, and
 js_DecompileFunction static to jsopcode.cpp. Delete js_DecompileFunctionBody;
 it is unused. r=jorendorff

---
 js/src/jsopcode.cpp | 34 ++++++++++------------------------
 js/src/jsopcode.h   |  8 --------
 2 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index ffcfd8dcba67..d5ea2c322484 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -1417,6 +1417,8 @@ ReconstructPCStack(JSContext *cx, JSScript *script, jsbytecode *pc, jsbytecode *
 
 #define FAILED_EXPRESSION_DECOMPILER ((char *) 1)
 
+static JSBool DecompileFunction(JSPrinter *jp);
+
 /*
  * Decompile a part of expression up to the given pc. The function returns
  * NULL on out-of-memory, or the FAILED_EXPRESSION_DECOMPILER sentinel when
@@ -2980,7 +2982,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, int nb)
                                         jp->strict);
                     if (!jp2)
                         return NULL;
-                    ok = js_DecompileFunction(jp2);
+                    ok = DecompileFunction(jp2);
                     if (ok && !jp2->sprinter.empty())
                         js_puts(jp, jp2->sprinter.string());
                     js_DestroyPrinter(jp2);
@@ -4937,7 +4939,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, int nb)
                     bool strict = jp->script->strictModeCode;
                     str = js_DecompileToString(cx, "lambda", fun, 0,
                                                false, grouped, strict,
-                                               js_DecompileFunction);
+                                               DecompileFunction);
                     if (!str)
                         return NULL;
                 }
@@ -5629,8 +5631,8 @@ DecompileBody(JSPrinter *jp, JSScript *script, jsbytecode *pc)
     return DecompileCode(jp, script, pc, end - pc, 0);
 }
 
-JSBool
-js_DecompileScript(JSPrinter *jp, JSScript *script)
+static JSBool
+DecompileScript(JSPrinter *jp, JSScript *script)
 {
     return DecompileBody(jp, script, script->code);
 }
@@ -5656,24 +5658,8 @@ js_DecompileToString(JSContext *cx, const char *name, JSFunction *fun,
 
 static const char native_code_str[] = "\t[native code]\n";
 
-JSBool
-js_DecompileFunctionBody(JSPrinter *jp)
-{
-    JSScript *script;
-
-    JS_ASSERT(jp->fun);
-    JS_ASSERT(!jp->script);
-    if (jp->fun->isNative() || jp->fun->isSelfHostedBuiltin()) {
-        js_printf(jp, native_code_str);
-        return JS_TRUE;
-    }
-
-    script = jp->fun->nonLazyScript().unsafeGet();
-    return DecompileBody(jp, script, script->code);
-}
-
-JSBool
-js_DecompileFunction(JSPrinter *jp)
+static JSBool
+DecompileFunction(JSPrinter *jp)
 {
     JSContext *cx = jp->sprinter.context;
 
@@ -7075,10 +7061,10 @@ GetPCCountJSON(JSContext *cx, const ScriptAndCounts &sac, StringBuffer &buf)
     jp->decompiledOpcodes = &decompiledOpcodes;
 
     if (fun) {
-        if (!js_DecompileFunction(jp))
+        if (!DecompileFunction(jp))
             return false;
     } else {
-        if (!js_DecompileScript(jp, script))
+        if (!DecompileScript(jp, script))
             return false;
     }
     JSString *str = js_GetPrinterOutput(jp);
diff --git a/js/src/jsopcode.h b/js/src/jsopcode.h
index 8c0ab452c288..91ac4ea9f9c0 100644
--- a/js/src/jsopcode.h
+++ b/js/src/jsopcode.h
@@ -296,14 +296,6 @@ StackDefs(JSScript *script, jsbytecode *pc);
 /*
  * Decompilers, for script, function, and expression pretty-printing.
  */
-extern JSBool
-js_DecompileScript(JSPrinter *jp, JSScript *script);
-
-extern JSBool
-js_DecompileFunctionBody(JSPrinter *jp);
-
-extern JSBool
-js_DecompileFunction(JSPrinter *jp);
 
 /*
  * Some C++ compilers treat the language linkage (extern "C" vs.

From cd71c363814ee45453cf07c8fb21f1e8295980d5 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Mon, 26 Nov 2012 20:38:19 -0500
Subject: [PATCH 088/160] Bug 746900 - Implement "Best Practices for Using
 U+FFFD" from the Unicode standard. r=smontagu

---
 intl/uconv/src/nsUTF8ToUnicode.cpp          |  76 +++++-------
 intl/uconv/src/nsUnicodeToUTF8.cpp          |  30 +++--
 intl/uconv/tests/unit/test_utf8_illegals.js | 123 +++++++++++++++-----
 3 files changed, 143 insertions(+), 86 deletions(-)

diff --git a/intl/uconv/src/nsUTF8ToUnicode.cpp b/intl/uconv/src/nsUTF8ToUnicode.cpp
index fb3810efae26..fc76259c26b0 100644
--- a/intl/uconv/src/nsUTF8ToUnicode.cpp
+++ b/intl/uconv/src/nsUTF8ToUnicode.cpp
@@ -214,52 +214,38 @@ NS_IMETHODIMP nsUTF8ToUnicode::Convert(const char * aSrc,
     mFirst = false;
 
   for (in = aSrc; ((in < inend) && (out < outend)); ++in) {
+    uint8_t c = *in;
     if (0 == mState) {
       // When mState is zero we expect either a US-ASCII character or a
       // multi-octet sequence.
-      if (0 == (0x80 & (*in))) {
+      if (c < 0x80) {  // 00..7F
         int32_t max_loops = NS_MIN(inend - in, outend - out);
         Convert_ascii_run(in, out, max_loops);
         --in; // match the rest of the cases
         mBytes = 1;
-      } else if (0xC0 == (0xE0 & (*in))) {
+      } else if (c < 0xC2) {  // C0/C1
+        // Overlong 2 octet sequence
+        res = NS_ERROR_ILLEGAL_INPUT;
+        break;
+      } else if (c < 0xE0) {  // C2..DF
         // First octet of 2 octet sequence
-        mUcs4 = (uint32_t)(*in);
+        mUcs4 = c;
         mUcs4 = (mUcs4 & 0x1F) << 6;
         mState = 1;
         mBytes = 2;
-      } else if (0xE0 == (0xF0 & (*in))) {
+      } else if (c < 0xF0) {  // E0..EF
         // First octet of 3 octet sequence
-        mUcs4 = (uint32_t)(*in);
+        mUcs4 = c;
         mUcs4 = (mUcs4 & 0x0F) << 12;
         mState = 2;
         mBytes = 3;
-      } else if (0xF0 == (0xF8 & (*in))) {
+      } else if (c < 0xF5) {  // F0..F4
         // First octet of 4 octet sequence
-        mUcs4 = (uint32_t)(*in);
+        mUcs4 = c;
         mUcs4 = (mUcs4 & 0x07) << 18;
         mState = 3;
         mBytes = 4;
-      } else if (0xF8 == (0xFC & (*in))) {
-        /* First octet of 5 octet sequence.
-         *
-         * This is illegal because the encoded codepoint must be either
-         * (a) not the shortest form or
-         * (b) outside the Unicode range of 0-0x10FFFF.
-         * Rather than trying to resynchronize, we will carry on until the end
-         * of the sequence and let the later error handling code catch it.
-         */
-        mUcs4 = (uint32_t)(*in);
-        mUcs4 = (mUcs4 & 0x03) << 24;
-        mState = 4;
-        mBytes = 5;
-      } else if (0xFC == (0xFE & (*in))) {
-        // First octet of 6 octet sequence, see comments for 5 octet sequence.
-        mUcs4 = (uint32_t)(*in);
-        mUcs4 = (mUcs4 & 1) << 30;
-        mState = 5;
-        mBytes = 6;
-      } else {
+      } else {  // F5..FF
         /* Current octet is neither in the US-ASCII range nor a legal first
          * octet of a multi-octet sequence.
          *
@@ -272,32 +258,34 @@ NS_IMETHODIMP nsUTF8ToUnicode::Convert(const char * aSrc,
     } else {
       // When mState is non-zero, we expect a continuation of the multi-octet
       // sequence
-      if (0x80 == (0xC0 & (*in))) {
+      if (0x80 == (0xC0 & c)) {
+        if (mState > 1) {
+          // If we are here, all possibilities are:
+          // mState == 2 && mBytes == 3 ||
+          // mState == 2 && mBytes == 4 ||
+          // mState == 3 && mBytes == 4
+          if (mBytes == 3 && (!mUcs4 && c < 0xA0 ||  // E0 80..9F
+                              mUcs4 == 0xD000 && c > 0x9F) ||  // ED A0..BF
+              mState == 3 && (!mUcs4 && c < 0x90 ||  // F0 80..8F
+                              mUcs4 == 0x100000 && c > 0x8F)) {  // F4 90..BF
+            // illegal sequences or sequences converted into illegal ranges.
+            in--;
+            res = NS_ERROR_ILLEGAL_INPUT;
+            break;
+          }
+        }
+
         // Legal continuation.
         uint32_t shift = (mState - 1) * 6;
-        uint32_t tmp = *in;
+        uint32_t tmp = c;
         tmp = (tmp & 0x0000003FL) << shift;
         mUcs4 |= tmp;
 
         if (0 == --mState) {
           /* End of the multi-octet sequence. mUcs4 now contains the final
            * Unicode codepoint to be output
-           *
-           * Check for illegal sequences and codepoints.
            */
 
-          // From Unicode 3.1, non-shortest form is illegal
-          if (((2 == mBytes) && (mUcs4 < 0x0080)) ||
-              ((3 == mBytes) && (mUcs4 < 0x0800)) ||
-              ((4 == mBytes) && (mUcs4 < 0x10000)) ||
-              (4 < mBytes) ||
-              // From Unicode 3.2, surrogate characters are illegal
-              ((mUcs4 & 0xFFFFF800) == 0xD800) ||
-              // Codepoints outside the Unicode range are illegal
-              (mUcs4 > 0x10FFFF)) {
-            res = NS_ERROR_ILLEGAL_INPUT;
-            break;
-          }
           if (mUcs4 > 0xFFFF) {
             // mUcs4 is in the range 0x10000 - 0x10FFFF. Output a UTF-16 pair
             if (out + 2 > outend) {
@@ -320,7 +308,7 @@ NS_IMETHODIMP nsUTF8ToUnicode::Convert(const char * aSrc,
           mFirst = false;
         }
       } else {
-        /* ((0xC0 & (*in) != 0x80) && (mState != 0))
+        /* ((0xC0 & c != 0x80) && (mState != 0))
          * 
          * Incomplete multi-octet sequence. Unconsume this
          * octet and return an error condition. Caller is responsible
diff --git a/intl/uconv/src/nsUnicodeToUTF8.cpp b/intl/uconv/src/nsUnicodeToUTF8.cpp
index b3fcee5e07e8..8fc76bde989f 100644
--- a/intl/uconv/src/nsUnicodeToUTF8.cpp
+++ b/intl/uconv/src/nsUnicodeToUTF8.cpp
@@ -50,9 +50,9 @@ NS_IMETHODIMP nsUnicodeToUTF8::Convert(const PRUnichar * aSrc,
       return NS_OK_UENC_MOREOUTPUT;
     }
     if (*src < (PRUnichar)0xdc00 || *src > (PRUnichar)0xdfff) { //not a pair
-      *dest++ = (char)0xe0 | (mHighSurrogate >> 12);
-      *dest++ = (char)0x80 | ((mHighSurrogate >> 6) & 0x003f);
-      *dest++ = (char)0x80 | (mHighSurrogate & 0x003f);
+      *dest++ = (char)0xef; //replacement character
+      *dest++ = (char)0xbf;
+      *dest++ = (char)0xbd;
       destLen -= 3;
     } else { 
       n = ((mHighSurrogate - (PRUnichar)0xd800) << 10) + 
@@ -79,7 +79,17 @@ NS_IMETHODIMP nsUnicodeToUTF8::Convert(const PRUnichar * aSrc,
       *dest++ = (char)0xc0 | (*src >> 6);
       *dest++ = (char)0x80 | (*src & 0x003f);
       destLen -= 2;
-    } else if (*src >= (PRUnichar)0xD800 && *src < (PRUnichar)0xDC00) {
+    } else if (*src >= (PRUnichar)0xd800 && *src <= (PRUnichar)0xdfff) {
+      if (*src >= (PRUnichar)0xdc00) { //not a pair
+        if (destLen < 3)
+          goto error_more_output;
+        *dest++ = (char)0xef; //replacement character
+        *dest++ = (char)0xbf;
+        *dest++ = (char)0xbd;
+        destLen -= 3;
+        ++src;
+        continue;
+      }
       if ((src+1) >= srcEnd) {
         //we need another surrogate to complete this unicode char
         mHighSurrogate = *src;
@@ -90,9 +100,9 @@ NS_IMETHODIMP nsUnicodeToUTF8::Convert(const PRUnichar * aSrc,
       if (destLen < 4)
         goto error_more_output;
       if (*(src+1) < (PRUnichar)0xdc00 || *(src+1) > 0xdfff) { //not a pair
-        *dest++ = (char)0xe0 | (*src >> 12);
-        *dest++ = (char)0x80 | ((*src >> 6) & 0x003f);
-        *dest++ = (char)0x80 | (*src & 0x003f);
+        *dest++ = (char)0xef; //replacement character
+        *dest++ = (char)0xbf;
+        *dest++ = (char)0xbd;
         destLen -= 3;
       } else {
         n = ((*src - (PRUnichar)0xd800) << 10) + (*(src+1) - (PRUnichar)0xdc00) + (uint32_t)0x10000;
@@ -133,9 +143,9 @@ NS_IMETHODIMP nsUnicodeToUTF8::Finish(char * aDest, int32_t * aDestLength)
       *aDestLength = 0;
       return NS_OK_UENC_MOREOUTPUT;
     }
-    *dest++ = (char)0xe0 | (mHighSurrogate >> 12);
-    *dest++ = (char)0x80 | ((mHighSurrogate >> 6) & 0x003f);
-    *dest++ = (char)0x80 | (mHighSurrogate & 0x003f);
+    *dest++ = (char)0xef; //replacement character
+    *dest++ = (char)0xbf;
+    *dest++ = (char)0xbd;
     mHighSurrogate = 0;
     *aDestLength = 3;
     return NS_OK;
diff --git a/intl/uconv/tests/unit/test_utf8_illegals.js b/intl/uconv/tests/unit/test_utf8_illegals.js
index f54073726a64..a1a029d63149 100644
--- a/intl/uconv/tests/unit/test_utf8_illegals.js
+++ b/intl/uconv/tests/unit/test_utf8_illegals.js
@@ -2,31 +2,93 @@
 
 const Cc = Components.Constructor;
 const Ci = Components.interfaces;
-        
-const inStrings1 = new Array("%c0%af",              // long forms of 0x2F
-                             "%e0%80%af",
-                             "%f0%80%80%af",
-                             "%f8%80%80%80%af",
-                             "%fc%80%80%80%80%af",
-                                                    // lone surrogates
-                             "%ed%a0%80",           // D800
-                             "%ed%ad%bf",           // DB7F
-                             "%ed%ae%80",           // DB80
-                             "%ed%af%bf",           // DBFF
-                             "%ed%b0%80",           // DC00
-                             "%ed%be%80",           // DF80
-                             "%ed%bf%bf");          // DFFF
-const expected1 = "ABC\ufffdXYZ";
-                                                    // Surrogate pairs
-const inStrings2 = new Array("%ed%a0%80%ed%b0%80",  // D800 DC00
-                             "%ed%a0%80%ed%bf%bf",  // D800 DFFF
-                             "%ed%ad%bf%ed%b0%80",  // DB7F DC00
-                             "%ed%ad%bf%ed%bf%bf",  // DB7F DFFF
-                             "%ed%ae%80%ed%b0%80",  // DB80 DC00
-                             "%ed%ae%80%ed%bf%bf",  // DB80 DFFF
-                             "%ed%af%bf%ed%b0%80",  // DBFF DC00
-                             "%ed%ad%bf%ed%bf%bf"); // DBFF DFFF
-const expected2 = "ABC\ufffd\ufffdXYZ";
+
+const tests = [
+{ inStrings: ["%80",                 // Illegal or incomplete sequences
+              "%8f",
+              "%90",
+              "%9f",
+              "%a0",
+              "%bf",
+              "%c0",
+              "%c1",
+              "%c2",
+              "%df",
+              "%e0",
+              "%e0%a0",
+              "%e0%bf",
+              "%ed%80",
+              "%ed%9f",
+              "%ef",
+              "%ef%bf",
+              "%f0",
+              "%f0%90",
+              "%f0%90%80",
+              "%f0%90%bf",
+              "%f0%bf",
+              "%f0%bf%80",
+              "%f0%bf%bf",
+              "%f4",
+              "%f4%80",
+              "%f4%80%80",
+              "%f4%80%bf",
+              "%f4%8f",
+              "%f4%8f%80",
+              "%f4%8f%bf",
+              "%f5",
+              "%f7",
+              "%f8",
+              "%fb",
+              "%fc",
+              "%fd"],
+  expected: "ABC\ufffdXYZ" },
+
+{ inStrings: ["%c0%af",              // Illegal bytes in 2-octet
+              "%c1%af"],             //  sequences
+  expected: "ABC\ufffd\ufffdXYZ" },
+
+{ inStrings: ["%e0%80%80",           // Illegal bytes in 3-octet
+              "%e0%80%af",           //  sequences
+              "%e0%9f%bf",
+                                     // long surrogates
+              "%ed%a0%80",           // D800
+              "%ed%ad%bf",           // DB7F
+              "%ed%ae%80",           // DB80
+              "%ed%af%bf",           // DBFF
+              "%ed%b0%80",           // DC00
+              "%ed%be%80",           // DF80
+              "%ed%bf%bf"],          // DFFF
+  expected: "ABC\ufffd\ufffd\ufffdXYZ" },
+
+{ inStrings: ["%f0%80%80%80",        // Illegal bytes in 4-octet
+              "%f0%80%80%af",        //  sequences
+              "%f0%8f%bf%bf",
+              "%f4%90%80%80",
+              "%f4%bf%bf%bf",
+              "%f5%80%80%80",
+              "%f7%bf%bf%bf"],
+  expected: "ABC\ufffd\ufffd\ufffd\ufffdXYZ" },
+
+{ inStrings: ["%f8%80%80%80%80",     // Illegal bytes in 5-octet
+              "%f8%80%80%80%af",     //  sequences
+              "%fb%bf%bf%bf%bf"],
+  expected: "ABC\ufffd\ufffd\ufffd\ufffd\ufffdXYZ" },
+
+                                     // Surrogate pairs
+{ inStrings: ["%ed%a0%80%ed%b0%80",  // D800 DC00
+              "%ed%a0%80%ed%bf%bf",  // D800 DFFF
+              "%ed%ad%bf%ed%b0%80",  // DB7F DC00
+              "%ed%ad%bf%ed%bf%bf",  // DB7F DFFF
+              "%ed%ae%80%ed%b0%80",  // DB80 DC00
+              "%ed%ae%80%ed%bf%bf",  // DB80 DFFF
+              "%ed%af%bf%ed%b0%80",  // DBFF DC00
+              "%ed%ad%bf%ed%bf%bf",  // DBFF DFFF
+              "%fc%80%80%80%80%80",  // Illegal bytes in 6-octet
+              "%fc%80%80%80%80%af",  //  sequences
+              "%fd%bf%bf%bf%bf%bf"],
+  expected: "ABC\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdXYZ" },
+];
+
 
 function testCaseInputStream(inStr, expected)
 {
@@ -66,12 +128,9 @@ function testCaseInputStream(inStr, expected)
 }
 
 function run_test() {
-    for (var i = 0; i < inStrings1.length; ++i) {
-	var inStr = inStrings1[i];
-	testCaseInputStream(inStr, expected1);
-    }
-    for (var i = 0; i < inStrings2.length; ++i) {
-	var inStr = inStrings2[i];
-	testCaseInputStream(inStr, expected2);
+  for (var t of tests) {
+    for (var inStr of t.inStrings) {
+      testCaseInputStream(inStr, t.expected);
     }
+  }
 }

From 0e92bf57ec71ac830198f4ddc7b6bfa0dd02983e Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Mon, 26 Nov 2012 20:38:20 -0500
Subject: [PATCH 089/160] Bug 782412 - Part 1: Rename UCS2BE to UTF16.
 r=smontagu

--HG--
rename : intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp => intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
rename : intl/uconv/ucvlatin/nsUCS2BEToUnicode.h => intl/uconv/ucvlatin/nsUTF16ToUnicode.h
rename : intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp => intl/uconv/ucvlatin/nsUnicodeToUTF16.cpp
rename : intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h => intl/uconv/ucvlatin/nsUnicodeToUTF16.h
---
 intl/uconv/src/nsUConvModule.cpp                            | 4 ++--
 intl/uconv/ucvlatin/Makefile.in                             | 4 ++--
 .../{nsUCS2BEToUnicode.cpp => nsUTF16ToUnicode.cpp}         | 2 +-
 .../ucvlatin/{nsUCS2BEToUnicode.h => nsUTF16ToUnicode.h}    | 6 +++---
 .../{nsUnicodeToUCS2BE.cpp => nsUnicodeToUTF16.cpp}         | 2 +-
 .../ucvlatin/{nsUnicodeToUCS2BE.h => nsUnicodeToUTF16.h}    | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename intl/uconv/ucvlatin/{nsUCS2BEToUnicode.cpp => nsUTF16ToUnicode.cpp} (99%)
 rename intl/uconv/ucvlatin/{nsUCS2BEToUnicode.h => nsUTF16ToUnicode.h} (94%)
 rename intl/uconv/ucvlatin/{nsUnicodeToUCS2BE.cpp => nsUnicodeToUTF16.cpp} (99%)
 rename intl/uconv/ucvlatin/{nsUnicodeToUCS2BE.h => nsUnicodeToUTF16.h} (94%)

diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp
index f15879ce8fa5..d1ecf4887763 100644
--- a/intl/uconv/src/nsUConvModule.cpp
+++ b/intl/uconv/src/nsUConvModule.cpp
@@ -87,7 +87,7 @@
 #include "nsVPSToUnicode.h"
 #include "nsUTF7ToUnicode.h"
 #include "nsMUTF7ToUnicode.h"
-#include "nsUCS2BEToUnicode.h"
+#include "nsUTF16ToUnicode.h"
 #include "nsT61ToUnicode.h"
 #include "nsUserDefinedToUnicode.h"
 #include "nsUnicodeToAscii.h"
@@ -136,7 +136,7 @@
 #include "nsUnicodeToVPS.h"
 #include "nsUnicodeToUTF7.h"
 #include "nsUnicodeToMUTF7.h"
-#include "nsUnicodeToUCS2BE.h"
+#include "nsUnicodeToUTF16.h"
 #include "nsUnicodeToT61.h"
 #include "nsUnicodeToUserDefined.h"
 #include "nsUnicodeToSymbol.h"
diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in
index d7d373842804..b67e8d2522ec 100644
--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@@ -69,7 +69,7 @@ CPPSRCS		= \
 		nsVPSToUnicode.cpp \
 		nsUTF7ToUnicode.cpp \
 		nsMUTF7ToUnicode.cpp \
-		nsUCS2BEToUnicode.cpp \
+		nsUTF16ToUnicode.cpp \
 		nsT61ToUnicode.cpp \
 		nsUserDefinedToUnicode.cpp \
 		nsUnicodeToAscii.cpp \
@@ -124,7 +124,7 @@ CPPSRCS		= \
 		nsUnicodeToVPS.cpp \
 		nsUnicodeToUTF7.cpp \
 		nsUnicodeToMUTF7.cpp \
-		nsUnicodeToUCS2BE.cpp \
+		nsUnicodeToUTF16.cpp \
 		nsUnicodeToT61.cpp \
 		nsUnicodeToUserDefined.cpp \
 		nsUnicodeToSymbol.cpp \
diff --git a/intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp b/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
similarity index 99%
rename from intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp
rename to intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
index 7542b10ceef9..2db37d097d22 100644
--- a/intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp
+++ b/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsUCConstructors.h"
-#include "nsUCS2BEToUnicode.h"
+#include "nsUTF16ToUnicode.h"
 #include "nsUCvLatinDll.h"
 #include "nsCharTraits.h"
 #include <string.h>
diff --git a/intl/uconv/ucvlatin/nsUCS2BEToUnicode.h b/intl/uconv/ucvlatin/nsUTF16ToUnicode.h
similarity index 94%
rename from intl/uconv/ucvlatin/nsUCS2BEToUnicode.h
rename to intl/uconv/ucvlatin/nsUTF16ToUnicode.h
index 42829b16baf0..76ce0edcaf8b 100644
--- a/intl/uconv/ucvlatin/nsUCS2BEToUnicode.h
+++ b/intl/uconv/ucvlatin/nsUTF16ToUnicode.h
@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef nsUCS2BEToUnicode_h___
-#define nsUCS2BEToUnicode_h___
+#ifndef nsUTF16ToUnicode_h_
+#define nsUTF16ToUnicode_h_
 
 #include "nsISupports.h"
 #include "nsUCSupport.h"
@@ -70,4 +70,4 @@ private:
   bool    mFoundBOM;
 };
 
-#endif /* nsUCS2BEToUnicode_h___ */
+#endif /* nsUTF16ToUnicode_h_ */
diff --git a/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp b/intl/uconv/ucvlatin/nsUnicodeToUTF16.cpp
similarity index 99%
rename from intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp
rename to intl/uconv/ucvlatin/nsUnicodeToUTF16.cpp
index 7cbf8a86841e..402df09db609 100644
--- a/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp
+++ b/intl/uconv/ucvlatin/nsUnicodeToUTF16.cpp
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsUnicodeToUCS2BE.h"
+#include "nsUnicodeToUTF16.h"
 #include <string.h>
 
 inline static void SwapBytes(char *aDest, const PRUnichar* aSrc, int32_t aLen);
diff --git a/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h b/intl/uconv/ucvlatin/nsUnicodeToUTF16.h
similarity index 94%
rename from intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h
rename to intl/uconv/ucvlatin/nsUnicodeToUTF16.h
index 436919336351..6ed0825858ff 100644
--- a/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h
+++ b/intl/uconv/ucvlatin/nsUnicodeToUTF16.h
@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef nsUnicodeToUCS2BE_h___
-#define nsUnicodeToUCS2BE_h___
+#ifndef nsUnicodeToUTF16_h_
+#define nsUnicodeToUTF16_h_
 
 #include "nsUCSupport.h"
 
@@ -53,4 +53,4 @@ public:
   nsUnicodeToUTF16() { mBOM = 0xFEFF;}
 };
 
-#endif /* nsUnicodeToUCS2BE_h___ */
+#endif /* nsUnicodeToUTF16_h_ */

From 37649b3c1de154cf743e7e6349487f5eebdc2770 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Mon, 26 Nov 2012 20:38:20 -0500
Subject: [PATCH 090/160] Bug 782412 - Part 2: Return NS_OK_UDEC_MOREINPUT and
 NS_OK_UDEC_MOREOUTPUT as appropriate. r=smontagu

---
 intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp b/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
index 2db37d097d22..4c7d425edbcd 100644
--- a/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
+++ b/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
@@ -28,6 +28,7 @@ UTF16ConvertToUnicode(uint8_t& aState, uint8_t& aOddByte,
   const char* srcEnd = aSrc + *aSrcLength;
   PRUnichar* dest = aDest;
   PRUnichar* destEnd = aDest + *aDestLength;
+  PRUnichar oddHighSurrogate;
 
   switch(aState) {
     case STATE_FOUND_BOM:
@@ -54,7 +55,7 @@ UTF16ConvertToUnicode(uint8_t& aState, uint8_t& aOddByte,
 
     case STATE_ODD_SURROGATE_PAIR:
       if (*aDestLength < 2)
-        *dest++ = UCS2_REPLACEMENT_CHAR;
+        goto error;
       else {
         *dest++ = aOddHighSurrogate;
         *dest++ = aOddLowSurrogate;
@@ -69,17 +70,21 @@ UTF16ConvertToUnicode(uint8_t& aState, uint8_t& aOddByte,
       break;
   }
 
+  oddHighSurrogate = aOddHighSurrogate;
+
   if (src == srcEnd) {
     *aDestLength = dest - aDest;
-    return NS_OK;
+    return (aState != STATE_NORMAL || oddHighSurrogate) ?
+           NS_OK_UDEC_MOREINPUT : NS_OK;
   }
 
-  PRUnichar oddHighSurrogate = aOddHighSurrogate;
-
   const char* srcEvenEnd;
 
   PRUnichar u;
   if (aState == STATE_HALF_CODE_POINT) {
+    if (dest == destEnd)
+      goto error;
+
     // the 1st byte of a 16-bit code unit was stored in |aOddByte| in the
     // previous run while the 2nd byte has to come from |*src|.
     aState = STATE_NORMAL;
@@ -151,7 +156,8 @@ have_codepoint:
 
   *aDestLength = dest - aDest;
   *aSrcLength =  src  - aSrc; 
-  return NS_OK;
+  return (aState != STATE_NORMAL || oddHighSurrogate) ?
+         NS_OK_UDEC_MOREINPUT : NS_OK;
 
 error:
   *aDestLength = dest - aDest;

From 3adf953533b158796d4ca253be137cbc846450b0 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Mon, 26 Nov 2012 20:38:20 -0500
Subject: [PATCH 091/160] Bug 782412 - Part 3: Improve the BOM handling.
 r=smontagu

---
 dom/encoding/test/test_TextDecoder.js    |  16 ++-
 intl/uconv/tests/unit/test_bug396637.js  |   4 +-
 intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp | 154 +++++++++++++----------
 3 files changed, 105 insertions(+), 69 deletions(-)

diff --git a/dom/encoding/test/test_TextDecoder.js b/dom/encoding/test/test_TextDecoder.js
index 4491a3b07b7b..0887da25b581 100644
--- a/dom/encoding/test/test_TextDecoder.js
+++ b/dom/encoding/test/test_TextDecoder.js
@@ -180,10 +180,16 @@ function testDecodeStreamCompositions() {
     {encoding: "utf-8", input: [0xEF,0xBB,0xBF,0xC2,0x80], expected: ["","","","","\x80"]},
     {encoding: "utf-16", input: [0x01,0x00], expected: ["","\x01"]},
     {encoding: "utf-16", input: [0x01,0x00,0x03,0x02], expected: ["","\x01","","\u0203"]},
+    {encoding: "utf-16", input: [0xFF,0xFD], expected: ["","\uFDFF"]},
     {encoding: "utf-16", input: [0xFF,0xFE], expected: ["",""]},
+    {encoding: "utf-16", input: [0xFF,0xFF], expected: ["","\uFFFF"]},
     {encoding: "utf-16", input: [0xFF,0xFE,0x01,0x00], expected: ["","","","\x01"]},
     {encoding: "utf-16", input: [0xFF,0xFE,0xFF,0xFE], expected: ["","","","\uFEFF"]},
     {encoding: "utf-16", input: [0xFF,0xFE,0xFE,0xFF], expected: ["","","","\uFFFE"]},
+    {encoding: "utf-16", input: [0xFD,0xFE], expected: ["","\uFEFD"]},
+    {encoding: "utf-16", input: [0xFD,0xFF], expected: ["","\uFFFD"]},
+    {encoding: "utf-16", input: [0xFE,0xFD], expected: ["","\uFDFE"]},
+    {encoding: "utf-16", input: [0xFE,0xFE], expected: ["","\uFEFE"]},
     {encoding: "utf-16", input: [0xFE,0xFF], expected: ["","\uFFFE"]},
     {encoding: "utf-16", input: [0xFE,0xFF,0x01,0x00], expected: ["","\uFFFE","","\x01"]},
     {encoding: "utf-16", input: [0xFE,0xFF,0xFF,0xFE], expected: ["","\uFFFE","","\uFEFF"]},
@@ -194,8 +200,16 @@ function testDecodeStreamCompositions() {
     {encoding: "utf-16le", input: [0xFE,0xFF,0x01,0x00], expected: ["","\uFFFE","","\x01"]},
     {encoding: "utf-16be", input: [0x01,0x00], expected: ["","\u0100"]},
     {encoding: "utf-16be", input: [0x01,0x00,0x03,0x02], expected: ["","\u0100","","\u0302"]},
-    {encoding: "utf-16be", input: [0xFF,0xFE,0x01,0x00], expected: ["","\uFFFE","","\u0100"]},
+    {encoding: "utf-16be", input: [0xFD,0xFE], expected: ["","\uFDFE"]},
+    {encoding: "utf-16be", input: [0xFD,0xFF], expected: ["","\uFDFF"]},
+    {encoding: "utf-16be", input: [0xFE,0xFD], expected: ["","\uFEFD"]},
+    {encoding: "utf-16be", input: [0xFE,0xFE], expected: ["","\uFEFE"]},
+    {encoding: "utf-16be", input: [0xFE,0xFF], expected: ["",""]},
     {encoding: "utf-16be", input: [0xFE,0xFF,0x01,0x00], expected: ["","","","\u0100"]},
+    {encoding: "utf-16be", input: [0xFF,0xFD], expected: ["","\uFFFD"]},
+    {encoding: "utf-16be", input: [0xFF,0xFE], expected: ["","\uFFFE"]},
+    {encoding: "utf-16be", input: [0xFF,0xFF], expected: ["","\uFFFF"]},
+    {encoding: "utf-16be", input: [0xFF,0xFE,0x01,0x00], expected: ["","\uFFFE","","\u0100"]},
     {encoding: "shift_jis", input: [0x81,0x40], expected: ["","\u3000"]},
   ];
   tests.forEach(function(t) {
diff --git a/intl/uconv/tests/unit/test_bug396637.js b/intl/uconv/tests/unit/test_bug396637.js
index 70cd66804d2a..49305ecd6899 100644
--- a/intl/uconv/tests/unit/test_bug396637.js
+++ b/intl/uconv/tests/unit/test_bug396637.js
@@ -1,9 +1,9 @@
 // Tests conversion of a single byte from UTF-16 to Unicode
 
 load('CharsetConversionTests.js');
-	
+
 const inString = "A";
-const expectedString = "\ufffd";
+const expectedString = "";
 const charset = "UTF-16BE";
 
 function run_test() {
diff --git a/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp b/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
index 4c7d425edbcd..725cb8499e01 100644
--- a/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
+++ b/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
@@ -10,11 +10,13 @@
 #include <string.h>
 #include "prtypes.h"
 
-#define STATE_NORMAL             0
-#define STATE_HALF_CODE_POINT    1
-#define STATE_FIRST_CALL         2
-#define STATE_FOUND_BOM          3
-#define STATE_ODD_SURROGATE_PAIR 4
+enum {
+  STATE_NORMAL = 0,
+  STATE_HALF_CODE_POINT = 1,
+  STATE_FIRST_CALL = 2,
+  STATE_SECOND_BYTE = STATE_FIRST_CALL | STATE_HALF_CODE_POINT,
+  STATE_ODD_SURROGATE_PAIR = 4
+};
 
 static nsresult
 UTF16ConvertToUnicode(uint8_t& aState, uint8_t& aOddByte,
@@ -31,25 +33,15 @@ UTF16ConvertToUnicode(uint8_t& aState, uint8_t& aOddByte,
   PRUnichar oddHighSurrogate;
 
   switch(aState) {
-    case STATE_FOUND_BOM:
+    case STATE_FIRST_CALL:
       NS_ASSERTION(*aSrcLength > 1, "buffer too short");
       src+=2;
       aState = STATE_NORMAL;
       break;
 
-    case STATE_FIRST_CALL: // first time called
-      NS_ASSERTION(*aSrcLength > 1, "buffer too short");
-      // Eliminate BOM (0xFEFF). Note that different endian case is taken care
-      // of in |Convert| of LE and BE converters. Here, we only have to
-      // deal with the same endian case. That is, 0xFFFE (byte-swapped BOM) is
-      // illegal.
-      if(0xFEFF == *((PRUnichar*)src)) {
-        src+=2;
-      } else if(0xFFFE == *((PRUnichar*)src)) {
-        *aSrcLength=0;
-        *aDestLength=0;
-        return NS_ERROR_ILLEGAL_INPUT;
-      }  
+    case STATE_SECOND_BYTE:
+      NS_ASSERTION(*aSrcLength > 0, "buffer too short");
+      src++;
       aState = STATE_NORMAL;
       break;
 
@@ -180,7 +172,7 @@ nsUTF16ToUnicodeBase::GetMaxLength(const char * aSrc, int32_t aSrcLength,
                                    int32_t * aDestLength)
 {
   // the left-over data of the previous run have to be taken into account.
-  *aDestLength = (aSrcLength + ((STATE_HALF_CODE_POINT == mState) ? 1 : 0)) / 2;
+  *aDestLength = (aSrcLength + ((STATE_HALF_CODE_POINT & mState) ? 1 : 0)) / 2;
   if (mOddHighSurrogate)
     (*aDestLength)++;
   if (mOddLowSurrogate)
@@ -193,29 +185,44 @@ NS_IMETHODIMP
 nsUTF16BEToUnicode::Convert(const char * aSrc, int32_t * aSrcLength,
                             PRUnichar * aDest, int32_t * aDestLength)
 {
-    if(STATE_FIRST_CALL == mState && *aSrcLength < 2)
-    {
-      nsresult res = (*aSrcLength == 0) ? NS_OK : NS_ERROR_ILLEGAL_INPUT;
-      *aSrcLength=0;
-      *aDestLength=0;
-      return res;
-    }
-#ifdef IS_LITTLE_ENDIAN
-    // Remove the BOM if we're little-endian. The 'same endian' case with the
-    // leading BOM will be taken care of by |UTF16ConvertToUnicode|.
-    if(STATE_FIRST_CALL == mState) // Called for the first time.
-    {
-      mState = STATE_NORMAL;
-      if(0xFFFE == *((PRUnichar*)aSrc)) {
-        // eliminate BOM (on LE machines, BE BOM is 0xFFFE)
-        mState = STATE_FOUND_BOM;
-      } else if(0xFEFF == *((PRUnichar*)aSrc)) {
-        *aSrcLength=0;
-        *aDestLength=0;
-        return NS_ERROR_ILLEGAL_INPUT;
+  switch (mState) {
+    case STATE_FIRST_CALL:
+      if (*aSrcLength < 2) {
+        if (*aSrcLength < 1) {
+          *aDestLength = 0;
+          return NS_OK;
+        }
+        if (uint8_t(*aSrc) != 0xFE) {
+          mState = STATE_NORMAL;
+          break;
+        }
+        *aDestLength = 0;
+        mState = STATE_SECOND_BYTE;
+        return NS_OK_UDEC_MOREINPUT;
+      }
+#ifdef IS_LITTLE_ENDIAN
+      // on LE machines, BE BOM is 0xFFFE
+      if (0xFFFE != *((PRUnichar*)aSrc)) {
+        mState = STATE_NORMAL;
+      }
+#else
+      if (0xFEFF != *((PRUnichar*)aSrc)) {
+        mState = STATE_NORMAL;
       }
-    }
 #endif
+      break;
+
+    case STATE_SECOND_BYTE:
+      if (*aSrcLength < 1) {
+        *aDestLength = 0;
+        return NS_OK_UDEC_MOREINPUT;
+      }
+      if (uint8_t(*aSrc) != 0xFF) {
+        mOddByte = 0xFE;
+        mState = STATE_HALF_CODE_POINT;
+      }
+      break;
+  }
 
   nsresult rv = UTF16ConvertToUnicode(mState, mOddByte, mOddHighSurrogate,
                                       mOddLowSurrogate,
@@ -233,30 +240,45 @@ NS_IMETHODIMP
 nsUTF16LEToUnicode::Convert(const char * aSrc, int32_t * aSrcLength,
                             PRUnichar * aDest, int32_t * aDestLength)
 {
-    if(STATE_FIRST_CALL == mState && *aSrcLength < 2)
-    {
-      nsresult res = (*aSrcLength == 0) ? NS_OK : NS_ERROR_ILLEGAL_INPUT;
-      *aSrcLength=0;
-      *aDestLength=0;
-      return res;
-    }
-#ifdef IS_BIG_ENDIAN
-    // Remove the BOM if we're big-endian. The 'same endian' case with the
-    // leading BOM will be taken care of by |UTF16ConvertToUnicode|.
-    if(STATE_FIRST_CALL == mState) // first time called
-    {
-      mState = STATE_NORMAL;
-      if(0xFFFE == *((PRUnichar*)aSrc)) {
-        // eliminate BOM (on BE machines, LE BOM is 0xFFFE)
-        mState = STATE_FOUND_BOM;
-      } else if(0xFEFF == *((PRUnichar*)aSrc)) {
-        *aSrcLength=0;
-        *aDestLength=0;
-        return NS_ERROR_ILLEGAL_INPUT;
+  switch (mState) {
+    case STATE_FIRST_CALL:
+      if (*aSrcLength < 2) {
+        if (*aSrcLength < 1) {
+          *aDestLength = 0;
+          return NS_OK;
+        }
+        if (uint8_t(*aSrc) != 0xFF) {
+          mState = STATE_NORMAL;
+          break;
+        }
+        *aDestLength = 0;
+        mState = STATE_SECOND_BYTE;
+        return NS_OK_UDEC_MOREINPUT;
+      }
+#ifdef IS_BIG_ENDIAN
+      // on BE machines, LE BOM is 0xFFFE
+      if (0xFFFE != *((PRUnichar*)aSrc)) {
+        mState = STATE_NORMAL;
+      }
+#else
+      if (0xFEFF != *((PRUnichar*)aSrc)) {
+        mState = STATE_NORMAL;
       }
-    }
 #endif
-    
+      break;
+
+    case STATE_SECOND_BYTE:
+      if (*aSrcLength < 1) {
+        *aDestLength = 0;
+        return NS_OK_UDEC_MOREINPUT;
+      }
+      if (uint8_t(*aSrc) != 0xFE) {
+        mOddByte = 0xFF;
+        mState = STATE_HALF_CODE_POINT;
+      }
+      break;
+  }
+
   nsresult rv = UTF16ConvertToUnicode(mState, mOddByte, mOddHighSurrogate,
                                       mOddLowSurrogate,
                                       aSrc, aSrcLength, aDest, aDestLength,
@@ -290,16 +312,13 @@ nsUTF16ToUnicode::Convert(const char * aSrc, int32_t * aSrcLength,
     }
     if(STATE_FIRST_CALL == mState) // first time called
     {
-      mState = STATE_NORMAL;
       // check if BOM (0xFEFF) is at the beginning, remove it if found, and
       // set mEndian accordingly.
       if(0xFF == uint8_t(aSrc[0]) && 0xFE == uint8_t(aSrc[1])) {
-        mState = STATE_FOUND_BOM;
         mEndian = kLittleEndian;
         mFoundBOM = true;
       }
       else if(0xFE == uint8_t(aSrc[0]) && 0xFF == uint8_t(aSrc[1])) {
-        mState = STATE_FOUND_BOM;
         mEndian = kBigEndian;
         mFoundBOM = true;
       }
@@ -307,15 +326,18 @@ nsUTF16ToUnicode::Convert(const char * aSrc, int32_t * aSrcLength,
       // the endianness. Assume the first character is [U+0001, U+00FF].
       // Not always valid, but it's very likely to hold for html/xml/css. 
       else if(!aSrc[0] && aSrc[1]) {  // 0x00 0xhh (hh != 00)
+        mState = STATE_NORMAL;
         mEndian = kBigEndian;
       }
       else if(aSrc[0] && !aSrc[1]) {  // 0xhh 0x00 (hh != 00)
+        mState = STATE_NORMAL;
         mEndian = kLittleEndian;
       }
       else { // Neither BOM nor 'plausible' byte patterns at the beginning.
              // Just assume it's BE (following Unicode standard)
              // and let the garbage show up in the browser. (security concern?)
              // (bug 246194)
+        mState = STATE_NORMAL;
         mEndian = kBigEndian;
       }
     }

From bc4214f5b82711bfdddc1ace50045c002d12d878 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Mon, 26 Nov 2012 20:38:20 -0500
Subject: [PATCH 092/160] Bug 782412 - Part 4: Implement inputErrorBehavior.
 r=smontagu

---
 dom/encoding/test/unit/test_singlebytes.js |  9 ++-
 intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp   | 81 ++++++++++++----------
 intl/uconv/ucvlatin/nsUTF16ToUnicode.h     |  4 ++
 3 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/dom/encoding/test/unit/test_singlebytes.js b/dom/encoding/test/unit/test_singlebytes.js
index 744f6b3510a4..85232c6fd6f8 100644
--- a/dom/encoding/test/unit/test_singlebytes.js
+++ b/dom/encoding/test/unit/test_singlebytes.js
@@ -181,11 +181,10 @@ test(
       { encoding: 'utf-8', input: [0xE0, 0x80, 0xC0] }, // invalid trail
       { encoding: 'utf-8', input: [0xFC, 0x80, 0x80, 0x80, 0x80, 0x80] }, // > 0x10FFFF
       { encoding: 'utf-16', input: [0x00] }, // truncated code unit
-      //TODO: Gecko doesn't throw for unpaired surrogates
-      //{ encoding: 'utf-16', input: [0x00, 0xd8] }, // surrogate half
-      //{ encoding: 'utf-16', input: [0x00, 0xd8, 0x00, 0x00] }, // surrogate half
-      //{ encoding: 'utf-16', input: [0x00, 0xdc, 0x00, 0x00] }, // trail surrogate
-      //{ encoding: 'utf-16', input: [0x00, 0xdc, 0x00, 0xd8] }  // swapped surrogates
+      { encoding: 'utf-16', input: [0x00, 0xd8] }, // surrogate half
+      { encoding: 'utf-16', input: [0x00, 0xd8, 0x00, 0x00] }, // surrogate half
+      { encoding: 'utf-16', input: [0x00, 0xdc, 0x00, 0x00] }, // trail surrogate
+      { encoding: 'utf-16', input: [0x00, 0xdc, 0x00, 0xd8] }  // swapped surrogates
       // TODO: Single byte encoding cases
     ];
 
diff --git a/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp b/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
index 725cb8499e01..fdf3d33c9422 100644
--- a/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
+++ b/intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
@@ -18,13 +18,12 @@ enum {
   STATE_ODD_SURROGATE_PAIR = 4
 };
 
-static nsresult
-UTF16ConvertToUnicode(uint8_t& aState, uint8_t& aOddByte,
-                      PRUnichar& aOddHighSurrogate, PRUnichar& aOddLowSurrogate,
-                      const char * aSrc,
-                      int32_t * aSrcLength, PRUnichar * aDest,
-                      int32_t * aDestLength,
-                      bool aSwapBytes)
+nsresult
+nsUTF16ToUnicodeBase::UTF16ConvertToUnicode(const char * aSrc,
+                                            int32_t * aSrcLength,
+                                            PRUnichar * aDest,
+                                            int32_t * aDestLength,
+                                            bool aSwapBytes)
 {
   const char* src = aSrc;
   const char* srcEnd = aSrc + *aSrcLength;
@@ -32,27 +31,27 @@ UTF16ConvertToUnicode(uint8_t& aState, uint8_t& aOddByte,
   PRUnichar* destEnd = aDest + *aDestLength;
   PRUnichar oddHighSurrogate;
 
-  switch(aState) {
+  switch(mState) {
     case STATE_FIRST_CALL:
       NS_ASSERTION(*aSrcLength > 1, "buffer too short");
       src+=2;
-      aState = STATE_NORMAL;
+      mState = STATE_NORMAL;
       break;
 
     case STATE_SECOND_BYTE:
       NS_ASSERTION(*aSrcLength > 0, "buffer too short");
       src++;
-      aState = STATE_NORMAL;
+      mState = STATE_NORMAL;
       break;
 
     case STATE_ODD_SURROGATE_PAIR:
       if (*aDestLength < 2)
         goto error;
       else {
-        *dest++ = aOddHighSurrogate;
-        *dest++ = aOddLowSurrogate;
-        aOddHighSurrogate = aOddLowSurrogate = 0;
-        aState = STATE_NORMAL;
+        *dest++ = mOddHighSurrogate;
+        *dest++ = mOddLowSurrogate;
+        mOddHighSurrogate = mOddLowSurrogate = 0;
+        mState = STATE_NORMAL;
       }
       break;
 
@@ -62,28 +61,28 @@ UTF16ConvertToUnicode(uint8_t& aState, uint8_t& aOddByte,
       break;
   }
 
-  oddHighSurrogate = aOddHighSurrogate;
+  oddHighSurrogate = mOddHighSurrogate;
 
   if (src == srcEnd) {
     *aDestLength = dest - aDest;
-    return (aState != STATE_NORMAL || oddHighSurrogate) ?
+    return (mState != STATE_NORMAL || oddHighSurrogate) ?
            NS_OK_UDEC_MOREINPUT : NS_OK;
   }
 
   const char* srcEvenEnd;
 
   PRUnichar u;
-  if (aState == STATE_HALF_CODE_POINT) {
+  if (mState == STATE_HALF_CODE_POINT) {
     if (dest == destEnd)
       goto error;
 
-    // the 1st byte of a 16-bit code unit was stored in |aOddByte| in the
+    // the 1st byte of a 16-bit code unit was stored in |mOddByte| in the
     // previous run while the 2nd byte has to come from |*src|.
-    aState = STATE_NORMAL;
+    mState = STATE_NORMAL;
 #ifdef IS_BIG_ENDIAN
-    u = (aOddByte << 8) | *src++; // safe, we know we have at least one byte.
+    u = (mOddByte << 8) | *src++; // safe, we know we have at least one byte.
 #else
-    u = (*src++ << 8) | aOddByte; // safe, we know we have at least one byte.
+    u = (*src++ << 8) | mOddByte; // safe, we know we have at least one byte.
 #endif
     srcEvenEnd = src + ((srcEnd - src) & ~1); // handle even number of bytes in main loop
     goto have_codepoint;
@@ -108,6 +107,9 @@ have_codepoint:
 
     if (!IS_SURROGATE(u)) {
       if (oddHighSurrogate) {
+        if (mErrBehavior == kOnError_Signal) {
+          goto error2;
+        }
         *dest++ = UCS2_REPLACEMENT_CHAR;
         if (dest == destEnd)
           goto error;
@@ -116,6 +118,9 @@ have_codepoint:
       *dest++ = u;
     } else if (NS_IS_HIGH_SURROGATE(u)) {
       if (oddHighSurrogate) {
+        if (mErrBehavior == kOnError_Signal) {
+          goto error2;
+        }
         *dest++ = UCS2_REPLACEMENT_CHAR;
         if (dest == destEnd)
           goto error;
@@ -125,14 +130,17 @@ have_codepoint:
     else /* if (NS_IS_LOW_SURROGATE(u)) */ {
       if (oddHighSurrogate && *aDestLength > 1) {
         if (dest + 1 >= destEnd) {
-          aOddLowSurrogate = u;
-          aOddHighSurrogate = oddHighSurrogate;
-          aState = STATE_ODD_SURROGATE_PAIR;
+          mOddLowSurrogate = u;
+          mOddHighSurrogate = oddHighSurrogate;
+          mState = STATE_ODD_SURROGATE_PAIR;
           goto error;
         }
         *dest++ = oddHighSurrogate;
         *dest++ = u;
       } else {
+        if (mErrBehavior == kOnError_Signal) {
+          goto error2;
+        }
         *dest++ = UCS2_REPLACEMENT_CHAR;
       }
       oddHighSurrogate = 0;
@@ -140,21 +148,26 @@ have_codepoint:
   }
   if (src != srcEnd) {
     // store the lead byte of a 16-bit unit for the next run.
-    aOddByte = *src++;
-    aState = STATE_HALF_CODE_POINT;
+    mOddByte = *src++;
+    mState = STATE_HALF_CODE_POINT;
   }
 
-  aOddHighSurrogate = oddHighSurrogate;
+  mOddHighSurrogate = oddHighSurrogate;
 
   *aDestLength = dest - aDest;
   *aSrcLength =  src  - aSrc; 
-  return (aState != STATE_NORMAL || oddHighSurrogate) ?
+  return (mState != STATE_NORMAL || oddHighSurrogate) ?
          NS_OK_UDEC_MOREINPUT : NS_OK;
 
 error:
   *aDestLength = dest - aDest;
   *aSrcLength =  src  - aSrc; 
   return  NS_OK_UDEC_MOREOUTPUT;
+
+error2:
+  *aDestLength = dest - aDest;
+  *aSrcLength = --src - aSrc; 
+  return  NS_ERROR_ILLEGAL_INPUT;
 }
 
 NS_IMETHODIMP
@@ -224,9 +237,7 @@ nsUTF16BEToUnicode::Convert(const char * aSrc, int32_t * aSrcLength,
       break;
   }
 
-  nsresult rv = UTF16ConvertToUnicode(mState, mOddByte, mOddHighSurrogate,
-                                      mOddLowSurrogate,
-                                      aSrc, aSrcLength, aDest, aDestLength,
+  nsresult rv = UTF16ConvertToUnicode(aSrc, aSrcLength, aDest, aDestLength,
 #ifdef IS_LITTLE_ENDIAN
                                       true
 #else
@@ -279,9 +290,7 @@ nsUTF16LEToUnicode::Convert(const char * aSrc, int32_t * aSrcLength,
       break;
   }
 
-  nsresult rv = UTF16ConvertToUnicode(mState, mOddByte, mOddHighSurrogate,
-                                      mOddLowSurrogate,
-                                      aSrc, aSrcLength, aDest, aDestLength,
+  nsresult rv = UTF16ConvertToUnicode(aSrc, aSrcLength, aDest, aDestLength,
 #ifdef IS_BIG_ENDIAN
                                       true
 #else
@@ -342,9 +351,7 @@ nsUTF16ToUnicode::Convert(const char * aSrc, int32_t * aSrcLength,
       }
     }
     
-    nsresult rv = UTF16ConvertToUnicode(mState, mOddByte, mOddHighSurrogate,
-                                        mOddLowSurrogate,
-                                        aSrc, aSrcLength, aDest, aDestLength,
+    nsresult rv = UTF16ConvertToUnicode(aSrc, aSrcLength, aDest, aDestLength,
 #ifdef IS_BIG_ENDIAN
                                         (mEndian == kLittleEndian)
 #elif defined(IS_LITTLE_ENDIAN)
diff --git a/intl/uconv/ucvlatin/nsUTF16ToUnicode.h b/intl/uconv/ucvlatin/nsUTF16ToUnicode.h
index 76ce0edcaf8b..5a1aa50e86ea 100644
--- a/intl/uconv/ucvlatin/nsUTF16ToUnicode.h
+++ b/intl/uconv/ucvlatin/nsUTF16ToUnicode.h
@@ -16,6 +16,10 @@ protected:
   // ctor accessible only by child classes
   nsUTF16ToUnicodeBase() { Reset();}
 
+  nsresult UTF16ConvertToUnicode(const char * aSrc,
+                                 int32_t * aSrcLength, PRUnichar * aDest,
+                                 int32_t * aDestLength, bool aSwapBytes);
+
 public: 
   //--------------------------------------------------------------------
   // Subclassing of nsDecoderSupport class [declaration]

From 65389fbd5361787dcd85a82549f5f9c4ec07ca00 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Mon, 26 Nov 2012 20:38:20 -0500
Subject: [PATCH 093/160] Bug 782412 - Part 5: Remove a workaround from
 dom/encoding. r=hsivonen

---
 dom/encoding/TextDecoder.cpp | 68 ++----------------------------------
 dom/encoding/TextDecoder.h   | 12 +------
 2 files changed, 3 insertions(+), 77 deletions(-)

diff --git a/dom/encoding/TextDecoder.cpp b/dom/encoding/TextDecoder.cpp
index de6f99d7bcb3..4de573f9fe16 100644
--- a/dom/encoding/TextDecoder.cpp
+++ b/dom/encoding/TextDecoder.cpp
@@ -28,9 +28,6 @@ TextDecoder::Init(const nsAString& aEncoding,
     return;
   }
 
-  mIsUTF16Family = mEncoding.EqualsLiteral("UTF-16LE") ||
-                   mEncoding.EqualsLiteral("UTF-16BE");
-
   // If the constructor is called with an options argument,
   // and the fatal property of the dictionary is set,
   // set the internal fatal flag of the decoder object.
@@ -55,13 +52,6 @@ TextDecoder::Init(const nsAString& aEncoding,
   }
 }
 
-void
-TextDecoder::ResetDecoder()
-{
-  mDecoder->Reset();
-  mOffset = 0;
-}
-
 void
 TextDecoder::Decode(const ArrayBufferView* aView,
                     const TextDecodeOptions& aOptions,
@@ -80,12 +70,6 @@ TextDecoder::Decode(const ArrayBufferView* aView,
   }
 
   aOutDecodedString.Truncate();
-  if (mIsUTF16Family && mOffset < 2) {
-    HandleBOM(data, length, aOptions, aOutDecodedString, aRv);
-    if (aRv.Failed() || mOffset < 2) {
-      return;
-    }
-  }
 
   // Run or resume the decoder algorithm of the decoder object's encoder.
   int32_t outLen;
@@ -117,7 +101,7 @@ TextDecoder::Decode(const ArrayBufferView* aView,
     // Emit a decode error manually because some decoders
     // do not support kOnError_Recover (bug 638379)
     if (srcLen == -1) {
-      ResetDecoder();
+      mDecoder->Reset();
     } else {
       data += srcLen + 1;
       length -= srcLen + 1;
@@ -128,7 +112,7 @@ TextDecoder::Decode(const ArrayBufferView* aView,
   // If the internal streaming flag of the decoder object is not set,
   // then reset the encoding algorithm state to the default values
   if (!aOptions.stream) {
-    ResetDecoder();
+    mDecoder->Reset();
     if (rv == NS_OK_UDEC_MOREINPUT) {
       if (mFatal) {
         aRv.Throw(NS_ERROR_DOM_ENCODING_DECODE_ERR);
@@ -145,54 +129,6 @@ TextDecoder::Decode(const ArrayBufferView* aView,
   }
 }
 
-void
-TextDecoder::HandleBOM(const char*& aData, uint32_t& aLength,
-                       const TextDecodeOptions& aOptions,
-                       nsAString& aOutString, ErrorResult& aRv)
-{
-  if (aLength < 2u - mOffset) {
-    if (aOptions.stream) {
-      memcpy(mInitialBytes + mOffset, aData, aLength);
-      mOffset += aLength;
-    } else if (mFatal) {
-      aRv.Throw(NS_ERROR_DOM_ENCODING_DECODE_ERR);
-    } else {
-      aOutString.Append(kReplacementChar);
-    }
-    return;
-  }
-
-  memcpy(mInitialBytes + mOffset, aData, 2 - mOffset);
-  // copied data will be fed later.
-  aData += 2 - mOffset;
-  aLength -= 2 - mOffset;
-  mOffset = 2;
-
-  nsAutoCString encoding;
-  if (!EncodingUtils::IdentifyDataOffset(mInitialBytes, 2, encoding) ||
-      !encoding.Equals(mEncoding)) {
-    // If the stream doesn't start with BOM or the BOM doesn't match the
-    // encoding, feed a BOM to workaround decoder's bug (bug 634541).
-    FeedBytes(mEncoding.EqualsLiteral("UTF-16LE") ? "\xFF\xFE" : "\xFE\xFF");
-  }
-  FeedBytes(mInitialBytes, &aOutString);
-}
-
-void
-TextDecoder::FeedBytes(const char* aBytes, nsAString* aOutString)
-{
-  PRUnichar buf[3];
-  int32_t srcLen = mOffset;
-  int32_t dstLen = mozilla::ArrayLength(buf);
-  DebugOnly<nsresult> rv =
-    mDecoder->Convert(aBytes, &srcLen, buf, &dstLen);
-  MOZ_ASSERT(NS_SUCCEEDED(rv));
-  MOZ_ASSERT(srcLen == mOffset);
-  if (aOutString) {
-    aOutString->Assign(buf, dstLen);
-  }
-}
-
 void
 TextDecoder::GetEncoding(nsAString& aEncoding)
 {
diff --git a/dom/encoding/TextDecoder.h b/dom/encoding/TextDecoder.h
index a84daaec5822..7dd6a8e49e46 100644
--- a/dom/encoding/TextDecoder.h
+++ b/dom/encoding/TextDecoder.h
@@ -41,7 +41,7 @@ public:
   }
 
   TextDecoder(nsISupports* aGlobal)
-    : mGlobal(aGlobal), mFatal(false), mOffset(0), mIsUTF16Family(false)
+    : mGlobal(aGlobal), mFatal(false)
   {
     MOZ_ASSERT(aGlobal);
     SetIsDOMBinding();
@@ -96,9 +96,6 @@ private:
   nsCOMPtr<nsIUnicodeDecoder> mDecoder;
   nsCOMPtr<nsISupports> mGlobal;
   bool mFatal;
-  uint8_t mOffset;
-  char mInitialBytes[3];
-  bool mIsUTF16Family;
 
   /**
    * Validates provided encoding and throws an exception if invalid encoding.
@@ -113,13 +110,6 @@ private:
   void Init(const nsAString& aEncoding,
             const TextDecoderOptions& aFatal,
             ErrorResult& aRv);
-
-  // Internal helper functions.
-  void ResetDecoder();
-  void HandleBOM(const char*& aData, uint32_t& aLength,
-                 const TextDecodeOptions& aOptions,
-                 nsAString& aOutString, ErrorResult& aRv);
-  void FeedBytes(const char* aBytes, nsAString* aOutString = nullptr);
 };
 
 } // dom

From 0fa18fa36afe5100177328a47286bc5ab3ee8e78 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@tormail.org>
Date: Mon, 26 Nov 2012 20:38:21 -0500
Subject: [PATCH 094/160] Bug 807683 - Convert ALSA to a configure option.
 r=khuey

---
 configure.in                         | 16 ++++++++++++++--
 media/libcubeb/src/Makefile.in       | 10 ++++++----
 media/libsydneyaudio/src/Makefile.in | 10 ++++++----
 toolkit/library/Makefile.in          |  7 ++-----
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/configure.in b/configure.in
index ec1694770bef..f082d045cdc7 100644
--- a/configure.in
+++ b/configure.in
@@ -5618,11 +5618,25 @@ dnl ========================================================
 
 dnl If using sydneyaudio with Linux, ensure that the alsa library is available
 if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then
+    MOZ_ALSA=1
+fi
+
+MOZ_ARG_ENABLE_BOOL(alsa,
+[  --enable-alsa          Enable Alsa support (default on Linux)],
+MOZ_ALSA=1,
+MOZ_ALSA=)
+
+if test -n "$MOZ_ALSA"; then
+    AC_DEFINE(MOZ_CUBEB)
     PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
          [echo "$MOZ_ALSA_PKG_ERRORS"
           AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
 fi
 
+AC_SUBST(MOZ_ALSA)
+AC_SUBST(MOZ_ALSA_CFLAGS)
+AC_SUBST(MOZ_ALSA_LIBS)
+
 dnl ========================================================
 dnl = Enable PulseAudio
 dnl ========================================================
@@ -8634,8 +8648,6 @@ AC_SUBST(MOZ_VP8_ERROR_CONCEALMENT)
 AC_SUBST(MOZ_VP8_ENCODER)
 AC_SUBST(MOZ_VP8)
 AC_SUBST(MOZ_OGG)
-AC_SUBST(MOZ_ALSA_LIBS)
-AC_SUBST(MOZ_ALSA_CFLAGS)
 AC_SUBST(VPX_AS)
 AC_SUBST(VPX_ASFLAGS)
 AC_SUBST(VPX_DASH_C_FLAG)
diff --git a/media/libcubeb/src/Makefile.in b/media/libcubeb/src/Makefile.in
index 96834da1c67e..3a732de0875d 100644
--- a/media/libcubeb/src/Makefile.in
+++ b/media/libcubeb/src/Makefile.in
@@ -29,10 +29,6 @@ CSRCS         = \
               $(NULL)
 endif
 # No Android implementation of libcubeb yet.
-else ifeq ($(OS_TARGET),Linux)
-CSRCS         = \
-              cubeb_alsa.c \
-              $(NULL)
 endif
 
 ifeq ($(OS_TARGET),Darwin)
@@ -47,6 +43,12 @@ CSRCS           = \
                 $(NULL)
 endif
 
+ifdef MOZ_ALSA
+CSRCS         = \
+              cubeb_alsa.c \
+              $(NULL)
+endif
+
 ifdef MOZ_PULSEAUDIO
 CSRCS		= \
 		cubeb_pulse.c \
diff --git a/media/libsydneyaudio/src/Makefile.in b/media/libsydneyaudio/src/Makefile.in
index 0302f16648f6..66050cba2ba1 100644
--- a/media/libsydneyaudio/src/Makefile.in
+++ b/media/libsydneyaudio/src/Makefile.in
@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 CSRCS		= \
 		sydney_audio_android.c \
 		$(NULL)
-else ifeq ($(OS_ARCH),Linux)
-CSRCS		= \
-		sydney_audio_alsa.c \
-		$(NULL)
 endif
 
 ifeq ($(OS_ARCH),WINNT)
@@ -68,6 +64,12 @@ CSRCS		= \
 		$(NULL)
 endif
 
+ifdef MOZ_ALSA
+CSRCS		= \
+		sydney_audio_alsa.c \
+		$(NULL)
+endif
+
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += winmm.lib
 endif
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index e4e8ca4acbc2..bf4eced9da7e 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -421,14 +421,11 @@ endif
 endif
 
 
-ifdef MOZ_SYDNEYAUDIO
-ifeq ($(OS_ARCH),Linux)
+ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO))
+ifdef MOZ_ALSA
 EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
 endif
-endif
-
 ifdef MOZ_PULSEAUDIO
-ifdef MOZ_CUBEB
 EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
 endif
 endif

From 9cfc6466823da73cfae2e556405304c535ebc255 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 26 Nov 2012 21:14:45 -0500
Subject: [PATCH 095/160] Bug 813623.  Fix Xrays to actually work correctly for
 static methods and properties.  r=peterv

---
 dom/bindings/Codegen.py                              | 6 +-----
 dom/tests/mochitest/chrome/test_sandbox_bindings.xul | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 0a2de1e56da4..536f80bb6ce0 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -1337,10 +1337,6 @@ class PropertyArrays():
         return [ "staticMethods", "staticAttrs", "methods", "attrs",
                  "unforgeableAttrs", "consts" ]
 
-    @staticmethod
-    def xrayRelevantArrayNames():
-        return [ "methods", "attrs", "unforgeableAttrs", "consts" ]
-
     def hasChromeOnly(self):
         return any(getattr(self, a).hasChromeOnly() for a in self.arrayNames())
     def hasNonChromeOnly(self):
@@ -1417,7 +1413,7 @@ class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
         # There is no need to init any IDs in workers, because worker bindings
         # don't have Xrays.
         if not self.descriptor.workers:
-            for var in self.properties.xrayRelevantArrayNames():
+            for var in self.properties.arrayNames():
                 props = getattr(self.properties, var)
                 # We only have non-chrome ids to init if we have no chrome ids.
                 if props.hasChromeOnly():
diff --git a/dom/tests/mochitest/chrome/test_sandbox_bindings.xul b/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
index c8ef4ebac40f..b4eebe77c2ce 100644
--- a/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
+++ b/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
@@ -186,6 +186,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=741267
         for (var i in url) {
           url[i];
         }
+        isnot(url.createObjectURL, undefined, "Should have a createObjectURL");
         ok(true, "We didn't crash!");
       } catch (e) {
         ok(false, "URL interface object manipulation via an Xray shouldn't throw" + e);

From a8de82776556d7cee69af69491c4d8113a425af3 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 26 Nov 2012 21:14:45 -0500
Subject: [PATCH 096/160] Bug 810641.  Implement support for variadic callback
 arguments in WebIDL.  r=peterv

---
 dom/bindings/Codegen.py | 70 +++++++++++++++++++++++++++++++----------
 dom/webidl/WebIDL.mk    |  1 +
 2 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 536f80bb6ce0..9815e498700a 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -6942,7 +6942,7 @@ class CGNativeMember(ClassMethod):
             if nullable:
                 type = type.inner
             elementType = type.inner
-            decl = CGWrapper(self.getArgType(elementType, False, True)[0],
+            decl = CGWrapper(self.getArgType(elementType, False, False, True)[0],
                              pre="Sequence< ", post=" >")
             return decl.define(), True, True
 
@@ -7028,17 +7028,23 @@ class CGNativeMember(ClassMethod):
 
         return builtinNames[type.tag()], False, True
 
-    def getArgType(self, type, optional, isMember):
+    def getArgType(self, type, optional, variadic, isMember):
         """
         Get the type of an argument declaration.  Returns the type CGThing, and
         whether this should be a const ref.
         """
-        (decl, ref, handleNullable) = self.doGetArgType(type, optional, isMember)
+        (decl, ref, handleNullable) = self.doGetArgType(type, optional,
+                                                        isMember or variadic)
         decl = CGGeneric(decl)
         if handleNullable and type.nullable():
             decl = CGWrapper(decl, pre="Nullable< ", post=" >")
             ref = True
-        if optional:
+        if variadic:
+            decl = CGWrapper(decl, pre="nsTArray< ", post=" >")
+            ref = True
+        elif optional:
+            # Note: All variadic args claim to be optional, but we can just use
+            # empty arrays to represent them not being present.
             decl = CGWrapper(decl, pre="Optional< ", post=" >")
             ref = True
         return (decl, ref)
@@ -7049,6 +7055,7 @@ class CGNativeMember(ClassMethod):
         """
         (decl, ref) = self.getArgType(arg.type,
                                       arg.optional and not arg.defaultValue,
+                                      arg.variadic,
                                       False)
         if ref:
             decl = CGWrapper(decl, pre="const ", post="&")
@@ -7410,6 +7417,15 @@ class CallCallback(CGNativeMember):
         self.callback = callback
         args = sig[1]
         self.argCount = len(args)
+        if self.argCount > 0:
+            # Check for variadic arguments
+            lastArg = args[self.argCount-1]
+            if lastArg.variadic:
+                self.argCountStr = (
+                    "(%d - 1) + %s.Length()" % (self.argCount,
+                                                lastArg.identifier.name))
+            else:
+                self.argCountStr = "%d" % self.argCount
         CGNativeMember.__init__(self, descriptorProvider, FakeMember(),
                                 "Call", (self.retvalType, args),
                                 extendedAttrs={},
@@ -7425,25 +7441,32 @@ class CallCallback(CGNativeMember):
     def getImpl(self):
         replacements = {
             "errorReturn" : self.getDefaultRetval(),
-            "argCount": self.argCount,
             "returnResult": self.getResultConversion(),
-            "convertArgs": self.getArgConversions()
+            "convertArgs": self.getArgConversions(),
             }
         if self.argCount > 0:
+            replacements["argCount"] = self.argCountStr
             replacements["argvDecl"] = string.Template(
-                "JS::Value argv[${argCount}];\n").substitute(replacements)
-            replacements["argv"] = "argv"
+                "JS::AutoValueVector argv(cx);\n"
+                "if (!argv.resize(${argCount})) {\n"
+                "  aRv.Throw(NS_ERROR_OUT_OF_MEMORY);\n"
+                "  return${errorReturn};\n"
+                "}\n"
+                ).substitute(replacements)
+            replacements["argv"] = "argv.begin()"
+            replacements["argc"] = "argc"
         else:
             # Avoid weird 0-sized arrays
             replacements["argvDecl"] = ""
             replacements["argv"] = "nullptr"
+            replacements["argc"] = "0"
 
         return string.Template(
             "JS::Value rval = JSVAL_VOID;\n"
             "${argvDecl}" # Newlines and semicolons are in the value
             "${convertArgs}"
             "if (!JS_CallFunctionValue(cx, aThisObj, JS::ObjectValue(*mCallable),\n"
-            "                          argc, ${argv}, &rval)) {\n"
+            "                          ${argc}, ${argv}, &rval)) {\n"
             "  aRv.Throw(NS_ERROR_UNEXPECTED);\n"
             "  return${errorReturn};\n"
             "}\n"
@@ -7486,15 +7509,22 @@ class CallCallback(CGNativeMember):
                                     pre="do {\n",
                                     post="\n} while (0);")
                           for c in argConversions]
-        argConversions.insert(0,
-                              CGGeneric("unsigned argc = %d;" % self.argCount));
+        if self.argCount > 0:
+            argConversions.insert(0,
+                                  CGGeneric("unsigned argc = %s;" % self.argCountStr));
         # And slap them together.
         return CGList(argConversions, "\n\n").define() + "\n\n"
 
     def getArgConversion(self, i, arg):
         argval = arg.identifier.name
-        if arg.optional:
-            argval += ".Value()"
+
+        if arg.variadic:
+            argval = argval + "[idx]"
+            jsvalIndex = "%d + idx" % i
+        else:
+            jsvalIndex = "%d" % i
+            if arg.optional:
+                argval += ".Value()"
         if arg.type.isString():
             # XPConnect string-to-JS conversion wants to mutate the string.  So
             # let's give it a string it can mutate
@@ -7509,16 +7539,22 @@ class CallCallback(CGNativeMember):
             arg.type, self.descriptor,
             {
                 'result' : result,
-                'successCode' : "break;",
-                'jsvalRef' : "argv[%d]" % i,
-                'jsvalPtr' : "&argv[%d]" % i,
+                'successCode' : "continue;" if arg.variadic else "break;",
+                'jsvalRef' : "argv[%s]" % jsvalIndex,
+                'jsvalPtr' : "&argv[%s]" % jsvalIndex,
                 # XXXbz we don't have anything better to use for 'obj',
                 # really...
                 'obj' : 'mCallable',
                 'isCreator': False,
                 'exceptionCode' : self.exceptionCode
                 })
-        if arg.optional:
+        if arg.variadic:
+            conversion = string.Template(
+                "for (uint32_t idx = 0; idx < ${arg}.Length(); ++idx) {\n" +
+                CGIndenter(CGGeneric(conversion)).define() + "\n"
+                "}\n"
+                "break;").substitute({ "arg": arg.identifier.name })
+        elif arg.optional:
             conversion = (
                 CGIfWrapper(CGGeneric(conversion),
                             "%s.WasPassed()" % arg.identifier.name).define() +
diff --git a/dom/webidl/WebIDL.mk b/dom/webidl/WebIDL.mk
index 3b48cbde46a2..6742de2c6e89 100644
--- a/dom/webidl/WebIDL.mk
+++ b/dom/webidl/WebIDL.mk
@@ -33,6 +33,7 @@ webidl_files = \
   EventTarget.webidl \
   FileList.webidl \
   FileReaderSync.webidl \
+  Function.webidl \
   GainNode.webidl \
   HTMLCollection.webidl \
   HTMLOptionsCollection.webidl \

From a0dbf6da957d65fa7f915c5ae849b7aa06b36382 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 26 Nov 2012 21:16:05 -0500
Subject: [PATCH 097/160] Bug 815460.  Always inline JS_THIS so that we don't
 run into performance issues if the compiler decides not to inline it. 
 r=waldo

---
 js/src/jsapi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index ad1909dc15ef..5a2a97946df7 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -3357,7 +3357,7 @@ extern JS_PUBLIC_API(jsval)
 JS_ComputeThis(JSContext *cx, jsval *vp);
 
 #undef JS_THIS
-static inline jsval
+static JS_ALWAYS_INLINE jsval
 JS_THIS(JSContext *cx, jsval *vp)
 {
     return JSVAL_IS_PRIMITIVE(vp[1]) ? JS_ComputeThis(cx, vp) : vp[1];

From 4bec908ccce1180a63493f606df491a44a507580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kan-Ru=20Chen=20=28=E9=99=B3=E4=BE=83=E5=A6=82=29?=
 <kanru@kanru.info>
Date: Tue, 27 Nov 2012 10:28:11 +0800
Subject: [PATCH 098/160] Bug 814822 - Notify wake lock change when content
 crashes. r=jlebar

---
 hal/HalWakeLock.cpp | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/hal/HalWakeLock.cpp b/hal/HalWakeLock.cpp
index 5c9f0e1bba3a..654eb1d087da 100644
--- a/hal/HalWakeLock.cpp
+++ b/hal/HalWakeLock.cpp
@@ -53,17 +53,6 @@ static StaticAutoPtr<LockTable> sLockTable;
 static bool sInitialized = false;
 static bool sIsShuttingDown = false;
 
-static PLDHashOperator
-RemoveChildFromList(const nsAString& aKey, ProcessLockTable* aTable, void* aUserArg)
-{
-  MOZ_ASSERT(aUserArg);
-
-  uint64_t childID = *static_cast<uint64_t*>(aUserArg);
-  aTable->Remove(childID);
-
-  return PL_DHASH_NEXT;
-}
-
 static PLDHashOperator
 CountWakeLocks(const uint64_t& aKey, LockCount aCount, void* aUserArg)
 {
@@ -76,6 +65,31 @@ CountWakeLocks(const uint64_t& aKey, LockCount aCount, void* aUserArg)
   return PL_DHASH_NEXT;
 }
 
+static PLDHashOperator
+RemoveChildFromList(const nsAString& aKey, ProcessLockTable* aTable, void* aUserArg)
+{
+  MOZ_ASSERT(aUserArg);
+
+  uint64_t childID = *static_cast<uint64_t*>(aUserArg);
+  if (aTable->Get(childID, NULL)) {
+    aTable->Remove(childID);
+    if (sActiveListeners) {
+      LockCount totalCount;
+      WakeLockInformation info;
+      aTable->EnumerateRead(CountWakeLocks, &totalCount);
+      if (!totalCount.numLocks) {
+        sLockTable->Remove(aKey);
+      }
+      info.numLocks() = totalCount.numLocks;
+      info.numHidden() = totalCount.numHidden;
+      info.topic() = aKey;
+      NotifyWakeLockChange(info);
+    }
+  }
+
+  return PL_DHASH_NEXT;
+}
+
 class ClearHashtableOnShutdown MOZ_FINAL : public nsIObserver {
 public:
   NS_DECL_ISUPPORTS
@@ -162,6 +176,8 @@ ModifyWakeLockInternal(const nsAString& aTopic,
                        hal::WakeLockControl aHiddenAdjust,
                        uint64_t aProcessID)
 {
+  MOZ_ASSERT(NS_IsMainThread());
+
   if (sIsShuttingDown) {
     return;
   }

From 047f75f8d363357a888c1b436801e1adf2710cd5 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Mon, 26 Nov 2012 19:08:37 -0800
Subject: [PATCH 099/160] Bug 814177 - Use a callVM for generic InstanceOf
 cases. r=dvander

---
 js/src/ion/CodeGenerator.cpp | 207 +++--------------------------------
 js/src/ion/CodeGenerator.h   |   6 +-
 js/src/ion/IonBuilder.cpp    |   4 +-
 js/src/ion/IonCaches.cpp     |   1 -
 js/src/ion/LIR-Common.h      |  52 +++------
 js/src/ion/LOpcodes.h        |   3 +-
 js/src/ion/Lowering.cpp      |  23 ++--
 js/src/ion/Lowering.h        |   2 +-
 js/src/ion/MIR.h             |  14 +--
 js/src/ion/MOpcodes.h        |   2 +-
 js/src/ion/TypePolicy.cpp    |   6 -
 js/src/jsfun.cpp             |   5 +-
 12 files changed, 59 insertions(+), 266 deletions(-)

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index 8a9f5fcb36d4..21eb4f1ce356 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -3418,8 +3418,6 @@ class OutOfLineCache : public OutOfLineCodeBase<CodeGenerator>
 
     bool accept(CodeGenerator *codegen) {
         switch (ins->op()) {
-          case LInstruction::LOp_InstanceOfO:
-          case LInstruction::LOp_InstanceOfV:
           case LInstruction::LOp_GetPropertyCacheT:
           case LInstruction::LOp_GetPropertyCacheV:
             return codegen->visitOutOfLineCacheGetProperty(this);
@@ -3531,12 +3529,6 @@ CodeGenerator::visitOutOfLineCacheGetProperty(OutOfLineCache *ool)
     PropertyName *name = NULL;
     bool allowGetters = false;
     switch (ins->op()) {
-      case LInstruction::LOp_InstanceOfO:
-      case LInstruction::LOp_InstanceOfV:
-        name = gen->compartment->rt->atomState.classPrototype;
-        objReg = ToRegister(ins->getTemp(1));
-        output = TypedOrValueRegister(MIRType_Object, ToAnyRegister(ins->getDef(0)));
-        break;
       case LInstruction::LOp_GetPropertyCacheT:
         name = ((LGetPropertyCacheT *) ins)->mir()->name();
         objReg = ToRegister(ins->getOperand(0));
@@ -4214,15 +4206,15 @@ CodeGenerator::visitInArray(LInArray *lir)
 }
 
 bool
-CodeGenerator::visitInstanceOfTypedO(LInstanceOfTypedO *ins)
+CodeGenerator::visitInstanceOfO(LInstanceOfO *ins)
 {
-    return emitInstanceOfTyped(ins, ins->mir()->prototypeObject());
+    return emitInstanceOf(ins, ins->mir()->prototypeObject());
 }
 
 bool
-CodeGenerator::visitInstanceOfTypedV(LInstanceOfTypedV *ins)
+CodeGenerator::visitInstanceOfV(LInstanceOfV *ins)
 {
-    return emitInstanceOfTyped(ins, ins->mir()->prototypeObject());
+    return emitInstanceOf(ins, ins->mir()->prototypeObject());
 }
 
 // Wrap IsDelegate, which takes a Value for the lhs of an instanceof.
@@ -4240,7 +4232,7 @@ typedef bool (*IsDelegateObjectFn)(JSContext *, HandleObject, HandleObject, JSBo
 static const VMFunction IsDelegateObjectInfo = FunctionInfo<IsDelegateObjectFn>(IsDelegateObject);
 
 bool
-CodeGenerator::emitInstanceOfTyped(LInstruction *ins, RawObject prototypeObject)
+CodeGenerator::emitInstanceOf(LInstruction *ins, RawObject prototypeObject)
 {
     // This path implements fun_hasInstance when the function's prototype is
     // known to be prototypeObject.
@@ -4250,16 +4242,16 @@ CodeGenerator::emitInstanceOfTyped(LInstruction *ins, RawObject prototypeObject)
 
     // If the lhs is a primitive, the result is false.
     Register objReg;
-    if (ins->isInstanceOfTypedV()) {
+    if (ins->isInstanceOfV()) {
         Label isObject;
-        ValueOperand lhsValue = ToValue(ins, LInstanceOfTypedV::LHS);
+        ValueOperand lhsValue = ToValue(ins, LInstanceOfV::LHS);
         masm.branchTestObject(Assembler::Equal, lhsValue, &isObject);
         masm.mov(Imm32(0), output);
         masm.jump(&done);
         masm.bind(&isObject);
         objReg = masm.extractObject(lhsValue, output);
     } else {
-        objReg = ToRegister(ins->toInstanceOfTypedO()->lhs());
+        objReg = ToRegister(ins->toInstanceOfO()->lhs());
     }
 
     // Crawl the lhs's prototype chain in a loop to search for prototypeObject.
@@ -4311,11 +4303,11 @@ CodeGenerator::emitInstanceOfTyped(LInstruction *ins, RawObject prototypeObject)
     } else {
         masm.bind(&regenerate);
         lazyEntry = &regenerate;
-        if (ins->isInstanceOfTypedV()) {
-            ValueOperand lhsValue = ToValue(ins, LInstanceOfTypedV::LHS);
+        if (ins->isInstanceOfV()) {
+            ValueOperand lhsValue = ToValue(ins, LInstanceOfV::LHS);
             objReg = masm.extractObject(lhsValue, output);
         } else {
-            objReg = ToRegister(ins->toInstanceOfTypedO()->lhs());
+            objReg = ToRegister(ins->toInstanceOfO()->lhs());
         }
         JS_ASSERT(objReg == output);
         masm.jump(ool->entry());
@@ -4329,182 +4321,19 @@ CodeGenerator::emitInstanceOfTyped(LInstruction *ins, RawObject prototypeObject)
     return true;
 }
 
-bool
-CodeGenerator::visitInstanceOfO(LInstanceOfO *ins)
-{
-    Register rhs = ToRegister(ins->getOperand(1));
-    return emitInstanceOf(ins, rhs);
-}
-
-bool
-CodeGenerator::visitInstanceOfV(LInstanceOfV *ins)
-{
-    Register rhs = ToRegister(ins->getOperand(LInstanceOfV::RHS));
-    return emitInstanceOf(ins, rhs);
-}
-
 typedef bool (*HasInstanceFn)(JSContext *, HandleObject, HandleValue, JSBool *);
 static const VMFunction HasInstanceInfo = FunctionInfo<HasInstanceFn>(js::HasInstance);
 
 bool
-CodeGenerator::emitInstanceOf(LInstruction *ins, Register rhs)
+CodeGenerator::visitCallInstanceOf(LCallInstanceOf *ins)
 {
-    Register rhsTmp = ToRegister(ins->getTemp(1));
-    Register output = ToRegister(ins->getDef(0));
+    ValueOperand lhs = ToValue(ins, LCallInstanceOf::LHS);
+    Register rhs = ToRegister(ins->rhs());
+    JS_ASSERT(ToRegister(ins->output()) == ReturnReg);
 
-    // This temporary is used in other parts of the code.
-    // Different names are used so the purpose is clear.
-    Register rhsFlags = ToRegister(ins->getTemp(0));
-    Register lhsTmp = ToRegister(ins->getTemp(0));
-
-    Label boundFunctionCheck;
-    Label boundFunctionDone;
-    Label done;
-    Label loopPrototypeChain;
-
-    JS_ASSERT(ins->isInstanceOfO() || ins->isInstanceOfV());
-    bool lhsIsValue = ins->isInstanceOfV();
-
-    // If the lhs is an object, then the ValueOperand that gets sent to
-    // HasInstance must be boxed first.  If the lhs is a value, it can
-    // be sent directly.  Hence the choice between ToValue and ToTempValue
-    // below.  Note that the same check is done below in the generated code
-    // and explicit boxing instructions emitted before calling the OOL code
-    // if we're handling a LInstanceOfO.
-
-    OutOfLineCode *call = oolCallVM(HasInstanceInfo, ins,
-        (ArgList(), rhs, lhsIsValue ? ToValue(ins, 0) : ToTempValue(ins, 0)),
-        StoreRegisterTo(output));
-    if (!call)
-        return false;
-
-    // 1. CODE FOR HASINSTANCE_BOUND_FUNCTION
-
-    // ASM-equivalent of following code
-    //  boundFunctionCheck:
-    //      if (!rhs->isFunction())
-    //          goto callHasInstance
-    //      if (!rhs->isBoundFunction())
-    //          goto HasInstanceCunction
-    //      rhs = rhs->getBoundFunction();
-    //      goto boundFunctionCheck
-
-    masm.mov(rhs, rhsTmp);
-
-    // Check Function
-    masm.bind(&boundFunctionCheck);
-
-    masm.loadBaseShape(rhsTmp, output);
-    masm.cmpPtr(Address(output, BaseShape::offsetOfClass()), ImmWord(&js::FunctionClass));
-    if (lhsIsValue) {
-        // If the input LHS is a value, no boxing necessary.
-        masm.j(Assembler::NotEqual, call->entry());
-    } else {
-        // If the input LHS is raw object pointer, it must be boxed before
-        // calling into js::HasInstance.
-        Label dontCallHasInstance;
-        masm.j(Assembler::Equal, &dontCallHasInstance);
-        masm.boxNonDouble(JSVAL_TYPE_OBJECT, ToRegister(ins->getOperand(0)), ToTempValue(ins, 0));
-        masm.jump(call->entry());
-        masm.bind(&dontCallHasInstance);
-    }
-
-    // Check Bound Function
-    masm.loadPtr(Address(output, BaseShape::offsetOfFlags()), rhsFlags);
-    masm.and32(Imm32(BaseShape::BOUND_FUNCTION), rhsFlags);
-    masm.j(Assembler::Zero, &boundFunctionDone);
-
-    // Get Bound Function
-    masm.loadPtr(Address(output, BaseShape::offsetOfParent()), rhsTmp);
-    masm.jump(&boundFunctionCheck);
-
-    // 2. CODE FOR HASINSTANCE_FUNCTION
-    masm.bind(&boundFunctionDone);
-
-    // ASM-equivalent of following code
-    //  if (!lhs->isObject()) {
-    //    output = false;
-    //    goto done;
-    //  }
-    //  rhs = rhs->getPrototypeClass();
-    //  output = false;
-    //  while (1) {
-    //    lhs = lhs->getType().proto;
-    //    if (lhs == NULL)
-    //      goto done;
-    //    if (lhs != rhs) {
-    //      output = true;
-    //      goto done;
-    //    }
-    //  }
-
-    // When lhs is a value: The HasInstance for function objects always
-    // return false when lhs isn't an object. So check if
-    // lhs is an object and otherwise return false
-    if (lhsIsValue) {
-        Label isObject;
-        ValueOperand lhsValue = ToValue(ins, LInstanceOfV::LHS);
-        masm.branchTestObject(Assembler::Equal, lhsValue, &isObject);
-        masm.mov(Imm32(0), output);
-        masm.jump(&done);
-
-        masm.bind(&isObject);
-        Register tmp = masm.extractObject(lhsValue, lhsTmp);
-        masm.mov(tmp, lhsTmp);
-    } else {
-        masm.mov(ToRegister(ins->getOperand(0)), lhsTmp);
-    }
-
-    // Get prototype-class by using a OutOfLine GetProperty Cache
-    // It will use register 'rhsTmp' as input and register 'output' as output, see r1889
-    OutOfLineCache *ool = new OutOfLineCache(ins);
-    if (!addOutOfLineCode(ool))
-        return false;
-
-    // If the IC code wants to patch, make sure there is enough space to that
-    // the patching does not overwrite an invalidation marker.
-    ensureOsiSpace();
-
-    CodeOffsetJump jump = masm.jumpWithPatch(ool->repatchEntry());
-    CodeOffsetLabel label = masm.labelForPatch();
-    masm.bind(ool->rejoin());
-    ool->setInlineJump(jump, label);
-
-    // Move the OutOfLineCache return value and set the output on false
-    masm.mov(output, rhsTmp);
-    masm.mov(Imm32(0), output);
-
-    // Walk the prototype chain
-    masm.bind(&loopPrototypeChain);
-    masm.loadPtr(Address(lhsTmp, JSObject::offsetOfType()), lhsTmp);
-    masm.loadPtr(Address(lhsTmp, offsetof(types::TypeObject, proto)), lhsTmp);
-
-    // Bail out if we hit a lazy proto
-    if (lhsIsValue) {
-        masm.branch32(Assembler::Equal, lhsTmp, Imm32(1), call->entry());
-    } else {
-        // If the input LHS is raw object pointer, it must be boxed before
-        // calling into js::HasInstance.
-        Label dontCallHasInstance;
-        masm.branch32(Assembler::NotEqual, lhsTmp, Imm32(1), &dontCallHasInstance);
-        masm.boxNonDouble(JSVAL_TYPE_OBJECT, ToRegister(ins->getOperand(0)), ToTempValue(ins, 0));
-        masm.jump(call->entry());
-        masm.bind(&dontCallHasInstance);
-    }
-
-    masm.testPtr(lhsTmp, lhsTmp);
-    masm.j(Assembler::Zero, &done);
-
-    // Check lhs is equal to rhsShape
-    masm.cmpPtr(lhsTmp, rhsTmp);
-    masm.j(Assembler::NotEqual, &loopPrototypeChain);
-
-    // return true
-    masm.mov(Imm32(1), output);
-
-    masm.bind(call->rejoin());
-    masm.bind(&done);
-    return true;
+    pushArg(lhs);
+    pushArg(rhs);
+    return callVM(HasInstanceInfo, ins);
 }
 
 bool
diff --git a/js/src/ion/CodeGenerator.h b/js/src/ion/CodeGenerator.h
index 5436bd61ceb2..a49749b6b743 100644
--- a/js/src/ion/CodeGenerator.h
+++ b/js/src/ion/CodeGenerator.h
@@ -168,14 +168,12 @@ class CodeGenerator : public CodeGeneratorSpecific
     bool visitCallDeleteProperty(LCallDeleteProperty *lir);
     bool visitBitNotV(LBitNotV *lir);
     bool visitBitOpV(LBitOpV *lir);
-    bool emitInstanceOfTyped(LInstruction *ins, RawObject prototypeObject);
-    bool emitInstanceOf(LInstruction *ins, Register rhs);
+    bool emitInstanceOf(LInstruction *ins, RawObject prototypeObject);
     bool visitIn(LIn *ins);
     bool visitInArray(LInArray *ins);
-    bool visitInstanceOfTypedO(LInstanceOfTypedO *ins);
-    bool visitInstanceOfTypedV(LInstanceOfTypedV *ins);
     bool visitInstanceOfO(LInstanceOfO *ins);
     bool visitInstanceOfV(LInstanceOfV *ins);
+    bool visitCallInstanceOf(LCallInstanceOf *ins);
     bool visitFunctionBoundary(LFunctionBoundary *lir);
     bool visitGetDOMProperty(LGetDOMProperty *lir);
     bool visitSetDOMProperty(LSetDOMProperty *lir);
diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index 5ef9ef76c516..affe4d4920db 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -6527,7 +6527,7 @@ IonBuilder::jsop_instanceof()
         if (!protoObject)
             break;
 
-        MInstanceOfTyped *ins = new MInstanceOfTyped(obj, protoObject);
+        MInstanceOf *ins = new MInstanceOf(obj, protoObject);
 
         current->add(ins);
         current->push(ins);
@@ -6535,7 +6535,7 @@ IonBuilder::jsop_instanceof()
         return resumeAfter(ins);
     } while (false);
 
-    MInstanceOf *ins = new MInstanceOf(obj, rhs);
+    MCallInstanceOf *ins = new MCallInstanceOf(obj, rhs);
 
     current->add(ins);
     current->push(ins);
diff --git a/js/src/ion/IonCaches.cpp b/js/src/ion/IonCaches.cpp
index b0d44fca1086..f8c4e1fbaeb2 100644
--- a/js/src/ion/IonCaches.cpp
+++ b/js/src/ion/IonCaches.cpp
@@ -1927,4 +1927,3 @@ js::ion::GetNameCache(JSContext *cx, size_t cacheIndex, HandleObject scopeChain,
 
     return true;
 }
-
diff --git a/js/src/ion/LIR-Common.h b/js/src/ion/LIR-Common.h
index 62002eb56bde..774f7cbc0e3d 100644
--- a/js/src/ion/LIR-Common.h
+++ b/js/src/ion/LIR-Common.h
@@ -3146,16 +3146,16 @@ class LIn : public LCallInstructionHelper<1, BOX_PIECES+1, 0>
     static const size_t RHS = BOX_PIECES;
 };
 
-class LInstanceOfTypedO : public LInstructionHelper<1, 1, 0>
+class LInstanceOfO : public LInstructionHelper<1, 1, 0>
 {
   public:
-    LIR_HEADER(InstanceOfTypedO);
-    LInstanceOfTypedO(const LAllocation &lhs) {
+    LIR_HEADER(InstanceOfO);
+    LInstanceOfO(const LAllocation &lhs) {
         setOperand(0, lhs);
     }
 
-    MInstanceOfTyped *mir() const {
-        return mir_->toInstanceOfTyped();
+    MInstanceOf *mir() const {
+        return mir_->toInstanceOf();
     }
 
     const LAllocation *lhs() {
@@ -3163,15 +3163,15 @@ class LInstanceOfTypedO : public LInstructionHelper<1, 1, 0>
     }
 };
 
-class LInstanceOfTypedV : public LInstructionHelper<1, BOX_PIECES, 0>
+class LInstanceOfV : public LInstructionHelper<1, BOX_PIECES, 0>
 {
   public:
-    LIR_HEADER(InstanceOfTypedV);
-    LInstanceOfTypedV() {
+    LIR_HEADER(InstanceOfV);
+    LInstanceOfV() {
     }
 
-    MInstanceOfTyped *mir() const {
-        return mir_->toInstanceOfTyped();
+    MInstanceOf *mir() const {
+        return mir_->toInstanceOf();
     }
 
     const LAllocation *lhs() {
@@ -3181,37 +3181,17 @@ class LInstanceOfTypedV : public LInstructionHelper<1, BOX_PIECES, 0>
     static const size_t LHS = 0;
 };
 
-class LInstanceOfO : public LInstructionHelper<1, 2, 2>
+class LCallInstanceOf : public LCallInstructionHelper<1, BOX_PIECES+1, 0>
 {
   public:
-    LIR_HEADER(InstanceOfO);
-    LInstanceOfO(const LAllocation &lhs, const LAllocation &rhs,
-                 const LDefinition &temp, const LDefinition &temp2)
-    {
-        setOperand(0, lhs);
-        setOperand(1, rhs);
-        setTemp(0, temp);
-        setTemp(1, temp2);
-    }
-
-    const LAllocation *lhs() {
-        return getOperand(0);
-    }
-    const LAllocation *rhs() {
-        return getOperand(1);
-    }
-};
-
-class LInstanceOfV : public LInstructionHelper<1, BOX_PIECES+1, 2>
-{
-  public:
-    LIR_HEADER(InstanceOfV);
-    LInstanceOfV(const LAllocation &rhs, const LDefinition &temp, const LDefinition &temp2) {
+    LIR_HEADER(CallInstanceOf);
+    LCallInstanceOf(const LAllocation &rhs) {
         setOperand(RHS, rhs);
-        setTemp(0, temp);
-        setTemp(1, temp2);
     }
 
+    const LDefinition *output() {
+        return this->getDef(0);
+    }
     const LAllocation *lhs() {
         return getOperand(LHS);
     }
diff --git a/js/src/ion/LOpcodes.h b/js/src/ion/LOpcodes.h
index be0918ca31c1..24eea979a7b1 100644
--- a/js/src/ion/LOpcodes.h
+++ b/js/src/ion/LOpcodes.h
@@ -169,10 +169,9 @@
     _(Round)                        \
     _(In)                           \
     _(InArray)                      \
-    _(InstanceOfTypedO)             \
-    _(InstanceOfTypedV)             \
     _(InstanceOfO)                  \
     _(InstanceOfV)                  \
+    _(CallInstanceOf)               \
     _(InterruptCheck)               \
     _(FunctionBoundary)             \
     _(GetDOMProperty)               \
diff --git a/js/src/ion/Lowering.cpp b/js/src/ion/Lowering.cpp
index a8a8e6ab4582..1b8bc80e9c80 100644
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -1925,37 +1925,34 @@ LIRGenerator::visitIn(MIn *ins)
 }
 
 bool
-LIRGenerator::visitInstanceOfTyped(MInstanceOfTyped *ins)
+LIRGenerator::visitInstanceOf(MInstanceOf *ins)
 {
     MDefinition *lhs = ins->getOperand(0);
 
     JS_ASSERT(lhs->type() == MIRType_Value || lhs->type() == MIRType_Object);
 
     if (lhs->type() == MIRType_Object) {
-        LInstanceOfTypedO *lir = new LInstanceOfTypedO(useRegister(lhs));
+        LInstanceOfO *lir = new LInstanceOfO(useRegister(lhs));
         return define(lir, ins) && assignSafepoint(lir, ins);
     }
 
-    LInstanceOfTypedV *lir = new LInstanceOfTypedV();
-    return useBox(lir, LInstanceOfTypedV::LHS, lhs) && define(lir, ins) && assignSafepoint(lir, ins);
+    LInstanceOfV *lir = new LInstanceOfV();
+    return useBox(lir, LInstanceOfV::LHS, lhs) && define(lir, ins) && assignSafepoint(lir, ins);
 }
 
 bool
-LIRGenerator::visitInstanceOf(MInstanceOf *ins)
+LIRGenerator::visitCallInstanceOf(MCallInstanceOf *ins)
 {
     MDefinition *lhs = ins->lhs();
     MDefinition *rhs = ins->rhs();
 
-    JS_ASSERT(lhs->type() == MIRType_Value || lhs->type() == MIRType_Object);
+    JS_ASSERT(lhs->type() == MIRType_Value);
     JS_ASSERT(rhs->type() == MIRType_Object);
 
-    if (lhs->type() == MIRType_Object) {
-        LInstanceOfO *lir = new LInstanceOfO(useRegister(lhs), useRegister(rhs), temp(), temp());
-        return define(lir, ins) && assignSafepoint(lir, ins);
-    }
-
-    LInstanceOfV *lir = new LInstanceOfV(useRegister(rhs), temp(), temp());
-    return useBox(lir, LInstanceOfV::LHS, lhs) && define(lir, ins) && assignSafepoint(lir, ins);
+    LCallInstanceOf *lir = new LCallInstanceOf(useRegisterAtStart(rhs));
+    if (!useBoxAtStart(lir, LCallInstanceOf::LHS, lhs))
+        return false;
+    return defineVMReturn(lir, ins) && assignSafepoint(lir, ins);
 }
 
 bool
diff --git a/js/src/ion/Lowering.h b/js/src/ion/Lowering.h
index de9b93d1bf39..4c8cc507b8d4 100644
--- a/js/src/ion/Lowering.h
+++ b/js/src/ion/Lowering.h
@@ -184,8 +184,8 @@ class LIRGenerator : public LIRGeneratorSpecific
     bool visitThrow(MThrow *ins);
     bool visitIn(MIn *ins);
     bool visitInArray(MInArray *ins);
-    bool visitInstanceOfTyped(MInstanceOfTyped *ins);
     bool visitInstanceOf(MInstanceOf *ins);
+    bool visitCallInstanceOf(MCallInstanceOf *ins);
     bool visitFunctionBoundary(MFunctionBoundary *ins);
     bool visitSetDOMProperty(MSetDOMProperty *ins);
     bool visitGetDOMProperty(MGetDOMProperty *ins);
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index 83fc476bb021..b216ea435819 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -5246,21 +5246,21 @@ class MInArray
 };
 
 // Implementation for instanceof operator with specific rhs.
-class MInstanceOfTyped
+class MInstanceOf
   : public MUnaryInstruction,
     public InstanceOfPolicy
 {
     CompilerRootObject protoObj_;
 
   public:
-    MInstanceOfTyped(MDefinition *obj, RawObject proto)
+    MInstanceOf(MDefinition *obj, RawObject proto)
       : MUnaryInstruction(obj)
     {
         protoObj_ = proto;
         setResultType(MIRType_Boolean);
     }
 
-    INSTRUCTION_HEADER(InstanceOfTyped);
+    INSTRUCTION_HEADER(InstanceOf);
 
     TypePolicy *typePolicy() {
         return this;
@@ -5272,18 +5272,18 @@ class MInstanceOfTyped
 };
 
 // Implementation for instanceof operator with unknown rhs.
-class MInstanceOf
+class MCallInstanceOf
   : public MBinaryInstruction,
-    public InstanceOfPolicy
+    public MixPolicy<BoxPolicy<0>, ObjectPolicy<1> >
 {
   public:
-    MInstanceOf(MDefinition *obj, MDefinition *proto)
+    MCallInstanceOf(MDefinition *obj, MDefinition *proto)
       : MBinaryInstruction(obj, proto)
     {
         setResultType(MIRType_Boolean);
     }
 
-    INSTRUCTION_HEADER(InstanceOf);
+    INSTRUCTION_HEADER(CallInstanceOf);
 
     TypePolicy *typePolicy() {
         return this;
diff --git a/js/src/ion/MOpcodes.h b/js/src/ion/MOpcodes.h
index 69e266af26f9..b0fa88ce18c9 100644
--- a/js/src/ion/MOpcodes.h
+++ b/js/src/ion/MOpcodes.h
@@ -133,8 +133,8 @@ namespace ion {
     _(Floor)                                                                \
     _(Round)                                                                \
     _(In)                                                                   \
-    _(InstanceOfTyped)                                                      \
     _(InstanceOf)                                                           \
+    _(CallInstanceOf)                                                       \
     _(InterruptCheck)                                                       \
     _(FunctionBoundary)                                                     \
     _(GetDOMProperty)                                                       \
diff --git a/js/src/ion/TypePolicy.cpp b/js/src/ion/TypePolicy.cpp
index 13fb0bd2d244..9c370f930d03 100644
--- a/js/src/ion/TypePolicy.cpp
+++ b/js/src/ion/TypePolicy.cpp
@@ -386,12 +386,6 @@ InstanceOfPolicy::adjustInputs(MInstruction *def)
        BoxPolicy<0>::staticAdjustInputs(def);
     }
 
-    if (def->numOperands() == 2) {
-        // Unbox second operand forcefully to an object,
-        // so it bailouts with other types
-        ObjectPolicy<1>::staticAdjustInputs(def);
-    }
-
     return true;
 }
 
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index d1c19ff387e7..8cdbbbed35bb 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -480,11 +480,8 @@ fun_hasInstance(JSContext *cx, HandleObject objArg, MutableHandleValue v, JSBool
 {
     RootedObject obj(cx, objArg);
 
-    while (obj->isFunction()) {
-        if (!obj->isBoundFunction())
-            break;
+    while (obj->isFunction() && obj->isBoundFunction())
         obj = obj->toFunction()->getBoundFunctionTarget();
-    }
 
     RootedValue pval(cx);
     if (!JSObject::getProperty(cx, obj, obj, cx->names().classPrototype, &pval))

From 94357a1f788c9e419f58d91cf955cdee28ce4680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Mon, 26 Nov 2012 20:03:43 -0800
Subject: [PATCH 100/160] Bug 813195 - [Apps] Cannot retry to download hosted
 apps with cache manifest [r=ferjm]

---
 dom/apps/src/Webapps.js  |  2 ++
 dom/apps/src/Webapps.jsm | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/dom/apps/src/Webapps.js b/dom/apps/src/Webapps.js
index 83f44d42b79a..0caba66958c1 100644
--- a/dom/apps/src/Webapps.js
+++ b/dom/apps/src/Webapps.js
@@ -540,6 +540,7 @@ WebappsApplication.prototype = {
           this.installState = msg.installState;
           if (this.installState == "installed") {
             this._downloadError = null;
+            this.downloading = false;
             this._fireEvent("downloadsuccess", this._ondownloadsuccess);
             this._fireEvent("downloadapplied", this._ondownloadapplied);
           } else {
@@ -607,6 +608,7 @@ WebappsApplication.prototype = {
               this.downloadAvailable = app.downloadAvailable;
               this.readyToApplyDownload = app.readyToApplyDownload;
               this.updateTime = app.updateTime;
+              this._manifest = msg.manifest;
               this._fireEvent("downloadsuccess", this._ondownloadsuccess);
               break;
             case "applied":
diff --git a/dom/apps/src/Webapps.jsm b/dom/apps/src/Webapps.jsm
index 2e017ea287d3..36bff69b34cf 100644
--- a/dom/apps/src/Webapps.jsm
+++ b/dom/apps/src/Webapps.jsm
@@ -20,7 +20,7 @@ Cu.import("resource://gre/modules/PermissionsInstaller.jsm");
 Cu.import("resource://gre/modules/OfflineCacheInstaller.jsm");
 
 function debug(aMsg) {
-  //dump("-*-*- Webapps.jsm : " + aMsg + "\n");
+  dump("-*-*- Webapps.jsm : " + aMsg + "\n");
 }
 
 const WEBAPP_RUNTIME = Services.appinfo.ID == "webapprt@mozilla.org";
@@ -783,6 +783,31 @@ this.DOMApplicationRegistry = {
     let file = FileUtils.getFile(DIRECTORY_NAME,
                                  ["webapps", id, "update.webapp"], true);
 
+    if (!file.exists()) {
+      // This is a hosted app, let's check if it has an appcache
+      // and download it.
+      this._readManifests([{ id: id }], (function readManifest(aResults) {
+        let jsonManifest = aResults[0].manifest;
+        let manifest = new ManifestHelper(jsonManifest, app.origin);
+
+        if (manifest.appcache_path) {
+          debug("appcache found");
+          app.installState = "updating";
+          this.startOfflineCacheDownload(manifest, app);
+        } else {
+          // hosted app with no appcache, nothing to do, but we fire a
+          // downloaded event
+          DOMApplicationRegistry.broadcastMessage("Webapps:PackageEvent",
+                                                  { type: "downloaded",
+                                                    manifestURL: aManifestURL,
+                                                    app: app,
+                                                    manifest: jsonManifest });
+        }
+      }).bind(this));
+
+      return;
+    }
+
     this._loadJSONAsync(file, (function(aJSON) {
       if (!aJSON) {
         debug("startDownload: No update manifest found at " + file.path + " " + aManifestURL);
@@ -1899,6 +1924,8 @@ this.DOMApplicationRegistry = {
  * Appcache download observer
  */
 let AppcacheObserver = function(aApp) {
+  debug("Creating AppcacheObserver for " + aApp.origin +
+        " - " + aApp.installState);
   this.app = aApp;
   this.startStatus = aApp.installState;
 };
@@ -1909,7 +1936,10 @@ AppcacheObserver.prototype = {
     let mustSave = false;
     let app = this.app;
 
+    debug("Offline cache state change for " + app.origin + " : " + aState);
+
     let setStatus = function appObs_setStatus(aStatus) {
+      debug("Offlinecache setStatus to " + aStatus + " for " + app.origin);
       mustSave = (app.installState != aStatus);
       app.installState = aStatus;
       app.downloading = false;
@@ -1919,6 +1949,7 @@ AppcacheObserver.prototype = {
     }
 
     let setError = function appObs_setError(aError) {
+      debug("Offlinecache setError to " + aError);
       DOMApplicationRegistry.broadcastMessage("Webapps:OfflineCache",
                                               { manifest: app.manifestURL,
                                                 error: aError });

From ad69bc93e8088a34bf2230e569a6fd008c1ae24a Mon Sep 17 00:00:00 2001
From: Edwin Flores <eflores@mozilla.com>
Date: Tue, 27 Nov 2012 17:08:40 +1300
Subject: [PATCH 101/160] Bug 812756 - Remove seeking hack from OMX decoder
 r=cpearce

---
 content/media/omx/MPAPI.h            |  1 +
 content/media/omx/MediaOmxReader.cpp | 15 +++++++++++++--
 content/media/omx/MediaOmxReader.h   |  1 +
 content/media/omx/OmxDecoder.cpp     |  9 ++++++---
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/content/media/omx/MPAPI.h b/content/media/omx/MPAPI.h
index a48daa0183ed..ed3b2422e514 100644
--- a/content/media/omx/MPAPI.h
+++ b/content/media/omx/MPAPI.h
@@ -24,6 +24,7 @@ struct VideoFrame {
   int64_t mTimeUs;
   int64_t mEndTimeUs;
   bool mKeyFrame;
+  bool mShouldSkip;
   void *mData;
   size_t mSize;
   int32_t mStride;
diff --git a/content/media/omx/MediaOmxReader.cpp b/content/media/omx/MediaOmxReader.cpp
index 8010c105a270..7d55d7b09e52 100644
--- a/content/media/omx/MediaOmxReader.cpp
+++ b/content/media/omx/MediaOmxReader.cpp
@@ -14,6 +14,8 @@
 #include "MediaOmxDecoder.h"
 #include "AbstractMediaDecoder.h"
 
+#define MAX_DROPPED_FRAMES 25
+
 using namespace android;
 
 namespace mozilla {
@@ -25,7 +27,8 @@ MediaOmxReader::MediaOmxReader(AbstractMediaDecoder *aDecoder) :
   mHasAudio(false),
   mVideoSeekTimeUs(-1),
   mAudioSeekTimeUs(-1),
-  mLastVideoFrame(nullptr)
+  mLastVideoFrame(nullptr),
+  mSkipCount(0)
 {
 }
 
@@ -142,6 +145,7 @@ bool MediaOmxReader::DecodeVideoFrame(bool &aKeyframeSkip,
   while (true) {
     MPAPI::VideoFrame frame;
     frame.mGraphicBuffer = nullptr;
+    frame.mShouldSkip = false;
     if (!mOmxDecoder->ReadVideo(&frame, aTimeThreshold, aKeyframeSkip, doSeek)) {
       // We reached the end of the video stream. If we have a buffered
       // video frame, push it the video queue using the total duration
@@ -159,6 +163,14 @@ bool MediaOmxReader::DecodeVideoFrame(bool &aKeyframeSkip,
       return false;
     }
 
+    parsed++;
+    if (frame.mShouldSkip && mSkipCount < MAX_DROPPED_FRAMES) {
+      mSkipCount++;
+      return true;
+    }
+
+    mSkipCount = 0;
+
     mVideoSeekTimeUs = -1;
     doSeek = aKeyframeSkip = false;
 
@@ -229,7 +241,6 @@ bool MediaOmxReader::DecodeVideoFrame(bool &aKeyframeSkip,
       return false;
     }
 
-    parsed++;
     decoded++;
     NS_ASSERTION(decoded <= parsed, "Expect to decode fewer frames than parsed in MediaPlugin...");
 
diff --git a/content/media/omx/MediaOmxReader.h b/content/media/omx/MediaOmxReader.h
index 519d267d3cca..ecf0e809d295 100644
--- a/content/media/omx/MediaOmxReader.h
+++ b/content/media/omx/MediaOmxReader.h
@@ -28,6 +28,7 @@ class MediaOmxReader : public MediaDecoderReader
   int64_t mVideoSeekTimeUs;
   int64_t mAudioSeekTimeUs;
   VideoData *mLastVideoFrame;
+  int32_t mSkipCount;
 public:
   MediaOmxReader(AbstractMediaDecoder* aDecoder);
   ~MediaOmxReader();
diff --git a/content/media/omx/OmxDecoder.cpp b/content/media/omx/OmxDecoder.cpp
index ef577630bc2a..d1b7c6d458e4 100644
--- a/content/media/omx/OmxDecoder.cpp
+++ b/content/media/omx/OmxDecoder.cpp
@@ -458,10 +458,9 @@ bool OmxDecoder::ReadVideo(VideoFrame *aFrame, int64_t aTimeUs,
 
   status_t err;
 
-  if (aDoSeek || aKeyframeSkip) {
+  if (aDoSeek) {
     MediaSource::ReadOptions options;
-    options.setSeekTo(aTimeUs, aDoSeek ? MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC :
-                                         MediaSource::ReadOptions::SEEK_NEXT_SYNC);
+    options.setSeekTo(aTimeUs, MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC);
     err = mVideoSource->read(&mVideoBuffer, &options);
   } else {
     err = mVideoSource->read(&mVideoBuffer);
@@ -514,6 +513,10 @@ bool OmxDecoder::ReadVideo(VideoFrame *aFrame, int64_t aTimeUs,
       aFrame->mEndTimeUs = timeUs + durationUs;
     }
 
+    if (aKeyframeSkip && timeUs < aTimeUs) {
+      aFrame->mShouldSkip = true;
+    }
+
   }
   else if (err == INFO_FORMAT_CHANGED) {
     // If the format changed, update our cached info.

From c2934219f5da6e736027b5bce0ae2bcce1493073 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 23 Nov 2012 18:33:41 -0500
Subject: [PATCH 102/160] Bug 814789 - Tie the life-time of the AudioContext to
 the life-time of the document owning it; r=bzbarsky

---
 content/media/webaudio/AudioContext.cpp |  3 ++-
 content/media/webaudio/AudioContext.h   |  2 ++
 dom/base/nsGlobalWindow.cpp             | 12 ++++++++++++
 dom/base/nsPIDOMWindow.h                | 17 +++++++++++++++--
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/content/media/webaudio/AudioContext.cpp b/content/media/webaudio/AudioContext.cpp
index ce589933c691..b3e1ba972cd5 100644
--- a/content/media/webaudio/AudioContext.cpp
+++ b/content/media/webaudio/AudioContext.cpp
@@ -60,7 +60,7 @@ AudioContext::WrapObject(JSContext* aCx, JSObject* aScope,
 /* static */ already_AddRefed<AudioContext>
 AudioContext::Constructor(nsISupports* aGlobal, ErrorResult& aRv)
 {
-  nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(aGlobal);
+  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobal);
   if (!window) {
     aRv.Throw(NS_ERROR_FAILURE);
     return nullptr;
@@ -68,6 +68,7 @@ AudioContext::Constructor(nsISupports* aGlobal, ErrorResult& aRv)
 
   AudioContext* object = new AudioContext(window);
   NS_ADDREF(object);
+  window->AddAudioContext(object);
   return object;
 }
 
diff --git a/content/media/webaudio/AudioContext.h b/content/media/webaudio/AudioContext.h
index 293d99f4798b..5918c46ee2bc 100644
--- a/content/media/webaudio/AudioContext.h
+++ b/content/media/webaudio/AudioContext.h
@@ -49,6 +49,8 @@ public:
     return mWindow;
   }
 
+  void Shutdown() {}
+
   virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope,
                                bool* aTriedToWrap);
 
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 0c2533ae640b..556dac6140ac 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -224,6 +224,7 @@
 #include "nsSandboxFlags.h"
 #include "TimeChangeObserver.h"
 #include "nsPISocketTransportService.h"
+#include "mozilla/dom/AudioContext.h"
 
 #ifdef ANDROID
 #include <android/log.h>
@@ -1121,6 +1122,11 @@ nsGlobalWindow::FreeInnerObjects()
 
   CleanupCachedXBLHandlers(this);
 
+  for (uint32_t i = 0; i < mAudioContexts.Length(); ++i) {
+    mAudioContexts[i]->Shutdown();
+  }
+  mAudioContexts.Clear();
+
 #ifdef DEBUG
   nsCycleCollector_DEBUG_shouldBeFreed(static_cast<nsIScriptGlobalObject*>(this));
 #endif
@@ -2800,6 +2806,12 @@ nsPIDOMWindow::MaybeCreateDoc()
   }
 }
 
+void
+nsPIDOMWindow::AddAudioContext(AudioContext* aAudioContext)
+{
+  mAudioContexts.AppendElement(aAudioContext);
+}
+
 NS_IMETHODIMP
 nsGlobalWindow::GetDocument(nsIDOMDocument** aDocument)
 {
diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
index c7ceb553a841..37f73fbb008a 100644
--- a/dom/base/nsPIDOMWindow.h
+++ b/dom/base/nsPIDOMWindow.h
@@ -16,6 +16,8 @@
 #include "nsIDOMEventTarget.h"
 #include "nsIDOMDocument.h"
 #include "nsCOMPtr.h"
+#include "nsAutoPtr.h"
+#include "nsTArray.h"
 #include "nsIURI.h"
 
 #define DOM_WINDOW_DESTROYED_TOPIC "dom-window-destroyed"
@@ -47,9 +49,15 @@ class nsXBLPrototypeHandler;
 class nsIArray;
 class nsPIWindowRoot;
 
+namespace mozilla {
+namespace dom {
+class AudioContext;
+}
+}
+
 #define NS_PIDOMWINDOW_IID \
-{ 0x7b18e421, 0x2179, 0x4e24, \
-  { 0x96, 0x58, 0x26, 0x75, 0xa4, 0x37, 0xf3, 0x8f } }
+{ 0xf5af1c3c, 0xebad, 0x4d00, \
+  { 0xa2, 0xa4, 0x12, 0x2e, 0x27, 0x16, 0x59, 0x01 } }
 
 class nsPIDOMWindow : public nsIDOMWindowInternal
 {
@@ -628,6 +636,8 @@ public:
   OpenNoNavigate(const nsAString& aUrl, const nsAString& aName,
                  const nsAString& aOptions, nsIDOMWindow **_retval) = 0;
 
+  void AddAudioContext(mozilla::dom::AudioContext* aAudioContext);
+
 protected:
   // The nsPIDOMWindow constructor. The aOuterWindow argument should
   // be null if and only if the created window itself is an outer
@@ -693,6 +703,9 @@ protected:
   // window is active
   nsCOMPtr<nsIContent> mFocusedNode;
 
+  // The AudioContexts created for the current document, if any.
+  nsTArray<nsRefPtr<mozilla::dom::AudioContext> > mAudioContexts;
+
   // A unique (as long as our 64-bit counter doesn't roll over) id for
   // this window.
   uint64_t mWindowID;

From 264de812cd6a18cc99d7b0029831c64ef2b191a0 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Fri, 23 Nov 2012 23:18:59 -0500
Subject: [PATCH 103/160] Count instruction and spill code bytes in Ion basic
 blocks, bug 814489. r=pierron

---
 js/src/ion/CodeGenerator.cpp | 80 +++++++++++++++++++++++++++++++-----
 js/src/ion/IonCode.h         | 23 ++++++++++-
 js/src/jsopcode.cpp          |  9 +++-
 3 files changed, 99 insertions(+), 13 deletions(-)

diff --git a/js/src/ion/CodeGenerator.cpp b/js/src/ion/CodeGenerator.cpp
index cc6fa67945b9..aa72a8851471 100644
--- a/js/src/ion/CodeGenerator.cpp
+++ b/js/src/ion/CodeGenerator.cpp
@@ -1435,6 +1435,70 @@ CodeGenerator::maybeCreateScriptCounts()
     return counts;
 }
 
+// Structure for managing the state tracked for a block by script counters.
+struct ScriptCountBlockState
+{
+    IonBlockCounts &block;
+    MacroAssembler &masm;
+
+    Sprinter printer;
+
+    uint32 instructionBytes;
+    uint32 spillBytes;
+
+    // Pointer to instructionBytes, spillBytes, or NULL, depending on the last
+    // instruction processed.
+    uint32 *last;
+    uint32 lastLength;
+
+  public:
+    ScriptCountBlockState(IonBlockCounts *block, MacroAssembler *masm)
+      : block(*block), masm(*masm),
+        printer(GetIonContext()->cx),
+        instructionBytes(0), spillBytes(0), last(NULL), lastLength(0)
+    {
+    }
+
+    bool init()
+    {
+        if (!printer.init())
+            return false;
+
+        // Bump the hit count for the block at the start. This code is not
+        // included in either the text for the block or the instruction byte
+        // counts.
+        masm.inc64(AbsoluteAddress(block.addressOfHitCount()));
+
+        // Collect human readable assembly for the code generated in the block.
+        masm.setPrinter(&printer);
+
+        return true;
+    }
+
+    void visitInstruction(LInstruction *ins)
+    {
+        if (last)
+            *last += masm.size() - lastLength;
+        lastLength = masm.size();
+        last = ins->isMoveGroup() ? &spillBytes : &instructionBytes;
+
+        // Prefix stream of assembly instructions with their LIR instruction name.
+        printer.printf("[%s]\n", ins->opName());
+    }
+
+    ~ScriptCountBlockState()
+    {
+        masm.setPrinter(NULL);
+
+        if (last)
+            *last += masm.size() - lastLength;
+
+        block.setCode(printer.string());
+        block.setInstructionBytes(instructionBytes);
+        block.setSpillBytes(spillBytes);
+    }
+};
+
 bool
 CodeGenerator::generateBody()
 {
@@ -1451,19 +1515,18 @@ CodeGenerator::generateBody()
             return false;
         iter++;
 
-        mozilla::Maybe<Sprinter> printer;
+        mozilla::Maybe<ScriptCountBlockState> blockCounts;
         if (counts) {
-            masm.inc64(AbsoluteAddress(counts->block(i).addressOfHitCount()));
-            printer.construct(GetIonContext()->cx);
-            if (!printer.ref().init())
+            blockCounts.construct(&counts->block(i), &masm);
+            if (!blockCounts.ref().init())
                 return false;
-            masm.setPrinter(printer.addr());
         }
 
         for (; iter != current->end(); iter++) {
             IonSpew(IonSpew_Codegen, "instruction %s", iter->opName());
+
             if (counts)
-                printer.ref().printf("[%s]\n", iter->opName());
+                blockCounts.ref().visitInstruction(*iter);
 
             if (iter->safepoint() && pushedArgumentSlots_.length()) {
                 if (!markArgumentSlots(iter->safepoint()))
@@ -1475,11 +1538,6 @@ CodeGenerator::generateBody()
         }
         if (masm.oom())
             return false;
-
-        if (counts) {
-            counts->block(i).setCode(printer.ref().string());
-            masm.setPrinter(NULL);
-        }
     }
 
     JS_ASSERT(pushedArgumentSlots_.empty());
diff --git a/js/src/ion/IonCode.h b/js/src/ion/IonCode.h
index b08427975dac..1fb62f5f9f53 100644
--- a/js/src/ion/IonCode.h
+++ b/js/src/ion/IonCode.h
@@ -420,9 +420,14 @@ struct IonBlockCounts
     // Hit count for this block.
     uint64 hitCount_;
 
-    // Information about the code generated for this block.
+    // Text information about the code generated for this block.
     char *code_;
 
+    // Number of bytes of code generated in this block. Spill code is counted
+    // separately from other, instruction implementing code.
+    uint32 instructionBytes_;
+    uint32 spillBytes_;
+
   public:
 
     bool init(uint32 id, uint32 offset, uint32 numSuccessors) {
@@ -485,6 +490,22 @@ struct IonBlockCounts
     const char *code() const {
         return code_;
     }
+
+    void setInstructionBytes(uint32 bytes) {
+        instructionBytes_ = bytes;
+    }
+
+    uint32 instructionBytes() const {
+        return instructionBytes_;
+    }
+
+    void setSpillBytes(uint32 bytes) {
+        spillBytes_ = bytes;
+    }
+
+    uint32 spillBytes() const {
+        return spillBytes_;
+    }
 };
 
 // Execution information for a compiled script which may persist after the
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index 29867a81a1c7..ffcfd8dcba67 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -328,7 +328,8 @@ js_DumpPCCounts(JSContext *cx, HandleScript script, js::Sprinter *sp)
             Sprint(sp, "BB #%lu [%05u]", block.id(), block.offset());
             for (size_t j = 0; j < block.numSuccessors(); j++)
                 Sprint(sp, " -> #%lu", block.successor(j));
-            Sprint(sp, " :: %llu hits\n", block.hitCount());
+            Sprint(sp, " :: %llu hits %u instruction bytes %u spill bytes\n",
+                   block.hitCount(), block.instructionBytes(), block.spillBytes());
             Sprint(sp, "%s\n", block.code());
         }
         ionCounts = ionCounts->previous();
@@ -7209,6 +7210,12 @@ GetPCCountJSON(JSContext *cx, const ScriptAndCounts &sac, StringBuffer &buf)
                     return false;
                 buf.append(str);
 
+                AppendJSONProperty(buf, "instructionBytes");
+                NumberValueToStringBuffer(cx, Int32Value(block.instructionBytes()), buf);
+
+                AppendJSONProperty(buf, "spillBytes");
+                NumberValueToStringBuffer(cx, Int32Value(block.spillBytes()), buf);
+
                 buf.append('}');
             }
             buf.append(']');

From 3793b5dfd6098768089cccd8ad5c05966e82cda3 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Fri, 23 Nov 2012 23:23:03 -0500
Subject: [PATCH 104/160] Add symbolic range analysis for loop induction
 variables, bug 766592. r=mjrosenb

---
 js/src/ion/Ion.cpp           |  22 +-
 js/src/ion/IonAnalysis.cpp   | 175 ++++++-
 js/src/ion/IonAnalysis.h     |  57 ++-
 js/src/ion/JSONSpewer.cpp    |  11 +-
 js/src/ion/LICM.cpp          | 296 +-----------
 js/src/ion/LICM.h            |  17 +-
 js/src/ion/Lowering.cpp      |   1 +
 js/src/ion/MIR.cpp           | 113 +++--
 js/src/ion/MIR.h             | 179 +++-----
 js/src/ion/MIRGraph.h        |   5 -
 js/src/ion/RangeAnalysis.cpp | 866 ++++++++++++++++++++++++++++-------
 js/src/ion/RangeAnalysis.h   | 157 ++++---
 12 files changed, 1150 insertions(+), 749 deletions(-)

diff --git a/js/src/ion/Ion.cpp b/js/src/ion/Ion.cpp
index b0d72c7a8b97..250d5bc126f8 100644
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -868,6 +868,17 @@ CompileBackEnd(MIRGenerator *mir)
             return NULL;
     }
 
+    if (js_IonOptions.licm) {
+        LICM licm(mir, graph);
+        if (!licm.analyze())
+            return NULL;
+        IonSpewPass("LICM");
+        AssertGraphCoherency(graph);
+
+        if (mir->shouldCancel("LICM"))
+            return NULL;
+    }
+
     if (js_IonOptions.rangeAnalysis) {
         RangeAnalysis r(graph);
         if (!r.addBetaNobes())
@@ -903,17 +914,6 @@ CompileBackEnd(MIRGenerator *mir)
     if (mir->shouldCancel("DCE"))
         return NULL;
 
-    if (js_IonOptions.licm) {
-        LICM licm(mir, graph);
-        if (!licm.analyze())
-            return NULL;
-        IonSpewPass("LICM");
-        AssertGraphCoherency(graph);
-
-        if (mir->shouldCancel("LICM"))
-            return NULL;
-    }
-
     if (js_IonOptions.edgeCaseAnalysis) {
         EdgeCaseAnalysis edgeCaseAnalysis(mir, graph);
         if (!edgeCaseAnalysis.analyzeLate())
diff --git a/js/src/ion/IonAnalysis.cpp b/js/src/ion/IonAnalysis.cpp
index 111a00c770f2..243e9392f8ff 100644
--- a/js/src/ion/IonAnalysis.cpp
+++ b/js/src/ion/IonAnalysis.cpp
@@ -812,7 +812,7 @@ typedef HashMap<uint32,
 static HashNumber
 BoundsCheckHashIgnoreOffset(MBoundsCheck *check)
 {
-    LinearSum indexSum = ExtractLinearSum(check->index());
+    SimpleLinearSum indexSum = ExtractLinearSum(check->index());
     uintptr_t index = indexSum.term ? uintptr_t(indexSum.term) : 0;
     uintptr_t length = uintptr_t(check->length());
     return index ^ length;
@@ -840,43 +840,105 @@ FindDominatingBoundsCheck(BoundsCheckMap &checks, MBoundsCheck *check, size_t in
 }
 
 // Extract a linear sum from ins, if possible (otherwise giving the sum 'ins + 0').
-LinearSum
+SimpleLinearSum
 ion::ExtractLinearSum(MDefinition *ins)
 {
+    if (ins->isBeta())
+        ins = ins->getOperand(0);
+
     if (ins->type() != MIRType_Int32)
-        return LinearSum(ins, 0);
+        return SimpleLinearSum(ins, 0);
 
     if (ins->isConstant()) {
         const Value &v = ins->toConstant()->value();
         JS_ASSERT(v.isInt32());
-        return LinearSum(NULL, v.toInt32());
+        return SimpleLinearSum(NULL, v.toInt32());
     } else if (ins->isAdd() || ins->isSub()) {
         MDefinition *lhs = ins->getOperand(0);
         MDefinition *rhs = ins->getOperand(1);
         if (lhs->type() == MIRType_Int32 && rhs->type() == MIRType_Int32) {
-            LinearSum lsum = ExtractLinearSum(lhs);
-            LinearSum rsum = ExtractLinearSum(rhs);
+            SimpleLinearSum lsum = ExtractLinearSum(lhs);
+            SimpleLinearSum rsum = ExtractLinearSum(rhs);
 
-            JS_ASSERT(lsum.term || rsum.term);
             if (lsum.term && rsum.term)
-                return LinearSum(ins, 0);
+                return SimpleLinearSum(ins, 0);
 
             // Check if this is of the form <SUM> + n, n + <SUM> or <SUM> - n.
             if (ins->isAdd()) {
                 int32 constant;
                 if (!SafeAdd(lsum.constant, rsum.constant, &constant))
-                    return LinearSum(ins, 0);
-                return LinearSum(lsum.term ? lsum.term : rsum.term, constant);
+                    return SimpleLinearSum(ins, 0);
+                return SimpleLinearSum(lsum.term ? lsum.term : rsum.term, constant);
             } else if (lsum.term) {
                 int32 constant;
                 if (!SafeSub(lsum.constant, rsum.constant, &constant))
-                    return LinearSum(ins, 0);
-                return LinearSum(lsum.term, constant);
+                    return SimpleLinearSum(ins, 0);
+                return SimpleLinearSum(lsum.term, constant);
             }
         }
     }
 
-    return LinearSum(ins, 0);
+    return SimpleLinearSum(ins, 0);
+}
+
+// Extract a linear inequality holding when a boolean test goes in the
+// specified direction, of the form 'lhs + lhsN <= rhs' (or >=).
+bool
+ion::ExtractLinearInequality(MTest *test, BranchDirection direction,
+                             SimpleLinearSum *plhs, MDefinition **prhs, bool *plessEqual)
+{
+    if (!test->getOperand(0)->isCompare())
+        return false;
+
+    MCompare *compare = test->getOperand(0)->toCompare();
+
+    MDefinition *lhs = compare->getOperand(0);
+    MDefinition *rhs = compare->getOperand(1);
+
+    if (compare->specialization() != MIRType_Int32)
+        return false;
+
+    JS_ASSERT(lhs->type() == MIRType_Int32);
+    JS_ASSERT(rhs->type() == MIRType_Int32);
+
+    JSOp jsop = compare->jsop();
+    if (direction == FALSE_BRANCH)
+        jsop = analyze::NegateCompareOp(jsop);
+
+    SimpleLinearSum lsum = ExtractLinearSum(lhs);
+    SimpleLinearSum rsum = ExtractLinearSum(rhs);
+
+    if (!SafeSub(lsum.constant, rsum.constant, &lsum.constant))
+        return false;
+
+    // Normalize operations to use <= or >=.
+    switch (jsop) {
+      case JSOP_LE:
+        *plessEqual = true;
+        break;
+      case JSOP_LT:
+        /* x < y ==> x + 1 <= y */
+        if (!SafeAdd(lsum.constant, 1, &lsum.constant))
+            return false;
+        *plessEqual = true;
+        break;
+      case JSOP_GE:
+        *plessEqual = false;
+        break;
+      case JSOP_GT:
+        /* x > y ==> x - 1 >= y */
+        if (!SafeSub(lsum.constant, 1, &lsum.constant))
+            return false;
+        *plessEqual = false;
+        break;
+      default:
+        return false;
+    }
+
+    *plhs = lsum;
+    *prhs = rsum.term;
+
+    return true;
 }
 
 static bool
@@ -889,8 +951,8 @@ TryEliminateBoundsCheck(MBoundsCheck *dominating, MBoundsCheck *dominated, bool
     if (dominating->length() != dominated->length())
         return true;
 
-    LinearSum sumA = ExtractLinearSum(dominating->index());
-    LinearSum sumB = ExtractLinearSum(dominated->index());
+    SimpleLinearSum sumA = ExtractLinearSum(dominating->index());
+    SimpleLinearSum sumB = ExtractLinearSum(dominated->index());
 
     // Both terms should be NULL or the same definition.
     if (sumA.term != sumB.term)
@@ -1010,3 +1072,86 @@ ion::EliminateRedundantBoundsChecks(MIRGraph &graph)
     JS_ASSERT(index == graph.numBlocks());
     return true;
 }
+
+bool
+LinearSum::multiply(int32 scale)
+{
+    for (size_t i = 0; i < terms_.length(); i++) {
+        if (!SafeMul(scale, terms_[i].scale, &terms_[i].scale))
+            return false;
+    }
+    return SafeMul(scale, constant_, &constant_);
+}
+
+bool
+LinearSum::add(const LinearSum &other)
+{
+    for (size_t i = 0; i < other.terms_.length(); i++) {
+        if (!add(other.terms_[i].term, other.terms_[i].scale))
+            return false;
+    }
+    return add(other.constant_);
+}
+
+bool
+LinearSum::add(MDefinition *term, int32 scale)
+{
+    JS_ASSERT(term);
+
+    if (scale == 0)
+        return true;
+
+    if (term->isConstant()) {
+        int32 constant = term->toConstant()->value().toInt32();
+        if (!SafeMul(constant, scale, &constant))
+            return false;
+        return add(constant);
+    }
+
+    for (size_t i = 0; i < terms_.length(); i++) {
+        if (term == terms_[i].term) {
+            if (!SafeAdd(scale, terms_[i].scale, &terms_[i].scale))
+                return false;
+            if (terms_[i].scale == 0) {
+                terms_[i] = terms_.back();
+                terms_.popBack();
+            }
+            return true;
+        }
+    }
+
+    terms_.append(LinearTerm(term, scale));
+    return true;
+}
+
+bool
+LinearSum::add(int32 constant)
+{
+    return SafeAdd(constant, constant_, &constant_);
+}
+
+void
+LinearSum::print(Sprinter &sp) const
+{
+    for (size_t i = 0; i < terms_.length(); i++) {
+        int32 scale = terms_[i].scale;
+        int32 id = terms_[i].term->id();
+        JS_ASSERT(scale);
+        if (scale > 0) {
+            if (i)
+                sp.printf("+");
+            if (scale == 1)
+                sp.printf("#%d", id);
+            else
+                sp.printf("%d*#%d", scale, id);
+        } else if (scale == -1) {
+            sp.printf("-#%d", id);
+        } else {
+            sp.printf("%d*#%d", scale, id);
+        }
+    }
+    if (constant_ > 0)
+        sp.printf("+%d", constant_);
+    else if (constant_ < 0)
+        sp.printf("%d", constant_);
+}
diff --git a/js/src/ion/IonAnalysis.h b/js/src/ion/IonAnalysis.h
index 2cdf21ccd631..c7cfe0ed4581 100644
--- a/js/src/ion/IonAnalysis.h
+++ b/js/src/ion/IonAnalysis.h
@@ -11,6 +11,7 @@
 // This file declares various analysis passes that operate on MIR.
 
 #include "IonAllocPolicy.h"
+#include "MIR.h"
 
 namespace js {
 namespace ion {
@@ -45,23 +46,69 @@ AssertGraphCoherency(MIRGraph &graph);
 bool
 EliminateRedundantBoundsChecks(MIRGraph &graph);
 
-// Linear sum of term(s). For now the only linear sums which can be represented
-// are 'n' or 'x + n' (for any computation x).
 class MDefinition;
 
-struct LinearSum
+// Simple linear sum of the form 'n' or 'x + n'.
+struct SimpleLinearSum
 {
     MDefinition *term;
     int32 constant;
 
-    LinearSum(MDefinition *term, int32 constant)
+    SimpleLinearSum(MDefinition *term, int32 constant)
         : term(term), constant(constant)
     {}
 };
 
-LinearSum
+SimpleLinearSum
 ExtractLinearSum(MDefinition *ins);
 
+bool
+ExtractLinearInequality(MTest *test, BranchDirection direction,
+                        SimpleLinearSum *plhs, MDefinition **prhs, bool *plessEqual);
+
+struct LinearTerm
+{
+    MDefinition *term;
+    int32 scale;
+
+    LinearTerm(MDefinition *term, int32 scale)
+      : term(term), scale(scale)
+    {
+    }
+};
+
+// General linear sum of the form 'x1*n1 + x2*n2 + ... + n'
+class LinearSum
+{
+  public:
+    LinearSum()
+      : constant_(0)
+    {
+    }
+
+    LinearSum(const LinearSum &other)
+      : constant_(other.constant_)
+    {
+        for (size_t i = 0; i < other.terms_.length(); i++)
+            terms_.append(other.terms_[i]);
+    }
+
+    bool multiply(int32 scale);
+    bool add(const LinearSum &other);
+    bool add(MDefinition *term, int32 scale);
+    bool add(int32 constant);
+
+    int32 constant() const { return constant_; }
+    size_t numTerms() const { return terms_.length(); }
+    LinearTerm term(size_t i) const { return terms_[i]; }
+
+    void print(Sprinter &sp) const;
+
+  private:
+    Vector<LinearTerm, 2, IonAllocPolicy> terms_;
+    int32 constant_;
+};
+
 } // namespace ion
 } // namespace js
 
diff --git a/js/src/ion/JSONSpewer.cpp b/js/src/ion/JSONSpewer.cpp
index 09de5d982eb3..eddde32a7b1e 100644
--- a/js/src/ion/JSONSpewer.cpp
+++ b/js/src/ion/JSONSpewer.cpp
@@ -13,6 +13,7 @@
 #include "MIR.h"
 #include "MIRGraph.h"
 #include "LinearScan.h"
+#include "RangeAnalysis.h"
 using namespace js;
 using namespace js::ion;
 
@@ -255,8 +256,14 @@ JSONSpewer::spewMDef(MDefinition *def)
         integerValue(use.def()->id());
     endList();
 
-    stringProperty("type", "%s : [%d, %d]", StringFromMIRType(def->type()),
-                   def->range()->lower(), def->range()->upper());
+    if (def->range()) {
+        Sprinter sp(GetIonContext()->cx);
+        sp.init();
+        def->range()->print(sp);
+        stringProperty("type", "%s : %s", sp.string());
+    } else {
+        stringProperty("type", "%s", StringFromMIRType(def->type()));
+    }
 
     if (def->isInstruction()) {
         if (MResumePoint *rp = def->toInstruction()->resumePoint())
diff --git a/js/src/ion/LICM.cpp b/js/src/ion/LICM.cpp
index e6e76520bafd..ba5d24ad18e9 100644
--- a/js/src/ion/LICM.cpp
+++ b/js/src/ion/LICM.cpp
@@ -17,64 +17,6 @@
 using namespace js;
 using namespace js::ion;
 
-bool
-ion::ExtractLinearInequality(MTest *test, BranchDirection direction,
-                             LinearSum *plhs, MDefinition **prhs, bool *plessEqual)
-{
-    if (!test->getOperand(0)->isCompare())
-        return false;
-
-    MCompare *compare = test->getOperand(0)->toCompare();
-
-    MDefinition *lhs = compare->getOperand(0);
-    MDefinition *rhs = compare->getOperand(1);
-
-    if (compare->specialization() != MIRType_Int32)
-        return false;
-
-    JS_ASSERT(lhs->type() == MIRType_Int32);
-    JS_ASSERT(rhs->type() == MIRType_Int32);
-
-    JSOp jsop = compare->jsop();
-    if (direction == FALSE_BRANCH)
-        jsop = analyze::NegateCompareOp(jsop);
-
-    LinearSum lsum = ExtractLinearSum(lhs);
-    LinearSum rsum = ExtractLinearSum(rhs);
-
-    if (!SafeSub(lsum.constant, rsum.constant, &lsum.constant))
-        return false;
-
-    // Normalize operations to use <= or >=.
-    switch (jsop) {
-      case JSOP_LE:
-        *plessEqual = true;
-        break;
-      case JSOP_LT:
-        /* x < y ==> x + 1 <= y */
-        if (!SafeAdd(lsum.constant, 1, &lsum.constant))
-            return false;
-        *plessEqual = true;
-        break;
-      case JSOP_GE:
-        *plessEqual = false;
-        break;
-      case JSOP_GT:
-        /* x > y ==> x - 1 >= y */
-        if (!SafeSub(lsum.constant, 1, &lsum.constant))
-            return false;
-        *plessEqual = false;
-        break;
-      default:
-        return false;
-    }
-
-    *plhs = lsum;
-    *prhs = rsum.term;
-
-    return true;
-}
-
 LICM::LICM(MIRGenerator *mir, MIRGraph &graph)
   : mir(mir), graph(graph)
 {
@@ -178,7 +120,6 @@ bool
 Loop::optimize()
 {
     InstructionQueue invariantInstructions;
-    InstructionQueue boundsChecks;
 
     IonSpew(IonSpew_LICM, "These instructions are in the loop: ");
 
@@ -220,62 +161,17 @@ Loop::optimize()
 
             if (IonSpewEnabled(IonSpew_LICM))
                 fprintf(IonSpewFile, " Loop Invariant!\n");
-        } else if (ins->isBoundsCheck()) {
-            if (!boundsChecks.append(ins))
-                return false;
         }
     }
 
-    if (!hoistInstructions(invariantInstructions, boundsChecks))
+    if (!hoistInstructions(invariantInstructions))
         return false;
     return true;
 }
 
 bool
-Loop::hoistInstructions(InstructionQueue &toHoist, InstructionQueue &boundsChecks)
+Loop::hoistInstructions(InstructionQueue &toHoist)
 {
-    // Hoist bounds checks first, so that hoistBoundsCheck can test for
-    // invariant instructions, but delay actual insertion until the end to
-    // handle dependencies on loop invariant instructions.
-    InstructionQueue hoistedChecks;
-    for (size_t i = 0; i < boundsChecks.length(); i++) {
-        MBoundsCheck *ins = boundsChecks[i]->toBoundsCheck();
-        if (isLoopInvariant(ins) || !isInLoop(ins))
-            continue;
-
-        // Try to find a test dominating the bounds check which can be
-        // transformed into a hoistable check. Stop after the first such check
-        // which could be transformed (the one which will be the closest to the
-        // access in the source).
-        MBasicBlock *block = ins->block();
-        while (true) {
-            BranchDirection direction;
-            MTest *branch = block->immediateDominatorBranch(&direction);
-            if (branch) {
-                MInstruction *upper, *lower;
-                tryHoistBoundsCheck(ins, branch, direction, &upper, &lower);
-                if (upper && !hoistedChecks.append(upper))
-                    return false;
-                if (lower && !hoistedChecks.append(lower))
-                    return false;
-                if (upper || lower) {
-                    // Note: replace all uses of the original bounds check with the
-                    // actual index. This is usually done during bounds check elimination,
-                    // but in this case it's safe to do it here since the load/store is
-                    // definitely not loop-invariant, so we will never move it before
-                    // one of the bounds checks we just added.
-                    ins->replaceAllUsesWith(ins->index());
-                    ins->block()->discard(ins);
-                    break;
-                }
-            }
-            MBasicBlock *dom = block->immediateDominator();
-            if (dom == block)
-                break;
-            block = dom;
-        }
-    }
-
     // Move all instructions to the preLoop_ block just before the control instruction.
     for (size_t i = 0; i < toHoist.length(); i++) {
         MInstruction *ins = toHoist[i];
@@ -292,11 +188,6 @@ Loop::hoistInstructions(InstructionQueue &toHoist, InstructionQueue &boundsCheck
         }
     }
 
-    for (size_t i = 0; i < hoistedChecks.length(); i++) {
-        MInstruction *ins = hoistedChecks[i];
-        preLoop_->insertBefore(preLoop_->lastIns(), ins);
-    }
-
     return true;
 }
 
@@ -370,186 +261,3 @@ Loop::popFromWorklist()
     toReturn->setNotInWorklist();
     return toReturn;
 }
-
-// Try to compute hoistable checks for the upper and lower bound on ins,
-// according to a test in the loop which dominates ins.
-//
-// Given a bounds check within a loop which is not loop invariant, we would
-// like to compute loop invariant bounds checks which imply that the inner
-// check will succeed.  These invariant checks can then be added to the
-// preheader, and the inner check eliminated.
-//
-// Example:
-//
-// for (i = v; i < n; i++)
-//   x[i] = 0;
-//
-// There are two constraints captured by the bounds check here: i >= 0, and
-// i < length(x).  'i' is not loop invariant, but we can still hoist these
-// checks:
-//
-// - At the point of the check, it is known that i < n.  Given this,
-//   if n <= length(x) then i < length(x), and since n and length(x) are loop
-//   invariant the former condition can be hoisted and the i < length(x) check
-//   removed.
-//
-// - i is only incremented within the loop, so if its initial value is >= 0
-//   then all its values within the loop will also be >= 0.  The lower bounds
-//   check can be hoisted as v >= 0.
-//
-// tryHoistBoundsCheck encodes this logic.  Given a bounds check B and a test T
-// in the loop dominating that bounds check, where B and T share a non-invariant
-// term lhs, a new check C is computed such that T && C imply B.
-void
-Loop::tryHoistBoundsCheck(MBoundsCheck *ins, MTest *test, BranchDirection direction,
-                          MInstruction **pupper, MInstruction **plower)
-{
-    *pupper = NULL;
-    *plower = NULL;
-
-    if (!isLoopInvariant(ins->length()))
-        return;
-
-    LinearSum lhs(NULL, 0);
-    MDefinition *rhs;
-    bool lessEqual;
-    if (!ExtractLinearInequality(test, direction, &lhs, &rhs, &lessEqual))
-        return;
-
-    // Ensure the rhs is a loop invariant term.
-    if (rhs && !isLoopInvariant(rhs)) {
-        if (lhs.term && !isLoopInvariant(lhs.term))
-            return;
-        MDefinition *temp = lhs.term;
-        lhs.term = rhs;
-        rhs = temp;
-        if (!SafeSub(0, lhs.constant, &lhs.constant))
-            return;
-        lessEqual = !lessEqual;
-    }
-
-    JS_ASSERT_IF(rhs, isLoopInvariant(rhs));
-
-    // Ensure the lhs is a phi node from the start of the loop body.
-    if (!lhs.term || !lhs.term->isPhi() || lhs.term->block() != header_)
-        return;
-
-    // Check if the lhs in the conditional matches the bounds check index.
-    LinearSum index = ExtractLinearSum(ins->index());
-    if (index.term != lhs.term)
-        return;
-
-    if (!lessEqual)
-        return;
-
-    // At the point of the access, it is known that lhs + lhsN <= rhs, and the
-    // bounds check is that lhs + indexN + maximum < length. To ensure the
-    // bounds check holds then, we need to ensure that:
-    //
-    // rhs - lhsN + indexN + maximum < length
-
-    int32 adjustment;
-    if (!SafeSub(index.constant, lhs.constant, &adjustment))
-        return;
-    if (!SafeAdd(adjustment, ins->maximum(), &adjustment))
-        return;
-
-    // For the lower bound, check that lhs + indexN + minimum >= 0, e.g.
-    //
-    // lhs >= -indexN - minimum
-    //
-    // lhs is not loop invariant, but if this condition holds of the backing
-    // variable at loop entry and the variable's value never decreases in the
-    // loop body, it will hold throughout the loop.
-
-    uint32 position = preLoop_->positionInPhiSuccessor();
-    MDefinition *initialIndex = lhs.term->toPhi()->getOperand(position);
-    if (!nonDecreasing(initialIndex, lhs.term))
-        return;
-
-    int32 lowerBound;
-    if (!SafeSub(0, index.constant, &lowerBound))
-        return;
-    if (!SafeSub(lowerBound, ins->minimum(), &lowerBound))
-        return;
-
-    // XXX limit on how much can be hoisted, to ensure ballast works?
-
-    if (!rhs) {
-        rhs = MConstant::New(Int32Value(adjustment));
-        adjustment = 0;
-        preLoop_->insertBefore(preLoop_->lastIns(), rhs->toInstruction());
-    }
-
-    MBoundsCheck *upper = MBoundsCheck::New(rhs, ins->length());
-    upper->setMinimum(adjustment);
-    upper->setMaximum(adjustment);
-
-    MBoundsCheckLower *lower = MBoundsCheckLower::New(initialIndex);
-    lower->setMinimum(lowerBound);
-
-    *pupper = upper;
-    *plower = lower;
-}
-
-// Determine whether the possible value of start (a phi node within the loop)
-// can become smaller than an initial value at loop entry.
-bool
-Loop::nonDecreasing(MDefinition *initial, MDefinition *start)
-{
-    MDefinitionVector worklist;
-    MDefinitionVector seen;
-
-    if (!worklist.append(start))
-        return false;
-
-    while (!worklist.empty()) {
-        MDefinition *def = worklist.popCopy();
-        bool duplicate = false;
-        for (size_t i = 0; i < seen.length() && !duplicate; i++) {
-            if (seen[i] == def)
-                duplicate = true;
-        }
-        if (duplicate)
-            continue;
-        if (!seen.append(def))
-            return false;
-
-        if (def->type() != MIRType_Int32)
-            return false;
-
-        if (!isInLoop(def)) {
-            if (def != initial)
-                return false;
-            continue;
-        }
-
-        if (def->isPhi()) {
-            MPhi *phi = def->toPhi();
-            for (size_t i = 0; i < phi->numOperands(); i++) {
-                if (!worklist.append(phi->getOperand(i)))
-                    return false;
-            }
-            continue;
-        }
-
-        if (def->isAdd()) {
-            if (def->toAdd()->specialization() != MIRType_Int32)
-                return false;
-            MDefinition *lhs = def->toAdd()->getOperand(0);
-            MDefinition *rhs = def->toAdd()->getOperand(1);
-            if (!rhs->isConstant())
-                return false;
-            Value v = rhs->toConstant()->value();
-            if (!v.isInt32() || v.toInt32() < 0)
-                return false;
-            if (!worklist.append(lhs))
-                return false;
-            continue;
-        }
-
-        return false;
-    }
-
-    return true;
-}
diff --git a/js/src/ion/LICM.h b/js/src/ion/LICM.h
index 651676403d48..3dfb62ac1919 100644
--- a/js/src/ion/LICM.h
+++ b/js/src/ion/LICM.h
@@ -33,12 +33,6 @@ class LICM
     bool analyze();
 };
 
-// Extract a linear inequality holding when a boolean test goes in the
-// specified direction, of the form 'lhs + lhsN <= rhs' (or >=).
-bool
-ExtractLinearInequality(MTest *test, BranchDirection direction,
-                        LinearSum *plhs, MDefinition **prhs, bool *plessEqual);
-
 class Loop
 {
     MIRGenerator *mir;
@@ -77,7 +71,7 @@ class Loop
     // Along the way it adds instructions to the worklist for invariance testing.
     LoopReturn iterateLoopBlocks(MBasicBlock *current);
 
-    bool hoistInstructions(InstructionQueue &toHoist, InstructionQueue &boundsChecks);
+    bool hoistInstructions(InstructionQueue &toHoist);
 
     // Utility methods for invariance testing and instruction hoisting.
     bool isInLoop(MDefinition *ins);
@@ -96,15 +90,6 @@ class Loop
     inline bool isHoistable(const MDefinition *ins) const {
         return ins->isMovable() && !ins->isEffectful();
     }
-
-    // State for hoisting bounds checks. Even if the terms involved in a bounds
-    // check are not loop invariant, we analyze the tests and increments done
-    // in the loop to try to find a stronger condition which can be hoisted.
-
-    void tryHoistBoundsCheck(MBoundsCheck *ins, MTest *test, BranchDirection direction,
-                             MInstruction **pupper, MInstruction **plower);
-
-    bool nonDecreasing(MDefinition *initial, MDefinition *start);
 };
 
 } // namespace ion
diff --git a/js/src/ion/Lowering.cpp b/js/src/ion/Lowering.cpp
index 1123962b6d40..0b1779eac961 100644
--- a/js/src/ion/Lowering.cpp
+++ b/js/src/ion/Lowering.cpp
@@ -10,6 +10,7 @@
 #include "MIR.h"
 #include "MIRGraph.h"
 #include "IonSpewer.h"
+#include "RangeAnalysis.h"
 #include "jsanalyze.h"
 #include "jsbool.h"
 #include "jsnum.h"
diff --git a/js/src/ion/MIR.cpp b/js/src/ion/MIR.cpp
index b2c3f1014d20..1b0c0d5af706 100644
--- a/js/src/ion/MIR.cpp
+++ b/js/src/ion/MIR.cpp
@@ -10,6 +10,7 @@
 #include "MIR.h"
 #include "MIRGraph.h"
 #include "EdgeCaseAnalysis.h"
+#include "RangeAnalysis.h"
 #include "IonSpewer.h"
 #include "jsnum.h"
 #include "jsstr.h"
@@ -284,11 +285,6 @@ MConstant::MConstant(const js::Value &vp)
 {
     setResultType(MIRTypeFromValue(vp));
     setMovable();
-
-    if (type() == MIRType_Int32) {
-        range()->setLower(value().toInt32());
-        range()->setUpper(value().toInt32());
-    }
 }
 
 HashNumber
@@ -476,53 +472,6 @@ MPhi::addInput(MDefinition *ins)
     return inputs_.append(ins);
 }
 
-bool
-MPhi::recomputeRange()
-{
-    if (type() != MIRType_Int32)
-        return false;
-
-    // Use RangeUpdater rather than Range because it needs to
-    // track if it has been updated yet.
-    RangeUpdater r;
-    JS_ASSERT(getOperand(0)->op() != MDefinition::Op_OsrValue);
-    bool updated = false;
-    for (size_t i = 0; i < numOperands(); i++) {
-        if (getOperand(i)->block()->earlyAbort()) {
-            IonSpew(IonSpew_Range, "Ignoring unreachable input %d", getOperand(i)->id());
-            continue;
-        }
-
-        if (!isOSRLikeValue(getOperand(i))) {
-            if (block()->isLoopHeader()) {
-                IonSpew(IonSpew_Range, "    Updating input #%d (inst %d)", i, getOperand(i)->id());
-                changeCounts_[i].updateRange(getOperand(i)->range());
-                r.unionWith(&changeCounts_[i]);
-            } else {
-                r.unionWith(getOperand(i)->range());
-            }
-
-#ifdef DEBUG
-            if (IonSpewEnabled(IonSpew_Range)) {
-                fprintf(IonSpewFile, "    %d:", getOperand(i)->id());
-                getOperand(i)->range()->printRange(IonSpewFile);
-                fprintf(IonSpewFile, " => ");
-                r.printRange(IonSpewFile);
-                fprintf(IonSpewFile, "\n");
-            }
-#endif
-
-
-        }
-     }
-     if (!updated) {
-         IonSpew(IonSpew_Range, "My block is unreachable %d", id());
-         block()->setEarlyAbort();
-         return false;
-     }
-     return range()->update(r.getRange());
-}
-
 uint32
 MPrepareCall::argc() const
 {
@@ -894,6 +843,12 @@ MAdd::updateForReplacement(MDefinition *ins_)
     return true;
 }
 
+bool
+MAdd::fallible()
+{
+    return !isTruncated() && (!range() || !range()->isFinite());
+}
+
 void
 MSub::analyzeTruncateBackward()
 {
@@ -911,6 +866,12 @@ MSub::updateForReplacement(MDefinition *ins_)
     return true;
 }
 
+bool
+MSub::fallible()
+{
+    return !isTruncated() && (!range() || !range()->isFinite());
+}
+
 MDefinition *
 MMul::foldsTo(bool useValueNumbers)
 {
@@ -975,6 +936,24 @@ MMul::updateForReplacement(MDefinition *ins_)
     return true;
 }
 
+bool
+MMul::canOverflow()
+{
+    if (implicitTruncate_)
+        return false;
+    return !range() || !range()->isFinite();
+}
+
+bool
+MMul::canBeNegativeZero()
+{
+    if (!range())
+        return canBeNegativeZero_;
+    if (range()->lower() > 0 || range()->upper() < 0)
+        return false;
+    return canBeNegativeZero_;
+}
+
 void
 MBinaryArithInstruction::infer(JSContext *cx, const TypeOracle::BinaryTypes &b)
 {
@@ -1530,6 +1509,12 @@ MNot::foldsTo(bool useValueNumbers)
     return this;
 }
 
+bool
+MBoundsCheckLower::fallible()
+{
+    return !range() || range()->lower() < minimum_;
+}
+
 void
 MBeta::printOpcode(FILE *fp)
 {
@@ -1537,17 +1522,23 @@ MBeta::printOpcode(FILE *fp)
     fprintf(fp, " ");
     getOperand(0)->printName(fp);
     fprintf(fp, " ");
-    comparison_.printRange(fp);
+
+    Sprinter sp(GetIonContext()->cx);
+    sp.init();
+    comparison_->print(sp);
+    fprintf(fp, "%s", sp.string());
 }
 
-bool
-MBeta::recomputeRange()
+void
+MBeta::computeRange()
 {
-    bool nullRange = false;
-    bool ret = range()->update(Range::intersect(val_->range(), &comparison_, &nullRange));
-    if (nullRange) {
-            IonSpew(IonSpew_Range, "Marking block for inst %d unexitable", id());
-            block()->setEarlyAbort();
+    bool emptyRange = false;
+
+    Range *range = Range::intersect(val_->range(), comparison_, &emptyRange);
+    if (emptyRange) {
+        IonSpew(IonSpew_Range, "Marking block for inst %d unexitable", id());
+        block()->setEarlyAbort();
+    } else {
+        setRange(range);
     }
-    return ret;
 }
diff --git a/js/src/ion/MIR.h b/js/src/ion/MIR.h
index b2c5933db261..372f0903e196 100644
--- a/js/src/ion/MIR.h
+++ b/js/src/ion/MIR.h
@@ -24,12 +24,14 @@
 #include "IonMacroAssembler.h"
 #include "Bailouts.h"
 #include "FixedList.h"
-#include "RangeAnalysis.h"
 #include "CompilerRoot.h"
 
 namespace js {
 namespace ion {
+
 class ValueNumberData;
+class Range;
+
 static const inline
 MIRType MIRTypeFromValue(const js::Value &vp)
 {
@@ -228,11 +230,7 @@ class MDefinition : public MNode
     uint32 id_;                    // Instruction ID, which after block re-ordering
                                    // is sorted within a basic block.
     ValueNumberData *valueNumber_; // The instruction's value number (see GVN for details in use)
-
-    // Bug 765126: This should be a pointer. The range should only be allocated if range analysis is
-    // enabled.
-    Range range_;                  // The most specific known range for this def.
-
+    Range *range_;                 // Any computed range for this def.
     MIRType resultType_;           // Representation of result type.
     uint32 flags_;                 // Bit flags.
     union {
@@ -292,8 +290,11 @@ class MDefinition : public MNode
         return trackedPc_;
     }
 
-    Range *range() {
-        return &range_;
+    Range *range() const {
+        return range_;
+    }
+    void setRange(Range *range) {
+        range_ = range;
     }
 
     virtual HashNumber valueHash() const;
@@ -306,9 +307,10 @@ class MDefinition : public MNode
     virtual void analyzeEdgeCasesBackward();
     virtual void analyzeTruncateBackward();
     bool earlyAbortCheck();
-    // Propagate a range. Return true if the range changed.
-    virtual bool recomputeRange() {
-        return false;
+
+    // Compute an absolute or symbolic range for the value of this node.
+    // Ranges are only computed for definitions whose type is int32.
+    virtual void computeRange() {
     }
 
     MNode::Kind kind() const {
@@ -623,6 +625,8 @@ class MConstant : public MNullaryInstruction
     AliasSet getAliasSet() const {
         return AliasSet::None();
     }
+
+    void computeRange();
 };
 
 class MParameter : public MNullaryInstruction
@@ -852,6 +856,17 @@ class MGoto : public MAryControlInstruction<0, 1>
     }
 };
 
+enum BranchDirection {
+    FALSE_BRANCH,
+    TRUE_BRANCH
+};
+
+static inline BranchDirection
+NegateBranchDirection(BranchDirection dir)
+{
+    return (dir == FALSE_BRANCH) ? TRUE_BRANCH : FALSE_BRANCH;
+}
+
 // Tests if the input instruction evaluates to true or false, and jumps to the
 // start of a corresponding basic block.
 class MTest
@@ -875,6 +890,9 @@ class MTest
     MBasicBlock *ifFalse() const {
         return getSuccessor(1);
     }
+    MBasicBlock *branchSuccessor(BranchDirection dir) const {
+        return (dir == TRUE_BRANCH) ? ifTrue() : ifFalse();
+    }
     TypePolicy *typePolicy() {
         return this;
     }
@@ -1701,7 +1719,6 @@ class MToInt32 : public MUnaryInstruction
     {
         setResultType(MIRType_Int32);
         setMovable();
-        range()->set(JSVAL_INT_MIN, JSVAL_INT_MAX);
     }
 
   public:
@@ -1742,7 +1759,6 @@ class MTruncateToInt32 : public MUnaryInstruction
     {
         setResultType(MIRType_Int32);
         setMovable();
-        range()->set(JSVAL_INT_MIN, JSVAL_INT_MAX);
     }
 
   public:
@@ -1808,7 +1824,6 @@ class MBitNot
     {
         setResultType(MIRType_Int32);
         setMovable();
-        range()->set(JSVAL_INT_MIN, JSVAL_INT_MAX);
     }
 
   public:
@@ -1904,7 +1919,6 @@ class MBinaryBitwiseInstruction
     {
         setResultType(MIRType_Int32);
         setMovable();
-        range()->set(JSVAL_INT_MIN, JSVAL_INT_MAX);
     }
 
   public:
@@ -1947,12 +1961,7 @@ class MBitAnd : public MBinaryBitwiseInstruction
     MDefinition *foldIfEqual() {
         return getOperand(0); // x & x => x;
     }
-    bool recomputeRange() {
-        Range *left = getOperand(0)->range();
-        Range *right = getOperand(1)->range();
-        return range()->update(Range::and_(left, right));
-    }
-
+    void computeRange();
 };
 
 class MBitOr : public MBinaryBitwiseInstruction
@@ -2031,15 +2040,7 @@ class MLsh : public MShiftInstruction
         return getOperand(0);
     }
 
-    bool recomputeRange() {
-        MDefinition *right = getOperand(1);
-        if (!right->isConstant())
-            return false;
-
-        int32 c = right->toConstant()->value().toInt32();
-        const Range *other = getOperand(0)->range();
-        return range()->update(Range::shl(other, c));
-    }
+    void computeRange();
 };
 
 class MRsh : public MShiftInstruction
@@ -2057,15 +2058,7 @@ class MRsh : public MShiftInstruction
         // x >> 0 => x
         return getOperand(0);
     }
-    bool recomputeRange() {
-        MDefinition *right = getOperand(1);
-        if (!right->isConstant())
-            return false;
-
-        int32 c = right->toConstant()->value().toInt32();
-        Range *other = getOperand(0)->range();
-        return range()->update(Range::shr(other, c));
-    }
+    void computeRange();
 };
 
 class MUrsh : public MShiftInstruction
@@ -2140,6 +2133,11 @@ class MBinaryArithInstruction
 
     void infer(JSContext *cx, const TypeOracle::BinaryTypes &b);
 
+    void setInt32() {
+        specialization_ = MIRType_Int32;
+        setResultType(MIRType_Int32);
+    }
+
     bool congruentTo(MDefinition *const &ins) const {
         return MBinaryInstruction::congruentTo(ins);
     }
@@ -2226,17 +2224,7 @@ class MAbs
     AliasSet getAliasSet() const {
         return AliasSet::None();
     }
-    bool recomputeRange() {
-        if (specialization_ != MIRType_Int32)
-            return false;
-
-        Range *other = getOperand(0)->range();
-        Range r(0,
-                Max(Range::abs64((int64_t)other->lower()),
-                    Range::abs64((int64_t)other->upper())));
-
-        return range()->update(r);
-    }
+    void computeRange();
 };
 
 // Inline implementation of Math.sqrt().
@@ -2439,18 +2427,8 @@ class MAdd : public MBinaryArithInstruction
         return 0;
     }
 
-    bool fallible() {
-        return !isTruncated() && !range()->isFinite();
-    }
-
-    bool recomputeRange() {
-        if (specialization() != MIRType_Int32)
-            return false;
-        Range *left = getOperand(0)->range();
-        Range *right = getOperand(1)->range();
-        Range next = isTruncated() ? Range::addTruncate(left,right) : Range::add(left, right);
-        return range()->update(next);
-    }
+    bool fallible();
+    void computeRange();
 };
 
 class MSub : public MBinaryArithInstruction
@@ -2482,18 +2460,8 @@ class MSub : public MBinaryArithInstruction
         return 0;
     }
 
-    bool fallible() {
-        return !isTruncated() && !range()->isFinite();
-    }
-
-    bool recomputeRange() {
-        if (specialization() != MIRType_Int32)
-            return false;
-        Range *left = getOperand(0)->range();
-        Range *right = getOperand(1)->range();
-        Range next = isTruncated() ? Range::subTruncate(left,right) : Range::sub(left, right);
-        return range()->update(next);
-    }
+    bool fallible();
+    void computeRange();
 };
 
 class MMul : public MBinaryArithInstruction
@@ -2540,30 +2508,16 @@ class MMul : public MBinaryArithInstruction
         return 1;
     }
 
-    bool canOverflow() {
-        return !implicitTruncate_ && !range()->isFinite();
-    }
+    bool canOverflow();
+    bool canBeNegativeZero();
 
-    bool canBeNegativeZero() {
-        if (range()->lower() > 0 || range()->upper() < 0)
-            return false;
-        return canBeNegativeZero_;
-    }
     bool updateForReplacement(MDefinition *ins);
 
     bool fallible() {
         return canBeNegativeZero_ || canOverflow();
     }
 
-    bool recomputeRange() {
-        if (specialization() != MIRType_Int32)
-            return false;
-        Range *left = getOperand(0)->range();
-        Range *right = getOperand(1)->range();
-        if (isPossibleTruncated())
-            implicitTruncate_ = !Range::precisionLossMul(left, right);
-        return range()->update(Range::mul(left, right));
-    }
+    void computeRange();
 
     bool isPossibleTruncated() const {
         return possibleTruncate_;
@@ -2655,21 +2609,7 @@ class MMod : public MBinaryArithInstruction
         return 1;
     }
 
-    bool recomputeRange() {
-        if (specialization() != MIRType_Int32)
-            return false;
-        Range *rhs = getOperand(1)->range();
-        int64_t a = Range::abs64((int64_t)rhs->lower());
-        int64_t b = Range::abs64((int64_t)rhs->upper());
-        if (a ==0 && b == 0) {
-            // We should never take something % 0.
-            Range r(INT_MIN, INT_MAX);
-            return range()->update(r);
-        }
-        int64_t bound = Max(1-a, b-1);
-        Range r(-bound, bound);
-        return range()->update(r);
-    }
+    void computeRange();
 };
 
 class MConcat
@@ -2709,8 +2649,6 @@ class MCharCodeAt
     {
         setMovable();
         setResultType(MIRType_Int32);
-        range()->set(0, 65535); //ECMA 262 says that the integer will be
-                                //non-negative and less than 65535.
     }
 
   public:
@@ -2728,6 +2666,8 @@ class MCharCodeAt
         // Strings are immutable, so there is no implicit dependency.
         return AliasSet::None();
     }
+
+    void computeRange();
 };
 
 class MFromCharCode
@@ -2760,9 +2700,6 @@ class MPhi : public MDefinition, public InlineForwardListNode<MPhi>
     bool triedToSpecialize_;
     bool hasBytecodeUses_;
     bool isIterator_;
-    // For every input to the phi, track how many times it has changed
-    // Only used in loop headers, so it defaults to 0 elements to conserve space
-    js::Vector<RangeChangeCount, 0, IonAllocPolicy> changeCounts_;
     MPhi(uint32 slot)
       : slot_(slot),
         triedToSpecialize_(false),
@@ -2819,10 +2756,7 @@ class MPhi : public MDefinition, public InlineForwardListNode<MPhi>
     AliasSet getAliasSet() const {
         return AliasSet::None();
     }
-    bool recomputeRange();
-    bool initCounts() {
-        return changeCounts_.resize(inputs_.length());
-    }
+    void computeRange();
 };
 
 // The goal of a Beta node is to split a def at a conditionally taken
@@ -2830,19 +2764,20 @@ class MPhi : public MDefinition, public InlineForwardListNode<MPhi>
 class MBeta : public MUnaryInstruction
 {
   private:
-    Range comparison_;
+    const Range *comparison_;
     MDefinition *val_;
-    MBeta(MDefinition *val, const Range &comp)
+    MBeta(MDefinition *val, const Range *comp)
         : MUnaryInstruction(val),
           comparison_(comp),
           val_(val)
     {
+        setResultType(val->type());
     }
 
   public:
     INSTRUCTION_HEADER(Beta);
     void printOpcode(FILE *fp);
-    static MBeta *New(MDefinition *val, const Range &comp)
+    static MBeta *New(MDefinition *val, const Range *comp)
     {
         return new MBeta(val, comp);
     }
@@ -2851,7 +2786,7 @@ class MBeta : public MUnaryInstruction
         return AliasSet::None();
     }
 
-    bool recomputeRange();
+    void computeRange();
 };
 
 // MIR representation of a Value on the OSR StackFrame.
@@ -3509,9 +3444,7 @@ class MBoundsCheckLower
     AliasSet getAliasSet() const {
         return AliasSet::None();
     }
-    bool fallible() {
-        return range()->lower() < minimum_;
-    }
+    bool fallible();
 };
 
 // Load a value from a dense array's element vector and does a hole check if the
@@ -3987,7 +3920,6 @@ class MClampToUint8
     {
         setResultType(MIRType_Int32);
         setMovable();
-        range()->set(0, 255);
     }
 
   public:
@@ -4011,6 +3943,7 @@ class MClampToUint8
     AliasSet getAliasSet() const {
         return AliasSet::None();
     }
+    void computeRange();
 };
 
 class MLoadFixedSlot
diff --git a/js/src/ion/MIRGraph.h b/js/src/ion/MIRGraph.h
index fb7df644cd5d..effa716c47e1 100644
--- a/js/src/ion/MIRGraph.h
+++ b/js/src/ion/MIRGraph.h
@@ -30,11 +30,6 @@ typedef InlineForwardListIterator<MPhi> MPhiIterator;
 
 class LBlock;
 
-enum BranchDirection {
-    FALSE_BRANCH,
-    TRUE_BRANCH
-};
-
 class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
 {
   public:
diff --git a/js/src/ion/RangeAnalysis.cpp b/js/src/ion/RangeAnalysis.cpp
index 19b229232639..b349545f6629 100644
--- a/js/src/ion/RangeAnalysis.cpp
+++ b/js/src/ion/RangeAnalysis.cpp
@@ -8,6 +8,7 @@
 #include <stdio.h>
 
 #include "Ion.h"
+#include "IonAnalysis.h"
 #include "MIR.h"
 #include "MIRGraph.h"
 #include "RangeAnalysis.h"
@@ -95,11 +96,11 @@ static inline void
 SpewRange(MDefinition *def)
 {
 #ifdef DEBUG
-    if (IonSpewEnabled(IonSpew_Range)) {
-        IonSpewHeader(IonSpew_Range);
-        fprintf(IonSpewFile, "%d has range ", def->id());
-        def->range()->printRange(IonSpewFile);
-        fprintf(IonSpewFile, "\n");
+    if (IonSpewEnabled(IonSpew_Range) && def->range()) {
+        Sprinter sp(GetIonContext()->cx);
+        sp.init();
+        def->range()->print(sp);
+        IonSpew(IonSpew_Range, "%d has range %s", def->id(), sp.string());
     }
 #endif
 }
@@ -162,10 +163,10 @@ RangeAnalysis::addBetaNobes()
             }
             if (smaller && greater) {
                 MBeta *beta;
-                beta = MBeta::New(smaller, Range(JSVAL_INT_MIN, JSVAL_INT_MAX-1));
+                beta = MBeta::New(smaller, new Range(JSVAL_INT_MIN, JSVAL_INT_MAX-1));
                 block->insertBefore(*block->begin(), beta);
                 replaceDominatedUsesWith(smaller, beta, block);
-                beta = MBeta::New(greater, Range(JSVAL_INT_MIN+1, JSVAL_INT_MAX));
+                beta = MBeta::New(greater, new Range(JSVAL_INT_MIN+1, JSVAL_INT_MAX));
                 block->insertBefore(*block->begin(), beta);
                 replaceDominatedUsesWith(greater, beta, block);
             }
@@ -202,7 +203,7 @@ RangeAnalysis::addBetaNobes()
         }
 
         IonSpew(IonSpew_Range, "Adding beta node for %d", val->id());
-        MBeta *beta = MBeta::New(val, comp);
+        MBeta *beta = MBeta::New(val, new Range(comp));
         block->insertBefore(*block->begin(), beta);
         replaceDominatedUsesWith(val, beta, block);
     }
@@ -237,26 +238,65 @@ RangeAnalysis::removeBetaNobes()
 }
 
 void
-Range::printRange(FILE *fp)
+SymbolicBound::print(Sprinter &sp) const
+{
+    if (loop)
+        sp.printf("[loop] ");
+    sum.print(sp);
+}
+
+void
+Range::print(Sprinter &sp) const
 {
     JS_ASSERT_IF(lower_infinite_, lower_ == JSVAL_INT_MIN);
     JS_ASSERT_IF(upper_infinite_, upper_ == JSVAL_INT_MAX);
-    fprintf(fp, "[");
-    if (lower_infinite_) { fprintf(fp, "-inf"); } else { fprintf(fp, "%d", lower_); }
-    fprintf(fp, ", ");
-    if (upper_infinite_) { fprintf(fp, "inf"); } else { fprintf(fp, "%d", upper_); }
-    fprintf(fp, "]");
+
+    sp.printf("[");
+
+    if (lower_infinite_)
+        sp.printf("-inf");
+    else
+        sp.printf("%d", lower_);
+    if (symbolicLower_) {
+        sp.printf(" {");
+        symbolicLower_->print(sp);
+        sp.printf("}");
+    }
+
+    sp.printf(", ");
+
+    if (upper_infinite_)
+        sp.printf("inf");
+    else
+        sp.printf("%d", upper_);
+    if (symbolicUpper_) {
+        sp.printf(" {");
+        symbolicUpper_->print(sp);
+        sp.printf("}");
+    }
+
+    sp.printf("]");
 }
 
-Range
-Range::intersect(const Range *lhs, const Range *rhs, bool *nullRange)
+Range *
+Range::intersect(const Range *lhs, const Range *rhs, bool *emptyRange)
 {
-    Range r(
+    *emptyRange = false;
+
+    if (!lhs && !rhs)
+        return NULL;
+
+    if (!lhs)
+        return new Range(*rhs);
+    if (!rhs)
+        return new Range(*lhs);
+
+    Range *r = new Range(
         Max(lhs->lower_, rhs->lower_),
         Min(lhs->upper_, rhs->upper_));
 
-    r.lower_infinite_ = lhs->lower_infinite_ && rhs->lower_infinite_;
-    r.upper_infinite_ = lhs->upper_infinite_ && rhs->upper_infinite_;
+    r->lower_infinite_ = lhs->lower_infinite_ && rhs->lower_infinite_;
+    r->upper_infinite_ = lhs->upper_infinite_ && rhs->upper_infinite_;
 
     // :TODO: This information could be used better. If upper < lower, then we
     // have conflicting constraints. Consider:
@@ -272,10 +312,11 @@ Range::intersect(const Range *lhs, const Range *rhs, bool *nullRange)
     //
     // Instead, we should use it to eliminate the dead block.
     // (Bug 765127)
-    if (r.upper_ < r.lower_) {
-        *nullRange = true;
-        r.makeRangeInfinite();
+    if (r->upper_ < r->lower_) {
+        *emptyRange = true;
+        r->makeRangeInfinite();
     }
+
     return r;
 }
 
@@ -288,93 +329,70 @@ Range::unionWith(const Range *other)
    upper_infinite_ |= other->upper_infinite_;
 }
 
-void
-RangeUpdater::updateLower(const Range *other)
+static const Range emptyRange;
+
+static inline void
+EnsureRange(const Range **prange)
 {
-    if (lowerSet_) {
-        r_.setLower(Min(r_.lower(), other->lower()));
-    } else {
-        r_.setLower(other->lower());
-        lowerSet_ = true;
-    }
-    if (other->isLowerInfinite())
-        r_.makeLowerInfinite();
-}
-void
-RangeUpdater::updateUpper(const Range *other)
-{
-    if (upperSet_) {
-        r_.setUpper(Min(r_.upper(), other->upper()));
-    } else {
-        r_.setUpper(other->upper());
-        upperSet_ = true;
-    }
-    if (other->isUpperInfinite())
-        r_.makeUpperInfinite();
+    if (!*prange)
+        *prange = &emptyRange;
 }
 
-void
-RangeUpdater::unionWith(const Range *other)
-{
-    updateLower(other);
-    updateUpper(other);
-}
-
-void
-RangeUpdater::unionWith(RangeChangeCount *other)
-{
-    if (other->lowerCount_ <= 2) {
-        // If this->lower has been initialized, then update it
-        // otherwise, initialize it.
-        updateLower(&other->oldRange);
-    } else {
-        other->lowerCount_ = 0;
-    }
-
-    if (other->upperCount_ <= 2) {
-        updateUpper(&other->oldRange);
-    } else {
-        other->upperCount_ = 0;
-    }
-}
-
-Range
+Range *
 Range::add(const Range *lhs, const Range *rhs)
 {
-    Range ret(
+    EnsureRange(&lhs);
+    EnsureRange(&rhs);
+    return new Range(
         (int64_t)lhs->lower_ + (int64_t)rhs->lower_,
         (int64_t)lhs->upper_ + (int64_t)rhs->upper_);
-    return ret;
 }
 
-Range
+Range *
 Range::sub(const Range *lhs, const Range *rhs)
 {
-    Range ret(
+    EnsureRange(&lhs);
+    EnsureRange(&rhs);
+    return new Range(
         (int64_t)lhs->lower_ - (int64_t)rhs->upper_,
         (int64_t)lhs->upper_ - (int64_t)rhs->lower_);
-    return ret;
-
 }
-Range
+
+/* static */ Range *
+Range::Truncate(int64_t l, int64_t h)
+{
+    Range *ret = new Range(l, h);
+    if (!ret->isFinite()) {
+        ret->makeLowerInfinite();
+        ret->makeUpperInfinite();
+    }
+    return ret;
+}
+
+Range *
 Range::addTruncate(const Range *lhs, const Range *rhs)
 {
-    Range ret = Truncate((int64_t)lhs->lower_ + (int64_t)rhs->lower_,
-                         (int64_t)lhs->upper_ + (int64_t)rhs->upper_);
-    return ret;
+    EnsureRange(&lhs);
+    EnsureRange(&rhs);
+    return Truncate((int64_t)lhs->lower_ + (int64_t)rhs->lower_,
+                    (int64_t)lhs->upper_ + (int64_t)rhs->upper_);
 }
 
-Range
+Range *
 Range::subTruncate(const Range *lhs, const Range *rhs)
 {
-    Range ret = Truncate((int64_t)lhs->lower_ - (int64_t)rhs->upper_,
-                         (int64_t)lhs->upper_ - (int64_t)rhs->lower_);
-    return ret;
+    EnsureRange(&lhs);
+    EnsureRange(&rhs);
+    return Truncate((int64_t)lhs->lower_ - (int64_t)rhs->upper_,
+                    (int64_t)lhs->upper_ - (int64_t)rhs->lower_);
 }
 
-Range
+Range *
 Range::and_(const Range *lhs, const Range *rhs)
 {
+    EnsureRange(&lhs);
+    EnsureRange(&rhs);
+
     int64_t lower;
     int64_t upper;
 
@@ -382,8 +400,7 @@ Range::and_(const Range *lhs, const Range *rhs)
     if (lhs->lower_ < 0 && rhs->lower_ < 0) {
         lower = INT_MIN;
         upper = Max(lhs->upper_, rhs->upper_);
-        Range ret(lower, upper);
-        return ret;
+        return new Range(lower, upper);
     }
 
     // Only one of both numbers can be negative.
@@ -400,46 +417,48 @@ Range::and_(const Range *lhs, const Range *rhs)
     if (rhs->lower_ < 0)
         upper = lhs->upper_;
 
-    Range ret(lower, upper);
-    return ret;
-
+    return new Range(lower, upper);
 }
-Range
+
+Range *
 Range::mul(const Range *lhs, const Range *rhs)
 {
+    EnsureRange(&lhs);
+    EnsureRange(&rhs);
     int64_t a = (int64_t)lhs->lower_ * (int64_t)rhs->lower_;
     int64_t b = (int64_t)lhs->lower_ * (int64_t)rhs->upper_;
     int64_t c = (int64_t)lhs->upper_ * (int64_t)rhs->lower_;
     int64_t d = (int64_t)lhs->upper_ * (int64_t)rhs->upper_;
-    Range ret(
+    return new Range(
         Min( Min(a, b), Min(c, d) ),
         Max( Max(a, b), Max(c, d) ));
-    return ret;
 }
 
-Range
+Range *
 Range::shl(const Range *lhs, int32 c)
 {
+    EnsureRange(&lhs);
     int32 shift = c & 0x1f;
-    Range ret(
+    return new Range(
         (int64_t)lhs->lower_ << shift,
         (int64_t)lhs->upper_ << shift);
-    return ret;
 }
 
-Range
+Range *
 Range::shr(const Range *lhs, int32 c)
 {
+    EnsureRange(&lhs);
     int32 shift = c & 0x1f;
-    Range ret(
+    return new Range(
         (int64_t)lhs->lower_ >> shift,
         (int64_t)lhs->upper_ >> shift);
-    return ret;
 }
 
 bool
 Range::precisionLossMul(const Range *lhs, const Range *rhs)
 {
+    EnsureRange(&lhs);
+    EnsureRange(&rhs);
     int64_t loss  = 1LL<<53; // result must be lower than 2^53
     int64_t a = (int64_t)lhs->lower_ * (int64_t)rhs->lower_;
     int64_t b = (int64_t)lhs->lower_ * (int64_t)rhs->upper_;
@@ -473,83 +492,612 @@ Range::update(const Range *other)
     return changed;
 }
 
-static inline bool
-AddToWorklist(MDefinitionVector &worklist, MDefinition *def)
+///////////////////////////////////////////////////////////////////////////////
+// Range Computation for MIR Nodes
+///////////////////////////////////////////////////////////////////////////////
+
+void
+MPhi::computeRange()
 {
-    if (def->isInWorklist())
-        return true;
-    def->setInWorklist();
-    return worklist.append(def);
+    if (type() != MIRType_Int32)
+        return;
+
+    Range *range = NULL;
+    JS_ASSERT(getOperand(0)->op() != MDefinition::Op_OsrValue);
+    for (size_t i = 0; i < numOperands(); i++) {
+        if (getOperand(i)->block()->earlyAbort()) {
+            IonSpew(IonSpew_Range, "Ignoring unreachable input %d", getOperand(i)->id());
+            continue;
+        }
+
+        if (isOSRLikeValue(getOperand(i)))
+            continue;
+
+        Range *input = getOperand(i)->range();
+
+        if (!input) {
+            range = NULL;
+            break;
+        }
+
+        if (range)
+            range->unionWith(input);
+        else
+            range = new Range(*input);
+    }
+
+    setRange(range);
+
+    if (block()->isLoopHeader()) {
+    }
 }
 
-static inline MDefinition *
-PopFromWorklist(MDefinitionVector &worklist)
+void
+MConstant::computeRange()
 {
-    JS_ASSERT(!worklist.empty());
-    MDefinition *def = worklist.popCopy();
-    def->setNotInWorklist();
+    if (type() == MIRType_Int32)
+        setRange(new Range(value().toInt32(), value().toInt32()));
+}
+
+void
+MCharCodeAt::computeRange()
+{
+    setRange(new Range(0, 65535)); //ECMA 262 says that the integer will be
+                                   //non-negative and at most 65535.
+}
+
+void
+MClampToUint8::computeRange()
+{
+    setRange(new Range(0, 255));
+}
+
+void
+MBitAnd::computeRange()
+{
+    Range *left = getOperand(0)->range();
+    Range *right = getOperand(1)->range();
+    setRange(Range::and_(left, right));
+}
+
+void
+MLsh::computeRange()
+{
+    MDefinition *right = getOperand(1);
+    if (!right->isConstant())
+        return;
+
+    int32 c = right->toConstant()->value().toInt32();
+    const Range *other = getOperand(0)->range();
+    setRange(Range::shl(other, c));
+}
+
+void
+MRsh::computeRange()
+{
+    MDefinition *right = getOperand(1);
+    if (!right->isConstant())
+        return;
+
+    int32 c = right->toConstant()->value().toInt32();
+    Range *other = getOperand(0)->range();
+    setRange(Range::shr(other, c));
+}
+
+void
+MAbs::computeRange()
+{
+    if (specialization_ != MIRType_Int32)
+        return;
+
+    const Range *other = getOperand(0)->range();
+    EnsureRange(&other);
+
+    Range *range = new Range(0,
+                             Max(Range::abs64((int64_t)other->lower()),
+                                 Range::abs64((int64_t)other->upper())));
+    setRange(range);
+}
+
+void
+MAdd::computeRange()
+{
+    if (specialization() != MIRType_Int32)
+        return;
+    Range *left = getOperand(0)->range();
+    Range *right = getOperand(1)->range();
+    Range *next = isTruncated() ? Range::addTruncate(left,right) : Range::add(left, right);
+    setRange(next);
+}
+
+void
+MSub::computeRange()
+{
+    if (specialization() != MIRType_Int32)
+        return;
+    Range *left = getOperand(0)->range();
+    Range *right = getOperand(1)->range();
+    Range *next = isTruncated() ? Range::subTruncate(left,right) : Range::sub(left, right);
+    setRange(next);
+}
+
+void
+MMul::computeRange()
+{
+    if (specialization() != MIRType_Int32)
+        return;
+    Range *left = getOperand(0)->range();
+    Range *right = getOperand(1)->range();
+    if (isPossibleTruncated())
+        implicitTruncate_ = !Range::precisionLossMul(left, right);
+    setRange(Range::mul(left, right));
+}
+
+void
+MMod::computeRange()
+{
+    if (specialization() != MIRType_Int32)
+        return;
+    const Range *rhs = getOperand(1)->range();
+    EnsureRange(&rhs);
+    int64_t a = Range::abs64((int64_t)rhs->lower());
+    int64_t b = Range::abs64((int64_t)rhs->upper());
+    if (a == 0 && b == 0)
+        return;
+    int64_t bound = Max(1-a, b-1);
+    setRange(new Range(-bound, bound));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Range Analysis
+///////////////////////////////////////////////////////////////////////////////
+
+void
+RangeAnalysis::markBlocksInLoopBody(MBasicBlock *header, MBasicBlock *current)
+{
+    // Visited.
+    current->mark();
+
+    // If we haven't reached the loop header yet, recursively explore predecessors
+    // if we haven't seen them already.
+    if (current != header) {
+        for (size_t i = 0; i < current->numPredecessors(); i++) {
+            if (current->getPredecessor(i)->isMarked())
+                continue;
+            markBlocksInLoopBody(header, current->getPredecessor(i));
+        }
+    }
+}
+
+void
+RangeAnalysis::analyzeLoop(MBasicBlock *header)
+{
+    // Try to compute an upper bound on the number of times the loop backedge
+    // will be taken. Look for tests that dominate the backedge and which have
+    // an edge leaving the loop body.
+    MBasicBlock *backedge = header->backedge();
+
+    // Ignore trivial infinite loops.
+    if (backedge == header)
+        return;
+
+    markBlocksInLoopBody(header, backedge);
+
+    LoopIterationBound *iterationBound = NULL;
+
+    MBasicBlock *block = backedge;
+    do {
+        BranchDirection direction;
+        MTest *branch = block->immediateDominatorBranch(&direction);
+
+        if (block == block->immediateDominator())
+            break;
+
+        block = block->immediateDominator();
+
+        if (branch) {
+            direction = NegateBranchDirection(direction);
+            MBasicBlock *otherBlock = branch->branchSuccessor(direction);
+            if (!otherBlock->isMarked()) {
+                iterationBound =
+                    analyzeLoopIterationCount(header, branch, direction);
+                if (iterationBound)
+                    break;
+            }
+        }
+    } while (block != header);
+
+    if (!iterationBound) {
+        graph_.unmarkBlocks();
+        return;
+    }
+
+#ifdef DEBUG
+    if (IonSpewEnabled(IonSpew_Range)) {
+        Sprinter sp(GetIonContext()->cx);
+        sp.init();
+        iterationBound->sum.print(sp);
+        IonSpew(IonSpew_Range, "computed symbolic bound on backedges: %s",
+                sp.string());
+    }
+#endif
+
+    // Try to compute symbolic bounds for the phi nodes at the head of this
+    // loop, expressed in terms of the iteration bound just computed.
+
+    for (MDefinitionIterator iter(header); iter; iter++) {
+        MDefinition *def = *iter;
+        if (def->isPhi())
+            analyzeLoopPhi(header, iterationBound, def->toPhi());
+    }
+
+    // Try to hoist any bounds checks from the loop using symbolic bounds.
+
+    Vector<MBoundsCheck *, 0, IonAllocPolicy> hoistedChecks;
+
+    for (ReversePostorderIterator iter(graph_.rpoBegin()); iter != graph_.rpoEnd(); iter++) {
+        MBasicBlock *block = *iter;
+        if (!block->isMarked())
+            continue;
+
+        for (MDefinitionIterator iter(block); iter; iter++) {
+            MDefinition *def = *iter;
+            if (def->isBoundsCheck() && def->isMovable()) {
+                if (tryHoistBoundsCheck(header, def->toBoundsCheck()))
+                    hoistedChecks.append(def->toBoundsCheck());
+            }
+        }
+    }
+
+    // Note: replace all uses of the original bounds check with the
+    // actual index. This is usually done during bounds check elimination,
+    // but in this case it's safe to do it here since the load/store is
+    // definitely not loop-invariant, so we will never move it before
+    // one of the bounds checks we just added.
+    for (size_t i = 0; i < hoistedChecks.length(); i++) {
+        MBoundsCheck *ins = hoistedChecks[i];
+        ins->replaceAllUsesWith(ins->index());
+        ins->block()->discard(ins);
+    }
+
+    graph_.unmarkBlocks();
+}
+
+LoopIterationBound *
+RangeAnalysis::analyzeLoopIterationCount(MBasicBlock *header,
+                                         MTest *test, BranchDirection direction)
+{
+    SimpleLinearSum lhs(NULL, 0);
+    MDefinition *rhs;
+    bool lessEqual;
+    if (!ExtractLinearInequality(test, direction, &lhs, &rhs, &lessEqual))
+        return NULL;
+
+    // Ensure the rhs is a loop invariant term.
+    if (rhs && rhs->block()->isMarked()) {
+        if (lhs.term && lhs.term->block()->isMarked())
+            return NULL;
+        MDefinition *temp = lhs.term;
+        lhs.term = rhs;
+        rhs = temp;
+        if (!SafeSub(0, lhs.constant, &lhs.constant))
+            return NULL;
+        lessEqual = !lessEqual;
+    }
+
+    JS_ASSERT_IF(rhs, !rhs->block()->isMarked());
+
+    // Ensure the lhs is a phi node from the start of the loop body.
+    if (!lhs.term || !lhs.term->isPhi() || lhs.term->block() != header)
+        return NULL;
+
+    // Check that the value of the lhs changes by a constant amount with each
+    // loop iteration. This requires that the lhs be written in every loop
+    // iteration with a value that is a constant difference from its value at
+    // the start of the iteration.
+
+    if (lhs.term->toPhi()->numOperands() != 2)
+        return NULL;
+
+    // The first operand of the phi should be the lhs' value at the start of
+    // the first executed iteration, and not a value written which could
+    // replace the second operand below during the middle of execution.
+    MDefinition *lhsInitial = lhs.term->toPhi()->getOperand(0);
+    if (lhsInitial->block()->isMarked())
+        return NULL;
+
+    // The second operand of the phi should be a value written by an add/sub
+    // in every loop iteration, i.e. in a block which dominates the backedge.
+    MDefinition *lhsWrite = lhs.term->toPhi()->getOperand(1);
+    if (lhsWrite->isBeta())
+        lhsWrite = lhsWrite->getOperand(0);
+    if (!lhsWrite->isAdd() && !lhsWrite->isSub())
+        return NULL;
+    if (!lhsWrite->block()->isMarked())
+        return NULL;
+    MBasicBlock *bb = header->backedge();
+    for (; bb != lhsWrite->block() && bb != header; bb = bb->immediateDominator()) {}
+    if (bb != lhsWrite->block())
+        return NULL;
+
+    SimpleLinearSum lhsModified = ExtractLinearSum(lhsWrite);
+
+    // Check that the value of the lhs at the backedge is of the form
+    // 'old(lhs) + N'. We can be sure that old(lhs) is the value at the start
+    // of the iteration, and not that written to lhs in a previous iteration,
+    // as such a previous value could not appear directly in the addition:
+    // it could not be stored in lhs as the lhs add/sub executes in every
+    // iteration, and if it were stored in another variable its use here would
+    // be as an operand to a phi node for that variable.
+    if (lhsModified.term != lhs.term)
+        return NULL;
+
+    LinearSum bound;
+
+    if (lhsModified.constant == 1 && !lessEqual) {
+        // The value of lhs is 'initial(lhs) + iterCount' and this will end
+        // execution of the loop if 'lhs + lhsN >= rhs'. Thus, an upper bound
+        // on the number of backedges executed is:
+        //
+        // initial(lhs) + iterCount + lhsN == rhs
+        // iterCount == rhsN - initial(lhs) - lhsN
+
+        if (rhs) {
+            if (!bound.add(rhs, 1))
+                return NULL;
+        }
+        if (!bound.add(lhsInitial, -1))
+            return NULL;
+
+        int32 lhsConstant;
+        if (!SafeSub(0, lhs.constant, &lhsConstant))
+            return NULL;
+        if (!bound.add(lhsConstant))
+            return NULL;
+    } else if (lhsModified.constant == -1 && lessEqual) {
+        // The value of lhs is 'initial(lhs) - iterCount'. Similar to the above
+        // case, an upper bound on the number of backedges executed is:
+        //
+        // initial(lhs) - iterCount + lhsN == rhs
+        // iterCount == initial(lhs) - rhs + lhsN
+
+        if (!bound.add(lhsInitial, 1))
+            return NULL;
+        if (rhs) {
+            if (!bound.add(rhs, -1))
+                return NULL;
+        }
+        if (!bound.add(lhs.constant))
+            return NULL;
+    } else {
+        return NULL;
+    }
+
+    return new LoopIterationBound(header, test, bound);
+}
+
+void
+RangeAnalysis::analyzeLoopPhi(MBasicBlock *header, LoopIterationBound *loopBound, MPhi *phi)
+{
+    // Given a bound on the number of backedges taken, compute an upper and
+    // lower bound for a phi node that may change by a constant amount each
+    // iteration. Unlike for the case when computing the iteration bound
+    // itself, the phi does not need to change the same amount every iteration,
+    // but is required to change at most N and be either nondecreasing or
+    // nonincreasing.
+
+    if (phi->numOperands() != 2)
+        return;
+
+    MBasicBlock *preLoop = header->loopPredecessor();
+    JS_ASSERT(!preLoop->isMarked() && preLoop->successorWithPhis() == header);
+
+    MBasicBlock *backedge = header->backedge();
+    JS_ASSERT(backedge->isMarked() && backedge->successorWithPhis() == header);
+
+    MDefinition *initial = phi->getOperand(preLoop->positionInPhiSuccessor());
+    if (initial->block()->isMarked())
+        return;
+
+    SimpleLinearSum modified = ExtractLinearSum(phi->getOperand(backedge->positionInPhiSuccessor()));
+
+    if (modified.term != phi || modified.constant == 0)
+        return;
+
+    if (!phi->range())
+        phi->setRange(new Range());
+
+    LinearSum initialSum;
+    if (!initialSum.add(initial, 1))
+        return;
+
+    // The phi may change by N each iteration, and is either nondecreasing or
+    // nonincreasing. initial(phi) is either a lower or upper bound for the
+    // phi, and initial(phi) + loopBound * N is either an upper or lower bound,
+    // at all points within the loop, provided that loopBound >= 0.
+    //
+    // We are more interested, however, in the bound for phi at points
+    // dominated by the loop bound's test; if the test dominates e.g. a bounds
+    // check we want to hoist from the loop, using the value of the phi at the
+    // head of the loop for this will usually be too imprecise to hoist the
+    // check. These points will execute only if the backedge executes at least
+    // one more time (as the test passed and the test dominates the backedge),
+    // so we know both that loopBound >= 1 and that the phi's value has changed
+    // at most loopBound - 1 times. Thus, another upper or lower bound for the
+    // phi is initial(phi) + (loopBound - 1) * N, without requiring us to
+    // ensure that loopBound >= 0.
+
+    LinearSum limitSum(loopBound->sum);
+    if (!limitSum.multiply(modified.constant) || !limitSum.add(initialSum))
+        return;
+
+    int32 negativeConstant;
+    if (!SafeSub(0, modified.constant, &negativeConstant) || !limitSum.add(negativeConstant))
+        return;
+
+    if (modified.constant > 0) {
+        phi->range()->setSymbolicLower(new SymbolicBound(NULL, initialSum));
+        phi->range()->setSymbolicUpper(new SymbolicBound(loopBound, limitSum));
+    } else {
+        phi->range()->setSymbolicUpper(new SymbolicBound(NULL, initialSum));
+        phi->range()->setSymbolicLower(new SymbolicBound(loopBound, limitSum));
+    }
+
+    IonSpew(IonSpew_Range, "added symbolic range on %d", phi->id());
+    SpewRange(phi);
+}
+
+// Whether bound is valid at the specified bounds check instruction in a loop,
+// and may be used to hoist ins.
+static inline bool
+SymbolicBoundIsValid(MBasicBlock *header, MBoundsCheck *ins, const SymbolicBound *bound)
+{
+    if (!bound->loop)
+        return true;
+    if (ins->block() == header)
+        return false;
+    MBasicBlock *bb = ins->block()->immediateDominator();
+    while (bb != header && bb != bound->loop->test->block())
+        bb = bb->immediateDominator();
+    return bb == bound->loop->test->block();
+}
+
+// Convert all components of a linear sum *except* its constant to a definition,
+// adding any necessary instructions to the end of block.
+static inline MDefinition *
+ConvertLinearSum(MBasicBlock *block, const LinearSum &sum)
+{
+    MDefinition *def = NULL;
+
+    for (size_t i = 0; i < sum.numTerms(); i++) {
+        LinearTerm term = sum.term(i);
+        JS_ASSERT(!term.term->isConstant());
+        if (term.scale == 1) {
+            if (def) {
+                def = MAdd::New(def, term.term);
+                def->toAdd()->setInt32();
+                block->insertBefore(block->lastIns(), def->toInstruction());
+            } else {
+                def = term.term;
+            }
+        } else {
+            if (!def) {
+                def = MConstant::New(Int32Value(0));
+                block->insertBefore(block->lastIns(), def->toInstruction());
+            }
+            if (term.scale == -1) {
+                def = MSub::New(def, term.term);
+                def->toSub()->setInt32();
+                block->insertBefore(block->lastIns(), def->toInstruction());
+            } else {
+                MConstant *factor = MConstant::New(Int32Value(term.scale));
+                block->insertBefore(block->lastIns(), factor);
+                MMul *mul = MMul::New(term.term, factor);
+                mul->setInt32();
+                block->insertBefore(block->lastIns(), mul);
+                def = MAdd::New(def, mul);
+                def->toAdd()->setInt32();
+                block->insertBefore(block->lastIns(), def->toInstruction());
+            }
+        }
+    }
+
+    if (!def) {
+        def = MConstant::New(Int32Value(0));
+        block->insertBefore(block->lastIns(), def->toInstruction());
+    }
+
     return def;
 }
 
+bool
+RangeAnalysis::tryHoistBoundsCheck(MBasicBlock *header, MBoundsCheck *ins)
+{
+    // The bounds check's length must be loop invariant.
+    if (ins->length()->block()->isMarked())
+        return false;
+
+    // The bounds check's index should not be loop invariant (else we would
+    // already have hoisted it during LICM).
+    SimpleLinearSum index = ExtractLinearSum(ins->index());
+    if (!index.term || !index.term->block()->isMarked())
+        return false;
+
+    // Check for a symbolic lower and upper bound on the index. If either
+    // condition depends on an iteration bound for the loop, only hoist if
+    // the bounds check is dominated by the iteration bound's test.
+    if (!index.term->range())
+        return false;
+    const SymbolicBound *lower = index.term->range()->symbolicLower();
+    if (!lower || !SymbolicBoundIsValid(header, ins, lower))
+        return false;
+    const SymbolicBound *upper = index.term->range()->symbolicUpper();
+    if (!upper || !SymbolicBoundIsValid(header, ins, upper))
+        return false;
+
+    MBasicBlock *preLoop = header->loopPredecessor();
+    JS_ASSERT(!preLoop->isMarked());
+
+    MDefinition *lowerTerm = ConvertLinearSum(preLoop, lower->sum);
+    if (!lowerTerm)
+        return false;
+
+    MDefinition *upperTerm = ConvertLinearSum(preLoop, upper->sum);
+    if (!upperTerm)
+        return false;
+
+    // We are checking that index + indexConstant >= 0, and know that
+    // index >= lowerTerm + lowerConstant. Thus, check that:
+    //
+    // lowerTerm + lowerConstant + indexConstant >= 0
+    // lowerTerm >= -lowerConstant - indexConstant
+
+    int32 lowerConstant = 0;
+    if (!SafeSub(lowerConstant, index.constant, &lowerConstant))
+        return false;
+    if (!SafeSub(lowerConstant, lower->sum.constant(), &lowerConstant))
+        return false;
+    MBoundsCheckLower *lowerCheck = MBoundsCheckLower::New(lowerTerm);
+    lowerCheck->setMinimum(lowerConstant);
+
+    // We are checking that index < boundsLength, and know that
+    // index <= upperTerm + upperConstant. Thus, check that:
+    //
+    // upperTerm + upperConstant < boundsLength
+
+    int32 upperConstant = index.constant;
+    if (!SafeAdd(upper->sum.constant(), upperConstant, &upperConstant))
+        return false;
+    MBoundsCheck *upperCheck = MBoundsCheck::New(upperTerm, ins->length());
+    upperCheck->setMinimum(upperConstant);
+    upperCheck->setMaximum(upperConstant);
+
+    // Hoist the loop invariant upper and lower bounds checks.
+    preLoop->insertBefore(preLoop->lastIns(), lowerCheck);
+    preLoop->insertBefore(preLoop->lastIns(), upperCheck);
+
+    return true;
+}
 
 bool
 RangeAnalysis::analyze()
 {
-    int numBlocks = 0;
-    for (PostorderIterator i(graph_.poBegin()); i != graph_.poEnd(); i++) {
-        numBlocks++;
-        MBasicBlock *curBlock = *i;
-        if (!curBlock->isLoopHeader())
-            continue;
-        for (MPhiIterator pi(curBlock->phisBegin()); pi != curBlock->phisEnd(); pi++)
-            if (!pi->initCounts())
-                return false;
-    }
-
     IonSpew(IonSpew_Range, "Doing range propagation");
-    MDefinitionVector worklist;
 
-    for (ReversePostorderIterator block(graph_.rpoBegin()); block != graph_.rpoEnd(); block++) {
-        for (MDefinitionIterator iter(*block); iter; iter++) {
+    for (ReversePostorderIterator iter(graph_.rpoBegin()); iter != graph_.rpoEnd(); iter++) {
+        MBasicBlock *block = *iter;
+
+        for (MDefinitionIterator iter(block); iter; iter++) {
             MDefinition *def = *iter;
 
-            AddToWorklist(worklist, def);
-
-        }
-    }
-    size_t iters = 0;
-
-    while (!worklist.empty()) {
-        MDefinition *def = PopFromWorklist(worklist);
-        IonSpew(IonSpew_Range, "recomputing range on %d", def->id());
-        SpewRange(def);
-        if (!def->earlyAbortCheck() && def->recomputeRange()) {
-            JS_ASSERT(def->range()->lower() <= def->range()->upper());
-            IonSpew(IonSpew_Range, "Range changed; adding consumers");
-            IonSpew(IonSpew_Range, "New range for %d is: (%d, %d)", def->id(), def->range()->lower(), def->range()->upper());
-            for (MUseDefIterator use(def); use; use++) {
-                if(!AddToWorklist(worklist, use.def()))
-                    return false;
-            }
-        }
-        iters++;
-        if (iters >= numBlocks * 100)
-            return false;
-    }
-    // Cleanup (in case we stopped due to MAX_ITERS)
-    for(size_t i = 0; i < worklist.length(); i++)
-        worklist[i]->setNotInWorklist();
-
-
-#ifdef DEBUG
-    for (ReversePostorderIterator block(graph_.rpoBegin()); block != graph_.rpoEnd(); block++) {
-        for (MDefinitionIterator iter(*block); iter; iter++) {
-            MDefinition *def = *iter;
+            def->computeRange();
+            IonSpew(IonSpew_Range, "computing range on %d", def->id());
             SpewRange(def);
-            JS_ASSERT(def->range()->lower() <= def->range()->upper());
-            JS_ASSERT(!def->isInWorklist());
         }
+
+        if (block->isLoopHeader())
+            analyzeLoop(block);
     }
-#endif
+
     return true;
 }
diff --git a/js/src/ion/RangeAnalysis.h b/js/src/ion/RangeAnalysis.h
index b60f6857745f..845e4689f404 100644
--- a/js/src/ion/RangeAnalysis.h
+++ b/js/src/ion/RangeAnalysis.h
@@ -11,6 +11,7 @@
 #include "wtf/Platform.h"
 #include "MIR.h"
 #include "CompileInfo.h"
+#include "IonAnalysis.h"
 
 namespace js {
 namespace ion {
@@ -18,6 +19,52 @@ namespace ion {
 class MBasicBlock;
 class MIRGraph;
 
+// An upper bound computed on the number of backedges a loop will take.
+// This count only includes backedges taken while running Ion code: for OSR
+// loops, this will exclude iterations that executed in the interpreter or in
+// baseline compiled code.
+struct LoopIterationBound : public TempObject
+{
+    // Loop for which this bound applies.
+    MBasicBlock *header;
+
+    // Test from which this bound was derived. Code in the loop body which this
+    // test dominates (will include the backedge) will execute at most 'bound'
+    // times. Other code in the loop will execute at most '1 + Max(bound, 0)'
+    // times.
+    MTest *test;
+
+    // Symbolic bound computed for the number of backedge executions.
+    LinearSum sum;
+
+    LoopIterationBound(MBasicBlock *header, MTest *test, LinearSum sum)
+      : header(header), test(test), sum(sum)
+    {
+    }
+};
+
+// A symbolic upper or lower bound computed for a term.
+struct SymbolicBound : public TempObject
+{
+    // Any loop iteration bound from which this was derived.
+    //
+    // If non-NULL, then 'sum' is only valid within the loop body, at points
+    // dominated by the loop bound's test (see LoopIterationBound).
+    //
+    // If NULL, then 'sum' is always valid.
+    LoopIterationBound *loop;
+
+    // Computed symbolic bound, see above.
+    LinearSum sum;
+
+    SymbolicBound(LoopIterationBound *loop, LinearSum sum)
+      : loop(loop), sum(sum)
+    {
+    }
+
+    void print(Sprinter &sp) const;
+};
+
 class RangeAnalysis
 {
   protected:
@@ -33,16 +80,20 @@ class RangeAnalysis
     bool addBetaNobes();
     bool analyze();
     bool removeBetaNobes();
+
+  private:
+    void analyzeLoop(MBasicBlock *header);
+    LoopIterationBound *analyzeLoopIterationCount(MBasicBlock *header,
+                                                  MTest *test, BranchDirection direction);
+    void analyzeLoopPhi(MBasicBlock *header, LoopIterationBound *loopBound, MPhi *phi);
+    bool tryHoistBoundsCheck(MBasicBlock *header, MBoundsCheck *ins);
+    void markBlocksInLoopBody(MBasicBlock *header, MBasicBlock *current);
 };
 
-struct RangeChangeCount;
-class Range {
+class Range : public TempObject {
   private:
-    // :TODO: we should do symbolic range evaluation, where we have
-    // information of the form v1 < v2 for arbitrary defs v1 and v2, not
-    // just constants of type int32.
-    // (Bug 766592)
-
+    // Absolute ranges.
+    //
     // We represent ranges where the endpoints can be in the set:
     // {-infty} U [INT_MIN, INT_MAX] U {infty}.  A bound of +/-
     // infty means that the value may have overflowed in that
@@ -69,33 +120,38 @@ class Range {
     int32 upper_;
     bool upper_infinite_;
 
+    // Any symbolic lower or upper bound computed for this term.
+    const SymbolicBound *symbolicLower_;
+    const SymbolicBound *symbolicUpper_;
+
   public:
     Range()
         : lower_(JSVAL_INT_MIN),
           lower_infinite_(true),
           upper_(JSVAL_INT_MAX),
-          upper_infinite_(true)
+          upper_infinite_(true),
+          symbolicLower_(NULL),
+          symbolicUpper_(NULL)
     {}
 
-    Range(int64_t l, int64_t h) {
+    Range(int64_t l, int64_t h)
+        : symbolicLower_(NULL),
+          symbolicUpper_(NULL)
+    {
         setLower(l);
         setUpper(h);
     }
 
     Range(const Range &other)
-    : lower_(other.lower_),
-      lower_infinite_(other.lower_infinite_),
-      upper_(other.upper_),
-      upper_infinite_(other.upper_infinite_)
+        : lower_(other.lower_),
+          lower_infinite_(other.lower_infinite_),
+          upper_(other.upper_),
+          upper_infinite_(other.upper_infinite_),
+          symbolicLower_(NULL),
+          symbolicUpper_(NULL)
     {}
-    static Range Truncate(int64_t l, int64_t h) {
-        Range ret(l,h);
-        if (!ret.isFinite()) {
-            ret.makeLowerInfinite();
-            ret.makeUpperInfinite();
-        }
-        return ret;
-    }
+
+    static Range *Truncate(int64_t l, int64_t h);
 
     static int64_t abs64(int64_t x) {
 #ifdef WTF_OS_WINDOWS
@@ -105,7 +161,7 @@ class Range {
 #endif
     }
 
-    void printRange(FILE *fp);
+    void print(Sprinter &sp) const;
     bool update(const Range *other);
     bool update(const Range &other) {
         return update(&other);
@@ -116,15 +172,15 @@ class Range {
     // copying when chaining together unions when handling Phi
     // nodes.
     void unionWith(const Range *other);
-    static Range intersect(const Range *lhs, const Range *rhs, bool *nullRange);
-    static Range addTruncate(const Range *lhs, const Range *rhs);
-    static Range subTruncate(const Range *lhs, const Range *rhs);
-    static Range add(const Range *lhs, const Range *rhs);
-    static Range sub(const Range *lhs, const Range *rhs);
-    static Range mul(const Range *lhs, const Range *rhs);
-    static Range and_(const Range *lhs, const Range *rhs);
-    static Range shl(const Range *lhs, int32 c);
-    static Range shr(const Range *lhs, int32 c);
+    static Range * intersect(const Range *lhs, const Range *rhs, bool *emptyRange);
+    static Range * addTruncate(const Range *lhs, const Range *rhs);
+    static Range * subTruncate(const Range *lhs, const Range *rhs);
+    static Range * add(const Range *lhs, const Range *rhs);
+    static Range * sub(const Range *lhs, const Range *rhs);
+    static Range * mul(const Range *lhs, const Range *rhs);
+    static Range * and_(const Range *lhs, const Range *rhs);
+    static Range * shl(const Range *lhs, int32 c);
+    static Range * shr(const Range *lhs, int32 c);
 
     static bool precisionLossMul(const Range *lhs, const Range *rhs);
 
@@ -184,35 +240,20 @@ class Range {
         setLower(l);
         setUpper(h);
     }
-};
 
-struct RangeChangeCount {
-    Range oldRange;
-    unsigned char lowerCount_ : 4;
-    unsigned char upperCount_ : 4;
-    RangeChangeCount() : oldRange(), lowerCount_(0), upperCount_(0) {};
-    void updateRange(Range *newRange) {
-        JS_ASSERT(newRange->lower() >= oldRange.lower());
-        if (newRange->lower() != oldRange.lower())
-            lowerCount_ = lowerCount_ < 15 ? lowerCount_ + 1 : lowerCount_;
-        JS_ASSERT(newRange->upper() <= oldRange.upper());
-        if (newRange->upper() != oldRange.upper())
-            upperCount_ = upperCount_ < 15 ? upperCount_ + 1 : upperCount_;
-        oldRange = *newRange;
+    const SymbolicBound *symbolicLower() const {
+        return symbolicLower_;
+    }
+    const SymbolicBound *symbolicUpper() const {
+        return symbolicUpper_;
+    }
+
+    void setSymbolicLower(SymbolicBound *bound) {
+        symbolicLower_ = bound;
+    }
+    void setSymbolicUpper(SymbolicBound *bound) {
+        symbolicUpper_ = bound;
     }
-};
-class RangeUpdater {
-    Range r_;
-    bool lowerSet_;
-    bool upperSet_;
-  public:
-    RangeUpdater() : r_(), lowerSet_(false), upperSet_(false) {}
-    void unionWith(const Range *other);
-    void unionWith(RangeChangeCount *other);
-    void updateLower(const Range * other);
-    void updateUpper(const Range * other);
-    Range *getRange() { JS_ASSERT(lowerSet_ && upperSet_); return &r_; }
-    void printRange(FILE *fp) { r_.printRange(fp); }
 };
 
 } // namespace ion

From 07cf66e55e3f3c93d9e2b0274b46e071b47e9fbc Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Fri, 23 Nov 2012 21:13:37 -0800
Subject: [PATCH 105/160] Bug 808263 - Write profile creation time to the
 profile on creation. r=Mossop

---
 toolkit/profile/nsToolkitProfileService.cpp  | 45 ++++++++++++++
 toolkit/profile/test/test_create_profile.xul | 64 ++++++++++++++++++--
 2 files changed, 103 insertions(+), 6 deletions(-)

diff --git a/toolkit/profile/nsToolkitProfileService.cpp b/toolkit/profile/nsToolkitProfileService.cpp
index e70b890fbf47..9782ac541872 100644
--- a/toolkit/profile/nsToolkitProfileService.cpp
+++ b/toolkit/profile/nsToolkitProfileService.cpp
@@ -7,6 +7,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <prlong.h>
+#include <prprf.h>
+#include <prtime.h>
 #include "nsProfileLock.h"
 
 #ifdef XP_WIN
@@ -122,6 +125,8 @@ private:
 
     NS_HIDDEN_(nsresult) Init();
 
+    nsresult CreateTimesInternal(nsIFile *profileDir);
+
     nsresult CreateProfileInternal(nsIFile* aRootDir,
                                    nsIFile* aLocalDir,
                                    const nsACString& aName,
@@ -813,6 +818,12 @@ nsToolkitProfileService::CreateProfileInternal(nsIFile* aRootDir,
         NS_ENSURE_SUCCESS(rv, rv);
     }
 
+    // We created a new profile dir. Let's store a creation timestamp.
+    // Note that this code path does not apply if the profile dir was
+    // created prior to launching.
+    rv = CreateTimesInternal(rootDir);
+    NS_ENSURE_SUCCESS(rv, rv);
+
     nsToolkitProfile* last = aForExternalApp ? nullptr : mFirst;
     if (last) {
         while (last->mNext)
@@ -827,6 +838,40 @@ nsToolkitProfileService::CreateProfileInternal(nsIFile* aRootDir,
     return NS_OK;
 }
 
+nsresult
+nsToolkitProfileService::CreateTimesInternal(nsIFile* aProfileDir)
+{
+    nsresult rv = NS_ERROR_FAILURE;
+    nsCOMPtr<nsIFile> creationLog;
+    rv = aProfileDir->Clone(getter_AddRefs(creationLog));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = creationLog->AppendNative(NS_LITERAL_CSTRING("times.json"));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    bool exists = false;
+    creationLog->Exists(&exists);
+    if (exists) {
+      return NS_OK;
+    }
+
+    rv = creationLog->Create(nsIFile::NORMAL_FILE_TYPE, 0700);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    // We don't care about microsecond resolution.
+    PRInt64 msec;
+    LL_DIV(msec, PR_Now(), PR_USEC_PER_MSEC);
+
+    // Write it out.
+    PRFileDesc *writeFile;
+    rv = creationLog->OpenNSPRFileDesc(PR_WRONLY, 0700, &writeFile);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    PR_fprintf(writeFile, "{\n\"created\": %lld\n}\n", msec);
+    PR_Close(writeFile);
+    return NS_OK;
+}
+
 NS_IMETHODIMP
 nsToolkitProfileService::GetProfileCount(uint32_t *aResult)
 {
diff --git a/toolkit/profile/test/test_create_profile.xul b/toolkit/profile/test/test_create_profile.xul
index 9ee6ba96f071..f670d215417c 100644
--- a/toolkit/profile/test/test_create_profile.xul
+++ b/toolkit/profile/test/test_create_profile.xul
@@ -29,8 +29,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=543854
   const ASCIIName = "myprofile";
   const UnicodeName = "\u09A0\u09BE\u0995\u09C1\u09B0"; // A Bengali name
 
+  var gIOService;
   var gProfileService;
 
+  gIOService = Cc["@mozilla.org/network/io-service;1"].
+    getService(Ci.nsIIOService);
+
   gProfileService = Cc["@mozilla.org/toolkit/profile-service;1"].
     getService(Ci.nsIToolkitProfileService);
 
@@ -38,24 +42,72 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=543854
   createProfile(UnicodeName);
   SimpleTest.finish();
 
-function createProfile(profileName)
-{
-  var profile = gProfileService.createProfile(null, null, profileName);
+/**
+ * Read the contents of an nsIFile. Throws on error.
+
+ * @param file an nsIFile instance.
+ * @return string contents.
+ */
+function readFile(file) {
+  let fstream = Cc["@mozilla.org/network/file-input-stream;1"].
+    createInstance(Ci.nsIFileInputStream);
+  let sstream = Cc["@mozilla.org/scriptableinputstream;1"].
+    createInstance(Components.interfaces.nsIScriptableInputStream);
+
+  const RO = 0x01;
+  const READ_OTHERS = 4;
+
+  fstream.init(file, RO, READ_OTHERS, 0);
+  sstream.init(fstream);
+  let out = sstream.read(sstream.available());
+  sstream.close();
+  fstream.close();
+  return out;
+}
+
+function checkBounds(lowerBound, value, upperBound) {
+  ok(lowerBound <= value, "value " + value +
+                          " is above lower bound " + lowerBound);
+  ok(upperBound >= value, "value " + value +
+                          " is within upper bound " + upperBound);
+}
+
+function createProfile(profileName) {
+  // Filesystem precision is lower than Date precision.
+  let lowerBound = Date.now() - 1000;
+
+  let profile = gProfileService.createProfile(null, null, profileName);
 
   // check that the directory was created
   isnot(profile, null, "Profile " + profileName + " created");
 
-  var profileDir = profile.rootDir;
+  let profileDir = profile.rootDir;
 
   ok(profileDir.exists(), "Profile dir created");
   ok(profileDir.isDirectory(), "Profile dir is a directory");
 
-  var profileDirPath = profileDir.path;
+  let profileDirPath = profileDir.path;
 
   is(profileDirPath.substr(profileDirPath.length - profileName.length),
      profileName, "Profile dir has expected name");
 
-  // clean up the profile
+  // Ensure that our timestamp file was created.
+  let jsonFile = profileDir.clone();
+  jsonFile.append("times.json");
+  ok(jsonFile.path, "Path is " + jsonFile.path);
+  ok(jsonFile.exists(), "Times file was created");
+  ok(jsonFile.isFile(), "Times file is a file");
+  let json = JSON.parse(readFile(jsonFile));
+
+  let upperBound = Date.now() + 1000;
+
+  let created = json.created;
+  ok(created, "created is set");
+
+  // Check against real clock time.
+  checkBounds(lowerBound, created, upperBound);
+
+  // Clean up the profile.
   profile.remove(true);
 }
 

From c0bc8ca51435c5fad752ffa9f1b5f2043aaa941b Mon Sep 17 00:00:00 2001
From: "Thinker K.F. Li" <thinker@codemud.net>
Date: Sat, 24 Nov 2012 20:25:02 +1300
Subject: [PATCH 106/160] Bug 805711 - check EOS against audio source for
 OmxDecoder. r=doublec

---
 content/media/omx/OmxDecoder.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/content/media/omx/OmxDecoder.cpp b/content/media/omx/OmxDecoder.cpp
index f4a7114a7055..ef577630bc2a 100644
--- a/content/media/omx/OmxDecoder.cpp
+++ b/content/media/omx/OmxDecoder.cpp
@@ -571,6 +571,11 @@ bool OmxDecoder::ReadAudio(AudioFrame *aFrame, int64_t aSeekTimeUs)
       return ReadAudio(aFrame, aSeekTimeUs);
     }
   }
+  else if (err == ERROR_END_OF_STREAM) {
+    if (aFrame->mSize == 0) {
+      return false;
+    }
+  }
 
   return true;
 }

From 3db742746983ca5aa091702744cf997c0a57a52b Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 24 Nov 2012 20:05:37 +0100
Subject: [PATCH 107/160] Bug 814777 - Try to fix timeout handling for
 testharness.js tests; r=jgraham

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

diff --git a/dom/imptests/testharnessreport.js b/dom/imptests/testharnessreport.js
index 7e2ed31abb74..ecd218f8f350 100644
--- a/dom/imptests/testharnessreport.js
+++ b/dom/imptests/testharnessreport.js
@@ -197,7 +197,7 @@ var W3CTest = {
     add_completion_callback(W3CTest.finish.bind(W3CTest));
     setup({
       "output": false,
-      "timeout": 1000000
+      "explicit_timeout": true
     });
   } catch (e) {
     W3CTest.logFailure("Unexpected exception: " + e);

From 4b2d94c7619e8a656e006cdd982032f86f2c978d Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Sat, 24 Nov 2012 17:32:08 -0500
Subject: [PATCH 108/160] Bug 775511 - Move full screen state variable from
 GeckoApp to LayerView. r=Cwiiis

---
 mobile/android/base/GeckoApp.java             | 15 +++++++++++----
 mobile/android/base/gfx/GeckoLayerClient.java |  5 +++++
 mobile/android/base/gfx/LayerView.java        |  9 +++++++++
 mobile/android/base/ui/PanZoomController.java |  2 +-
 mobile/android/base/ui/PanZoomTarget.java     |  1 +
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index e97484f5ab18..d9a344b631a5 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -161,7 +161,6 @@ abstract public class GeckoApp
     public View getView() { return mGeckoLayout; }
     public SurfaceView cameraView;
     public static GeckoApp mAppContext;
-    public boolean mDOMFullScreen = false;
     protected MenuPresenter mMenuPresenter;
     protected MenuPanel mMenuPanel;
     protected Menu mMenu;
@@ -991,9 +990,17 @@ abstract public class GeckoApp
             } else if (event.equals("ToggleChrome:Focus")) {
                 focusChrome();
             } else if (event.equals("DOMFullScreen:Start")) {
-                mDOMFullScreen = true;
+                // Local ref to layerView for thread safety
+                LayerView layerView = mLayerView;
+                if (layerView != null) {
+                    layerView.setFullScreen(true);
+                }
             } else if (event.equals("DOMFullScreen:Stop")) {
-                mDOMFullScreen = false;
+                // Local ref to layerView for thread safety
+                LayerView layerView = mLayerView;
+                if (layerView != null) {
+                    layerView.setFullScreen(false);
+                }
             } else if (event.equals("Permissions:Data")) {
                 String host = message.getString("host");
                 JSONArray permissions = message.getJSONArray("permissions");
@@ -2504,7 +2511,7 @@ abstract public class GeckoApp
             return;
         }
 
-        if (mDOMFullScreen) {
+        if (mLayerView.isFullScreen()) {
             GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("FullScreen:Exit", null));
             return;
         }
diff --git a/mobile/android/base/gfx/GeckoLayerClient.java b/mobile/android/base/gfx/GeckoLayerClient.java
index dac50a934c65..19d2a60da334 100644
--- a/mobile/android/base/gfx/GeckoLayerClient.java
+++ b/mobile/android/base/gfx/GeckoLayerClient.java
@@ -650,6 +650,11 @@ public class GeckoLayerClient
         return mZoomConstraints;
     }
 
+    /** Implementation of PanZoomTarget */
+    public boolean isFullScreen() {
+        return mView.isFullScreen();
+    }
+
     /** Implementation of PanZoomTarget */
     public void setAnimationTarget(ImmutableViewportMetrics metrics) {
         if (mGeckoIsReady) {
diff --git a/mobile/android/base/gfx/LayerView.java b/mobile/android/base/gfx/LayerView.java
index 095af1875849..ea1096edb28d 100644
--- a/mobile/android/base/gfx/LayerView.java
+++ b/mobile/android/base/gfx/LayerView.java
@@ -54,6 +54,7 @@ public class LayerView extends FrameLayout {
     private int mPaintState;
     private int mCheckerboardColor;
     private boolean mCheckerboardShouldShowChecks;
+    private boolean mFullScreen;
 
     private SurfaceView mSurfaceView;
     private TextureView mTextureView;
@@ -426,4 +427,12 @@ public class LayerView extends FrameLayout {
         super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
         GeckoAccessibility.onLayerViewFocusChanged(this, gainFocus);
     }
+
+    public void setFullScreen(boolean fullScreen) {
+        mFullScreen = fullScreen;
+    }
+
+    public boolean isFullScreen() {
+        return mFullScreen;
+    }
 }
diff --git a/mobile/android/base/ui/PanZoomController.java b/mobile/android/base/ui/PanZoomController.java
index 2f00a5887fbe..866db03dea0b 100644
--- a/mobile/android/base/ui/PanZoomController.java
+++ b/mobile/android/base/ui/PanZoomController.java
@@ -831,7 +831,7 @@ public class PanZoomController
 
     @Override
     public boolean onScale(SimpleScaleGestureDetector detector) {
-        if (GeckoApp.mAppContext == null || GeckoApp.mAppContext.mDOMFullScreen)
+        if (mTarget.isFullScreen())
             return false;
 
         if (mState != PanZoomState.PINCHING)
diff --git a/mobile/android/base/ui/PanZoomTarget.java b/mobile/android/base/ui/PanZoomTarget.java
index ef8a641bf5e4..aa13f3331cd6 100644
--- a/mobile/android/base/ui/PanZoomTarget.java
+++ b/mobile/android/base/ui/PanZoomTarget.java
@@ -13,6 +13,7 @@ import android.graphics.PointF;
 public interface PanZoomTarget {
     public ImmutableViewportMetrics getViewportMetrics();
     public ZoomConstraints getZoomConstraints();
+    public boolean isFullScreen();
 
     public void setAnimationTarget(ImmutableViewportMetrics viewport);
     public void setViewportMetrics(ImmutableViewportMetrics viewport);

From 9a78308c75df939d5b0fea31ea42cbb37332df2b Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Sat, 24 Nov 2012 17:32:09 -0500
Subject: [PATCH 109/160] Bug 775511 - Disable panning and showing of
 scrollbars when in full-screen mode. r=Cwiiis

---
 mobile/android/base/gfx/LayerRenderer.java    | 6 +++---
 mobile/android/base/ui/PanZoomController.java | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/gfx/LayerRenderer.java b/mobile/android/base/gfx/LayerRenderer.java
index b16f1fa5bf78..bcc06ab85010 100644
--- a/mobile/android/base/gfx/LayerRenderer.java
+++ b/mobile/android/base/gfx/LayerRenderer.java
@@ -454,9 +454,9 @@ public class LayerRenderer implements Tabs.OnTabsChangedListener {
 
             Layer rootLayer = mView.getLayerClient().getRoot();
 
-            if (!mPageContext.fuzzyEquals(mLastPageContext)) {
-                // the viewport or page changed, so show the scrollbars again
-                // as per UX decision
+            if (!mPageContext.fuzzyEquals(mLastPageContext) && !mView.isFullScreen()) {
+                // The viewport or page changed, so show the scrollbars again
+                // as per UX decision. Don't do this if we're in full-screen mode though.
                 mVertScrollLayer.unfade();
                 mHorizScrollLayer.unfade();
                 mFadeRunnable.scheduleStartFade(ScrollbarLayer.FADE_DELAY);
diff --git a/mobile/android/base/ui/PanZoomController.java b/mobile/android/base/ui/PanZoomController.java
index 866db03dea0b..aa32ba883bba 100644
--- a/mobile/android/base/ui/PanZoomController.java
+++ b/mobile/android/base/ui/PanZoomController.java
@@ -315,7 +315,8 @@ public class PanZoomController
             return false;
 
         case TOUCHING:
-            if (panDistance(event) < PAN_THRESHOLD) {
+            // Don't allow panning if there is an element in full-screen mode. See bug 775511.
+            if (mTarget.isFullScreen() || panDistance(event) < PAN_THRESHOLD) {
                 return false;
             }
             cancelTouch();

From b946212eec91307a8cabf14f7a9432442cc9914d Mon Sep 17 00:00:00 2001
From: Gina Yeh <gyeh@mozilla.com>
Date: Mon, 26 Nov 2012 10:35:55 +0800
Subject: [PATCH 110/160] Bug 814555 - Patch 1: After hanging up the phone,
 still ring tone from bluetooth, r=echou

---
 dom/bluetooth/BluetoothHfpManager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dom/bluetooth/BluetoothHfpManager.cpp b/dom/bluetooth/BluetoothHfpManager.cpp
index bffe034f9b0f..7d749014cfe5 100644
--- a/dom/bluetooth/BluetoothHfpManager.cpp
+++ b/dom/bluetooth/BluetoothHfpManager.cpp
@@ -823,6 +823,7 @@ BluetoothHfpManager::SetupCIND(int aCallIndex, int aCallState, bool aInitial)
       if (!aInitial) {
         switch (currentCallState) {
           case nsIRadioInterfaceLayer::CALL_STATE_INCOMING:
+          case nsIRadioInterfaceLayer::CALL_STATE_BUSY:
             // Incoming call, no break
             sStopSendingRingFlag = true;
           case nsIRadioInterfaceLayer::CALL_STATE_DIALING:
@@ -979,6 +980,7 @@ BluetoothHfpManager::OnDisconnect()
     NotifySettings();
   }
 
+  sStopSendingRingFlag = true;
   sCINDItems[CINDType::CALL].value = CallState::NO_CALL;
   sCINDItems[CINDType::CALLSETUP].value = CallSetupState::NO_CALLSETUP;
   sCINDItems[CINDType::CALLHELD].value = CallHeldState::NO_CALLHELD;

From 544de2de55ae42c214c4efff495baafd980f44a2 Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Sun, 25 Nov 2012 22:48:35 -0800
Subject: [PATCH 111/160] Bug 815047 - Qt Geolocation does not compile on mer
 sdk QtMobility namespace missing. r=romaxa DONTBUILD NPODB

---
 dom/system/unix/QTMLocationProvider.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/system/unix/QTMLocationProvider.h b/dom/system/unix/QTMLocationProvider.h
index b6ed7ad70a4a..f61ba833ae94 100644
--- a/dom/system/unix/QTMLocationProvider.h
+++ b/dom/system/unix/QTMLocationProvider.h
@@ -24,7 +24,7 @@ public:
 
 public Q_SLOTS:
     // QGeoPositionInfoSource
-    void positionUpdated(const QGeoPositionInfo&);
+    void positionUpdated(const QtMobility::QGeoPositionInfo&);
 
 private:
     ~QTMLocationProvider();

From 7e44abfc4f0c897de2113c2e4d6ecc936204059c Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Sun, 25 Nov 2012 23:13:12 -0800
Subject: [PATCH 112/160] Bug 815047 - Qt Orientation does not compile on mer
 sdk QtMobility namespace missing. r=romaxa NPODB DONTBUILD

---
 widget/qt/mozqorientationsensorfilter.cpp |  2 ++
 widget/qt/mozqorientationsensorfilter.h   | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/widget/qt/mozqorientationsensorfilter.cpp b/widget/qt/mozqorientationsensorfilter.cpp
index aeba6607aa6e..db97fff1b437 100644
--- a/widget/qt/mozqorientationsensorfilter.cpp
+++ b/widget/qt/mozqorientationsensorfilter.cpp
@@ -12,6 +12,8 @@
 #endif
 #include "nsXULAppAPI.h"
 
+using namespace QtMobility;
+
 int MozQOrientationSensorFilter::mWindowRotationAngle = 0;
 QTransform MozQOrientationSensorFilter::mWindowRotationTransform;
 
diff --git a/widget/qt/mozqorientationsensorfilter.h b/widget/qt/mozqorientationsensorfilter.h
index 856e9aee90aa..d5f34dcf781b 100644
--- a/widget/qt/mozqorientationsensorfilter.h
+++ b/widget/qt/mozqorientationsensorfilter.h
@@ -13,7 +13,8 @@
 #include <QTransform>
 
 
-class MozQOrientationSensorFilter : public QObject, public QOrientationFilter
+class MozQOrientationSensorFilter : public QObject
+                                  , public QtMobility::QOrientationFilter
 {
     Q_OBJECT
 
@@ -25,7 +26,7 @@ public:
 
     virtual ~MozQOrientationSensorFilter(){}
 
-    virtual bool filter(QOrientationReading* reading);
+    virtual bool filter(QtMobility::QOrientationReading* reading);
 
     static int GetWindowRotationAngle();
     static QTransform& GetRotationTransform();
@@ -34,7 +35,10 @@ signals:
     void orientationChanged();
 
 private:
-    bool filter(QSensorReading *reading) { return filter(static_cast<QOrientationReading*>(reading)); }
+    bool filter(QtMobility::QSensorReading *reading)
+    {
+        return filter(static_cast<QtMobility::QOrientationReading*>(reading));
+    }
 
     static int mWindowRotationAngle;
     static QTransform mWindowRotationTransform;

From 13c706ad4498a0f14ae0d0c81fff4a96134042ca Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Mon, 26 Nov 2012 00:08:22 -0800
Subject: [PATCH 113/160] Bug 814979 - Fennec build fails with Mer SDK: invalid
 inclusion of GLXLibrary.h. r=glandium,mattwoodrow

---
 configure.in                         |  1 +
 gfx/layers/opengl/CanvasLayerOGL.cpp |  8 ++++----
 gfx/layers/opengl/CanvasLayerOGL.h   |  6 +++---
 gfx/layers/opengl/ImageLayerOGL.cpp  |  4 ++--
 gfx/thebes/gfxXlibSurface.cpp        | 14 +++++++-------
 gfx/thebes/gfxXlibSurface.h          |  6 +++---
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/configure.in b/configure.in
index d8b471ef0801..ec1694770bef 100644
--- a/configure.in
+++ b/configure.in
@@ -6704,6 +6704,7 @@ AC_SUBST(MOZ_GL_PROVIDER)
 AC_DEFINE_UNQUOTED(MOZ_GL_PROVIDER, GLContextProvider$MOZ_GL_PROVIDER)
 fi
 AC_SUBST(MOZ_GL_DEFAULT_PROVIDER)
+AC_DEFINE_UNQUOTED(GL_PROVIDER_$MOZ_GL_DEFAULT_PROVIDER)
 
 dnl ========================================================
 dnl = faststripe theme
diff --git a/gfx/layers/opengl/CanvasLayerOGL.cpp b/gfx/layers/opengl/CanvasLayerOGL.cpp
index 981130029e08..3bd9e578b40e 100644
--- a/gfx/layers/opengl/CanvasLayerOGL.cpp
+++ b/gfx/layers/opengl/CanvasLayerOGL.cpp
@@ -129,7 +129,7 @@ CanvasLayerOGL::Initialize(const Data& aData)
   } else if (aData.mSurface) {
     mCanvasSurface = aData.mSurface;
     mNeedsYFlip = false;
-#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
     if (aData.mSurface->GetType() == gfxASurface::SurfaceTypeXlib) {
         gfxXlibSurface *xsurf = static_cast<gfxXlibSurface*>(aData.mSurface);
         mPixmap = xsurf->GetGLXPixmap();
@@ -188,7 +188,7 @@ CanvasLayerOGL::UpdateSurface()
     return;
   }
 
-#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
   if (mPixmap) {
     return;
   }
@@ -308,7 +308,7 @@ CanvasLayerOGL::RenderLayer(int aPreviousDestination,
     program = mOGLManager->GetProgram(mLayerProgram, GetMaskLayer());
   }
 
-#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
   if (mPixmap && !mDelayedUpdates) {
     sDefGLXLib.BindTexImage(mPixmap);
   }
@@ -334,7 +334,7 @@ CanvasLayerOGL::RenderLayer(int aPreviousDestination,
     mOGLManager->BindAndDrawQuadWithTextureRect(program, drawRect, drawRect.Size());
   }
 
-#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
   if (mPixmap && !mDelayedUpdates) {
     sDefGLXLib.ReleaseTexImage(mPixmap);
   }
diff --git a/gfx/layers/opengl/CanvasLayerOGL.h b/gfx/layers/opengl/CanvasLayerOGL.h
index e6aa5600ffd1..ea824fbaa343 100644
--- a/gfx/layers/opengl/CanvasLayerOGL.h
+++ b/gfx/layers/opengl/CanvasLayerOGL.h
@@ -9,7 +9,7 @@
 
 #include "LayerManagerOGL.h"
 #include "gfxASurface.h"
-#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
 #include "GLXLibrary.h"
 #include "mozilla/X11Util.h"
 #endif
@@ -31,7 +31,7 @@ public:
       mTexture(0),
       mTextureTarget(LOCAL_GL_TEXTURE_2D),
       mDelayedUpdates(false)
-#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
       ,mPixmap(0)
 #endif
   { 
@@ -65,7 +65,7 @@ protected:
   bool mGLBufferIsPremultiplied;
   bool mNeedsYFlip;
   bool mForceReadback;
-#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
   GLXPixmap mPixmap;
 #endif
 
diff --git a/gfx/layers/opengl/ImageLayerOGL.cpp b/gfx/layers/opengl/ImageLayerOGL.cpp
index c84c1262996c..7eac2bd38e87 100644
--- a/gfx/layers/opengl/ImageLayerOGL.cpp
+++ b/gfx/layers/opengl/ImageLayerOGL.cpp
@@ -14,7 +14,7 @@
 #include "gfxUtils.h"
 #include "yuv_convert.h"
 #include "GLContextProvider.h"
-#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
 # include "GLXLibrary.h"
 # include "gfxXlibSurface.h"
 #endif
@@ -561,7 +561,7 @@ ImageLayerOGL::AllocateTexturesCairo(CairoImage *aImage)
 
   SetClamping(gl, tex);
 
-#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
   if (aImage->mSurface->GetType() == gfxASurface::SurfaceTypeXlib) {
     gfxXlibSurface *xsurf =
       static_cast<gfxXlibSurface*>(aImage->mSurface.get());
diff --git a/gfx/thebes/gfxXlibSurface.cpp b/gfx/thebes/gfxXlibSurface.cpp
index cba30d105fde..9a1ac0df58be 100644
--- a/gfx/thebes/gfxXlibSurface.cpp
+++ b/gfx/thebes/gfxXlibSurface.cpp
@@ -23,7 +23,7 @@ using namespace mozilla;
 
 gfxXlibSurface::gfxXlibSurface(Display *dpy, Drawable drawable, Visual *visual)
     : mPixmapTaken(false), mDisplay(dpy), mDrawable(drawable)
-#if !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
     , mGLXPixmap(None)
 #endif
 {
@@ -34,7 +34,7 @@ gfxXlibSurface::gfxXlibSurface(Display *dpy, Drawable drawable, Visual *visual)
 
 gfxXlibSurface::gfxXlibSurface(Display *dpy, Drawable drawable, Visual *visual, const gfxIntSize& size)
     : mPixmapTaken(false), mDisplay(dpy), mDrawable(drawable), mSize(size)
-#if !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
     , mGLXPixmap(None)
 #endif
 {
@@ -49,7 +49,7 @@ gfxXlibSurface::gfxXlibSurface(Screen *screen, Drawable drawable, XRenderPictFor
                                const gfxIntSize& size)
     : mPixmapTaken(false), mDisplay(DisplayOfScreen(screen)),
       mDrawable(drawable), mSize(size)
-#if !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
       , mGLXPixmap(None)
 #endif
 {
@@ -67,7 +67,7 @@ gfxXlibSurface::gfxXlibSurface(cairo_surface_t *csurf)
     : mPixmapTaken(false),
       mSize(cairo_xlib_surface_get_width(csurf),
             cairo_xlib_surface_get_height(csurf))
-#if !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
       , mGLXPixmap(None)
 #endif
 {
@@ -82,7 +82,7 @@ gfxXlibSurface::gfxXlibSurface(cairo_surface_t *csurf)
 
 gfxXlibSurface::~gfxXlibSurface()
 {
-#if !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
     if (mGLXPixmap) {
         gl::sDefGLXLib.DestroyPixmap(mGLXPixmap);
     }
@@ -217,7 +217,7 @@ gfxXlibSurface::CreateSimilarSurface(gfxContentType aContent,
 void
 gfxXlibSurface::Finish()
 {
-#if !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
     if (mGLXPixmap) {
         gl::sDefGLXLib.DestroyPixmap(mGLXPixmap);
         mGLXPixmap = None;
@@ -518,7 +518,7 @@ gfxXlibSurface::XRenderFormat()
     return cairo_xlib_surface_get_xrender_format(CairoSurface());
 }
 
-#if !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
 GLXPixmap
 gfxXlibSurface::GetGLXPixmap()
 {
diff --git a/gfx/thebes/gfxXlibSurface.h b/gfx/thebes/gfxXlibSurface.h
index 58d3096c467a..34322ebe51f9 100644
--- a/gfx/thebes/gfxXlibSurface.h
+++ b/gfx/thebes/gfxXlibSurface.h
@@ -11,7 +11,7 @@
 #include <X11/extensions/Xrender.h>
 #include <X11/Xlib.h>
 
-#if !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
 #include "GLXLibrary.h"
 #endif
 
@@ -76,7 +76,7 @@ public:
     // server, not the main application.
     virtual gfxASurface::MemoryLocation GetMemoryLocation() const;
 
-#if !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
     GLXPixmap GetGLXPixmap();
 #endif
 
@@ -103,7 +103,7 @@ protected:
 
     gfxIntSize mSize;
 
-#if !defined(MOZ_PLATFORM_MAEMO)
+#if defined(GL_PROVIDER_GLX)
     GLXPixmap mGLXPixmap;
 #endif
 };

From 369cc444e1607a4c7bbc46dc2f2715ab7f30e1fa Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Mon, 26 Nov 2012 15:34:37 -0500
Subject: [PATCH 115/160] Bug 815076 - The default Twitter search engine does
 not work r=bnicholson

---
 mobile/locales/en-US/searchplugins/twitter.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/locales/en-US/searchplugins/twitter.xml b/mobile/locales/en-US/searchplugins/twitter.xml
index 146a97ef4d29..da5eb759054c 100644
--- a/mobile/locales/en-US/searchplugins/twitter.xml
+++ b/mobile/locales/en-US/searchplugins/twitter.xml
@@ -5,7 +5,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
   <ShortName>Twitter</ShortName>
   <Image width="16" height="16">data:image/png;base64,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</Image>
-  <Url type="text/html" method="GET" template="https://mobile.twitter.com/search">
+  <Url type="text/html" method="GET" template="https://mobile.twitter.com/search/">
     <Param name="q" value="{searchTerms}"/>
   </Url>
   <InputEncoding>UTF-8</InputEncoding>

From 1008811963489bdee29de75ca72658c1973e8440 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Mon, 26 Nov 2012 15:34:40 -0500
Subject: [PATCH 116/160] Bug 762046 - Amazon search-plugin hard-coded for
 desktop site r=bnicholson

---
 mobile/locales/en-US/searchplugins/amazondotcom.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/mobile/locales/en-US/searchplugins/amazondotcom.xml b/mobile/locales/en-US/searchplugins/amazondotcom.xml
index 06b5cffdd20c..26eb1c8232e5 100644
--- a/mobile/locales/en-US/searchplugins/amazondotcom.xml
+++ b/mobile/locales/en-US/searchplugins/amazondotcom.xml
@@ -6,11 +6,8 @@
 <ShortName>Amazon.com</ShortName>
 <InputEncoding>ISO-8859-1</InputEncoding>
 <Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZJREFUeNrEV01IFGEYfndXNzq0QdalJOoUbQiBUuopD2k/GFSG/Vxyq0OHbCUjwn7AEooUzUNRkdkhS1o9JBVaUDctKqhoRQi0WjtlxG6XVtfpfb6Z2caZ2ZnZXZdeeJxvx+973+f9+775XJIkkUaWMcoYG5TxfMpvxlvGMGM8+RYEFOxn/JJyLzOMiwwv7LqUCNQwHjpxIxKJ0Gg4LABZUVhIfr+f1jLSlNuMwyCwEHoZS6xmvxoZoc6Oq+JpJoVMpOncWdpcWZkOiRIQ2MKDp1az+kIhOtV40pHG6zdvpEOixc1/VtqFvKX5gmOX0pkL2yDgsZpxt+sORaPROe8Q6ncf3tPAk8eG3Ks14lA8brsZYZ2yukBAwOfzCeMHA3WGNXrCVpLnJKeqRyhAfX5RfNmILQF4urG0VIzxBBkU5aQI9agIeU4JqNLZ0UH9ob6sDWZE4MDefSn7P1txO/FcbxypQG18nhinew/u5zYC3dyG+qLL1qjjCKDg9C21q2a3oe9zRsCsn2PR2JzfKEy9PB96Nj8E0IJm54IaGZwPZsWJOU4jY1kD2OlAQhsJjKu3bSe7yPUzifpgMPsuOBY8brtR1evmyFt0IL0IzH4fJtcCH7kK1hn2/hh71G1yKKEdz/DBBIOTkUkRemzVl1uvCGKzE4OMIaFbiv1LSX51L7mXl4kxvgeO8vMaJk0PHiHvjl4DCTWs2lMOX0L6cwD/Bxlp6hNNv2gUT9MjsLiB8koaMOxJRgCMgPijWsqvaCP3qqqUZ4JVzUASYyFyL/WTqyggPxWH4qGtBlJzagCGIYjEzJv2zHe38vOUt6mNPGv20OyPMMV7yuVwL5IjBlLmRej1UX7VLdmLt+2CMVKTiSDn0wO1NPPyBOtdLL+MyzWkTbGhC5AGsBdKkEtWAjglgjUwCq/FGjhV0ZosdOhXI5FyH0DoIIK9slB0CS8UCgr8AlpvpamwqHpttcO4WtSqA57ioKENE05IqIYSY46uD4Is0qmGG2s9RYeS7adI3Paz3K6lTMmzIdFmXp/d1Gb1YvLF7i4IzxMfu1ITYWOe1VWix7U5tlKpXkzwYycONqfVLcW+cU7lQ0jePf360DqRS4zT/+Ny+ofRxPBoL6fa6zmu5uvtbkwZyE/lev6a8VV9+VeAAQADg36zc4GRNAAAAABJRU5ErkJggg==</Image>
-<Url type="text/html" method="GET" template="http://www.amazon.com/exec/obidos/external-search/">
-  <Param name="field-keywords" value="{searchTerms}"/>
-  <Param name="mode" value="blended"/>
-  <Param name="tag" value="mozilla-20"/>
-  <Param name="sourceid" value="Mozilla-search"/>
+<Url type="text/html" method="GET" template="http://m.amazon.com/gp/aw/s">
+  <Param name="k" value="{searchTerms}"/>
 </Url>
-<SearchForm>http://www.amazon.com/</SearchForm>
+<SearchForm>http://m.amazon.com/</SearchForm>
 </SearchPlugin>

From 80790a99cc9b6dc26f6d57a17c0e253059715836 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Tue, 27 Nov 2012 10:20:01 -0500
Subject: [PATCH 117/160] Bug 814886 - Correctly check selection bounds on
 Android; r=cpeterson

---
 mobile/android/base/GeckoEditable.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/GeckoEditable.java b/mobile/android/base/GeckoEditable.java
index cfda52ace92a..b0248ab86a8a 100644
--- a/mobile/android/base/GeckoEditable.java
+++ b/mobile/android/base/GeckoEditable.java
@@ -127,7 +127,9 @@ final class GeckoEditable
         }
 
         static Action newSetSelection(int start, int end) {
-            if (start < 0 || start > end) {
+            // start == -1 when the start offset should remain the same
+            // end == -1 when the end offset should remain the same
+            if (start < -1 || end < -1) {
                 throw new IllegalArgumentException("invalid selection offsets");
             }
             final Action action = new Action(TYPE_SET_SELECTION);
@@ -433,8 +435,12 @@ final class GeckoEditable
         switch (action.mType) {
         case Action.TYPE_SET_SELECTION:
             final int len = mText.length();
-            final int selStart = Math.min(action.mStart, len);
-            final int selEnd = Math.min(action.mEnd, len);
+            final int curStart = Selection.getSelectionStart(mText);
+            final int curEnd = Selection.getSelectionEnd(mText);
+            // start == -1 when the start offset should remain the same
+            // end == -1 when the end offset should remain the same
+            final int selStart = Math.min(action.mStart < 0 ? curStart : action.mStart, len);
+            final int selEnd = Math.min(action.mEnd < 0 ? curEnd : action.mEnd, len);
 
             if (selStart < action.mStart || selEnd < action.mEnd) {
                 Log.w(LOGTAG, "IME sync error: selection out of bounds");
@@ -520,7 +526,7 @@ final class GeckoEditable
             // GeckoEditableListener methods should all be called from the Gecko thread
             GeckoApp.assertOnGeckoThread();
         }
-        if (start < 0 || start > end || end > mText.length()) {
+        if (start < 0 || start > mText.length() || end < 0 || end > mText.length()) {
             throw new IllegalArgumentException("invalid selection notification range");
         }
         final int seqnoWhenPosted = ++mGeckoUpdateSeqno;

From 10c4c20f25eca391a2788e35b6a49aa6c576255f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hfiguiere@mozilla.com>
Date: Mon, 26 Nov 2012 18:29:20 -0500
Subject: [PATCH 118/160] Bug 811778 - Only send crash reports on wifi.
 r=fabrice

---
 b2g/chrome/content/shell.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js
index c19a6a4d5ee3..10af0c02a0d9 100644
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -81,6 +81,13 @@ var shell = {
     return this.CrashSubmit;
   },
 
+  onlineForCrashReport: function shell_onlineForCrashReport() {
+    let wifiManager = navigator.mozWifiManager;
+    let onWifi = (wifiManager &&
+                  (wifiManager.connection.status == 'connected'));
+    return !Services.io.offline && onWifi;
+  },
+
   reportCrash: function shell_reportCrash(isChrome, aCrashID) {
     let crashID = aCrashID;
     try {
@@ -113,16 +120,19 @@ var shell = {
 
   // This function submits a crash when we're online.
   submitCrash: function shell_submitCrash(aCrashID) {
-    if (!Services.io.offline) {
+    if (this.onlineForCrashReport()) {
       this.CrashSubmit.submit(aCrashID);
       return;
     }
+
     Services.obs.addObserver(function observer(subject, topic, state) {
-      if (state == 'online') {
+      let network = subject.QueryInterface(Ci.nsINetworkInterface);
+      if (network.state == Ci.nsINetworkInterface.NETWORK_STATE_CONNECTED
+          && network.type == Ci.nsINetworkInterface.NETWORK_TYPE_WIFI) {
         shell.CrashSubmit.submit(aCrashID);
         Services.obs.removeObserver(observer, topic);
       }
-    }, "network:offline-status-changed", false);
+    }, "network-interface-state-changed", false);
   },
 
   get contentBrowser() {

From 0dbe0111a264ed065f691cda238cc2f9cf91d6da Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Tue, 27 Nov 2012 16:40:00 +1300
Subject: [PATCH 119/160] Bug 806534 - Support regular expressions in extension
 id for blocklist entries. r=Mossop

---
 .../mozapps/extensions/nsBlocklistService.js  |  67 ++++--
 .../addons/blocklist_regexp1_1/install.rdf    |  19 ++
 .../addons/blocklist_regexp1_2/install.rdf    |  19 ++
 .../addons/blocklist_regexp1_3/install.rdf    |  19 ++
 .../data/blocklistchange/addon_change.xml     |   7 +
 .../data/blocklistchange/addon_update1.rdf    |  20 ++
 .../data/blocklistchange/addon_update2.rdf    |  20 ++
 .../data/blocklistchange/addon_update3.rdf    |  20 ++
 .../data/blocklistchange/app_update.xml       |  14 ++
 .../blocklistchange/blocklist_update2.xml     |   4 +
 .../data/blocklistchange/manual_update.xml    |   3 +
 .../xpcshell/data/test_blocklist_regexp_1.xml |  20 ++
 .../test/xpcshell/test_blocklist_regexp.js    | 123 ++++++++++
 .../test/xpcshell/test_blocklistchange.js     | 213 +++++++++++++-----
 .../extensions/test/xpcshell/xpcshell.ini     |   2 +
 15 files changed, 496 insertions(+), 74 deletions(-)
 create mode 100644 toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf
 create mode 100644 toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf
 create mode 100644 toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf
 create mode 100644 toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_regexp_1.xml
 create mode 100644 toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js

diff --git a/toolkit/mozapps/extensions/nsBlocklistService.js b/toolkit/mozapps/extensions/nsBlocklistService.js
index e7735cba175b..a33262bb4c57 100644
--- a/toolkit/mozapps/extensions/nsBlocklistService.js
+++ b/toolkit/mozapps/extensions/nsBlocklistService.js
@@ -239,6 +239,22 @@ function getDistributionPrefValue(aPrefName) {
   return prefValue;
 }
 
+/**
+ * Parse a string representation of a regular expression. Needed because we
+ * use the /pattern/flags form (because it's detectable), which is only
+ * supported as a literal in JS.
+ *
+ * @param  aStr
+ *         String representation of regexp
+ * @return RegExp instance
+ */
+function parseRegExp(aStr) {
+  let lastSlash = aStr.lastIndexOf("/");
+  let pattern = aStr.slice(1, lastSlash);
+  let flags = aStr.slice(lastSlash + 1);
+  return new RegExp(pattern, flags);
+}
+
 /**
  * Manages the Blocklist. The Blocklist is a representation of the contents of
  * blocklist.xml and allows us to remotely disable / re-enable blocklisted
@@ -342,11 +358,11 @@ Blocklist.prototype = {
     if (!toolkitVersion)
       toolkitVersion = gApp.platformVersion;
 
-    var blItem = addonEntries[id];
+    var blItem = this._findMatchingAddonEntry(addonEntries, id);
     if (!blItem)
       return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
 
-    for (let currentblItem of blItem) {
+    for (let currentblItem of blItem.versions) {
       if (currentblItem.includesItem(version, appVersion, toolkitVersion))
         return currentblItem.severity >= gBlocklistLevel ? Ci.nsIBlocklistService.STATE_BLOCKED :
                                                        Ci.nsIBlocklistService.STATE_SOFTBLOCKED;
@@ -354,6 +370,19 @@ Blocklist.prototype = {
     return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
   },
 
+  _findMatchingAddonEntry: function Blocklist_findMatchingAddonEntry(aAddonEntries,
+                                                                     aId) {
+    for (let entry of aAddonEntries) {
+      if (entry.id instanceof RegExp) {
+        if (entry.id.test(aId))
+          return entry;
+      } else if (entry.id == aId) {
+        return entry;
+      }
+    }
+    return null;
+  },
+
   /* See nsIBlocklistService */
   getAddonBlocklistURL: function Blocklist_getAddonBlocklistURL(id, version, appVersion, toolkitVersion) {
     if (!gBlocklistEnabled)
@@ -362,7 +391,7 @@ Blocklist.prototype = {
     if (!this._addonEntries)
       this._loadBlocklist();
 
-    let blItem = this._addonEntries[id];
+    let blItem = this._findMatchingAddonEntry(this._addonEntries, id);
     if (!blItem || !blItem.blockID)
       return null;
 
@@ -516,8 +545,8 @@ Blocklist.prototype = {
 
     var oldAddonEntries = this._addonEntries;
     var oldPluginEntries = this._pluginEntries;
-    this._addonEntries = { };
-    this._pluginEntries = { };
+    this._addonEntries = [];
+    this._pluginEntries = [];
     this._loadBlocklistFromFile(FileUtils.getFile(KEY_PROFILEDIR,
                                                   [FILE_BLOCKLIST]));
 
@@ -551,8 +580,8 @@ Blocklist.prototype = {
    * load it or does nothing if neither exist.
    */
   _loadBlocklist: function Blocklist_loadBlocklist() {
-    this._addonEntries = { };
-    this._pluginEntries = { };
+    this._addonEntries = [];
+    this._pluginEntries = [];
     var profFile = FileUtils.getFile(KEY_PROFILEDIR, [FILE_BLOCKLIST]);
     if (profFile.exists()) {
       this._loadBlocklistFromFile(profFile);
@@ -606,7 +635,7 @@ Blocklist.prototype = {
 #              <versionRange minVersion="1.5" maxVersion="1.5.*"/>
 #            </targetApplication>
 #          </versionRange>
-#        <emItem id="item_5@domain"/>
+#        <emItem id="/@badperson\.com$/"/>
 #      </emItems>
 #      <pluginItems>
 #        <pluginItem blockID="i4">
@@ -688,23 +717,35 @@ Blocklist.prototype = {
     if (!matchesOSABI(blocklistElement))
       return;
 
+    let blockEntry = {
+      id: null,
+      versions: [],
+      blockID: null
+    };
+
     var versionNodes = blocklistElement.childNodes;
     var id = blocklistElement.getAttribute("id");
-    result[id] = [];
+    // Add-on IDs cannot contain '/', so an ID starting with '/' must be a regex
+    if (id.startsWith("/"))
+      id = parseRegExp(id);
+    blockEntry.id = id;
+
     for (var x = 0; x < versionNodes.length; ++x) {
       var versionRangeElement = versionNodes.item(x);
       if (!(versionRangeElement instanceof Ci.nsIDOMElement) ||
           versionRangeElement.localName != "versionRange")
         continue;
 
-      result[id].push(new BlocklistItemData(versionRangeElement));
+      blockEntry.versions.push(new BlocklistItemData(versionRangeElement));
     }
     // if only the extension ID is specified block all versions of the
     // extension for the current application.
-    if (result[id].length == 0)
-      result[id].push(new BlocklistItemData(null));
+    if (blockEntry.versions.length == 0)
+      blockEntry.versions.push(new BlocklistItemData(null));
 
-    result[id].blockID = blocklistElement.getAttribute("blockID");
+    blockEntry.blockID = blocklistElement.getAttribute("blockID");
+
+    result.push(blockEntry);
   },
 
   _handlePluginItemNode: function Blocklist_handlePluginItemNode(blocklistElement, result) {
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf
new file mode 100644
index 000000000000..fd3b25ed7c0e
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>regexpblock@tests.mozilla.org</em:id>
+    <em:version>1.0</em:version>
+    <em:name>RegExp-blocked add-on</em:name>
+    <em:updateURL>http://localhost:4444/data/addon_update1.rdf</em:updateURL>
+    <em:targetApplication>
+      <Description>
+        <em:id>xpcshell@tests.mozilla.org</em:id>
+        <em:minVersion>1</em:minVersion>
+        <em:maxVersion>3</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+  </Description>
+</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf
new file mode 100644
index 000000000000..3325bd7a3ec8
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>regexpblock@tests.mozilla.org</em:id>
+    <em:version>2.0</em:version>
+    <em:name>RegExp-blocked add-on</em:name>
+    <em:updateURL>http://localhost:4444/data/addon_update2.rdf</em:updateURL>
+    <em:targetApplication>
+      <Description>
+        <em:id>xpcshell@tests.mozilla.org</em:id>
+        <em:minVersion>1</em:minVersion>
+        <em:maxVersion>3</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+  </Description>
+</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf
new file mode 100644
index 000000000000..5ddf66c8f75f
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>regexpblock@tests.mozilla.org</em:id>
+    <em:version>3.0</em:version>
+    <em:name>RegExp-blocked add-on</em:name>
+    <em:updateURL>http://localhost:4444/data/addon_update3.rdf</em:updateURL>
+    <em:targetApplication>
+      <Description>
+        <em:id>xpcshell@tests.mozilla.org</em:id>
+        <em:minVersion>1</em:minVersion>
+        <em:maxVersion>3</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+  </Description>
+</RDF>
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_change.xml b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_change.xml
index 374c353183e6..a229a653a105 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_change.xml
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_change.xml
@@ -20,5 +20,12 @@
     <emItem id="hardblock@tests.mozilla.org">
       <versionRange minVersion="2" maxVersion="3"/>
     </emItem>
+    <!-- Two RegExp matches, so test flags work - first shouldn't match. -->
+    <emItem id="/^RegExp/">
+      <versionRange severity="1" minVersion="2" maxVersion="3"/>
+    </emItem>
+    <emItem id="/^RegExp/i">
+      <versionRange severity="2" minVersion="2" maxVersion="3"/>
+    </emItem>
   </emItems>
 </blocklist>
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update1.rdf b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update1.rdf
index 55f510e16bb2..1b55ccfab261 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update1.rdf
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update1.rdf
@@ -121,4 +121,24 @@
       </RDF:Seq>
     </em:updates>
   </RDF:Description>
+
+  <RDF:Description about="urn:mozilla:extension:regexpblock@tests.mozilla.org">
+    <em:updates>
+      <RDF:Seq>
+        <RDF:li>
+          <RDF:Description>
+            <em:version>2</em:version>
+            <em:targetApplication>
+              <RDF:Description>
+                <em:id>toolkit@mozilla.org</em:id>
+                <em:minVersion>0</em:minVersion>
+                <em:maxVersion>*</em:maxVersion>
+                <em:updateLink>http://localhost:4444/addons/blocklist_regexp1_2.xpi</em:updateLink>
+              </RDF:Description>
+            </em:targetApplication>
+          </RDF:Description>
+        </RDF:li>
+      </RDF:Seq>
+    </em:updates>
+  </RDF:Description>
 </RDF:RDF>
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update2.rdf b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update2.rdf
index 0722a49bdc64..a5be8a6f54ff 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update2.rdf
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update2.rdf
@@ -121,4 +121,24 @@
       </RDF:Seq>
     </em:updates>
   </RDF:Description>
+
+  <RDF:Description about="urn:mozilla:extension:regexpblock@tests.mozilla.org">
+    <em:updates>
+      <RDF:Seq>
+        <RDF:li>
+          <RDF:Description>
+            <em:version>3</em:version>
+            <em:targetApplication>
+              <RDF:Description>
+                <em:id>toolkit@mozilla.org</em:id>
+                <em:minVersion>0</em:minVersion>
+                <em:maxVersion>*</em:maxVersion>
+                <em:updateLink>http://localhost:4444/addons/blocklist_regexp1_3.xpi</em:updateLink>
+              </RDF:Description>
+            </em:targetApplication>
+          </RDF:Description>
+        </RDF:li>
+      </RDF:Seq>
+    </em:updates>
+  </RDF:Description>
 </RDF:RDF>
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update3.rdf b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update3.rdf
index a13e47a470de..fe1a39b479bb 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update3.rdf
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update3.rdf
@@ -121,4 +121,24 @@
       </RDF:Seq>
     </em:updates>
   </RDF:Description>
+
+  <RDF:Description about="urn:mozilla:extension:regexpblock@tests.mozilla.org">
+    <em:updates>
+      <RDF:Seq>
+        <RDF:li>
+          <RDF:Description>
+            <em:version>4</em:version>
+            <em:targetApplication>
+              <RDF:Description>
+                <em:id>toolkit@mozilla.org</em:id>
+                <em:minVersion>0</em:minVersion>
+                <em:maxVersion>*</em:maxVersion>
+                <em:updateLink>http://localhost:4444/addons/blocklist_regexp1_1.xpi</em:updateLink>
+              </RDF:Description>
+            </em:targetApplication>
+          </RDF:Description>
+        </RDF:li>
+      </RDF:Seq>
+    </em:updates>
+  </RDF:Description>
 </RDF:RDF>
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/app_update.xml b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/app_update.xml
index 43fea570d091..85a66fe5555f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/app_update.xml
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/app_update.xml
@@ -44,5 +44,19 @@
         </targetApplication>
       </versionRange>
     </emItem>
+    <emItem id="/^RegExp/">
+      <versionRange severity="1">
+        <targetApplication id="xpcshell@tests.mozilla.org">
+          <versionRange minVersion="2" maxVersion="2.*"/>
+        </targetApplication>
+      </versionRange>
+    </emItem>
+    <emItem id="/^RegExp/i">
+      <versionRange>
+        <targetApplication id="xpcshell@tests.mozilla.org">
+          <versionRange minVersion="2" maxVersion="2.*"/>
+        </targetApplication>
+      </versionRange>
+    </emItem>
   </emItems>
 </blocklist>
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/blocklist_update2.xml b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/blocklist_update2.xml
index 8b1a0f676bbf..867a34255b7b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/blocklist_update2.xml
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/blocklist_update2.xml
@@ -18,5 +18,9 @@
       <versionRange severity="1"/>
     </emItem>
     <emItem id="hardblock@tests.mozilla.org"/>
+    <emItem id="/^RegExp/">
+      <versionRange severity="1"/>
+    </emItem>
+    <emItem id="/^RegExp/i"/>
   </emItems>
 </blocklist>
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/manual_update.xml b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/manual_update.xml
index dd82aaf144a1..df9276525b65 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/manual_update.xml
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/manual_update.xml
@@ -20,5 +20,8 @@
     <emItem id="hardblock@tests.mozilla.org">
       <versionRange minVersion="1" maxVersion="2"/>
     </emItem>
+    <emItem id="/^RegExp/i">
+      <versionRange minVersion="1" maxVersion="2"/>
+    </emItem>
   </emItems>
 </blocklist>
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_regexp_1.xml b/toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_regexp_1.xml
new file mode 100644
index 000000000000..20035c6a2ed3
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_regexp_1.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
+  <emItems>
+    <emItem id="/block1/">
+      <versionRange severity="1">
+        <targetApplication id="xpcshell@tests.mozilla.org">
+          <versionRange minVersion="1" maxVersion="2.*"/>
+        </targetApplication>
+      </versionRange>
+    </emItem>
+    <emItem id="/block1/">
+      <versionRange severity="2">
+        <targetApplication id="xpcshell@tests.mozilla.org">
+          <versionRange minVersion="1" maxVersion="2.*"/>
+        </targetApplication>
+      </versionRange>
+    </emItem>
+  </emItems>
+</blocklist>
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js b/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js
new file mode 100644
index 000000000000..dde62dd3e040
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js
@@ -0,0 +1,123 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Checks that blocklist entries using RegExp work as expected. This only covers
+// behavior specific to RegExp entries - general behavior is already tested 
+// in test_blocklistchange.js.
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+const URI_EXTENSION_BLOCKLIST_DIALOG = "chrome://mozapps/content/extensions/blocklist.xul";
+
+Cu.import("resource://testing-common/httpd.js");
+var testserver;
+
+const profileDir = gProfD.clone();
+profileDir.append("extensions");
+
+// Don't need the full interface, attempts to call other methods will just
+// throw which is just fine
+var WindowWatcher = {
+  openWindow: function(parent, url, name, features, arguments) {
+    // Should be called to list the newly blocklisted items
+    do_check_eq(url, URI_EXTENSION_BLOCKLIST_DIALOG);
+
+    // Simulate auto-disabling any softblocks
+    var list = arguments.wrappedJSObject.list;
+    list.forEach(function(aItem) {
+      if (!aItem.blocked)
+        aItem.disable = true;
+    });
+
+    //run the code after the blocklist is closed
+    Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
+
+  },
+
+  QueryInterface: function(iid) {
+    if (iid.equals(Ci.nsIWindowWatcher)
+     || iid.equals(Ci.nsISupports))
+      return this;
+
+    throw Cr.NS_ERROR_NO_INTERFACE;
+  }
+};
+
+var WindowWatcherFactory = {
+  createInstance: function createInstance(outer, iid) {
+    if (outer != null)
+      throw Cr.NS_ERROR_NO_AGGREGATION;
+    return WindowWatcher.QueryInterface(iid);
+  }
+};
+
+var registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
+registrar.registerFactory(Components.ID("{1dfeb90a-2193-45d5-9cb8-864928b2af55}"),
+                          "Fake Window Watcher",
+                          "@mozilla.org/embedcomp/window-watcher;1",
+                          WindowWatcherFactory);
+
+
+function load_blocklist(aFile, aCallback) {
+  Services.obs.addObserver(function() {
+    Services.obs.removeObserver(arguments.callee, "blocklist-updated");
+
+    do_execute_soon(aCallback);
+  }, "blocklist-updated", false);
+
+  Services.prefs.setCharPref("extensions.blocklist.url", "http://localhost:4444/data/" + aFile);
+  var blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
+                  getService(Ci.nsITimerCallback);
+  blocklist.notify(null);
+}
+
+
+function end_test() {
+  testserver.stop(do_test_finished);
+}
+
+
+function run_test() {
+  testserver = new HttpServer();
+  testserver.registerDirectory("/data/", do_get_file("data"));
+  testserver.start(4444);
+
+  do_test_pending();
+
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");
+
+  writeInstallRDFForExtension({
+    id: "block1@tests.mozilla.org",
+    version: "1.0",
+    name: "RegExp blocked add-on",
+    targetApplications: [{
+      id: "xpcshell@tests.mozilla.org",
+      minVersion: "1",
+      maxVersion: "3"
+    }]
+  }, profileDir);
+
+  startupManager();
+
+  AddonManager.getAddonsByIDs(["block1@tests.mozilla.org"], function([a1]) {
+    do_check_eq(a1.blocklistState, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+
+    run_test_1();
+  });
+}
+
+function run_test_1() {
+  load_blocklist("test_blocklist_regexp_1.xml", function() {
+    restartManager();
+
+    AddonManager.getAddonsByIDs(["block1@tests.mozilla.org"], function([a1]) {
+      // Blocklist contains two entries that will match this addon - ensure
+      // that the first one is applied.
+      do_check_neq(a1, null);
+      do_check_eq(a1.blocklistState, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
+
+      end_test();
+    });
+  });
+}
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js b/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
index 05a857d1cd78..a9044165a931 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
@@ -273,12 +273,49 @@ var hardblock_3 = {
   }]
 };
 
+var regexpblock_1 = {
+  id: "regexpblock@tests.mozilla.org",
+  version: "1.0",
+  name: "RegExp-blocked add-on",
+  updateURL: "http://localhost:4444/data/addon_update1.rdf",
+  targetApplications: [{
+    id: "xpcshell@tests.mozilla.org",
+    minVersion: "1",
+    maxVersion: "3"
+  }]
+};
+
+var regexpblock_2 = {
+  id: "regexpblock@tests.mozilla.org",
+  version: "2.0",
+  name: "RegExp-blocked add-on",
+  updateURL: "http://localhost:4444/data/addon_update2.rdf",
+  targetApplications: [{
+    id: "xpcshell@tests.mozilla.org",
+    minVersion: "1",
+    maxVersion: "3"
+  }]
+};
+
+var regexpblock_3 = {
+  id: "regexpblock@tests.mozilla.org",
+  version: "3.0",
+  name: "RegExp-blocked add-on",
+  updateURL: "http://localhost:4444/data/addon_update3.rdf",
+  targetApplications: [{
+    id: "xpcshell@tests.mozilla.org",
+    minVersion: "1",
+    maxVersion: "3"
+  }]
+};
+
 const ADDON_IDS = ["softblock1@tests.mozilla.org",
                    "softblock2@tests.mozilla.org",
                    "softblock3@tests.mozilla.org",
                    "softblock4@tests.mozilla.org",
                    "softblock5@tests.mozilla.org",
-                   "hardblock@tests.mozilla.org"];
+                   "hardblock@tests.mozilla.org",
+                   "regexpblock@tests.mozilla.org"];
 
 // Don't need the full interface, attempts to call other methods will just
 // throw which is just fine
@@ -428,42 +465,46 @@ function manual_update(aVersion, aCallback) {
             AddonManager.getInstallForURL("http://localhost:4444/addons/blocklist_hard1_" + aVersion + ".xpi",
                                           function(aInstall) {
               installs.push(aInstall);
+              AddonManager.getInstallForURL("http://localhost:4444/addons/blocklist_regexp1_" + aVersion + ".xpi",
+                                            function(aInstall) {
+                installs.push(aInstall);
 
-              Services.obs.addObserver(function(aSubject, aTopic, aData) {
-                Services.obs.removeObserver(arguments.callee, "addon-install-blocked");
+                Services.obs.addObserver(function(aSubject, aTopic, aData) {
+                  Services.obs.removeObserver(arguments.callee, "addon-install-blocked");
 
-                aSubject.QueryInterface(Ci.amIWebInstallInfo);
+                  aSubject.QueryInterface(Ci.amIWebInstallInfo);
 
-                var installCount = aSubject.installs.length;
+                  var installCount = aSubject.installs.length;
 
-                var listener = {
-                  installComplete: function() {
-                    installCount--;
-                    if (installCount)
-                      return;
+                  var listener = {
+                    installComplete: function() {
+                      installCount--;
+                      if (installCount)
+                        return;
 
-                    do_execute_soon(aCallback);
-                  },
+                      do_execute_soon(aCallback);
+                    },
 
-                  onDownloadCancelled: function(aInstall) {
-                    this.installComplete();
-                  },
+                    onDownloadCancelled: function(aInstall) {
+                      this.installComplete();
+                    },
 
-                  onInstallEnded: function(aInstall) {
-                    this.installComplete();
-                  }
-                };
+                    onInstallEnded: function(aInstall) {
+                      this.installComplete();
+                    }
+                  };
 
-                aSubject.installs.forEach(function(aInstall) {
-                  aInstall.addListener(listener);
-                });
+                  aSubject.installs.forEach(function(aInstall) {
+                    aInstall.addListener(listener);
+                  });
 
-                aSubject.install();
-              }, "addon-install-blocked", false);
+                  aSubject.install();
+                }, "addon-install-blocked", false);
 
-              AddonManager.installAddonsFromWebpage("application/x-xpinstall", null,
-                                                    NetUtil.newURI("http://localhost:4444/"),
-                                                    installs);
+                AddonManager.installAddonsFromWebpage("application/x-xpinstall", null,
+                                                      NetUtil.newURI("http://localhost:4444/"),
+                                                      installs);
+              }, "application/x-xpinstall");
             }, "application/x-xpinstall");
           }, "application/x-xpinstall");
         }, "application/x-xpinstall");
@@ -480,6 +521,7 @@ function check_addon(aAddon, aExpectedVersion, aExpectedUserDisabled,
 
   do_check_neq(aAddon, null);
   do_check_eq(aAddon.version, aExpectedVersion);
+  do_check_eq(aAddon.blocklistState, aExpectedState);
   do_check_eq(aAddon.userDisabled, aExpectedUserDisabled);
   do_check_eq(aAddon.softDisabled, aExpectedSoftDisabled);
   if (aAddon.softDisabled)
@@ -499,7 +541,6 @@ function check_addon(aAddon, aExpectedVersion, aExpectedUserDisabled,
       do_check_true(hasFlag(aAddon.permissions, AddonManager.PERM_CAN_DISABLE));
   }
   do_check_eq(aAddon.appDisabled, aExpectedState == Ci.nsIBlocklistService.STATE_BLOCKED);
-  do_check_eq(aAddon.blocklistState, aExpectedState);
 
   let willBeActive = aAddon.isActive;
   if (hasFlag(aAddon.pendingOperations, AddonManager.PENDING_DISABLE))
@@ -532,9 +573,10 @@ function run_test() {
   writeInstallRDFForExtension(softblock4_1, profileDir);
   writeInstallRDFForExtension(softblock5_1, profileDir);
   writeInstallRDFForExtension(hardblock_1, profileDir);
+  writeInstallRDFForExtension(regexpblock_1, profileDir);
   startupManager();
 
-  AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+  AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
     s4.userDisabled = true;
     s5.userDisabled = false;
     restartManager();
@@ -554,7 +596,7 @@ function run_app_update_test() {
   load_blocklist("app_update.xml", function() {
     restartManager();
 
-    AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+    AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
       check_addon(s1, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
       check_addon(s2, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
@@ -562,11 +604,12 @@ function run_app_update_test() {
       check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
       check_addon(s5, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
       check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+      check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
       do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "test/1.0");
 
       restartManager("2");
 
-      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
         check_addon(s1, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(s2, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
@@ -574,6 +617,7 @@ function run_app_update_test() {
         check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(s5, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+        check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
         do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
         s2.userDisabled = false;
@@ -585,7 +629,7 @@ function run_app_update_test() {
 
         restartManager("2.5");
 
-        AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+        AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
           check_addon(s1, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(s2, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
@@ -593,11 +637,12 @@ function run_app_update_test() {
           check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(s5, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+          check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
           do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
           restartManager("1");
 
-          AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+          AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
             check_addon(s1, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             check_addon(s2, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
@@ -605,6 +650,7 @@ function run_app_update_test() {
             check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             check_addon(s5, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+            check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
             s1.userDisabled = false;
@@ -625,7 +671,7 @@ function run_app_update_schema_test() {
   dump(arguments.callee.name + "\n");
   restartManager();
 
-  AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+  AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
     check_addon(s1, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
     check_addon(s2, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
@@ -633,6 +679,7 @@ function run_app_update_schema_test() {
     check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
     check_addon(s5, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
     check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+    check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
     do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "test/1.0");
 
     shutdownManager();
@@ -644,7 +691,7 @@ function run_app_update_schema_test() {
     gAppInfo.version = "2";
     startupManager(true);
 
-    AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+    AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
       check_addon(s1, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
       check_addon(s2, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
@@ -652,6 +699,7 @@ function run_app_update_schema_test() {
       check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
       check_addon(s5, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
       check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+      check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
       do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
       s2.userDisabled = false;
@@ -670,7 +718,7 @@ function run_app_update_schema_test() {
       gAppInfo.version = "2.5";
       startupManager(true);
 
-      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
         check_addon(s1, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(s2, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
@@ -678,6 +726,7 @@ function run_app_update_schema_test() {
         check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(s5, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+        check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
         do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
         shutdownManager();
@@ -688,7 +737,7 @@ function run_app_update_schema_test() {
         db.close();
         startupManager(false);
 
-        AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+        AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
           check_addon(s1, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(s2, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
@@ -696,6 +745,7 @@ function run_app_update_schema_test() {
           check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(s5, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+          check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
           do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
           shutdownManager();
@@ -707,7 +757,7 @@ function run_app_update_schema_test() {
           gAppInfo.version = "1";
           startupManager(true);
 
-          AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+          AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
             check_addon(s1, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             check_addon(s2, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
@@ -715,6 +765,7 @@ function run_app_update_schema_test() {
             check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             check_addon(s5, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+            check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
             s1.userDisabled = false;
@@ -735,7 +786,7 @@ function run_blocklist_update_test() {
   load_blocklist("blocklist_update1.xml", function() {
     restartManager();
 
-    AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+    AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
       check_addon(s1, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
       check_addon(s2, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
@@ -743,12 +794,13 @@ function run_blocklist_update_test() {
       check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
       check_addon(s5, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
       check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+      check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
       do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "test/1.0");
 
       load_blocklist("blocklist_update2.xml", function() {
         restartManager();
 
-        AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+        AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
           check_addon(s1, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(s2, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
@@ -756,6 +808,7 @@ function run_blocklist_update_test() {
           check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(s5, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+          check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
           do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
           s2.userDisabled = false;
@@ -768,7 +821,7 @@ function run_blocklist_update_test() {
           load_blocklist("blocklist_update2.xml", function() {
             restartManager();
 
-            AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+            AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
               check_addon(s1, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
               check_addon(s2, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
@@ -776,12 +829,13 @@ function run_blocklist_update_test() {
               check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
               check_addon(s5, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
               check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+              check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
               do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
               load_blocklist("blocklist_update1.xml", function() {
                 restartManager();
 
-                AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+                AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
                   check_addon(s1, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
                   check_addon(s2, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
@@ -789,6 +843,7 @@ function run_blocklist_update_test() {
                   check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
                   check_addon(s5, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
                   check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+                  check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
                   do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
                   s1.userDisabled = false;
@@ -812,7 +867,7 @@ function run_addon_change_test() {
   load_blocklist("addon_change.xml", function() {
     restartManager();
 
-    AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+    AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
       check_addon(s1, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
       check_addon(s2, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
@@ -820,6 +875,7 @@ function run_addon_change_test() {
       check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
       check_addon(s5, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
       check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+      check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
       do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "test/1.0");
 
       shutdownManager();
@@ -836,10 +892,12 @@ function run_addon_change_test() {
       setExtensionModifiedTime(getFileForAddon(profileDir, softblock5_2.id), Date.now() + 10000);
       writeInstallRDFForExtension(hardblock_2, profileDir);
       setExtensionModifiedTime(getFileForAddon(profileDir, hardblock_2.id), Date.now() + 10000);
+      writeInstallRDFForExtension(regexpblock_2, profileDir);
+      setExtensionModifiedTime(getFileForAddon(profileDir, regexpblock_2.id), Date.now() + 10000);
 
       startupManager(false);
 
-      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
         check_addon(s1, "2.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(s2, "2.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
@@ -847,6 +905,7 @@ function run_addon_change_test() {
         check_addon(s4, "2.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(s5, "2.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(h, "2.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+        check_addon(r, "2.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
         do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
         s2.userDisabled = false;
@@ -870,10 +929,12 @@ function run_addon_change_test() {
         setExtensionModifiedTime(getFileForAddon(profileDir, softblock5_3.id), Date.now() + 20000);
         writeInstallRDFForExtension(hardblock_3, profileDir);
         setExtensionModifiedTime(getFileForAddon(profileDir, hardblock_3.id), Date.now() + 20000);
+        writeInstallRDFForExtension(regexpblock_3, profileDir);
+        setExtensionModifiedTime(getFileForAddon(profileDir, regexpblock_3.id), Date.now() + 20000);
 
         startupManager(false);
 
-        AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+        AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
           check_addon(s1, "3.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(s2, "3.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
@@ -881,6 +942,7 @@ function run_addon_change_test() {
           check_addon(s4, "3.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(s5, "3.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(h, "3.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+          check_addon(r, "3.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
           do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
           shutdownManager();
@@ -897,10 +959,12 @@ function run_addon_change_test() {
           setExtensionModifiedTime(getFileForAddon(profileDir, softblock5_1.id), Date.now() + 30000);
           writeInstallRDFForExtension(hardblock_1, profileDir);
           setExtensionModifiedTime(getFileForAddon(profileDir, hardblock_1.id), Date.now() + 30000);
+          writeInstallRDFForExtension(regexpblock_1, profileDir);
+          setExtensionModifiedTime(getFileForAddon(profileDir, regexpblock_1.id), Date.now() + 30000);
 
           startupManager(false);
 
-          AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+          AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
             check_addon(s1, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             check_addon(s2, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
@@ -908,6 +972,7 @@ function run_addon_change_test() {
             check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             check_addon(s5, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+            check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             do_check_eq(Services.prefs.getCharPref("general.skins.selectedSkin"), "classic/1.0");
 
             s1.userDisabled = false;
@@ -933,6 +998,7 @@ function run_addon_change_2_test() {
   getFileForAddon(profileDir, softblock4_1.id).remove(true);
   getFileForAddon(profileDir, softblock5_1.id).remove(true);
   getFileForAddon(profileDir, hardblock_1.id).remove(true);
+  getFileForAddon(profileDir, regexpblock_1.id).remove(true);
 
   startupManager(false);
   shutdownManager();
@@ -943,15 +1009,17 @@ function run_addon_change_2_test() {
   writeInstallRDFForExtension(softblock4_2, profileDir);
   writeInstallRDFForExtension(softblock5_2, profileDir);
   writeInstallRDFForExtension(hardblock_2, profileDir);
+  writeInstallRDFForExtension(regexpblock_2, profileDir);
 
   startupManager(false);
 
-  AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+  AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
     check_addon(s1, "2.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
     check_addon(s2, "2.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
     check_addon(s3, "2.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
     check_addon(h, "2.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+    check_addon(r, "2.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
 
     s2.userDisabled = false;
     s2.userDisabled = true;
@@ -974,15 +1042,18 @@ function run_addon_change_2_test() {
     setExtensionModifiedTime(getFileForAddon(profileDir, softblock5_3.id), Date.now() + 10000);
     writeInstallRDFForExtension(hardblock_3, profileDir);
     setExtensionModifiedTime(getFileForAddon(profileDir, hardblock_3.id), Date.now() + 10000);
+    writeInstallRDFForExtension(regexpblock_3, profileDir);
+    setExtensionModifiedTime(getFileForAddon(profileDir, regexpblock_3.id), Date.now() + 10000);
 
     startupManager(false);
 
-    AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+    AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
       check_addon(s1, "3.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
       check_addon(s2, "3.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
       check_addon(s3, "3.0", false, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
       check_addon(h, "3.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+      check_addon(r, "3.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
 
       shutdownManager();
 
@@ -998,15 +1069,18 @@ function run_addon_change_2_test() {
       setExtensionModifiedTime(getFileForAddon(profileDir, softblock5_1.id), Date.now() + 20000);
       writeInstallRDFForExtension(hardblock_1, profileDir);
       setExtensionModifiedTime(getFileForAddon(profileDir, hardblock_1.id), Date.now() + 20000);
+      writeInstallRDFForExtension(regexpblock_1, profileDir);
+      setExtensionModifiedTime(getFileForAddon(profileDir, regexpblock_1.id), Date.now() + 20000);
 
       startupManager(false);
 
-      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
         check_addon(s1, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
         check_addon(s2, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
         check_addon(s3, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
         check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+        check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
 
         s1.userDisabled = false;
         s2.userDisabled = false;
@@ -1024,7 +1098,7 @@ function run_background_update_test() {
   dump(arguments.callee.name + "\n");
   restartManager();
 
-  AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+  AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
     check_addon(s1, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
     check_addon(s2, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
@@ -1032,11 +1106,12 @@ function run_background_update_test() {
     check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
     check_addon(s5, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
     check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+    check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
 
     background_update(function() {
       restartManager();
 
-      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
         check_addon(s1, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
         check_addon(s2, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
@@ -1044,6 +1119,7 @@ function run_background_update_test() {
         check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
         check_addon(s5, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
         check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+        check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
 
         run_background_update_2_test();
       });
@@ -1063,6 +1139,7 @@ function run_background_update_2_test() {
   getFileForAddon(profileDir, softblock4_1.id).remove(true);
   getFileForAddon(profileDir, softblock5_1.id).remove(true);
   getFileForAddon(profileDir, hardblock_1.id).remove(true);
+  getFileForAddon(profileDir, regexpblock_1.id).remove(true);
 
   startupManager(false);
   shutdownManager();
@@ -1073,15 +1150,17 @@ function run_background_update_2_test() {
   writeInstallRDFForExtension(softblock4_3, profileDir);
   writeInstallRDFForExtension(softblock5_3, profileDir);
   writeInstallRDFForExtension(hardblock_3, profileDir);
+  writeInstallRDFForExtension(regexpblock_3, profileDir);
 
   startupManager(false);
 
-  AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+  AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
     check_addon(s1, "3.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
     check_addon(s2, "3.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
     check_addon(s3, "3.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
     check_addon(h, "3.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+    check_addon(r, "3.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
 
     s2.userDisabled = false;
     s2.userDisabled = true;
@@ -1093,12 +1172,13 @@ function run_background_update_2_test() {
     background_update(function() {
       restartManager();
 
-      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
         check_addon(s1, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
         check_addon(s2, "1.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
         check_addon(s3, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
         check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+        check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
 
         s1.userDisabled = false;
         s2.userDisabled = false;
@@ -1118,7 +1198,7 @@ function run_manual_update_test() {
   load_blocklist("manual_update.xml", function() {
     restartManager();
 
-    AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+    AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
       check_addon(s1, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
       check_addon(s2, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
@@ -1126,6 +1206,7 @@ function run_manual_update_test() {
       check_addon(s4, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
       check_addon(s5, "1.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
       check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+      check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
 
       s2.userDisabled = false;
       s2.userDisabled = true;
@@ -1137,7 +1218,7 @@ function run_manual_update_test() {
       manual_update("2", function() {
         restartManager();
 
-        AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+        AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
           check_addon(s1, "2.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           check_addon(s2, "2.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
@@ -1146,11 +1227,12 @@ function run_manual_update_test() {
           check_addon(s5, "2.0", false, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
           // Can't manually update to a hardblocked add-on
           check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+          check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
 
           manual_update("3", function() {
             restartManager();
 
-            AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+            AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
               check_addon(s1, "3.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
               check_addon(s2, "3.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
@@ -1158,6 +1240,7 @@ function run_manual_update_test() {
               check_addon(s4, "3.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
               check_addon(s5, "3.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
               check_addon(h, "3.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+              check_addon(r, "3.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
 
               run_manual_update_2_test();
             });
@@ -1180,6 +1263,7 @@ function run_manual_update_2_test() {
   getFileForAddon(profileDir, softblock4_1.id).remove(true);
   getFileForAddon(profileDir, softblock5_1.id).remove(true);
   getFileForAddon(profileDir, hardblock_1.id).remove(true);
+  getFileForAddon(profileDir, regexpblock_1.id).remove(true);
 
   startupManager(false);
   shutdownManager();
@@ -1190,15 +1274,17 @@ function run_manual_update_2_test() {
   writeInstallRDFForExtension(softblock4_1, profileDir);
   writeInstallRDFForExtension(softblock5_1, profileDir);
   writeInstallRDFForExtension(hardblock_1, profileDir);
+  writeInstallRDFForExtension(regexpblock_1, profileDir);
 
   startupManager(false);
 
-  AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+  AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
     check_addon(s1, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
     check_addon(s2, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
     check_addon(s3, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
     check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+    check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
 
     s2.userDisabled = false;
     s2.userDisabled = true;
@@ -1210,25 +1296,27 @@ function run_manual_update_2_test() {
     manual_update("2", function() {
       restartManager();
 
-      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
         check_addon(s1, "2.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(s2, "2.0", true, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(s3, "2.0", false, false, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         // Can't manually update to a hardblocked add-on
         check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+        check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
 
         restartManager();
 
         manual_update("3", function() {
           restartManager();
 
-          AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+          AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
             check_addon(s1, "3.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             check_addon(s2, "3.0", true, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             check_addon(s3, "3.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
             check_addon(h, "3.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
+            check_addon(r, "3.0", false, false, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
 
             s1.userDisabled = false;
             s2.userDisabled = false;
@@ -1252,6 +1340,7 @@ function run_local_install_test() {
   getFileForAddon(profileDir, softblock4_1.id).remove(true);
   getFileForAddon(profileDir, softblock5_1.id).remove(true);
   getFileForAddon(profileDir, hardblock_1.id).remove(true);
+  getFileForAddon(profileDir, regexpblock_1.id).remove(true);
 
   startupManager(false);
 
@@ -1261,18 +1350,20 @@ function run_local_install_test() {
     do_get_file("addons/blocklist_soft3_1.xpi"),
     do_get_file("addons/blocklist_soft4_1.xpi"),
     do_get_file("addons/blocklist_soft5_1.xpi"),
-    do_get_file("addons/blocklist_hard1_1.xpi")
+    do_get_file("addons/blocklist_hard1_1.xpi"),
+    do_get_file("addons/blocklist_regexp1_1.xpi")
   ], function() {
     AddonManager.getAllInstalls(function(aInstalls) {
       // Should have finished all installs without needing to restart
       do_check_eq(aInstalls.length, 0);
 
-      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h]) {
+      AddonManager.getAddonsByIDs(ADDON_IDS, function([s1, s2, s3, s4, s5, h, r]) {
 
         check_addon(s1, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(s2, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(s3, "1.0", true, true, Ci.nsIBlocklistService.STATE_SOFTBLOCKED);
         check_addon(h, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
+        check_addon(r, "1.0", false, false, Ci.nsIBlocklistService.STATE_BLOCKED);
 
         end_test();
       });
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
index 2e3ff6760562..7c00adc12bdc 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -17,6 +17,8 @@ skip-if = os == "android"
 [test_blocklistchange.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
+[test_blocklist_regexp.js]
+skip-if = os == "android"
 [test_bootstrap.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"

From 2eecde6b4ea498721f32383321d732410d8e4274 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Mon, 26 Nov 2012 20:34:10 -0800
Subject: [PATCH 120/160] Backed out changeset 704c91d3e7fa (Bug 814789)
 because of mac build-bustage

---
 content/media/webaudio/AudioContext.cpp |  3 +--
 content/media/webaudio/AudioContext.h   |  2 --
 dom/base/nsGlobalWindow.cpp             | 12 ------------
 dom/base/nsPIDOMWindow.h                | 17 ++---------------
 4 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/content/media/webaudio/AudioContext.cpp b/content/media/webaudio/AudioContext.cpp
index b3e1ba972cd5..ce589933c691 100644
--- a/content/media/webaudio/AudioContext.cpp
+++ b/content/media/webaudio/AudioContext.cpp
@@ -60,7 +60,7 @@ AudioContext::WrapObject(JSContext* aCx, JSObject* aScope,
 /* static */ already_AddRefed<AudioContext>
 AudioContext::Constructor(nsISupports* aGlobal, ErrorResult& aRv)
 {
-  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobal);
+  nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(aGlobal);
   if (!window) {
     aRv.Throw(NS_ERROR_FAILURE);
     return nullptr;
@@ -68,7 +68,6 @@ AudioContext::Constructor(nsISupports* aGlobal, ErrorResult& aRv)
 
   AudioContext* object = new AudioContext(window);
   NS_ADDREF(object);
-  window->AddAudioContext(object);
   return object;
 }
 
diff --git a/content/media/webaudio/AudioContext.h b/content/media/webaudio/AudioContext.h
index 5918c46ee2bc..293d99f4798b 100644
--- a/content/media/webaudio/AudioContext.h
+++ b/content/media/webaudio/AudioContext.h
@@ -49,8 +49,6 @@ public:
     return mWindow;
   }
 
-  void Shutdown() {}
-
   virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope,
                                bool* aTriedToWrap);
 
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 556dac6140ac..0c2533ae640b 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -224,7 +224,6 @@
 #include "nsSandboxFlags.h"
 #include "TimeChangeObserver.h"
 #include "nsPISocketTransportService.h"
-#include "mozilla/dom/AudioContext.h"
 
 #ifdef ANDROID
 #include <android/log.h>
@@ -1122,11 +1121,6 @@ nsGlobalWindow::FreeInnerObjects()
 
   CleanupCachedXBLHandlers(this);
 
-  for (uint32_t i = 0; i < mAudioContexts.Length(); ++i) {
-    mAudioContexts[i]->Shutdown();
-  }
-  mAudioContexts.Clear();
-
 #ifdef DEBUG
   nsCycleCollector_DEBUG_shouldBeFreed(static_cast<nsIScriptGlobalObject*>(this));
 #endif
@@ -2806,12 +2800,6 @@ nsPIDOMWindow::MaybeCreateDoc()
   }
 }
 
-void
-nsPIDOMWindow::AddAudioContext(AudioContext* aAudioContext)
-{
-  mAudioContexts.AppendElement(aAudioContext);
-}
-
 NS_IMETHODIMP
 nsGlobalWindow::GetDocument(nsIDOMDocument** aDocument)
 {
diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
index 37f73fbb008a..c7ceb553a841 100644
--- a/dom/base/nsPIDOMWindow.h
+++ b/dom/base/nsPIDOMWindow.h
@@ -16,8 +16,6 @@
 #include "nsIDOMEventTarget.h"
 #include "nsIDOMDocument.h"
 #include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
-#include "nsTArray.h"
 #include "nsIURI.h"
 
 #define DOM_WINDOW_DESTROYED_TOPIC "dom-window-destroyed"
@@ -49,15 +47,9 @@ class nsXBLPrototypeHandler;
 class nsIArray;
 class nsPIWindowRoot;
 
-namespace mozilla {
-namespace dom {
-class AudioContext;
-}
-}
-
 #define NS_PIDOMWINDOW_IID \
-{ 0xf5af1c3c, 0xebad, 0x4d00, \
-  { 0xa2, 0xa4, 0x12, 0x2e, 0x27, 0x16, 0x59, 0x01 } }
+{ 0x7b18e421, 0x2179, 0x4e24, \
+  { 0x96, 0x58, 0x26, 0x75, 0xa4, 0x37, 0xf3, 0x8f } }
 
 class nsPIDOMWindow : public nsIDOMWindowInternal
 {
@@ -636,8 +628,6 @@ public:
   OpenNoNavigate(const nsAString& aUrl, const nsAString& aName,
                  const nsAString& aOptions, nsIDOMWindow **_retval) = 0;
 
-  void AddAudioContext(mozilla::dom::AudioContext* aAudioContext);
-
 protected:
   // The nsPIDOMWindow constructor. The aOuterWindow argument should
   // be null if and only if the created window itself is an outer
@@ -703,9 +693,6 @@ protected:
   // window is active
   nsCOMPtr<nsIContent> mFocusedNode;
 
-  // The AudioContexts created for the current document, if any.
-  nsTArray<nsRefPtr<mozilla::dom::AudioContext> > mAudioContexts;
-
   // A unique (as long as our 64-bit counter doesn't roll over) id for
   // this window.
   uint64_t mWindowID;

From 57e9d5cef0af8fc885e0adb288a6dd9b89cf7816 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Mon, 26 Nov 2012 20:34:16 -0800
Subject: [PATCH 121/160] Bug 815450: Add "u" suffix to numeric literals in
 TestAudioEventTimeline.cpp, to fix sign-compare build warnings. r=ehsan

---
 content/media/webaudio/compiledtest/Makefile.in  |  1 +
 .../compiledtest/TestAudioEventTimeline.cpp      | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/content/media/webaudio/compiledtest/Makefile.in b/content/media/webaudio/compiledtest/Makefile.in
index b7b61dd6bfd0..3574b5477269 100644
--- a/content/media/webaudio/compiledtest/Makefile.in
+++ b/content/media/webaudio/compiledtest/Makefile.in
@@ -7,6 +7,7 @@ topsrcdir      := @top_srcdir@
 srcdir         := @srcdir@
 VPATH          := @srcdir@
 relativesrcdir := @relativesrcdir@
+FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/content/media/webaudio/compiledtest/TestAudioEventTimeline.cpp b/content/media/webaudio/compiledtest/TestAudioEventTimeline.cpp
index 03ccddd874f8..1455b1821507 100644
--- a/content/media/webaudio/compiledtest/TestAudioEventTimeline.cpp
+++ b/content/media/webaudio/compiledtest/TestAudioEventTimeline.cpp
@@ -195,16 +195,16 @@ void TestEventReplacement()
 
   ErrorResultMock rv;
 
-  is(timeline.GetEventCount(), 0, "No events yet");
+  is(timeline.GetEventCount(), 0u, "No events yet");
   timeline.SetValueAtTime(10.0f, 0.1, rv);
-  is(timeline.GetEventCount(), 1, "One event scheduled now");
+  is(timeline.GetEventCount(), 1u, "One event scheduled now");
   timeline.SetValueAtTime(20.0f, 0.1, rv);
   is(rv, NS_OK, "Event scheduling should be successful");
-  is(timeline.GetEventCount(), 1, "Event should be replaced");
+  is(timeline.GetEventCount(), 1u, "Event should be replaced");
   is(timeline.GetValueAtTime(0.1f), 20.0f, "The first event should be overwritten");
   timeline.LinearRampToValueAtTime(30.0f, 0.1, rv);
   is(rv, NS_OK, "Event scheduling should be successful");
-  is(timeline.GetEventCount(), 2, "Different event type should be appended");
+  is(timeline.GetEventCount(), 2u, "Different event type should be appended");
   is(timeline.GetValueAtTime(0.1f), 30.0f, "The first event should be overwritten");
 }
 
@@ -218,13 +218,13 @@ void TestEventRemoval()
   timeline.SetValueAtTime(15.0f, 0.15, rv);
   timeline.SetValueAtTime(20.0f, 0.2, rv);
   timeline.LinearRampToValueAtTime(30.0f, 0.3, rv);
-  is(timeline.GetEventCount(), 4, "Should have three events initially");
+  is(timeline.GetEventCount(), 4u, "Should have three events initially");
   timeline.CancelScheduledValues(0.4);
-  is(timeline.GetEventCount(), 4, "Trying to delete past the end of the array should have no effect");
+  is(timeline.GetEventCount(), 4u, "Trying to delete past the end of the array should have no effect");
   timeline.CancelScheduledValues(0.3);
-  is(timeline.GetEventCount(), 3, "Should successfully delete one event");
+  is(timeline.GetEventCount(), 3u, "Should successfully delete one event");
   timeline.CancelScheduledValues(0.12);
-  is(timeline.GetEventCount(), 1, "Should successfully delete two events");
+  is(timeline.GetEventCount(), 1u, "Should successfully delete two events");
 }
 
 void TestBeforeFirstEvent()

From 321d58af6d72c2d6e6543d6e98c9629cfccd68ca Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Mon, 26 Nov 2012 20:34:19 -0800
Subject: [PATCH 122/160] Bug 815367: Fix warnings for extra semicolons in
 media/mtransport/test/. r=jesup

---
 media/mtransport/test/sctp_unittest.cpp                   | 1 -
 media/mtransport/test/sockettransportservice_unittest.cpp | 2 +-
 media/mtransport/test/transport_unittests.cpp             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/media/mtransport/test/sctp_unittest.cpp b/media/mtransport/test/sctp_unittest.cpp
index aca36df6baa9..7d8e4736219a 100644
--- a/media/mtransport/test/sctp_unittest.cpp
+++ b/media/mtransport/test/sctp_unittest.cpp
@@ -33,7 +33,6 @@
 
 
 using namespace mozilla;
-MOZ_MTLOG_MODULE("mtransport");
 
 MtransportTestUtils *test_utils;
 static bool sctp_logging = false;
diff --git a/media/mtransport/test/sockettransportservice_unittest.cpp b/media/mtransport/test/sockettransportservice_unittest.cpp
index df57017d86c3..0da54d7e75dc 100644
--- a/media/mtransport/test/sockettransportservice_unittest.cpp
+++ b/media/mtransport/test/sockettransportservice_unittest.cpp
@@ -135,7 +135,7 @@ class SocketHandler : public nsASocketHandler {
   SocketTransportServiceTest *test_;
 };
 
-NS_IMPL_ISUPPORTS0(SocketHandler);
+NS_IMPL_ISUPPORTS0(SocketHandler)
 
 void SocketTransportServiceTest::SetUp() {
   // Get the transport service as a dispatch target
diff --git a/media/mtransport/test/transport_unittests.cpp b/media/mtransport/test/transport_unittests.cpp
index eb26a7147838..143609af03e6 100644
--- a/media/mtransport/test/transport_unittests.cpp
+++ b/media/mtransport/test/transport_unittests.cpp
@@ -38,7 +38,7 @@
 #include "gtest_utils.h"
 
 using namespace mozilla;
-MOZ_MTLOG_MODULE("mtransport");
+MOZ_MTLOG_MODULE("mtransport")
 
 MtransportTestUtils *test_utils;
 

From a6f5e9e389fcf6f7693ce555a5ccc24eecbe0440 Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Tue, 27 Nov 2012 13:59:39 +0900
Subject: [PATCH 123/160] Bug 813508 - no need in special HTML caption
 processing for accessible tree creation, r=tbsaunde

---
 .../src/base/nsAccessibilityService.cpp       |  21 +--
 .../tests/mochitest/tree/test_table.html      | 146 +++++++++++-------
 2 files changed, 90 insertions(+), 77 deletions(-)

diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 6c8914a4cc48..dfc62343eace 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -901,26 +901,9 @@ nsAccessibilityService::GetOrCreateAccessible(nsINode* aNode,
       newAcc = CreateHTMLAccessibleByMarkup(frame, content, aDoc,
                                             legalPartOfHTMLTable);
 
-      if (!newAcc && (!partOfHTMLTable || legalPartOfHTMLTable)) {
-        // Do not create accessible object subtrees for non-rendered table
-        // captions. This could not be done in
-        // nsTableCaptionFrame::GetAccessible() because the descendants of
-        // the table caption would still be created. By setting
-        // *aIsSubtreeHidden = true we ensure that no descendant accessibles
-        // are created.
-        if (frame->GetType() == nsGkAtoms::tableCaptionFrame &&
-            frame->GetRect().IsEmpty()) {
-          // XXX This is not the ideal place for this code, but right now there
-          // is no better place:
-          if (aIsSubtreeHidden)
-            *aIsSubtreeHidden = true;
-
-          return nullptr;
-        }
-
-        // Try using frame to do it.
+      // Try using frame to do it.
+      if (!newAcc && (!partOfHTMLTable || legalPartOfHTMLTable))
         newAcc = CreateAccessibleByFrameType(frame, content, aDoc);
-      }
     }
   }
 
diff --git a/accessible/tests/mochitest/tree/test_table.html b/accessible/tests/mochitest/tree/test_table.html
index a5eb42d969f1..dec34ff5cae3 100644
--- a/accessible/tests/mochitest/tree/test_table.html
+++ b/accessible/tests/mochitest/tree/test_table.html
@@ -17,68 +17,76 @@
     function doTest()
     {
       //////////////////////////////////////////////////////////////////////////
-      // table1
+      // tables having captions
 
-      var accTree = {
-        role: ROLE_TABLE,
-        children: [
-          {
-            role: ROLE_CAPTION,
-            children: [
-              {
-                role: ROLE_TEXT_LEAF
-              }
-            ]
-          },
-          {
-            role: ROLE_ROW,
-            children: [
-              {
-                role: ROLE_COLUMNHEADER
-              },
-              {
-                role: ROLE_COLUMNHEADER
-              }
-            ]
-          },
-          {
-            role: ROLE_ROW,
-            children: [
-              {
-                role: ROLE_CELL
-              },
-              {
-                role: ROLE_CELL
-              }
-            ]
-          },
-          {
-            role: ROLE_ROW,
-            children: [
-              {
-                role: ROLE_CELL
-              },
-              {
-                role: ROLE_CELL
-              }
-            ]
-          },
-          {
-            role: ROLE_ROW,
-            children: [
-              {
-                role: ROLE_CELL
-              },
-              {
-                role: ROLE_CELL
-              }
-            ]
-          }
-        ]
-      };
+      // Two captions, first is used, second is ignored.
+      var accTree =
+        { TABLE: [
+          { CAPTION: [
+            {
+              role: ROLE_TEXT_LEAF,
+              name: "caption"
+             }
+          ] },
+          { ROW: [
+            { COLUMNHEADER: [ { TEXT_LEAF: [ ] } ] },
+            { COLUMNHEADER: [ { TEXT_LEAF: [ ] } ] }
+          ] },
+          { ROW: [
+            { CELL: [ { TEXT_LEAF: [ ] } ] },
+            { CELL: [ { TEXT_LEAF: [ ] } ] }
+          ] },
+          { ROW: [
+            { CELL: [ { TEXT_LEAF: [ ] } ] },
+            { CELL: [ { TEXT_LEAF: [ ] } ] }
+          ] },
+          { ROW: [
+            { CELL: [ { TEXT_LEAF: [ ] } ] },
+            { CELL: [ { TEXT_LEAF: [ ] } ] }
+          ] }
+        ] };
 
       testAccessibleTree("table", accTree);
 
+      // One caption, empty text, caption is ignored.
+      accTree =
+        { TABLE: [
+          { ROW: [
+            { CELL: [ { TEXT_LEAF: [ ] } ] },
+            { CELL: [ { TEXT_LEAF: [ ] } ] }
+          ] }
+        ] };
+
+      testAccessibleTree("table_caption_empty", accTree);
+
+      // Two captions, first has empty text, both are ignored.
+      accTree =
+        { TABLE: [
+          { ROW: [
+            { CELL: [ { TEXT_LEAF: [ ] } ] },
+            { CELL: [ { TEXT_LEAF: [ ] } ] }
+          ] }
+        ] };
+
+      testAccessibleTree("table_caption_firstempty", accTree);
+
+      // One caption, placed in the end of table. In use.
+      accTree =
+        { TABLE: [
+          { CAPTION: [
+            {
+              role: ROLE_TEXT_LEAF,
+              name: "caption"
+             }
+          ] },
+          { ROW: [
+            { CELL: [ { TEXT_LEAF: [ ] } ] },
+            { CELL: [ { TEXT_LEAF: [ ] } ] }
+          ] }
+        ] };
+
+      testAccessibleTree("table_caption_intheend", accTree);
+
       //////////////////////////////////////////////////////////////////////////
       // table2 (consist of one column)
 
@@ -187,6 +195,28 @@
     </tfoot>
   </table>
 
+  <table id="table_caption_empty">
+    <caption></caption>
+    <tr>
+      <td>cell1</td><td>cell2</td>
+    </tr>
+  </table>
+
+  <table id="table_caption_firstempty">
+    <caption></caption>
+    <tr>
+      <td>cell1</td><td>cell2</td>
+    </tr>
+    <caption>caption</caption>
+  </table>
+
+  <table id="table_caption_intheend">
+    <tr>
+      <td>cell1</td><td>cell2</td>
+    </tr>
+    <caption>caption</caption>
+  </table>
+
   <table id="table2">
     <thead>
       <tr>

From 4a54741fec8ec2403b7456f8c68d10ee1089fb67 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 27 Nov 2012 16:30:29 +1100
Subject: [PATCH 124/160] Bug 815499 - Force @supports pref on for
 test_supports_rules.html. r=bz

---
 layout/style/test/test_supports_rules.html | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/layout/style/test/test_supports_rules.html b/layout/style/test/test_supports_rules.html
index 3fd13142c6fc..4460fec00c1c 100644
--- a/layout/style/test/test_supports_rules.html
+++ b/layout/style/test/test_supports_rules.html
@@ -8,11 +8,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=649740
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <style id="style">
-    @supports(color: green){ }
-    @supports (color: green) { }
-    @supports ((color: green)) { }
-    @supports (color: green) and (color: blue) { }
-    @supports ( Font:  20px serif ! Important)  { }
   </style>
 </head>
 <body>
@@ -30,17 +25,30 @@ function condition(s) {
   return s.replace(/^@supports\s*/, '').replace(/ \s*{\s*}\s*$/, '');
 }
 
-if (!SpecialPowers.getBoolPref("layout.css.supports-rule.enabled")) {
-  todo(false, "skipping test because pref is disabled");
-} else {
-  var sheet = document.getElementById("style").sheet;
+var styleSheetText =
+  "@supports(color: green){ }\n" +
+  "@supports (color: green) { }\n" +
+  "@supports ((color: green)) { }\n" +
+  "@supports (color: green) and (color: blue) { }\n" +
+  "@supports ( Font:  20px serif ! Important)  { }";
+
+function runTest() {
+  var style = document.getElementById("style");
+  style.textContent = styleSheetText;
+
+  var sheet = style.sheet;
 
   is(condition(sheet.cssRules[0].cssText), "(color: green)");
   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)");
+
+  SimpleTest.finish();
 }
+
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({ "set": [["layout.css.supports-rule.enabled", true]] }, runTest);
 </script>
 </pre>
 </body>

From 76405ff9472e7ea9d06ac0aa3b0f494e3dcdefd3 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 27 Nov 2012 16:30:30 +1100
Subject: [PATCH 125/160] Bug 814907 - Add new CSS GroupingRule and
 ConditionRule interfaces. r=bz

---
 dom/interfaces/css/Makefile.in                |   2 +
 dom/interfaces/css/nsIDOMCSSConditionRule.idl |  16 ++
 dom/interfaces/css/nsIDOMCSSGroupingRule.idl  |  21 +++
 dom/interfaces/css/nsIDOMCSSMediaRule.idl     |  16 +-
 .../css/nsIDOMCSSMozDocumentRule.idl          |  16 +-
 dom/interfaces/css/nsIDOMCSSSupportsRule.idl  |  11 +-
 layout/style/nsCSSRules.cpp                   | 154 ++++++++++++------
 layout/style/nsCSSRules.h                     |  24 +++
 layout/style/test/Makefile.in                 |   1 +
 layout/style/test/test_condition_text.html    |  89 ++++++++++
 10 files changed, 273 insertions(+), 77 deletions(-)
 create mode 100644 dom/interfaces/css/nsIDOMCSSConditionRule.idl
 create mode 100644 dom/interfaces/css/nsIDOMCSSGroupingRule.idl
 create mode 100644 layout/style/test/test_condition_text.html

diff --git a/dom/interfaces/css/Makefile.in b/dom/interfaces/css/Makefile.in
index 52394bbede23..f964c6bab71a 100644
--- a/dom/interfaces/css/Makefile.in
+++ b/dom/interfaces/css/Makefile.in
@@ -27,7 +27,9 @@ SDK_XPIDLSRCS = 				\
 
 XPIDLSRCS =					\
 	nsIDOMCSSCharsetRule.idl		\
+	nsIDOMCSSConditionRule.idl		\
 	nsIDOMCSSFontFaceRule.idl		\
+	nsIDOMCSSGroupingRule.idl		\
 	nsIDOMCSSImportRule.idl			\
 	nsIDOMCSSMediaRule.idl			\
 	nsIDOMCSSMozDocumentRule.idl		\
diff --git a/dom/interfaces/css/nsIDOMCSSConditionRule.idl b/dom/interfaces/css/nsIDOMCSSConditionRule.idl
new file mode 100644
index 000000000000..eccdac1f9b2a
--- /dev/null
+++ b/dom/interfaces/css/nsIDOMCSSConditionRule.idl
@@ -0,0 +1,16 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsIDOMCSSGroupingRule.idl"
+
+/**
+ * Interface in the CSS OM for at-rules that conditionally apply their
+ * child rules.
+ */
+[scriptable, uuid(942754f2-2c0e-461b-9c10-c0e929504fe1)]
+interface nsIDOMCSSConditionRule : nsIDOMCSSGroupingRule
+{
+  attribute DOMString conditionText;
+};
diff --git a/dom/interfaces/css/nsIDOMCSSGroupingRule.idl b/dom/interfaces/css/nsIDOMCSSGroupingRule.idl
new file mode 100644
index 000000000000..cc4b616a0ab9
--- /dev/null
+++ b/dom/interfaces/css/nsIDOMCSSGroupingRule.idl
@@ -0,0 +1,21 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsIDOMCSSRule.idl"
+
+/**
+ * Interface for at-rules that have child rules in the CSS OM.
+ */
+[scriptable, uuid(ab013eed-fa21-4c6a-bba3-79e8780f583e)]
+interface nsIDOMCSSGroupingRule : nsIDOMCSSRule
+{
+  readonly attribute nsIDOMCSSRuleList cssRules;
+
+  unsigned long      insertRule(in DOMString rule,
+                                in unsigned long index)
+                                        raises(DOMException);
+  void               deleteRule(in unsigned long index)
+                                        raises(DOMException);
+};
diff --git a/dom/interfaces/css/nsIDOMCSSMediaRule.idl b/dom/interfaces/css/nsIDOMCSSMediaRule.idl
index ad8a6554c2a3..9ee987b45e0e 100644
--- a/dom/interfaces/css/nsIDOMCSSMediaRule.idl
+++ b/dom/interfaces/css/nsIDOMCSSMediaRule.idl
@@ -3,17 +3,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/. */
 
-#include "nsIDOMCSSRule.idl"
+#include "nsIDOMCSSConditionRule.idl"
 
-[scriptable, uuid(a6cf90bc-15b3-11d2-932e-00805f8add32)]
-interface nsIDOMCSSMediaRule : nsIDOMCSSRule
+/**
+ * Interface for @media rules in the CSS OM.
+ */
+[scriptable, uuid(1f491b05-932b-4aa1-a1f1-466505d70898)]
+interface nsIDOMCSSMediaRule : nsIDOMCSSConditionRule
 {
   readonly attribute nsIDOMMediaList   media;
-  readonly attribute nsIDOMCSSRuleList cssRules;
-
-  unsigned long      insertRule(in DOMString rule, 
-                                in unsigned long index)
-                                        raises(DOMException);
-  void               deleteRule(in unsigned long index)
-                                        raises(DOMException);
 };
diff --git a/dom/interfaces/css/nsIDOMCSSMozDocumentRule.idl b/dom/interfaces/css/nsIDOMCSSMozDocumentRule.idl
index 82de6c893e75..68a0ea2f02eb 100644
--- a/dom/interfaces/css/nsIDOMCSSMozDocumentRule.idl
+++ b/dom/interfaces/css/nsIDOMCSSMozDocumentRule.idl
@@ -3,21 +3,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/. */
 
-#include "nsIDOMCSSRule.idl"
+#include "nsIDOMCSSConditionRule.idl"
 
 /**
- * Modified version of nsIDOMCSSMediaRule for @-moz-document rules.
+ * Interface for @-moz-document rules in the CSS OM.
  */
-[scriptable, uuid(4eb9adac-afaf-4b8a-8640-7340863c1587)]
-interface nsIDOMCSSMozDocumentRule : nsIDOMCSSRule
+[scriptable, uuid(f118a5a8-ac36-464f-b993-18cf6fe76fda)]
+interface nsIDOMCSSMozDocumentRule : nsIDOMCSSConditionRule
 {
-  readonly attribute nsIDOMCSSRuleList cssRules;
-
-  unsigned long      insertRule(in DOMString rule, 
-                                in unsigned long index)
-                                        raises(DOMException);
-  void               deleteRule(in unsigned long index)
-                                        raises(DOMException);
-
   // XXX Add access to the URL list.
 };
diff --git a/dom/interfaces/css/nsIDOMCSSSupportsRule.idl b/dom/interfaces/css/nsIDOMCSSSupportsRule.idl
index 9588bef01224..04c991622479 100644
--- a/dom/interfaces/css/nsIDOMCSSSupportsRule.idl
+++ b/dom/interfaces/css/nsIDOMCSSSupportsRule.idl
@@ -3,19 +3,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/. */
 
-#include "nsIDOMCSSRule.idl"
+#include "nsIDOMCSSConditionRule.idl"
 
 /**
  * Interface for @supports rules in the CSS OM.
  */
 [scriptable, uuid(5f409a4d-92f9-4a62-8e8a-cc1c02c32918)]
-interface nsIDOMCSSSupportsRule : nsIDOMCSSRule
+interface nsIDOMCSSSupportsRule : nsIDOMCSSConditionRule
 {
-  readonly attribute nsIDOMCSSRuleList cssRules;
-
-  unsigned long      insertRule(in DOMString rule,
-                                in unsigned long index)
-                                        raises(DOMException);
-  void               deleteRule(in unsigned long index)
-                                        raises(DOMException);
 };
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 2da32d30b7de..94ec95dbebbc 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -814,6 +814,8 @@ NS_IMPL_RELEASE_INHERITED(MediaRule, GroupRule)
 NS_INTERFACE_MAP_BEGIN(MediaRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSGroupingRule)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSConditionRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMediaRule)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSMediaRule)
@@ -885,13 +887,7 @@ NS_IMETHODIMP
 MediaRule::GetCssText(nsAString& aCssText)
 {
   aCssText.AssignLiteral("@media ");
-  // get all the media
-  if (mMedia) {
-    nsAutoString mediaText;
-    mMedia->GetText(mediaText);
-    aCssText.Append(mediaText);
-  }
-
+  AppendConditionText(aCssText);
   return GroupRule::AppendRulesToCssText(aCssText);
 }
 
@@ -913,15 +909,7 @@ MediaRule::GetParentRule(nsIDOMCSSRule** aParentRule)
   return GroupRule::GetParentRule(aParentRule);
 }
 
-// nsIDOMCSSMediaRule methods
-NS_IMETHODIMP
-MediaRule::GetMedia(nsIDOMMediaList* *aMedia)
-{
-  NS_ENSURE_ARG_POINTER(aMedia);
-  NS_IF_ADDREF(*aMedia = mMedia);
-  return NS_OK;
-}
-
+// nsIDOMCSSGroupingRule methods
 NS_IMETHODIMP
 MediaRule::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
 {
@@ -940,6 +928,30 @@ MediaRule::DeleteRule(uint32_t aIndex)
   return GroupRule::DeleteRule(aIndex);
 }
 
+// nsIDOMCSSConditionRule methods
+NS_IMETHODIMP
+MediaRule::GetConditionText(nsAString& aConditionText)
+{
+  aConditionText.Truncate(0);
+  AppendConditionText(aConditionText);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+MediaRule::SetConditionText(const nsAString& aConditionText)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+// nsIDOMCSSMediaRule methods
+NS_IMETHODIMP
+MediaRule::GetMedia(nsIDOMMediaList* *aMedia)
+{
+  NS_ENSURE_ARG_POINTER(aMedia);
+  NS_IF_ADDREF(*aMedia = mMedia);
+  return NS_OK;
+}
+
 // GroupRule interface
 /* virtual */ bool
 MediaRule::UseForPresentation(nsPresContext* aPresContext,
@@ -964,6 +976,16 @@ MediaRule::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
   return n;
 }
 
+void
+MediaRule::AppendConditionText(nsAString& aOutput)
+{
+  if (mMedia) {
+    nsAutoString mediaText;
+    mMedia->GetText(mediaText);
+    aOutput.Append(mediaText);
+  }
+}
+
 } // namespace css
 } // namespace mozilla
 
@@ -994,6 +1016,8 @@ NS_IMPL_RELEASE_INHERITED(DocumentRule, GroupRule)
 NS_INTERFACE_MAP_BEGIN(DocumentRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSGroupingRule)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSConditionRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMozDocumentRule)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSMozDocumentRule)
@@ -1060,27 +1084,7 @@ NS_IMETHODIMP
 DocumentRule::GetCssText(nsAString& aCssText)
 {
   aCssText.AssignLiteral("@-moz-document ");
-  for (URL *url = mURLs; url; url = url->next) {
-    switch (url->func) {
-      case eURL:
-        aCssText.AppendLiteral("url(");
-        break;
-      case eURLPrefix:
-        aCssText.AppendLiteral("url-prefix(");
-        break;
-      case eDomain:
-        aCssText.AppendLiteral("domain(");
-        break;
-      case eRegExp:
-        aCssText.AppendLiteral("regexp(");
-        break;
-    }
-    nsStyleUtil::AppendEscapedCSSString(NS_ConvertUTF8toUTF16(url->url),
-                                        aCssText);
-    aCssText.AppendLiteral("), ");
-  }
-  aCssText.Cut(aCssText.Length() - 2, 1); // remove last ,
-
+  AppendConditionText(aCssText);
   return GroupRule::AppendRulesToCssText(aCssText);
 }
 
@@ -1102,6 +1106,7 @@ DocumentRule::GetParentRule(nsIDOMCSSRule** aParentRule)
   return GroupRule::GetParentRule(aParentRule);
 }
 
+// nsIDOMCSSGroupingRule methods
 NS_IMETHODIMP
 DocumentRule::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
 {
@@ -1120,6 +1125,21 @@ DocumentRule::DeleteRule(uint32_t aIndex)
   return GroupRule::DeleteRule(aIndex);
 }
 
+// nsIDOMCSSConditionRule methods
+NS_IMETHODIMP
+DocumentRule::GetConditionText(nsAString& aConditionText)
+{
+  aConditionText.Truncate(0);
+  AppendConditionText(aConditionText);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DocumentRule::SetConditionText(const nsAString& aConditionText)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 // GroupRule interface
 /* virtual */ bool
 DocumentRule::UseForPresentation(nsPresContext* aPresContext,
@@ -1186,6 +1206,31 @@ DocumentRule::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
   return n;
 }
 
+void
+DocumentRule::AppendConditionText(nsAString& aCssText)
+{
+  for (URL *url = mURLs; url; url = url->next) {
+    switch (url->func) {
+      case eURL:
+        aCssText.AppendLiteral("url(");
+        break;
+      case eURLPrefix:
+        aCssText.AppendLiteral("url-prefix(");
+        break;
+      case eDomain:
+        aCssText.AppendLiteral("domain(");
+        break;
+      case eRegExp:
+        aCssText.AppendLiteral("regexp(");
+        break;
+    }
+    nsStyleUtil::AppendEscapedCSSString(NS_ConvertUTF8toUTF16(url->url),
+                                        aCssText);
+    aCssText.AppendLiteral("), ");
+  }
+  aCssText.Truncate(aCssText.Length() - 2); // remove last ", "
+}
+
 } // namespace css
 } // namespace mozilla
 
@@ -2608,6 +2653,8 @@ NS_IMPL_RELEASE_INHERITED(CSSSupportsRule, css::GroupRule)
 NS_INTERFACE_MAP_BEGIN(CSSSupportsRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSGroupingRule)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMCSSConditionRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSSupportsRule)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSSupportsRule)
@@ -2647,15 +2694,7 @@ CSSSupportsRule::GetParentRule(nsIDOMCSSRule** aParentRule)
   return css::GroupRule::GetParentRule(aParentRule);
 }
 
-/* virtual */ size_t
-CSSSupportsRule::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
-{
-  size_t n = aMallocSizeOf(this);
-  n += css::GroupRule::SizeOfExcludingThis(aMallocSizeOf);
-  n += mCondition.SizeOfExcludingThisIfUnshared(aMallocSizeOf);
-  return n;
-}
-
+// nsIDOMCSSGroupingRule methods
 NS_IMETHODIMP
 CSSSupportsRule::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
 {
@@ -2674,6 +2713,29 @@ CSSSupportsRule::DeleteRule(uint32_t aIndex)
   return css::GroupRule::DeleteRule(aIndex);
 }
 
+// nsIDOMCSSConditionRule methods
+NS_IMETHODIMP
+CSSSupportsRule::GetConditionText(nsAString& aConditionText)
+{
+  aConditionText.Assign(mCondition);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+CSSSupportsRule::SetConditionText(const nsAString& aConditionText)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* virtual */ size_t
+CSSSupportsRule::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
+{
+  size_t n = aMallocSizeOf(this);
+  n += css::GroupRule::SizeOfExcludingThis(aMallocSizeOf);
+  n += mCondition.SizeOfExcludingThisIfUnshared(aMallocSizeOf);
+  return n;
+}
+
 } // namespace mozilla
 
 // Must be outside namespace
diff --git a/layout/style/nsCSSRules.h b/layout/style/nsCSSRules.h
index 6eb6104ae8ff..656aba7913b5 100644
--- a/layout/style/nsCSSRules.h
+++ b/layout/style/nsCSSRules.h
@@ -13,7 +13,9 @@
 
 #include "mozilla/css/GroupRule.h"
 #include "mozilla/Preferences.h"
+#include "nsIDOMCSSConditionRule.h"
 #include "nsIDOMCSSFontFaceRule.h"
+#include "nsIDOMCSSGroupingRule.h"
 #include "nsIDOMCSSMediaRule.h"
 #include "nsIDOMCSSMozDocumentRule.h"
 #include "nsIDOMCSSSupportsRule.h"
@@ -69,6 +71,12 @@ public:
   // nsIDOMCSSRule interface
   NS_DECL_NSIDOMCSSRULE
 
+  // nsIDOMCSSGroupingRule interface
+  NS_DECL_NSIDOMCSSGROUPINGRULE
+
+  // nsIDOMCSSConditionRule interface
+  NS_DECL_NSIDOMCSSCONDITIONRULE
+
   // nsIDOMCSSMediaRule interface
   NS_DECL_NSIDOMCSSMEDIARULE
 
@@ -83,6 +91,8 @@ public:
     SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
 
 protected:
+  void AppendConditionText(nsAString& aOutput);
+
   nsRefPtr<nsMediaList> mMedia;
 };
 
@@ -118,6 +128,12 @@ public:
   // nsIDOMCSSRule interface
   NS_DECL_NSIDOMCSSRULE
 
+  // nsIDOMCSSGroupingRule interface
+  NS_DECL_NSIDOMCSSGROUPINGRULE
+
+  // nsIDOMCSSConditionRule interface
+  NS_DECL_NSIDOMCSSCONDITIONRULE
+
   // nsIDOMCSSMozDocumentRule interface
   NS_DECL_NSIDOMCSSMOZDOCUMENTRULE
 
@@ -153,6 +169,8 @@ public:
     SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
 
 protected:
+  void AppendConditionText(nsAString& aOutput);
+
   nsAutoPtr<URL> mURLs; // linked list of |struct URL| above.
 };
 
@@ -537,6 +555,12 @@ public:
   // nsIDOMCSSRule interface
   NS_DECL_NSIDOMCSSRULE
 
+  // nsIDOMCSSGroupingRule interface
+  NS_DECL_NSIDOMCSSGROUPINGRULE
+
+  // nsIDOMCSSConditionRule interface
+  NS_DECL_NSIDOMCSSCONDITIONRULE
+
   // nsIDOMCSSSupportsRule interface
   NS_DECL_NSIDOMCSSSUPPORTSRULE
 
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index b0ed11235aa7..bec8be8a9582 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -92,6 +92,7 @@ MOCHITEST_FILES =	test_acid3_test46.html \
 		test_compute_data_with_start_struct.html \
 		test_computed_style.html \
 		test_computed_style_no_pseudo.html \
+		test_condition_text.html \
 		test_default_computed_style.html \
 		test_css_cross_domain.html \
 		test_css_eof_handling.html \
diff --git a/layout/style/test/test_condition_text.html b/layout/style/test/test_condition_text.html
new file mode 100644
index 000000000000..a53bb7f3b846
--- /dev/null
+++ b/layout/style/test/test_condition_text.html
@@ -0,0 +1,89 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=814907
+-->
+<head>
+  <title>Test for Bug 814907</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <style id="style">
+    @-moz-document url(http://www.example.com/) {}
+    @-moz-document url('http://www.example.com/') {}
+    @-moz-document url("http://www.example.com/") {}
+    @-moz-document url-prefix('http://www.example.com/') {}
+    @-moz-document url-prefix("http://www.example.com/") {}
+    @-moz-document domain('example.com') {}
+    @-moz-document domain("example.com") {}
+    @-moz-document regexp('http://www.w3.org/TR/\\d{4}/[^/]*-CSS2-\\d{8}/') {}
+    @-moz-document regexp("http://www.w3.org/TR/\\d{4}/[^/]*-CSS2-\\d{8}/") {}
+
+    @media all {}
+    @media only color {}
+    @media (color ) {}
+    @media color \0061ND ( monochrome ) {}
+    @media (max-width: 200px), (color) {}
+
+    @supports(color: green){}
+    @supports (color: green) {}
+    @supports ((color: green)) {}
+    @supports (color: green) and (color: blue) {}
+    @supports ( Font:  20px serif ! Important)  {}
+  </style>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=814907">Mozilla Bug 814907</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 814907 **/
+
+function runTest()
+{
+  var sheet = document.getElementById("style").sheet;
+
+  var conditions = [
+    "url(\"http://www.example.com/\")",
+    "url(\"http://www.example.com/\")",
+    "url(\"http://www.example.com/\")",
+    "url-prefix(\"http://www.example.com/\")",
+    "url-prefix(\"http://www.example.com/\")",
+    "domain(\"example.com\")",
+    "domain(\"example.com\")",
+    "regexp(\"http://www.w3.org/TR/\\\\d{4}/[^/]*-CSS2-\\\\d{8}/\")",
+    "regexp(\"http://www.w3.org/TR/\\\\d{4}/[^/]*-CSS2-\\\\d{8}/\")",
+    "all",
+    "only color",
+    "(color)",
+    "color and (monochrome)",
+    "(max-width: 200px), (color)",
+    "(color: green)",
+    "(color: green)",
+    "((color: green))",
+    "(color: green) and (color: blue)",
+    "( Font:  20px serif ! Important)"
+  ];
+
+  is(sheet.cssRules.length, conditions.length);
+
+  for (var i = 0; i < sheet.cssRules.length; i++) {
+    var rule = sheet.cssRules[i];
+    is(rule.conditionText, conditions[i], "rule " + i + " has expected conditionText");
+    if (rule.type == CSSRule.MEDIA_RULE) {
+      is(rule.conditionText, rule.media.mediaText, "rule " + i + " conditionText matches media.mediaText");
+    }
+  }
+
+  SimpleTest.finish();
+}
+
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({ "set": [["layout.css.supports-rule.enabled", true]] }, runTest);
+</script>
+</pre>
+</body>
+</html>

From 557949bf7ed3b0ba51f6038bb6ec8ef286a32899 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 27 Nov 2012 16:30:31 +1100
Subject: [PATCH 126/160] Bug 815021 - Implement MediaRule.conditionText
 setter. r?

---
 layout/style/nsCSSParser.cpp                  |  7 ++-
 layout/style/nsCSSRules.cpp                   | 14 ++++-
 layout/style/nsCSSStyleSheet.h                |  1 -
 layout/style/test/Makefile.in                 |  1 +
 .../test/test_condition_text_assignment.html  | 59 +++++++++++++++++++
 5 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 layout/style/test/test_condition_text_assignment.html

diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index d799fbea8a5b..4995831a1067 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -1144,7 +1144,8 @@ CSSParserImpl::ParseMediaList(const nsSubstring& aBuffer,
                               bool aHTMLMode)
 {
   // XXX Are there cases where the caller wants to keep what it already
-  // has in case of parser error?
+  // has in case of parser error?  If GatherMedia ever changes to return
+  // a value other than true, we probably should avoid modifying aMediaList.
   aMediaList->Clear();
 
   // fake base URI since media lists don't have URIs in them
@@ -1166,7 +1167,9 @@ CSSParserImpl::ParseMediaList(const nsSubstring& aBuffer,
   // to a media query.  (The main substative difference is the relative
   // precedence of commas and paretheses.)
 
-  GatherMedia(aMediaList, false);
+  DebugOnly<bool> parsedOK = GatherMedia(aMediaList, false);
+  NS_ASSERTION(parsedOK, "GatherMedia returned false; we probably want to avoid "
+                         "trashing aMediaList");
 
   CLEAR_ERROR();
   ReleaseScanner();
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 94ec95dbebbc..8ade76b19492 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -665,7 +665,7 @@ GroupRule::EnumerateRulesForwards(RuleEnumFunc aFunc, void * aData) const
 /*
  * The next two methods (DeleteStyleRuleAt and InsertStyleRulesAt)
  * should never be called unless you have first called WillDirty() on
- * the parents tylesheet.  After they are called, DidDirty() needs to
+ * the parents stylesheet.  After they are called, DidDirty() needs to
  * be called on the sheet
  */
 nsresult
@@ -940,7 +940,17 @@ MediaRule::GetConditionText(nsAString& aConditionText)
 NS_IMETHODIMP
 MediaRule::SetConditionText(const nsAString& aConditionText)
 {
-  return NS_ERROR_NOT_IMPLEMENTED;
+  if (!mMedia) {
+    nsRefPtr<nsMediaList> media = new nsMediaList();
+    media->SetStyleSheet(GetStyleSheet());
+    nsresult rv = media->SetMediaText(aConditionText);
+    if (NS_SUCCEEDED(rv)) {
+      mMedia = media;
+    }
+    return rv;
+  }
+
+  return mMedia->SetMediaText(aConditionText);
 }
 
 // nsIDOMCSSMediaRule methods
diff --git a/layout/style/nsCSSStyleSheet.h b/layout/style/nsCSSStyleSheet.h
index 1db88fab3d5e..8a067ba3a5e5 100644
--- a/layout/style/nsCSSStyleSheet.h
+++ b/layout/style/nsCSSStyleSheet.h
@@ -25,7 +25,6 @@
 
 class nsXMLNameSpaceMap;
 class nsCSSRuleProcessor;
-class nsMediaList;
 class nsIPrincipal;
 class nsIURI;
 class nsMediaList;
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index bec8be8a9582..dc67fc3fd34b 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -93,6 +93,7 @@ MOCHITEST_FILES =	test_acid3_test46.html \
 		test_computed_style.html \
 		test_computed_style_no_pseudo.html \
 		test_condition_text.html \
+		test_condition_text_assignment.html \
 		test_default_computed_style.html \
 		test_css_cross_domain.html \
 		test_css_eof_handling.html \
diff --git a/layout/style/test/test_condition_text_assignment.html b/layout/style/test/test_condition_text_assignment.html
new file mode 100644
index 000000000000..dc1ef923de11
--- /dev/null
+++ b/layout/style/test/test_condition_text_assignment.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=815021
+-->
+<head>
+  <title>Test for Bug 815021</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <style id="style">
+    #a { text-transform: none }
+    @media all {
+      #a { text-transform: lowercase }
+    }
+  </style>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=815021">Mozilla Bug 815021</a>
+<p id="display"><span id=a></span></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 815021 **/
+
+var sheet = document.getElementById("style").sheet;
+var rule = sheet.cssRules[1];
+var a = document.getElementById("a");
+
+function stylesApplied() {
+  return window.getComputedStyle(a, "").textTransform == "lowercase";
+}
+
+is(rule.type, CSSRule.MEDIA_RULE, "initial @media rule type");
+is(rule.conditionText, "all", "initial @media rule conditionText");
+ok(stylesApplied(), "initial @media rule applied");
+
+// [value to set, value to check, whether styles should be applied]
+var media = [
+  ["not all", "not all", false],
+  ["ALL ", "all", true],
+  ["unknown", "unknown", false],
+  ["(min-width:1px)", "(min-width: 1px)", true],
+  ["(bad syntax", "not all", false],
+  ["(max-width: 1px), (color)", "(max-width: 1px), (color)", true]
+];
+
+for (var i = 0; i < media.length; i++) {
+  rule.conditionText = media[i][0];
+  is(rule.conditionText, media[i][1], "value of conditionText #" + i);
+  ok(rule.cssText.startsWith("@media " + media[i][1]), "value of cssText #" + i);
+  ok(stylesApplied() == media[i][2], "styles applied #" + i);
+}
+</script>
+</pre>
+</body>
+</html>

From 96d61874a4357a9e4a5e4a1e0241e5b10a7e4d67 Mon Sep 17 00:00:00 2001
From: Eric Chou <echou@mozilla.com>
Date: Tue, 27 Nov 2012 14:12:19 +0800
Subject: [PATCH 127/160] Bug 811946 - remove annoying compiler warnings and
 define a more structured interface for Bluetooth uuid, r=qdot

---
 dom/bluetooth/BluetoothAdapter.cpp           |  1 -
 dom/bluetooth/BluetoothDevice.cpp            |  1 -
 dom/bluetooth/BluetoothHfpManager.cpp        | 23 ++++---
 dom/bluetooth/BluetoothOppManager.cpp        | 19 +++---
 dom/bluetooth/BluetoothScoManager.cpp        |  1 -
 dom/bluetooth/BluetoothServiceUuid.h         | 53 ----------------
 dom/bluetooth/BluetoothUuid.cpp              | 20 +++++++
 dom/bluetooth/BluetoothUuid.h                | 63 ++++++++++++++++++++
 dom/bluetooth/Makefile.in                    |  1 +
 dom/bluetooth/linux/BluetoothDBusService.cpp | 26 ++++----
 10 files changed, 118 insertions(+), 90 deletions(-)
 delete mode 100644 dom/bluetooth/BluetoothServiceUuid.h
 create mode 100644 dom/bluetooth/BluetoothUuid.cpp
 create mode 100644 dom/bluetooth/BluetoothUuid.h

diff --git a/dom/bluetooth/BluetoothAdapter.cpp b/dom/bluetooth/BluetoothAdapter.cpp
index 84cbeb866b7f..5d35bd5371fe 100644
--- a/dom/bluetooth/BluetoothAdapter.cpp
+++ b/dom/bluetooth/BluetoothAdapter.cpp
@@ -10,7 +10,6 @@
 #include "BluetoothPropertyEvent.h"
 #include "BluetoothReplyRunnable.h"
 #include "BluetoothService.h"
-#include "BluetoothServiceUuid.h"
 #include "BluetoothUtils.h"
 #include "GeneratedEvents.h"
 
diff --git a/dom/bluetooth/BluetoothDevice.cpp b/dom/bluetooth/BluetoothDevice.cpp
index da6d1196a426..1dcf447048b9 100644
--- a/dom/bluetooth/BluetoothDevice.cpp
+++ b/dom/bluetooth/BluetoothDevice.cpp
@@ -10,7 +10,6 @@
 #include "BluetoothReplyRunnable.h"
 #include "BluetoothService.h"
 #include "BluetoothUtils.h"
-#include "BluetoothServiceUuid.h"
 
 #include "nsIDOMDOMRequest.h"
 #include "nsDOMClassInfo.h"
diff --git a/dom/bluetooth/BluetoothHfpManager.cpp b/dom/bluetooth/BluetoothHfpManager.cpp
index 7d749014cfe5..72c709f0dbd0 100644
--- a/dom/bluetooth/BluetoothHfpManager.cpp
+++ b/dom/bluetooth/BluetoothHfpManager.cpp
@@ -11,8 +11,8 @@
 #include "BluetoothReplyRunnable.h"
 #include "BluetoothScoManager.h"
 #include "BluetoothService.h"
-#include "BluetoothServiceUuid.h"
 #include "BluetoothUtils.h"
+#include "BluetoothUuid.h"
 
 #include "mozilla/dom/bluetooth/BluetoothTypes.h"
 #include "mozilla/Services.h"
@@ -27,8 +27,6 @@
 
 #define MOZSETTINGS_CHANGED_ID "mozsettings-changed"
 #define AUDIO_VOLUME_BT_SCO "audio.volume.bt_sco"
-#define HANDSFREE_UUID mozilla::dom::bluetooth::BluetoothServiceUuidStr::Handsfree
-#define HEADSET_UUID mozilla::dom::bluetooth::BluetoothServiceUuidStr::Headset
 
 using namespace mozilla;
 using namespace mozilla::ipc;
@@ -623,17 +621,17 @@ BluetoothHfpManager::Connect(const nsAString& aDevicePath,
   BluetoothService* bs = BluetoothService::Get();
   NS_ENSURE_TRUE(bs, false);
 
-  nsString serviceUuidStr;
+  nsString uuid;
   if (aIsHandsfree) {
-    serviceUuidStr = NS_ConvertUTF8toUTF16(HANDSFREE_UUID);
+    BluetoothUuidHelper::GetString(BluetoothServiceClass::HANDSFREE, uuid);
   } else {
-    serviceUuidStr = NS_ConvertUTF8toUTF16(HEADSET_UUID);
+    BluetoothUuidHelper::GetString(BluetoothServiceClass::HEADSET, uuid);
   }
 
   mRunnable = aRunnable;
 
   nsresult rv = bs->GetSocketViaService(aDevicePath,
-                                        serviceUuidStr,
+                                        uuid,
                                         BluetoothSocketType::RFCOMM,
                                         true,
                                         true,
@@ -658,11 +656,12 @@ BluetoothHfpManager::Listen()
   BluetoothService* bs = BluetoothService::Get();
   NS_ENSURE_TRUE(bs, false);
 
-  nsresult rv = bs->ListenSocketViaService(BluetoothReservedChannels::HANDSFREE_AG,
-                                           BluetoothSocketType::RFCOMM,
-                                           true,
-                                           true,
-                                           this);
+  nsresult rv =
+    bs->ListenSocketViaService(BluetoothReservedChannels::CHANNEL_HANDSFREE_AG,
+                               BluetoothSocketType::RFCOMM,
+                               true,
+                               true,
+                               this);
 
   mSocketStatus = GetConnectionStatus();
 
diff --git a/dom/bluetooth/BluetoothOppManager.cpp b/dom/bluetooth/BluetoothOppManager.cpp
index d1b5b9a830cf..9d818fb54e22 100644
--- a/dom/bluetooth/BluetoothOppManager.cpp
+++ b/dom/bluetooth/BluetoothOppManager.cpp
@@ -9,8 +9,8 @@
 
 #include "BluetoothReplyRunnable.h"
 #include "BluetoothService.h"
-#include "BluetoothServiceUuid.h"
 #include "BluetoothUtils.h"
+#include "BluetoothUuid.h"
 #include "ObexBase.h"
 
 #include "mozilla/dom/bluetooth/BluetoothTypes.h"
@@ -207,13 +207,13 @@ BluetoothOppManager::Connect(const nsAString& aDeviceObjectPath,
     return false;
   }
 
-  nsString serviceUuidStr =
-    NS_ConvertUTF8toUTF16(BluetoothServiceUuidStr::ObjectPush);
+  nsString uuid;
+  BluetoothUuidHelper::GetString(BluetoothServiceClass::OBJECT_PUSH, uuid);
 
   mRunnable = aRunnable;
 
   nsresult rv = bs->GetSocketViaService(aDeviceObjectPath,
-                                        serviceUuidStr,
+                                        uuid,
                                         BluetoothSocketType::RFCOMM,
                                         true,
                                         true,
@@ -257,11 +257,12 @@ BluetoothOppManager::Listen()
     return false;
   }
 
-  nsresult rv = bs->ListenSocketViaService(BluetoothReservedChannels::OPUSH,
-                                           BluetoothSocketType::RFCOMM,
-                                           true,
-                                           true,
-                                           this);
+  nsresult rv =
+    bs->ListenSocketViaService(BluetoothReservedChannels::CHANNEL_OPUSH,
+                               BluetoothSocketType::RFCOMM,
+                               true,
+                               true,
+                               this);
   mSocketStatus = GetConnectionStatus();
 
   return NS_FAILED(rv) ? false : true;
diff --git a/dom/bluetooth/BluetoothScoManager.cpp b/dom/bluetooth/BluetoothScoManager.cpp
index 046dc9a887cf..6eef4c73c355 100644
--- a/dom/bluetooth/BluetoothScoManager.cpp
+++ b/dom/bluetooth/BluetoothScoManager.cpp
@@ -10,7 +10,6 @@
 
 #include "BluetoothReplyRunnable.h"
 #include "BluetoothService.h"
-#include "BluetoothServiceUuid.h"
 #include "BluetoothUtils.h"
 
 #include "mozilla/Services.h"
diff --git a/dom/bluetooth/BluetoothServiceUuid.h b/dom/bluetooth/BluetoothServiceUuid.h
deleted file mode 100644
index 29f337bbc350..000000000000
--- a/dom/bluetooth/BluetoothServiceUuid.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_dom_bluetooth_bluetoothuuid_h__
-#define mozilla_dom_bluetooth_bluetoothuuid_h__
-
-namespace mozilla {
-namespace dom {
-namespace bluetooth {
-
-namespace BluetoothServiceUuid {
-  static unsigned long long Headset      = 0x0000110800000000;
-  static unsigned long long HeadsetAG    = 0x0000111200000000;
-  static unsigned long long Handsfree    = 0x0000111E00000000;
-  static unsigned long long HandsfreeAG  = 0x0000111F00000000;
-  static unsigned long long ObjectPush   = 0x0000110500000000;
-
-  static unsigned long long BaseMSB     = 0x0000000000001000;
-  static unsigned long long BaseLSB     = 0x800000805F9B34FB;
-}
-
-namespace BluetoothServiceUuidStr {
-  static const char* Headset       = "00001108-0000-1000-8000-00805F9B34FB";
-  static const char* HeadsetAG     = "00001112-0000-1000-8000-00805F9B34FB";
-  static const char* Handsfree     = "0000111E-0000-1000-8000-00805F9B34FB";
-  static const char* HandsfreeAG   = "0000111F-0000-1000-8000-00805F9B34FB";
-  static const char* ObjectPush    = "00001105-0000-1000-8000-00805F9B34FB";
-}
-
-// TODO/qdot: Move these back into gonk and make the service handler deal with
-// it there.
-//
-// Gotten from reading the "u8" values in B2G/external/bluez/src/adapter.c
-// These were hardcoded into android
-enum BluetoothReservedChannels {
-  DIALUP_NETWORK = 1,
-  HANDSFREE_AG = 10,
-  HEADSET_AG = 11,
-  OPUSH = 12,
-  SIM_ACCESS = 15,
-  PBAP_PSE = 19,
-  FTP = 20,
-};
-
-}
-}
-}
-
-#endif
-
diff --git a/dom/bluetooth/BluetoothUuid.cpp b/dom/bluetooth/BluetoothUuid.cpp
new file mode 100644
index 000000000000..8edaf4d75241
--- /dev/null
+++ b/dom/bluetooth/BluetoothUuid.cpp
@@ -0,0 +1,20 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "BluetoothUuid.h"
+
+USING_BLUETOOTH_NAMESPACE
+
+void
+BluetoothUuidHelper::GetString(BluetoothServiceClass aServiceClassUuid,
+                               nsAString& aRetUuidStr)
+{
+  aRetUuidStr.Truncate();
+
+  aRetUuidStr.AppendLiteral("0000");
+  aRetUuidStr.AppendInt(aServiceClassUuid, 16);
+  aRetUuidStr.AppendLiteral("-0000-1000-8000-00805F9B34FB");
+}
diff --git a/dom/bluetooth/BluetoothUuid.h b/dom/bluetooth/BluetoothUuid.h
new file mode 100644
index 000000000000..486defaf2854
--- /dev/null
+++ b/dom/bluetooth/BluetoothUuid.h
@@ -0,0 +1,63 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_bluetooth_bluetoothuuid_h__
+#define mozilla_dom_bluetooth_bluetoothuuid_h__
+
+#include "BluetoothCommon.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+/*
+ * Service classes and Profile Identifiers
+ *
+ * Supported Bluetooth services for v1 are listed as below.
+ *
+ * The value of each service class is defined in "AssignedNumbers/Service
+ * Discovery Protocol (SDP)/Service classes and Profile Identifiers" in the
+ * Bluetooth Core Specification.
+ */
+enum BluetoothServiceClass
+{
+  HEADSET       = 0x1108,
+  HEADSET_AG    = 0x1112,
+  HANDSFREE     = 0x111E,
+  HANDSFREE_AG  = 0x111F,
+  OBJECT_PUSH   = 0x1105
+};
+
+class BluetoothUuidHelper
+{
+public:
+  /**
+   * Get a 128-bit uuid string calculated from a 16-bit service class UUID and
+   * BASE_UUID
+   *
+   * @param aServiceClassUuid  16-bit service class UUID
+   * @param aRetUuidStr  out parameter, 128-bit uuid string
+   */
+  static void
+  GetString(BluetoothServiceClass aServiceClassUuid, nsAString& aRetUuidStr);
+};
+
+// TODO/qdot: Move these back into gonk and make the service handler deal with
+// it there.
+//
+// Gotten from reading the "u8" values in B2G/external/bluez/src/adapter.c
+// These were hardcoded into android
+enum BluetoothReservedChannels {
+  CHANNEL_DIALUP_NETWORK = 1,
+  CHANNEL_HANDSFREE_AG = 10,
+  CHANNEL_HEADSET_AG = 11,
+  CHANNEL_OPUSH = 12,
+  CHANNEL_SIM_ACCESS = 15,
+  CHANNEL_PBAP_PSE = 19,
+  CHANNEL_FTP = 20,
+};
+
+END_BLUETOOTH_NAMESPACE
+
+#endif
diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in
index d16aeb9ff273..0a0548bcb061 100644
--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@@ -56,6 +56,7 @@ CPPSRCS += \
   BluetoothOppManager.cpp \
   ObexBase.cpp \
   BluetoothScoManager.cpp \
+  BluetoothUuid.cpp \
   $(NULL)
 
 ifdef MOZ_B2G_RIL
diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp
index 35a4097dc2da..cc929a25db7d 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -22,9 +22,9 @@
 #include "BluetoothOppManager.h"
 #include "BluetoothReplyRunnable.h"
 #include "BluetoothScoManager.h"
-#include "BluetoothServiceUuid.h"
 #include "BluetoothUnixSocketConnector.h"
 #include "BluetoothUtils.h"
+#include "BluetoothUuid.h"
 
 #include <cstdio>
 #include <dbus/dbus.h>
@@ -766,9 +766,9 @@ public:
 
     nsTArray<uint32_t> uuids;
 
-    uuids.AppendElement((uint32_t)(BluetoothServiceUuid::HandsfreeAG >> 32));
-    uuids.AppendElement((uint32_t)(BluetoothServiceUuid::HeadsetAG >> 32));
-    uuids.AppendElement((uint32_t)(BluetoothServiceUuid::ObjectPush >> 32));
+    uuids.AppendElement(BluetoothServiceClass::HANDSFREE_AG);
+    uuids.AppendElement(BluetoothServiceClass::HEADSET_AG);
+    uuids.AppendElement(BluetoothServiceClass::OBJECT_PUSH);
 
     // TODO/qdot: This needs to be held for the life of the bluetooth connection
     // so we could clean it up. For right now though, we can throw it away.
@@ -2313,21 +2313,21 @@ BluetoothDBusService::Connect(const nsAString& aDeviceAddress,
 
   BluetoothValue v;
   nsString errorStr;
-  if (aProfileId == (uint16_t)(BluetoothServiceUuid::Handsfree >> 32)) {
+  if (aProfileId == BluetoothServiceClass::HANDSFREE) {
     BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
     if (!hfp->Connect(GetObjectPathFromAddress(aAdapterPath, aDeviceAddress),
                       true, aRunnable)) {
       errorStr.AssignLiteral("BluetoothHfpManager has connected/is connecting to a headset!");
       DispatchBluetoothReply(aRunnable, v, errorStr);
     }
-  } else if (aProfileId == (uint16_t)(BluetoothServiceUuid::Headset >> 32)) {
+  } else if (aProfileId == BluetoothServiceClass::HEADSET) {
     BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
     if (!hfp->Connect(GetObjectPathFromAddress(aAdapterPath, aDeviceAddress),
                       false, aRunnable)) {
       errorStr.AssignLiteral("BluetoothHfpManager has connected/is connecting to a headset!");
       DispatchBluetoothReply(aRunnable, v, errorStr);
     }
-  } else if (aProfileId == (uint16_t)(BluetoothServiceUuid::ObjectPush >> 32)) {
+  } else if (aProfileId == BluetoothServiceClass::OBJECT_PUSH) {
     BluetoothOppManager* opp = BluetoothOppManager::Get();
     if (!opp->Connect(GetObjectPathFromAddress(aAdapterPath, aDeviceAddress),
                       aRunnable)) {
@@ -2345,11 +2345,11 @@ void
 BluetoothDBusService::Disconnect(const uint16_t aProfileId,
                                  BluetoothReplyRunnable* aRunnable)
 {
-  if (aProfileId == (uint16_t)(BluetoothServiceUuid::Handsfree >> 32) ||
-      aProfileId == (uint16_t)(BluetoothServiceUuid::Headset >> 32)) {
+  if (aProfileId == BluetoothServiceClass::HANDSFREE ||
+      aProfileId == BluetoothServiceClass::HEADSET) {
     BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
     hfp->Disconnect();
-  } else if (aProfileId == (uint16_t)(BluetoothServiceUuid::ObjectPush >> 32)) {
+  } else if (aProfileId == BluetoothServiceClass::OBJECT_PUSH) {
     BluetoothOppManager* opp = BluetoothOppManager::Get();
     opp->Disconnect();
   } else {
@@ -2370,11 +2370,11 @@ BluetoothDBusService::IsConnected(const uint16_t aProfileId)
 {
   NS_ASSERTION(NS_IsMainThread(), "Must be called from main thread!");
 
-  if (aProfileId == (uint16_t)(BluetoothServiceUuid::Handsfree >> 32)
-      || aProfileId == (uint16_t)(BluetoothServiceUuid::Headset >> 32)) {
+  if (aProfileId == BluetoothServiceClass::HANDSFREE ||
+      aProfileId == BluetoothServiceClass::HEADSET) {
     BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
     return hfp->GetConnectionStatus() == SocketConnectionStatus::SOCKET_CONNECTED;
-  } else if (aProfileId == (uint16_t)(BluetoothServiceUuid::ObjectPush >> 32)) {
+  } else if (aProfileId == BluetoothServiceClass::OBJECT_PUSH) {
     BluetoothOppManager* opp = BluetoothOppManager::Get();
     return opp->GetConnectionStatus() == SocketConnectionStatus::SOCKET_CONNECTED;
   }

From 18fc16fed433daee2d08a1259bd0fa90f9a812f0 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 27 Nov 2012 17:43:01 +1100
Subject: [PATCH 128/160] Bug 814907 - Fix test_interfaces.html failures.
 r=orange

---
 dom/tests/mochitest/general/test_interfaces.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html
index b3284b8a9110..6bc588a97feb 100644
--- a/dom/tests/mochitest/general/test_interfaces.html
+++ b/dom/tests/mochitest/general/test_interfaces.html
@@ -526,7 +526,9 @@ var interfaceNamesInGlobalScope =
     "RTCSessionDescription",
     "RTCIceCandidate",
     "RTCPeerConnection",
-    "LocalMediaStream"
+    "LocalMediaStream",
+    "CSSConditionRule",
+    "CSSGroupingRule"
   ]
 
 for (var i in SpecialPowers.Components.interfaces) {

From c08ef1247f7936a368d58db03c25a86d2f414b50 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Tue, 27 Nov 2012 17:54:55 +1100
Subject: [PATCH 129/160] Bug 813436 - tweaks to ensure a consistent UI as
 social is enabled/disabled/active/inactive.  r=jaws

---
 browser/base/content/browser-menubar.inc |  3 ++-
 browser/base/content/browser-sets.inc    |  1 +
 browser/base/content/browser-social.js   | 15 ++++++++++++---
 browser/base/content/browser.xul         |  3 ++-
 browser/modules/Social.jsm               |  2 +-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index a57e55c7ff74..4fc1323cb138 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -505,7 +505,8 @@
                         accesskey="&addons.accesskey;"
                         key="key_openAddons"
                         command="Tools:Addons"/>
-              <menu id="menu_socialAmbientMenu">
+              <menu id="menu_socialAmbientMenu"
+                    observes="socialActiveBroadcaster">
                 <menupopup id="menu_social-statusarea-popup">
                   <menuitem class="social-statusarea-user menuitem-iconic" pack="start" align="center"
                             observes="socialBroadcaster_userDetails"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 46c6f192df63..f93f00dcd546 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -193,6 +193,7 @@
 #endif
     <broadcaster id="workOfflineMenuitemState"/>
     <broadcaster id="socialSidebarBroadcaster" hidden="true"/>
+    <broadcaster id="socialActiveBroadcaster" hidden="true"/>
 
     <!-- DevTools broadcasters -->
     <broadcaster id="devtoolsMenuBroadcaster_DevToolbar"
diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index c1f3bb6d7664..6eb18e1523d3 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -17,6 +17,7 @@ let SocialUI = {
 
     Services.prefs.addObserver("social.sidebar.open", this, false);
     Services.prefs.addObserver("social.toast-notifications.enabled", this, false);
+    Services.prefs.addObserver("social.active", this, false);
 
     gBrowser.addEventListener("ActivateSocialFeature", this._activationEventHandler, true, true);
 
@@ -26,6 +27,7 @@ let SocialUI = {
       SocialChatBar.update();
     });
 
+    this.updateActiveBroadcaster();
     Social.init(this._providerReady.bind(this));
   },
 
@@ -39,6 +41,7 @@ let SocialUI = {
 
     Services.prefs.removeObserver("social.sidebar.open", this);
     Services.prefs.removeObserver("social.toast-notifications.enabled", this);
+    Services.prefs.removeObserver("social.active", this);
   },
 
   showProfile: function SocialUI_showProfile() {
@@ -62,6 +65,7 @@ let SocialUI = {
           SocialSidebar.update();
           SocialChatBar.update();
           SocialFlyout.unload();
+          SocialMenu.populate();
         } catch (e) {
           Components.utils.reportError(e);
           throw e;
@@ -86,6 +90,8 @@ let SocialUI = {
         }
         break;
       case "nsPref:changed":
+        this.updateActiveBroadcaster();
+        this.updateToggleCommand();
         SocialSidebar.update();
         SocialToolbar.updateButton();
         SocialMenu.populate();
@@ -130,6 +136,11 @@ let SocialUI = {
     toggleCommand.setAttribute("hidden", Social.active ? "false" : "true");
   },
 
+  updateActiveBroadcaster: function SocialUI_updateActiveBroadcaster() {
+    let broadcaster = document.getElementById("socialActiveBroadcaster");
+    broadcaster.hidden = !Social.active;
+  },
+
   // This handles "ActivateSocialFeature" events fired against content documents
   // in this window.
   _activationEventHandler: function SocialUI_activationHandler(e) {
@@ -592,7 +603,6 @@ let SocialShareButton = {
 
 var SocialMenu = {
   populate: function SocialMenu_populate() {
-    // This menu is only accessible through keyboard navigation.
     let submenu = document.getElementById("menu_social-statusarea-popup");
     let ambientMenuItems = submenu.getElementsByClassName("ambient-menuitem");
     while (ambientMenuItems.length)
@@ -601,7 +611,7 @@ var SocialMenu = {
     let separator = document.getElementById("socialAmbientMenuSeparator");
     separator.hidden = true;
     let provider = Social.provider;
-    if (Social.active && provider) {
+    if (provider && provider.enabled) {
       let iconNames = Object.keys(provider.ambientNotificationIcons);
       for (let name of iconNames) {
         let icon = provider.ambientNotificationIcons[name];
@@ -645,7 +655,6 @@ var SocialToolbar = {
 
   updateButtonHiddenState: function SocialToolbar_updateButtonHiddenState() {
     let tbi = document.getElementById("social-toolbar-item");
-    tbi.hidden = !Social.active;
     let socialEnabled = Social.enabled;
     for (let className of ["social-statusarea-separator", "social-statusarea-user"]) {
       for (let element of document.getElementsByClassName(className))
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 38d9462e5644..3beab97d813a 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -662,7 +662,8 @@
                    class="chromeclass-toolbar-additional"
                    removable="false"
                    title="&socialToolbar.title;"
-                   hidden="true">
+                   hidden="true"
+                   observes="socialActiveBroadcaster">
         <toolbarbutton id="social-provider-button"
                        class="toolbarbutton-1"
                        type="menu">
diff --git a/browser/modules/Social.jsm b/browser/modules/Social.jsm
index bafe528f7faf..236979a7b584 100644
--- a/browser/modules/Social.jsm
+++ b/browser/modules/Social.jsm
@@ -71,8 +71,8 @@ this.Social = {
     return Services.prefs.getBoolPref("social.active");
   },
   set active(val) {
-    Services.prefs.setBoolPref("social.active", !!val);
     this.enabled = !!val;
+    Services.prefs.setBoolPref("social.active", !!val);
   },
 
   toggle: function Social_toggle() {

From c2e78f8cc61be68693ebcd3c113f47817378b37d Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Tue, 27 Nov 2012 17:56:22 +1100
Subject: [PATCH 130/160] Bug 813789 - avoid console errors about
 _dynamicResizer being null.  r=jaws

---
 browser/base/content/browser-social.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index 6eb18e1523d3..5dac956276d4 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -396,8 +396,10 @@ let SocialFlyout = {
       iframe.addEventListener("load", function panelBrowserOnload(e) {
         iframe.removeEventListener("load", panelBrowserOnload, true);
         setTimeout(function() {
-          SocialFlyout._dynamicResizer.start(panel, iframe);
-          SocialFlyout.dispatchPanelEvent("socialFrameShow");
+          if (SocialFlyout._dynamicResizer) { // may go null if hidden quickly
+            SocialFlyout._dynamicResizer.start(panel, iframe);
+            SocialFlyout.dispatchPanelEvent("socialFrameShow");
+          }
         }, 0);
       }, true);
     }

From dfc6f73415d8d98241a4d201e00b14a284c4ddb7 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Tue, 27 Nov 2012 17:58:55 +1100
Subject: [PATCH 131/160] Bug 808422 - add 'Focus chats' as a keyboard-only
 item on the social menu.  r=jaws

---
 browser/base/content/browser-menubar.inc            | 6 ++++++
 browser/base/content/browser-sets.inc               | 3 ++-
 browser/base/content/browser-social.js              | 9 ++++++---
 browser/base/content/test/browser_social_toolbar.js | 4 ++--
 browser/locales/en-US/chrome/browser/browser.dtd    | 2 ++
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 4fc1323cb138..2f76de87cd50 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -535,6 +535,12 @@
                             command="Social:ToggleNotifications"
                             label="&social.toggleNotifications.label;"
                             accesskey="&social.toggleNotifications.accesskey;"/>
+                  <menuitem id="menu_focusChatBar"
+                            label="&social.chatBar.label;"
+                            accesskey="&social.chatBar.accesskey;"
+                            key="focusChatBar"
+                            command="Social:FocusChat"
+                            class="show-only-for-keyboard"/>
                   <menuseparator class="social-statusarea-separator"/>
                   <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
                   <menuitem class="social-remove-menuitem" command="Social:Remove"/>
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index f93f00dcd546..b87d4afe2cb2 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -116,6 +116,7 @@
     <command id="Social:UnsharePage" oncommand="SocialShareButton.unsharePage();"/>
     <command id="Social:ToggleSidebar" oncommand="Social.toggleSidebar();"/>
     <command id="Social:ToggleNotifications" oncommand="Social.toggleNotifications();"/>
+    <command id="Social:FocusChat" oncommand="SocialChatBar.focus();" hidden="true" disabled="true"/>
     <command id="Social:Toggle" oncommand="Social.toggle();" hidden="true"/>
     <command id="Social:Remove" oncommand="SocialUI.disableWithConfirmation();"/>
   </commandset>
@@ -415,7 +416,7 @@
 #endif
     
     <key id="sharePage" key="&sharePageCmd.commandkey;" command="Social:SharePage" modifiers="accel,shift"/>
-    <key id="focusChatBar" key="&social.chatBar.commandkey;" oncommand="SocialChatBar.focus();" modifiers="accel,shift"/>
+    <key id="focusChatBar" key="&social.chatBar.commandkey;" command="Social:FocusChat" modifiers="accel,shift"/>
 
 # don't use |command="Browser:Stop"|, ESC is being used to freeze animated gifs,
 # even if the stop button and menuitem are disabled (see Bug 284140)
diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index 5dac956276d4..a6278915de48 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -258,11 +258,14 @@ let SocialChatBar = {
       this.chatbar.openChat(aProvider, aURL, aCallback, aMode);
   },
   update: function() {
-    if (!this.isAvailable)
+    let command = document.getElementById("Social:FocusChat");
+    if (!this.isAvailable) {
       this.chatbar.removeAll();
-    else {
-      this.chatbar.hidden = document.mozFullScreen;
+      command.hidden = true;
+    } else {
+      this.chatbar.hidden = command.hidden = document.mozFullScreen;
     }
+    command.setAttribute("disabled", command.hidden ? "true" : "false");
   },
   focus: function SocialChatBar_focus() {
     this.chatbar.focus();
diff --git a/browser/base/content/test/browser_social_toolbar.js b/browser/base/content/test/browser_social_toolbar.js
index 72d5b8f00e1d..43219b4f7b20 100644
--- a/browser/base/content/test/browser_social_toolbar.js
+++ b/browser/base/content/test/browser_social_toolbar.js
@@ -46,7 +46,7 @@ var tests = {
       toolsPopup.removeEventListener("popupshown", ontoolspopupshownNoAmbient);
       let socialToggleMore = document.getElementById("menu_socialAmbientMenu");
       ok(socialToggleMore, "Keyboard accessible social menu should exist");
-      is(socialToggleMore.querySelectorAll("menuitem").length, 5, "The minimum number of menuitems is two when there are no ambient notifications.");
+      is(socialToggleMore.querySelectorAll("menuitem").length, 6, "The minimum number of menuitems is two when there are no ambient notifications.");
       is(socialToggleMore.hidden, false, "Menu should be visible since we show some non-ambient notifications in the menu.");
       toolsPopup.hidePopup();
       next();
@@ -104,7 +104,7 @@ var tests = {
         toolsPopup.removeEventListener("popupshown", ontoolspopupshownAmbient);
         let socialToggleMore = document.getElementById("menu_socialAmbientMenu");
         ok(socialToggleMore, "Keyboard accessible social menu should exist");
-        is(socialToggleMore.querySelectorAll("menuitem").length, 8, "The number of menuitems is minimum plus three ambient notification menuitems.");
+        is(socialToggleMore.querySelectorAll("menuitem").length, 9, "The number of menuitems is minimum plus three ambient notification menuitems.");
         is(socialToggleMore.hidden, false, "Menu is visible when ambient notifications have label & menuURL");
         let menuitem = socialToggleMore.querySelector(".ambient-menuitem");
         is(menuitem.getAttribute("label"), "Test Ambient 1", "Keyboard accessible ambient menuitem should have specified label");
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 29b51d7a96e7..d1741b89d3ca 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -659,3 +659,5 @@ toolbar button -->
 <!ENTITY social.activated.undobutton.accesskey "U">
 
 <!ENTITY social.chatBar.commandkey "c">
+<!ENTITY social.chatBar.label "Focus chats">
+<!ENTITY social.chatBar.accesskey "c">

From f0a1041df3f6b5a7784b14e815af138207800e0d Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Tue, 27 Nov 2012 17:59:51 +1100
Subject: [PATCH 132/160] Bug 814269 - social API keys should be disabled when
 command not available.  r=jaws

---
 browser/base/content/browser-sets.inc  | 2 +-
 browser/base/content/browser-social.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index b87d4afe2cb2..641b5a344774 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -112,7 +112,7 @@
     <command id="History:UndoCloseTab" oncommand="undoCloseTab();"/>
     <command id="History:UndoCloseWindow" oncommand="undoCloseWindow();"/>
     <command id="Browser:ToggleAddonBar" oncommand="toggleAddonBar();"/>
-    <command id="Social:SharePage" oncommand="SocialShareButton.sharePage();"/>
+    <command id="Social:SharePage" oncommand="SocialShareButton.sharePage();" disabled="true"/>
     <command id="Social:UnsharePage" oncommand="SocialShareButton.unsharePage();"/>
     <command id="Social:ToggleSidebar" oncommand="Social.toggleSidebar();"/>
     <command id="Social:ToggleNotifications" oncommand="Social.toggleNotifications();"/>
diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index a6278915de48..809f18c13b1e 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -513,6 +513,10 @@ let SocialShareButton = {
       shareButton.hidden = !Social.uiVisible || Social.provider.recommendInfo == null ||
                            !SocialUI.haveLoggedInUser() ||
                            !this.canSharePage(gBrowser.currentURI);
+    // also update the relevent command's disabled state so the keyboard
+    // shortcut only works when available.
+    let cmd = document.getElementById("Social:SharePage");
+    cmd.setAttribute("disabled", shareButton.hidden ? "true" : "false");
   },
 
   onClick: function SSB_onClick(aEvent) {

From bb1f3c64fd2a310645d22174fd4daf07d8c1c0e5 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Tue, 27 Nov 2012 00:41:02 -0800
Subject: [PATCH 133/160] Bug 815058: Move callers of mozilla-internal-API-only
 "SetDOMStringToNull()" from nsINode.h to .cpp, to fix "inline function used
 but never defined" build warnings. r=Ms2ger

---
 content/base/public/nsINode.h | 12 ++----------
 content/base/src/nsINode.cpp  | 12 ++++++++++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h
index 2775c08a1c10..db6ea81d6aa5 100644
--- a/content/base/public/nsINode.h
+++ b/content/base/public/nsINode.h
@@ -60,8 +60,6 @@ namespace JS {
 class Value;
 }
 
-inline void SetDOMStringToNull(nsAString& aString);
-
 #define NODE_FLAG_BIT(n_) (1U << (n_))
 
 enum {
@@ -1494,10 +1492,7 @@ public:
   {
     SetNodeValueInternal(aNodeValue, aError);
   }
-  virtual void GetNodeValueInternal(nsAString& aNodeValue)
-  {
-    SetDOMStringToNull(aNodeValue);
-  }
+  virtual void GetNodeValueInternal(nsAString& aNodeValue);
   virtual void SetNodeValueInternal(const nsAString& aNodeValue,
                                     mozilla::ErrorResult& aError)
   {
@@ -1592,10 +1587,7 @@ protected:
     return IsEditableInternal();
   }
 
-  virtual void GetTextContentInternal(nsAString& aTextContent)
-  {
-    SetDOMStringToNull(aTextContent);
-  }
+  virtual void GetTextContentInternal(nsAString& aTextContent);
   virtual void SetTextContentInternal(const nsAString& aTextContent,
                                       mozilla::ErrorResult& aError)
   {
diff --git a/content/base/src/nsINode.cpp b/content/base/src/nsINode.cpp
index aa705159eb32..eb0f4899d854 100644
--- a/content/base/src/nsINode.cpp
+++ b/content/base/src/nsINode.cpp
@@ -324,6 +324,12 @@ nsINode::ChildNodes()
   return slots->mChildNodes;
 }
 
+void
+nsINode::GetTextContentInternal(nsAString& aTextContent)
+{
+  SetDOMStringToNull(aTextContent);
+}
+
 #ifdef DEBUG
 void
 nsINode::CheckNotNativeAnonymous() const
@@ -423,6 +429,12 @@ nsINode::GetOwnerDocument(nsIDOMDocument** aOwnerDocument)
   return ownerDoc ? CallQueryInterface(ownerDoc, aOwnerDocument) : NS_OK;
 }
 
+void
+nsINode::GetNodeValueInternal(nsAString& aNodeValue)
+{
+  SetDOMStringToNull(aNodeValue);
+}
+
 nsINode*
 nsINode::RemoveChild(nsINode& aOldChild, ErrorResult& aError)
 {

From 10805566134852bfa287f170ac0c91258f9fbccc Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Tue, 27 Nov 2012 10:39:10 +0000
Subject: [PATCH 134/160] Backed out changeset 132d2e88ef03 (bug 788977) for
 talos regression.

---
 browser/app/profile/firefox.js                |   28 +-
 browser/base/content/browser-appmenu.inc      |   33 +-
 browser/base/content/browser-doctype.inc      |    2 +
 browser/base/content/browser-menubar.inc      |   40 +-
 browser/base/content/browser-sets.inc         |   87 +-
 browser/base/content/browser.css              |   14 +-
 browser/base/content/browser.js               |  106 +-
 browser/base/content/browser.xul              |  106 +-
 browser/base/content/highlighter.css          |   71 +-
 browser/base/content/nsContextMenu.js         |   16 +-
 browser/devtools/Makefile.in                  |    3 +-
 browser/devtools/commandline/CmdBreak.jsm     |   48 +-
 browser/devtools/commandline/CmdCalllog.jsm   |   12 +-
 .../devtools/commandline/CmdCalllogChrome.jsm |   11 +-
 browser/devtools/commandline/CmdConsole.jsm   |   14 +-
 browser/devtools/commandline/CmdDbg.jsm       |   66 +-
 browser/devtools/commandline/Commands.jsm     |    1 -
 .../commandline/test/browser_dbg_cmd.js       |  111 +-
 .../commandline/test/browser_dbg_cmd_break.js |  136 +-
 browser/devtools/debugger/DebuggerPanel.jsm   |  144 -
 .../devtools/debugger/debugger-controller.js  |   49 +-
 browser/devtools/debugger/debugger-toolbar.js |   15 +
 browser/devtools/debugger/debugger.xul        |   10 +
 browser/devtools/debugger/test/Makefile.in    |    8 +-
 .../debugger/test/browser_dbg_bfcache.js      |    2 +-
 .../test/browser_dbg_breakpoint-new-script.js |    2 +-
 ...rowser_dbg_bug723069_editor-breakpoints.js |   12 +-
 ...r_dbg_bug723071_editor-breakpoints-pane.js |   10 +-
 ...wser_dbg_bug727429_watch-expressions-01.js |    2 +-
 ...wser_dbg_bug727429_watch-expressions-02.js |    2 +-
 ...rowser_dbg_bug731394_editor-contextmenu.js |    2 +-
 ...er_dbg_bug737803_editor_actual_location.js |   10 +-
 ...bg_bug740825_conditional-breakpoints-01.js |    4 +-
 ...bg_bug740825_conditional-breakpoints-02.js |    4 +-
 .../browser_dbg_bug786070_hide_nonenums.js    |    2 +-
 .../debugger/test/browser_dbg_clean-exit.js   |    2 +-
 .../debugger/test/browser_dbg_createRemote.js |    2 +-
 .../debugger/test/browser_dbg_displayName.js  |    2 +-
 .../debugger/test/browser_dbg_iframes.js      |    5 +-
 .../debugger/test/browser_dbg_leaktest.js     |    2 +-
 .../browser_dbg_location-changes-blank.js     |    2 +-
 .../test/browser_dbg_location-changes-new.js  |    2 +-
 .../test/browser_dbg_location-changes.js      |    2 +-
 .../test/browser_dbg_pane-collapse.js         |    2 +-
 .../test/browser_dbg_panesize-inner.js        |   97 +-
 .../debugger/test/browser_dbg_panesize.js     |   55 +
 .../test/browser_dbg_pause-exceptions.js      |    8 +-
 .../debugger/test/browser_dbg_pause-resume.js |    2 +-
 .../test/browser_dbg_progress-listener-bug.js |    2 +-
 .../test/browser_dbg_propertyview-01.js       |    2 +-
 .../test/browser_dbg_propertyview-02.js       |    2 +-
 .../test/browser_dbg_propertyview-03.js       |    2 +-
 .../test/browser_dbg_propertyview-04.js       |    2 +-
 .../test/browser_dbg_propertyview-05.js       |    2 +-
 .../test/browser_dbg_propertyview-06.js       |    2 +-
 .../test/browser_dbg_propertyview-07.js       |    2 +-
 .../test/browser_dbg_propertyview-08.js       |    2 +-
 .../test/browser_dbg_propertyview-09.js       |    2 +-
 .../test/browser_dbg_propertyview-10.js       |    2 +-
 .../test/browser_dbg_propertyview-data.js     |    2 +-
 .../test/browser_dbg_propertyview-edit.js     |    2 +-
 .../browser_dbg_propertyview-filter-01.js     |    2 +-
 .../browser_dbg_propertyview-filter-02.js     |    2 +-
 .../browser_dbg_propertyview-filter-03.js     |    2 +-
 .../browser_dbg_propertyview-filter-04.js     |    2 +-
 .../browser_dbg_propertyview-filter-05.js     |    2 +-
 .../browser_dbg_propertyview-filter-06.js     |    2 +-
 .../browser_dbg_propertyview-filter-07.js     |    2 +-
 .../browser_dbg_propertyview-filter-08.js     |    2 +-
 .../test/browser_dbg_propertyview-reexpand.js |    2 +-
 .../test/browser_dbg_reload-same-script.js    |    2 +-
 .../test/browser_dbg_script-switching.js      |    2 +-
 .../test/browser_dbg_scripts-searching-01.js  |    2 +-
 .../test/browser_dbg_scripts-searching-02.js  |    2 +-
 .../test/browser_dbg_scripts-searching-03.js  |    2 +-
 .../test/browser_dbg_scripts-searching-04.js  |    2 +-
 .../test/browser_dbg_scripts-searching-05.js  |    2 +-
 .../test/browser_dbg_scripts-searching-06.js  |    2 +-
 .../test/browser_dbg_scripts-searching-07.js  |    2 +-
 .../test/browser_dbg_scripts-searching-08.js  |    2 +-
 .../browser_dbg_scripts-searching-popup.js    |    2 +-
 .../test/browser_dbg_scripts-sorting.js       |    2 +-
 .../debugger/test/browser_dbg_select-line.js  |    2 +-
 .../debugger/test/browser_dbg_stack-01.js     |    2 +-
 .../debugger/test/browser_dbg_stack-02.js     |    2 +-
 .../debugger/test/browser_dbg_stack-03.js     |    2 +-
 .../debugger/test/browser_dbg_stack-04.js     |    2 +-
 .../debugger/test/browser_dbg_stack-05.js     |    2 +-
 .../test/browser_dbg_update-editor-mode.js    |    2 +-
 browser/devtools/debugger/test/head.js        |   92 +-
 browser/devtools/framework/Makefile.in        |   18 -
 browser/devtools/framework/Sidebar.jsm        |  191 --
 browser/devtools/framework/Target.jsm         |  385 ---
 .../devtools/framework/ToolDefinitions.jsm    |   19 -
 browser/devtools/framework/Toolbox.jsm        |  523 ----
 browser/devtools/framework/ToolboxHosts.jsm   |  208 --
 .../devtools/framework/connect/connect.css    |   87 -
 browser/devtools/framework/connect/connect.js |  100 -
 .../devtools/framework/connect/connect.xhtml  |   45 -
 browser/devtools/framework/gDevTools.jsm      |  543 ----
 browser/devtools/framework/test/Makefile.in   |   26 -
 .../framework/test/browser_devtools_api.js    |  137 -
 .../test/browser_new_activation_workflow.js   |   64 -
 .../framework/test/browser_target_events.js   |   58 -
 .../browser_toolbox_dynamic_registration.js   |  112 -
 .../framework/test/browser_toolbox_hosts.js   |  135 -
 .../framework/test/browser_toolbox_ready.js   |   56 -
 .../test/browser_toolbox_select_event.js      |   97 -
 .../framework/test/browser_toolbox_sidebar.js |  132 -
 .../test/browser_toolbox_tool_ready.js        |   72 -
 browser/devtools/framework/test/head.js       |   36 -
 browser/devtools/framework/toolbox-window.xul |   33 -
 browser/devtools/framework/toolbox.css        |   10 -
 browser/devtools/framework/toolbox.xul        |   27 -
 browser/devtools/highlighter/CmdInspect.jsm   |   29 +
 .../{inspector => highlighter}/Makefile.in    |   10 +-
 .../highlighter.jsm}                          |  433 +--
 browser/devtools/highlighter/inspector.jsm    | 2414 +++++++++++++++++
 .../test/Makefile.in                          |   23 +-
 .../test/browser_inspector_breadcrumbs.html   |    0
 .../test/browser_inspector_breadcrumbs.js     |   37 +-
 ...r_inspector_bug_566084_location_changed.js |  120 +
 .../test/browser_inspector_bug_665880.js      |   28 +-
 ...inspector_bug_672902_keyboard_shortcuts.js |   55 +-
 .../test/browser_inspector_bug_674871.js      |   32 +-
 .../test/browser_inspector_bug_690361.js      |  107 +
 ..._inspector_bug_699308_iframe_navigation.js |   77 +
 .../test/browser_inspector_changes.js         |  124 +
 .../test/browser_inspector_cmd_inspect.html   |    0
 .../test/browser_inspector_cmd_inspect.js     |    2 +-
 .../browser_inspector_destroyselection.html   |    0
 .../browser_inspector_destroyselection.js     |   30 +-
 .../test/browser_inspector_highlighter.js     |   48 +-
 .../browser_inspector_highlighter_autohide.js |   59 +
 .../test/browser_inspector_iframeTest.js      |   33 +-
 .../test/browser_inspector_infobar.js         |   35 +-
 .../test/browser_inspector_initialization.js  |  191 ++
 .../test/browser_inspector_invalidate.js      |   56 +
 .../test/browser_inspector_keybindings.js     |   78 +
 .../test/browser_inspector_menu.js            |   43 +-
 .../browser_inspector_pseudoClass_menu.js     |   87 +
 .../browser_inspector_pseudoclass_lock.js     |   87 +-
 .../test/browser_inspector_ruleviewstore.js   |  105 +
 .../test/browser_inspector_scrolling.js       |   26 +-
 .../test/browser_inspector_sidebarstate.js    |   73 +
 .../test/browser_inspector_tab_switch.js      |  247 ++
 .../test/browser_inspector_treeSelection.js   |   84 +
 .../test/browser_inspector_tree_height.js     |    0
 .../{inspector => highlighter}/test/head.js   |   39 +-
 .../test/helpers.js                           |    0
 browser/devtools/inspector/Breadcrumbs.jsm    |  593 ----
 browser/devtools/inspector/CmdInspect.jsm     |   48 -
 .../inspector/InspectorDefinition.jsm         |   45 -
 browser/devtools/inspector/InspectorPanel.jsm |  536 ----
 browser/devtools/inspector/Selection.jsm      |  230 --
 browser/devtools/inspector/inspector.css      |   11 -
 browser/devtools/inspector/inspector.xul      |   71 -
 ...r_inspector_bug_566084_location_changed.js |  131 -
 ..._inspector_bug_699308_iframe_navigation.js |   65 -
 .../test/browser_inspector_changes.js         |  112 -
 .../browser_inspector_highlighter_autohide.js |   46 -
 .../test/browser_inspector_initialization.js  |  147 -
 .../test/browser_inspector_invalidate.js      |   50 -
 .../browser_inspector_pseudoClass_menu.js     |   71 -
 .../test/browser_inspector_sidebarstate.js    |   77 -
 browser/devtools/jar.mn                       |   13 +-
 browser/devtools/layoutview/LayoutView.jsm    |  368 +++
 browser/devtools/layoutview/Makefile.in       |    3 +
 .../layoutview/test/browser_layoutview.js     |   55 +-
 browser/devtools/layoutview/view.css          |    4 +
 browser/devtools/layoutview/view.js           |  248 --
 browser/devtools/layoutview/view.xhtml        |   18 +-
 browser/devtools/markupview/MarkupView.jsm    |   61 +-
 .../test/browser_inspector_markup_edit.js     |  262 +-
 .../test/browser_inspector_markup_mutation.js |   28 +-
 .../browser_inspector_markup_navigation.html  |    4 +-
 .../browser_inspector_markup_navigation.js    |   35 +-
 browser/devtools/markupview/test/head.js      |    6 -
 .../devtools/responsivedesign/CmdResize.jsm   |    2 -
 .../responsivedesign/responsivedesign.jsm     |   14 +-
 .../test/browser_responsivecomputedview.js    |   27 +-
 .../test/browser_responsiveruleview.js        |   27 +-
 .../devtools/responsivedesign/test/head.js    |   21 -
 browser/devtools/scratchpad/CmdScratchpad.jsm |   21 -
 browser/devtools/scratchpad/scratchpad.js     |    7 +-
 browser/devtools/scratchpad/scratchpad.xul    |    4 +
 browser/devtools/shared/DeveloperToolbar.jsm  |  100 +-
 browser/devtools/shared/EventEmitter.jsm      |   25 +-
 .../shared/test/browser_eventemitter_basic.js |   18 +-
 .../shared/test/browser_toolbar_basic.js      |  111 +-
 ...browser_toolbar_webconsole_errors_count.js |   17 +-
 browser/devtools/shared/test/head.js          |    6 -
 browser/devtools/shared/test/leakhunt.js      |  155 +-
 browser/devtools/styleeditor/StyleEditor.jsm  |  137 +-
 .../styleeditor/StyleEditorChrome.jsm         |   61 +-
 .../styleeditor/StyleEditorDefinition.jsm     |   56 -
 .../devtools/styleeditor/StyleEditorPanel.jsm |  109 -
 browser/devtools/styleeditor/styleeditor.xul  |  188 +-
 browser/devtools/styleeditor/test/Makefile.in |    4 +-
 .../test/browser_styleeditor_init.js          |    8 +
 .../test/browser_styleeditor_loading.js       |   41 +-
 .../test/browser_styleeditor_passedinsheet.js |   83 +-
 .../test/browser_styleeditor_private.js       |   32 +-
 .../test/browser_styleeditor_reopen.js        |  189 +-
 browser/devtools/styleeditor/test/head.js     |   35 +-
 .../devtools/styleinspector/CssHtmlTree.jsm   |  141 +-
 .../styleinspector/StyleInspector.jsm         |  230 +-
 .../devtools/styleinspector/csshtmltree.xul   |   15 +-
 .../devtools/styleinspector/cssruleview.xul   |   14 +-
 .../devtools/styleinspector/test/Makefile.in  |   12 +-
 .../test/browser_bug589375_keybindings.js     |   47 +-
 .../styleinspector/test/browser_bug683672.js  |   47 +-
 ...r_bug722196_property_view_media_queries.js |   30 +-
 .../test/browser_bug_692400_element_style.js  |   27 +-
 ...r_computedview_734259_style_editor_link.js |   80 +-
 ...mputedview_bug_703643_context_menu_copy.js |   52 +-
 ...owser_ruleview_734259_style_editor_link.js |   92 +-
 ...r_ruleview_bug_703643_context_menu_copy.js |   74 +-
 .../test/browser_ruleview_focus.js            |   40 +-
 .../test/browser_styleinspector.js            |   34 +-
 ...styleinspector_bug_672744_search_filter.js |   54 +-
 ...tyleinspector_bug_672746_default_styles.js |   39 +-
 ...ector_bug_689759_no_results_placeholder.js |   52 +-
 browser/devtools/styleinspector/test/head.js  |  291 +-
 browser/devtools/tilt/CmdTilt.jsm             |   62 +-
 browser/devtools/tilt/Tilt.jsm                |  165 +-
 browser/devtools/tilt/TiltVisualizer.jsm      |  171 +-
 browser/devtools/tilt/test/Makefile.in        |    1 +
 .../tilt/test/browser_tilt_03_tab_switch.js   |   77 +
 .../browser_tilt_04_initialization-key.js     |   82 +
 .../test/browser_tilt_04_initialization.js    |    4 +
 .../test/browser_tilt_05_destruction-esc.js   |    3 +
 .../tilt/test/browser_tilt_05_destruction.js  |    2 +-
 .../browser_tilt_arcball-reset-typeahead.js   |    2 +-
 .../tilt/test/browser_tilt_arcball-reset.js   |    2 +-
 .../tilt/test/browser_tilt_picking.js         |    2 +-
 .../tilt/test/browser_tilt_picking_delete.js  |    2 +-
 .../browser_tilt_picking_highlight01-offs.js  |    2 +-
 .../test/browser_tilt_picking_highlight01.js  |    2 +-
 .../test/browser_tilt_picking_highlight02.js  |    2 +-
 .../test/browser_tilt_picking_highlight03.js  |    2 +-
 .../tilt/test/browser_tilt_picking_miv.js     |    2 +-
 .../tilt/test/browser_tilt_visualizer.js      |    3 +-
 .../devtools/tilt/test/browser_tilt_zoom.js   |   10 +-
 browser/devtools/tilt/test/head.js            |   50 +-
 browser/devtools/webconsole/HUDService.jsm    |  567 +++-
 browser/devtools/webconsole/Makefile.in       |    1 -
 .../devtools/webconsole/WebConsolePanel.jsm   |  102 -
 browser/devtools/webconsole/test/Makefile.in  |   18 +-
 ...wser_webconsole_bug_581231_close_button.js |   37 +
 ...eactivateHUDForContext_unfocused_window.js |   20 +-
 ...r_webconsole_bug_601909_remember_height.js |  107 +
 ...bconsole_bug_602572_log_bodies_checkbox.js |    2 +
 ...ebconsole_bug_622303_persistent_filters.js |    9 +-
 ...e_bug_653531_highlighter_console_helper.js |   34 +-
 ...owser_webconsole_bug_660806_history_nav.js |    8 +-
 ...owser_webconsole_bug_663443_panel_title.js |   57 +
 ...le_bug_782653_CSS_links_in_Style_Editor.js |  142 +-
 .../test/browser_webconsole_menustatus.js     |   33 +
 .../test/browser_webconsole_position_ui.js    |  207 ++
 .../test/browser_webconsole_window_zombie.js  |   42 +
 browser/devtools/webconsole/test/head.js      |   80 +-
 browser/devtools/webconsole/webconsole.js     |  135 +-
 browser/devtools/webconsole/webconsole.xul    |   25 +
 .../locales/en-US/chrome/browser/browser.dtd  |   48 +-
 .../browser/devtools/connection-screen.dtd    |   15 -
 .../browser/devtools/debugger.properties      |   13 -
 .../chrome/browser/devtools/inspector.dtd     |   10 -
 .../browser/devtools/inspector.properties     |   32 +-
 .../chrome/browser/devtools/layoutview.dtd    |    1 -
 .../chrome/browser/devtools/scratchpad.dtd    |    6 +
 .../browser/devtools/styleeditor.properties   |   12 -
 .../browser/devtools/styleinspector.dtd       |    4 -
 .../devtools/styleinspector.properties        |   13 +
 .../en-US/chrome/browser/devtools/toolbox.dtd |    7 -
 .../chrome/browser/devtools/webConsole.dtd    |   21 +
 .../browser/devtools/webconsole.properties    |    8 -
 browser/locales/jar.mn                        |    3 -
 browser/makefiles.sh                          |    4 +-
 browser/themes/gnomestripe/browser.css        |  344 ++-
 .../devtools/command-responsivemode.png       |  Bin 1083 -> 0 bytes
 .../devtools/command-scratchpad.png           |  Bin 584 -> 0 bytes
 .../gnomestripe/devtools/command-tilt.png     |  Bin 1668 -> 0 bytes
 .../themes/gnomestripe/devtools/common.css    |   59 -
 .../gnomestripe/devtools/dock-bottom.png      |  Bin 487 -> 0 bytes
 .../themes/gnomestripe/devtools/dock-side.png |  Bin 536 -> 0 bytes
 .../gnomestripe/devtools/dock-window.png      |  Bin 806 -> 0 bytes
 .../themes/gnomestripe/devtools/inspector.css |  214 --
 .../devtools/layout-background.png            |  Bin 0 -> 981 bytes
 .../gnomestripe/devtools/layout-buttons.png   |  Bin 0 -> 447 bytes
 .../gnomestripe/devtools/layoutview.css       |   16 +-
 .../themes/gnomestripe/devtools/toolbox.css   |   99 -
 .../gnomestripe/devtools/treepanel-button.png |  Bin 0 -> 805 bytes
 browser/themes/gnomestripe/jar.mn             |   11 +-
 browser/themes/pinstripe/browser.css          |  341 ++-
 .../devtools/command-responsivemode.png       |  Bin 1083 -> 0 bytes
 .../pinstripe/devtools/command-scratchpad.png |  Bin 584 -> 0 bytes
 .../pinstripe/devtools/command-tilt.png       |  Bin 1668 -> 0 bytes
 browser/themes/pinstripe/devtools/common.css  |   54 -
 .../themes/pinstripe/devtools/dock-bottom.png |  Bin 487 -> 0 bytes
 .../themes/pinstripe/devtools/dock-side.png   |  Bin 536 -> 0 bytes
 .../themes/pinstripe/devtools/dock-window.png |  Bin 806 -> 0 bytes
 .../themes/pinstripe/devtools/inspector.css   |  229 --
 .../pinstripe/devtools/layout-background.png  |  Bin 0 -> 981 bytes
 .../pinstripe/devtools/layout-buttons.png     |  Bin 0 -> 447 bytes
 .../themes/pinstripe/devtools/layoutview.css  |   16 +-
 browser/themes/pinstripe/devtools/toolbox.css |   99 -
 .../pinstripe/devtools/treepanel-button.png   |  Bin 0 -> 805 bytes
 browser/themes/pinstripe/jar.mn               |   11 +-
 browser/themes/winstripe/browser.css          |  343 ++-
 .../devtools/command-responsivemode.png       |  Bin 1083 -> 0 bytes
 .../winstripe/devtools/command-scratchpad.png |  Bin 584 -> 0 bytes
 .../winstripe/devtools/command-tilt.png       |  Bin 1668 -> 0 bytes
 browser/themes/winstripe/devtools/common.css  |   59 -
 .../themes/winstripe/devtools/dock-bottom.png |  Bin 487 -> 0 bytes
 .../themes/winstripe/devtools/dock-side.png   |  Bin 536 -> 0 bytes
 .../themes/winstripe/devtools/dock-window.png |  Bin 806 -> 0 bytes
 .../themes/winstripe/devtools/inspector.css   |  218 --
 .../winstripe/devtools/layout-background.png  |  Bin 0 -> 981 bytes
 .../winstripe/devtools/layout-buttons.png     |  Bin 0 -> 447 bytes
 .../themes/winstripe/devtools/layoutview.css  |   16 +-
 browser/themes/winstripe/devtools/toolbox.css |  103 -
 .../winstripe/devtools/treepanel-button.png   |  Bin 0 -> 805 bytes
 browser/themes/winstripe/jar.mn               |   26 +-
 .../devtools/webconsole/WebConsoleUtils.jsm   |   13 +-
 325 files changed, 10112 insertions(+), 10303 deletions(-)
 delete mode 100644 browser/devtools/debugger/DebuggerPanel.jsm
 create mode 100644 browser/devtools/debugger/test/browser_dbg_panesize.js
 delete mode 100644 browser/devtools/framework/Makefile.in
 delete mode 100644 browser/devtools/framework/Sidebar.jsm
 delete mode 100644 browser/devtools/framework/Target.jsm
 delete mode 100644 browser/devtools/framework/ToolDefinitions.jsm
 delete mode 100644 browser/devtools/framework/Toolbox.jsm
 delete mode 100644 browser/devtools/framework/ToolboxHosts.jsm
 delete mode 100644 browser/devtools/framework/connect/connect.css
 delete mode 100644 browser/devtools/framework/connect/connect.js
 delete mode 100644 browser/devtools/framework/connect/connect.xhtml
 delete mode 100644 browser/devtools/framework/gDevTools.jsm
 delete mode 100644 browser/devtools/framework/test/Makefile.in
 delete mode 100644 browser/devtools/framework/test/browser_devtools_api.js
 delete mode 100644 browser/devtools/framework/test/browser_new_activation_workflow.js
 delete mode 100644 browser/devtools/framework/test/browser_target_events.js
 delete mode 100644 browser/devtools/framework/test/browser_toolbox_dynamic_registration.js
 delete mode 100644 browser/devtools/framework/test/browser_toolbox_hosts.js
 delete mode 100644 browser/devtools/framework/test/browser_toolbox_ready.js
 delete mode 100644 browser/devtools/framework/test/browser_toolbox_select_event.js
 delete mode 100644 browser/devtools/framework/test/browser_toolbox_sidebar.js
 delete mode 100644 browser/devtools/framework/test/browser_toolbox_tool_ready.js
 delete mode 100644 browser/devtools/framework/test/head.js
 delete mode 100644 browser/devtools/framework/toolbox-window.xul
 delete mode 100644 browser/devtools/framework/toolbox.css
 delete mode 100644 browser/devtools/framework/toolbox.xul
 create mode 100644 browser/devtools/highlighter/CmdInspect.jsm
 rename browser/devtools/{inspector => highlighter}/Makefile.in (68%)
 rename browser/devtools/{inspector/Highlighter.jsm => highlighter/highlighter.jsm} (64%)
 create mode 100644 browser/devtools/highlighter/inspector.jsm
 rename browser/devtools/{inspector => highlighter}/test/Makefile.in (88%)
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_breadcrumbs.html (100%)
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_breadcrumbs.js (68%)
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_bug_566084_location_changed.js
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_bug_665880.js (52%)
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_bug_672902_keyboard_shortcuts.js (51%)
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_bug_674871.js (68%)
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_bug_690361.js
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_bug_699308_iframe_navigation.js
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_changes.js
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_cmd_inspect.html (100%)
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_cmd_inspect.js (97%)
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_destroyselection.html (100%)
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_destroyselection.js (55%)
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_highlighter.js (78%)
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_highlighter_autohide.js
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_iframeTest.js (72%)
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_infobar.js (72%)
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_initialization.js
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_invalidate.js
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_keybindings.js
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_menu.js (62%)
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_pseudoClass_menu.js
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_pseudoclass_lock.js (59%)
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_ruleviewstore.js
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_scrolling.js (76%)
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_sidebarstate.js
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_tab_switch.js
 create mode 100644 browser/devtools/highlighter/test/browser_inspector_treeSelection.js
 rename browser/devtools/{inspector => highlighter}/test/browser_inspector_tree_height.js (100%)
 rename browser/devtools/{inspector => highlighter}/test/head.js (64%)
 rename browser/devtools/{inspector => highlighter}/test/helpers.js (100%)
 delete mode 100644 browser/devtools/inspector/Breadcrumbs.jsm
 delete mode 100644 browser/devtools/inspector/CmdInspect.jsm
 delete mode 100644 browser/devtools/inspector/InspectorDefinition.jsm
 delete mode 100644 browser/devtools/inspector/InspectorPanel.jsm
 delete mode 100644 browser/devtools/inspector/Selection.jsm
 delete mode 100644 browser/devtools/inspector/inspector.css
 delete mode 100644 browser/devtools/inspector/inspector.xul
 delete mode 100644 browser/devtools/inspector/test/browser_inspector_bug_566084_location_changed.js
 delete mode 100644 browser/devtools/inspector/test/browser_inspector_bug_699308_iframe_navigation.js
 delete mode 100644 browser/devtools/inspector/test/browser_inspector_changes.js
 delete mode 100644 browser/devtools/inspector/test/browser_inspector_highlighter_autohide.js
 delete mode 100644 browser/devtools/inspector/test/browser_inspector_initialization.js
 delete mode 100644 browser/devtools/inspector/test/browser_inspector_invalidate.js
 delete mode 100644 browser/devtools/inspector/test/browser_inspector_pseudoClass_menu.js
 delete mode 100644 browser/devtools/inspector/test/browser_inspector_sidebarstate.js
 create mode 100644 browser/devtools/layoutview/LayoutView.jsm
 delete mode 100644 browser/devtools/layoutview/view.js
 delete mode 100644 browser/devtools/scratchpad/CmdScratchpad.jsm
 delete mode 100644 browser/devtools/styleeditor/StyleEditorDefinition.jsm
 delete mode 100644 browser/devtools/styleeditor/StyleEditorPanel.jsm
 create mode 100644 browser/devtools/tilt/test/browser_tilt_04_initialization-key.js
 delete mode 100644 browser/devtools/webconsole/WebConsolePanel.jsm
 create mode 100644 browser/devtools/webconsole/test/browser_webconsole_bug_581231_close_button.js
 create mode 100644 browser/devtools/webconsole/test/browser_webconsole_bug_601909_remember_height.js
 create mode 100644 browser/devtools/webconsole/test/browser_webconsole_bug_663443_panel_title.js
 create mode 100644 browser/devtools/webconsole/test/browser_webconsole_menustatus.js
 create mode 100644 browser/devtools/webconsole/test/browser_webconsole_position_ui.js
 create mode 100644 browser/devtools/webconsole/test/browser_webconsole_window_zombie.js
 delete mode 100644 browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd
 delete mode 100644 browser/locales/en-US/chrome/browser/devtools/inspector.dtd
 delete mode 100644 browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
 delete mode 100644 browser/themes/gnomestripe/devtools/command-responsivemode.png
 delete mode 100644 browser/themes/gnomestripe/devtools/command-scratchpad.png
 delete mode 100644 browser/themes/gnomestripe/devtools/command-tilt.png
 delete mode 100644 browser/themes/gnomestripe/devtools/dock-bottom.png
 delete mode 100644 browser/themes/gnomestripe/devtools/dock-side.png
 delete mode 100644 browser/themes/gnomestripe/devtools/dock-window.png
 delete mode 100644 browser/themes/gnomestripe/devtools/inspector.css
 create mode 100644 browser/themes/gnomestripe/devtools/layout-background.png
 create mode 100644 browser/themes/gnomestripe/devtools/layout-buttons.png
 delete mode 100644 browser/themes/gnomestripe/devtools/toolbox.css
 create mode 100644 browser/themes/gnomestripe/devtools/treepanel-button.png
 delete mode 100644 browser/themes/pinstripe/devtools/command-responsivemode.png
 delete mode 100644 browser/themes/pinstripe/devtools/command-scratchpad.png
 delete mode 100644 browser/themes/pinstripe/devtools/command-tilt.png
 delete mode 100644 browser/themes/pinstripe/devtools/dock-bottom.png
 delete mode 100644 browser/themes/pinstripe/devtools/dock-side.png
 delete mode 100644 browser/themes/pinstripe/devtools/dock-window.png
 delete mode 100644 browser/themes/pinstripe/devtools/inspector.css
 create mode 100644 browser/themes/pinstripe/devtools/layout-background.png
 create mode 100644 browser/themes/pinstripe/devtools/layout-buttons.png
 delete mode 100644 browser/themes/pinstripe/devtools/toolbox.css
 create mode 100644 browser/themes/pinstripe/devtools/treepanel-button.png
 delete mode 100644 browser/themes/winstripe/devtools/command-responsivemode.png
 delete mode 100644 browser/themes/winstripe/devtools/command-scratchpad.png
 delete mode 100644 browser/themes/winstripe/devtools/command-tilt.png
 delete mode 100644 browser/themes/winstripe/devtools/dock-bottom.png
 delete mode 100644 browser/themes/winstripe/devtools/dock-side.png
 delete mode 100644 browser/themes/winstripe/devtools/dock-window.png
 delete mode 100644 browser/themes/winstripe/devtools/inspector.css
 create mode 100644 browser/themes/winstripe/devtools/layout-background.png
 create mode 100644 browser/themes/winstripe/devtools/layout-buttons.png
 delete mode 100644 browser/themes/winstripe/devtools/toolbox.css
 create mode 100644 browser/themes/winstripe/devtools/treepanel-button.png

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index e84052b863c6..677e9637829f 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1010,16 +1010,11 @@ pref("devtools.toolbar.visible", false);
 pref("devtools.gcli.allowSet", false);
 pref("devtools.commands.dir", "");
 
-// Toolbox preferences
-pref("devtools.toolbox.footer.height", 250);
-pref("devtools.toolbox.sidebar.width", 500);
-pref("devtools.toolbox.host", "bottom");
-pref("devtools.toolbox.selectedTool", "webconsole");
-pref("devtools.toolbox.toolbarSpec", '["tilt toggle","scratchpad","resize toggle"]');
-pref("devtools.toolbox.sideEnabled", false);
-
 // Enable the Inspector
 pref("devtools.inspector.enabled", true);
+pref("devtools.inspector.htmlHeight", 112);
+pref("devtools.inspector.htmlPanelOpen", false);
+pref("devtools.inspector.sidebarOpen", false);
 pref("devtools.inspector.activeSidebar", "ruleview");
 pref("devtools.inspector.markupPreview", false);
 
@@ -1051,11 +1046,17 @@ pref("devtools.debugger.ui.variables-sorting-enabled", true);
 pref("devtools.debugger.ui.variables-non-enum-visible", true);
 pref("devtools.debugger.ui.variables-searchbox-visible", false);
 
+// Enable the style inspector
+pref("devtools.styleinspector.enabled", true);
+
 // Enable the Tilt inspector
 pref("devtools.tilt.enabled", true);
 pref("devtools.tilt.intro_transition", true);
 pref("devtools.tilt.outro_transition", true);
 
+// Enable the rules view
+pref("devtools.ruleview.enabled", true);
+
 // Enable the Scratchpad tool.
 pref("devtools.scratchpad.enabled", true);
 
@@ -1080,6 +1081,17 @@ pref("devtools.gcli.eagerHelper", 2);
 // Do we allow the 'pref set' command
 pref("devtools.gcli.allowSet", false);
 
+// The last Web Console height. This is initially 0 which means that the Web
+// Console will use the default height next time it shows.
+// Change to -1 if you do not want the Web Console to remember its last height.
+pref("devtools.hud.height", 0);
+
+// Remember the Web Console position. Possible values:
+//   above - above the web page,
+//   below - below the web page,
+//   window - in a separate window/popup panel.
+pref("devtools.webconsole.position", "below");
+
 // Remember the Web Console filters
 pref("devtools.webconsole.filter.network", true);
 pref("devtools.webconsole.filter.networkinfo", true);
diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
index 479b542941d2..a195f1808381 100644
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -150,27 +150,20 @@
       <menu id="appmenu_webDeveloper"
             label="&appMenuWebDeveloper.label;">
         <menupopup id="appmenu_webDeveloper_popup">
-          <menuitem id="appmenu_devToolbox"
-                    observes="devtoolsMenuBroadcaster_DevToolbox"/>
-          <menuseparator id="appmenu_devtools_separator"/>
-          <menuitem id="appmenu_devToolbar"
-                    observes="devtoolsMenuBroadcaster_DevToolbar"/>
-          <menuitem id="appmenu_remoteWebConsole"
-                    observes="devtoolsMenuBroadcaster_RemoteWebConsole"/>
-          <menuitem id="appmenu_responsiveUI"
-                    observes="devtoolsMenuBroadcaster_ResponsiveUI"/>
-          <menuitem id="appmenu_scratchpad"
-                    observes="devtoolsMenuBroadcaster_Scratchpad"/>
-          <menuitem id="appmenu_pageSource"
-                    observes="devtoolsMenuBroadcaster_PageSource"/>
-          <menuitem id="appmenu_errorConsole"
-                    observes="devtoolsMenuBroadcaster_ErrorConsole"/>
-          <menuseparator id="appmenu_devToolsConnectSeparator"/>
-          <menuitem id="appmenu_devtools_connect"
-                    observes="devtoolsMenuBroadcaster_connect"/>
+          <menuitem id="appmenu_devToolbar" observes="devtoolsMenuBroadcaster_DevToolbar"/>
+          <menuitem id="appmenu_webConsole" observes="devtoolsMenuBroadcaster_WebConsole"/>
+          <menuitem id="appmenu_remoteWebConsole" observes="devtoolsMenuBroadcaster_RemoteWebConsole"/>
+          <menuitem id="appmenu_pageinspect" observes="devtoolsMenuBroadcaster_Inspect"/>
+          <menuitem id="appmenu_responsiveUI" observes="devtoolsMenuBroadcaster_ResponsiveUI"/>
+          <menuitem id="appmenu_debugger" observes="devtoolsMenuBroadcaster_Debugger"/>
+          <menuitem id="appmenu_remoteDebugger" observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
+          <menuitem id="appmenu_chromeDebugger" observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
+          <menuitem id="appmenu_scratchpad" observes="devtoolsMenuBroadcaster_Scratchpad"/>
+          <menuitem id="appmenu_styleeditor" observes="devtoolsMenuBroadcaster_StyleEditor"/>
+          <menuitem id="appmenu_pageSource" observes="devtoolsMenuBroadcaster_PageSource"/>
+          <menuitem id="appmenu_errorConsole" observes="devtoolsMenuBroadcaster_ErrorConsole"/>
           <menuseparator id="appmenu_devToolsEndSeparator"/>
-          <menuitem id="appmenu_getMoreDevtools"
-                    observes="devtoolsMenuBroadcaster_GetMoreTools"/>
+          <menuitem id="appmenu_getMoreDevtools" observes="devtoolsMenuBroadcaster_GetMoreTools"/>
           <menuseparator/>
 #define ID_PREFIX appmenu_developer_
 #define OMIT_ACCESSKEYS
diff --git a/browser/base/content/browser-doctype.inc b/browser/base/content/browser-doctype.inc
index cacd4d3a58c3..17c1e45f9823 100644
--- a/browser/base/content/browser-doctype.inc
+++ b/browser/base/content/browser-doctype.inc
@@ -19,5 +19,7 @@
 #endif
 <!ENTITY % aboutHomeDTD SYSTEM "chrome://browser/locale/aboutHome.dtd">
 %aboutHomeDTD;
+<!ENTITY % debuggerDTD SYSTEM "chrome://browser/locale/devtools/debugger.dtd">
+%debuggerDTD;
 ]>
 
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 3c968849df17..a57e55c7ff74 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -557,34 +557,20 @@
                     label="&webDeveloperMenu.label;"
                     accesskey="&webDeveloperMenu.accesskey;">
                 <menupopup id="menuWebDeveloperPopup">
-                  <menuitem id="menu_devToolbox"
-                            observes="devtoolsMenuBroadcaster_DevToolbox"
-                            accesskey="&devToolbox.accesskey;"/>
-                  <menuseparator id="menu_devtools_separator"/>
-                  <menuitem id="menu_devToolbar"
-                            observes="devtoolsMenuBroadcaster_DevToolbar"
-                            accesskey="&devToolbarMenu.accesskey;"/>
-                  <menuitem id="menu_remoteWebConsole"
-                            observes="devtoolsMenuBroadcaster_RemoteWebConsole"/>
-                  <menuitem id="menu_responsiveUI"
-                            observes="devtoolsMenuBroadcaster_ResponsiveUI"
-                            accesskey="&responsiveDesignTool.accesskey;"/>
-                  <menuitem id="menu_scratchpad"
-                            observes="devtoolsMenuBroadcaster_Scratchpad"
-                            accesskey="&scratchpad.accesskey;"/>
-                  <menuitem id="menu_pageSource"
-                            observes="devtoolsMenuBroadcaster_PageSource"
-                            accesskey="&pageSourceCmd.accesskey;"/>
-                  <menuitem id="javascriptConsole"
-                            observes="devtoolsMenuBroadcaster_ErrorConsole"
-                            accesskey="&errorConsoleCmd.accesskey;"/>
-                  <menuseparator id="menu_devToolsConnectSeparator"/>
-                  <menuitem id="menu_devtools_connect"
-                            observes="devtoolsMenuBroadcaster_connect"/>
+                  <menuitem id="menu_devToolbar" observes="devtoolsMenuBroadcaster_DevToolbar" accesskey="&devToolbarMenu.accesskey;"/>
+                  <menuitem id="webConsole" observes="devtoolsMenuBroadcaster_WebConsole" accesskey="&webConsoleCmd.accesskey;"/>
+                  <menuitem id="menu_remoteWebConsole" observes="devtoolsMenuBroadcaster_RemoteWebConsole"/>
+                  <menuitem id="menu_pageinspect" observes="devtoolsMenuBroadcaster_Inspect" accesskey="&inspectMenu.accesskey;"/>
+                  <menuitem id="menu_responsiveUI" observes="devtoolsMenuBroadcaster_ResponsiveUI" accesskey="&responsiveDesignTool.accesskey;"/>
+                  <menuitem id="menu_debugger" observes="devtoolsMenuBroadcaster_Debugger" accesskey="&debuggerMenu.accesskey;"/>
+                  <menuitem id="menu_remoteDebugger" observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
+                  <menuitem id="menu_chromeDebugger" observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
+                  <menuitem id="menu_scratchpad" observes="devtoolsMenuBroadcaster_Scratchpad" accesskey="&scratchpad.accesskey;"/>
+                  <menuitem id="menu_styleeditor" observes="devtoolsMenuBroadcaster_StyleEditor" accesskey="&styleeditor.accesskey;"/>
+                  <menuitem id="menu_pageSource" observes="devtoolsMenuBroadcaster_PageSource" accesskey="&pageSourceCmd.accesskey;"/>
+                  <menuitem id="javascriptConsole" observes="devtoolsMenuBroadcaster_ErrorConsole" accesskey="&errorConsoleCmd.accesskey;"/>
                   <menuseparator id="devToolsEndSeparator"/>
-                  <menuitem id="getMoreDevtools"
-                            observes="devtoolsMenuBroadcaster_GetMoreTools"
-                            accesskey="&getMoreDevtoolsCmd.accesskey;"/>
+                  <menuitem id="getMoreDevtools" observes="devtoolsMenuBroadcaster_GetMoreTools" accesskey="&getMoreDevtoolsCmd.accesskey;"/>
                 </menupopup>
               </menu>
               <menuitem id="menu_pageInfo"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index ba917712b721..46c6f192df63 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -88,15 +88,19 @@
 
     <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>
     <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
-    <command id="Tools:DevToolbox" oncommand="gDevTools.toggleToolboxCommand(gBrowser);"/>
     <command id="Tools:DevToolbar" oncommand="DeveloperToolbar.toggle();" disabled="true" hidden="true"/>
     <command id="Tools:DevToolbarFocus" oncommand="DeveloperToolbar.focusToggle();" disabled="true"/>
+    <command id="Tools:WebConsole" oncommand="HUDConsoleUI.toggleHUD();"/>
     <command id="Tools:RemoteWebConsole" oncommand="HUDConsoleUI.toggleRemoteHUD();" disabled="true" hidden="true"/>
+    <command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();"/>
+    <command id="Tools:Debugger" oncommand="DebuggerUI.toggleDebugger();" disabled="true" hidden="true"/>
+    <command id="Tools:RemoteDebugger" oncommand="DebuggerUI.toggleRemoteDebugger();" disabled="true" hidden="true"/>
+    <command id="Tools:ChromeDebugger" oncommand="DebuggerUI.toggleChromeDebugger();" disabled="true" hidden="true"/>
     <command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();" disabled="true" hidden="true"/>
+    <command id="Tools:StyleEditor" oncommand="StyleEditor.toggle();" disabled="true" hidden="true"/>
     <command id="Tools:ResponsiveUI" oncommand="ResponsiveUI.toggle();" disabled="true" hidden="true"/>
     <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
     <command id="Tools:ErrorConsole" oncommand="toJavaScriptConsole()" disabled="true" hidden="true"/>
-    <command id="Tools:DevToolsConnect" oncommand="DevToolsXULCommands.openConnectScreen(gBrowser)"/>
     <command id="Tools:Sanitize"
      oncommand="Cc['@mozilla.org/browser/browserglue;1'].getService(Ci.nsIBrowserGlue).sanitize(window);"/>
     <command id="Tools:PrivateBrowsing"
@@ -123,6 +127,27 @@
              oncommand="PlacesCommandHook.showPlacesOrganizer('History');"/>
   </commandset>
 
+  <commandset id="inspectorCommands">
+    <command id="Inspector:Inspect"
+             oncommand="InspectorUI.toggleInspection();"/>
+    <command id="Inspector:Sidebar"
+             oncommand="InspectorUI.toggleSidebar();"/>
+    <command id="Inspector:Tilt"
+             oncommand="Tilt.initialize();"/>
+    <command id="Inspector:HTMLPanel"
+             oncommand="InspectorUI.toggleHTMLPanel();"/>
+    <command id="Inspector:CopyInner"
+             oncommand="InspectorUI.copyInnerHTML();"/>
+    <command id="Inspector:CopyOuter"
+             oncommand="InspectorUI.copyOuterHTML();"/>
+    <command id="Inspector:DeleteNode"
+             oncommand="InspectorUI.deleteNode();"/>
+    <command id="Inspector:ToggleVeil"
+             oncommand="InspectorUI.toggleVeil();"/>
+    <command id="Inspector:ToggleInfobar"
+             oncommand="InspectorUI.toggleInfobar();"/>
+  </commandset>
+
   <broadcasterset id="mainBroadcasterSet">
     <broadcaster id="viewBookmarksSidebar" autoCheck="false" label="&bookmarksButton.label;"
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/bookmarks/bookmarksPanel.xul"
@@ -170,23 +195,45 @@
     <broadcaster id="socialSidebarBroadcaster" hidden="true"/>
 
     <!-- DevTools broadcasters -->
-    <broadcaster id="devtoolsMenuBroadcaster_DevToolbox"
-                 label="&devToolbarToolsButton.label;"
-                 type="checkbox" autocheck="false"
-                 command="Tools:DevToolbox"/>
     <broadcaster id="devtoolsMenuBroadcaster_DevToolbar"
                  label="&devToolbarMenu.label;"
                  type="checkbox" autocheck="false"
                  command="Tools:DevToolbar"
                  key="key_devToolbar"/>
+    <broadcaster id="devtoolsMenuBroadcaster_WebConsole"
+                 label="&webConsoleCmd.label;"
+                 type="checkbox" autocheck="false"
+                 key="key_webConsole"
+                 command="Tools:WebConsole"/>
     <broadcaster id="devtoolsMenuBroadcaster_RemoteWebConsole"
                  label="&remoteWebConsoleCmd.label;"
                  type="checkbox" autocheck="false"
                  command="Tools:RemoteWebConsole"/>
+    <broadcaster id="devtoolsMenuBroadcaster_Inspect"
+                 label="&inspectMenu.label;"
+                 type="checkbox" autocheck="false"
+                 command="Tools:Inspect"
+                 key="key_inspect"/>
+    <broadcaster id="devtoolsMenuBroadcaster_Debugger"
+                 label="&debuggerMenu.label2;"
+                 type="checkbox" autocheck="false"
+                 command="Tools:Debugger"
+                 key="key_debugger"/>
+    <broadcaster id="devtoolsMenuBroadcaster_RemoteDebugger"
+                 label="&remoteDebuggerMenu.label;"
+                 command="Tools:RemoteDebugger"/>
+    <broadcaster id="devtoolsMenuBroadcaster_ChromeDebugger"
+                 label="&chromeDebuggerMenu.label;"
+                 command="Tools:ChromeDebugger"/>
     <broadcaster id="devtoolsMenuBroadcaster_Scratchpad"
                  label="&scratchpad.label;"
                  command="Tools:Scratchpad"
                  key="key_scratchpad"/>
+    <broadcaster id="devtoolsMenuBroadcaster_StyleEditor"
+                 label="&styleeditor.label;"
+                 type="checkbox" autocheck="false"
+                 command="Tools:StyleEditor"
+                 key="key_styleeditor"/>
     <broadcaster id="devtoolsMenuBroadcaster_ResponsiveUI"
                  label="&responsiveDesignTool.label;"
                  type="checkbox" autocheck="false"
@@ -203,9 +250,6 @@
     <broadcaster id="devtoolsMenuBroadcaster_GetMoreTools"
                  label="&getMoreDevtoolsCmd.label;"
                  oncommand="openUILinkIn('https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/', 'tab');"/>
-    <broadcaster id="devtoolsMenuBroadcaster_connect"
-                 label="&devtoolsConnect.label;"
-                 command="Tools:DevToolsConnect"/>
 
     <!-- SocialAPI broadcasters -->
     <broadcaster id="socialBroadcaster_userDetails"
@@ -227,7 +271,7 @@
 
 #
 # Search Command Key Logic works like this:
-#
+# 
 # Unix: Ctrl+K (cross platform binding)
 #       Ctrl+J (in case of emacs Ctrl-K conflict)
 # Mac:  Cmd+K (cross platform binding)
@@ -259,6 +303,27 @@
     <key id="key_errorConsole" key="&errorConsoleCmd.commandkey;" command="Tools:ErrorConsole" modifiers="accel,shift"/>
     <key id="key_devToolbar" keycode="&devToolbar.keycode;" modifiers="shift"
          keytext="&devToolbar.keytext;" command="Tools:DevToolbarFocus"/>
+    <key id="key_webConsole" key="&webConsoleCmd.commandkey;" oncommand="HUDConsoleUI.toggleHUD();"
+#ifdef XP_MACOSX
+        modifiers="accel,alt"
+#else
+        modifiers="accel,shift"
+#endif
+    />
+    <key id="key_debugger" key="&debuggerMenu.commandkey;" command="Tools:Debugger"
+#ifdef XP_MACOSX
+        modifiers="accel,alt"
+#else
+        modifiers="accel,shift"
+#endif
+    />
+    <key id="key_inspect" key="&inspectMenu.commandkey;" command="Inspector:Inspect"
+#ifdef XP_MACOSX
+        modifiers="accel,alt"
+#else
+        modifiers="accel,shift"
+#endif
+    />
     <key id="key_responsiveUI" key="&responsiveDesignTool.commandkey;" command="Tools:ResponsiveUI"
 #ifdef XP_MACOSX
         modifiers="accel,alt"
@@ -268,6 +333,8 @@
     />
     <key id="key_scratchpad" keycode="&scratchpad.keycode;" modifiers="shift"
          keytext="&scratchpad.keytext;" command="Tools:Scratchpad"/>
+    <key id="key_styleeditor" keycode="&styleeditor.keycode;" modifiers="shift"
+         keytext="&styleeditor.keytext;" command="Tools:StyleEditor"/>
     <key id="openFileKb" key="&openFileCmd.commandkey;" command="Browser:OpenFile"  modifiers="accel"/>
     <key id="key_savePage" key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
     <key id="printKb" key="&printCmd.commandkey;" command="cmd_print"  modifiers="accel"/>
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 665216674817..1e59706185bc 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -562,6 +562,10 @@ statuspanel[inactive][previoustype=overLink] {
   -moz-box-align: end;
 }
 
+.styleInspector {
+  min-width: 350px;
+}
+
 .panel-inner-arrowcontentfooter[footertype="promobox"] {
   -moz-binding: url("chrome://browser/content/urlbarBindings.xml#promobox");
 }
@@ -589,16 +593,22 @@ html|*#gcli-output-frame,
   direction: ltr;
 }
 
-#developer-toolbar-toolbox-button[error-count] > .toolbarbutton-icon {
+#developer-toolbar-webconsole[error-count] > .toolbarbutton-icon {
   display: none;
 }
 
-#developer-toolbar-toolbox-button[error-count]:before {
+#developer-toolbar-webconsole[error-count]:before {
   content: attr(error-count);
   display: -moz-box;
   -moz-box-pack: center;
 }
 
+/* We don't show the Style Editor button in the developer toolbar for now.
+   See bug 771203 */
+#developer-toolbar-styleeditor {
+  display: none;
+}
+
 /* Responsive Mode */
 
 .browserContainer[responsivemode] {
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 573367137b32..b453b56e2f23 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -115,9 +115,28 @@ XPCOMUtils.defineLazyGetter(this, "DeveloperToolbar", function() {
   return new tmp.DeveloperToolbar(window, document.getElementById("developer-toolbar"));
 });
 
+XPCOMUtils.defineLazyGetter(this, "InspectorUI", function() {
+  let tmp = {};
+  Cu.import("resource:///modules/inspector.jsm", tmp);
+  return new tmp.InspectorUI(window);
+});
+
+XPCOMUtils.defineLazyGetter(this, "DebuggerUI", function() {
+  let tmp = {};
+  Cu.import("resource:///modules/devtools/DebuggerUI.jsm", tmp);
+  return new tmp.DebuggerUI(window);
+});
+
+XPCOMUtils.defineLazyGetter(this, "Tilt", function() {
+  let tmp = {};
+  Cu.import("resource:///modules/devtools/Tilt.jsm", tmp);
+  return new tmp.Tilt(window);
+});
+
 XPCOMUtils.defineLazyModuleGetter(this, "Social",
   "resource:///modules/Social.jsm");
 
+
 XPCOMUtils.defineLazyModuleGetter(this, "PageThumbs",
   "resource:///modules/PageThumbs.jsm");
 
@@ -1409,6 +1428,36 @@ var gBrowserInit = {
       }
     }
 
+    // Enable Debugger?
+    let enabled = gPrefService.getBoolPref("devtools.debugger.enabled");
+    if (enabled) {
+      let cmd = document.getElementById("Tools:Debugger");
+      cmd.removeAttribute("disabled");
+      cmd.removeAttribute("hidden");
+    }
+
+    // Enable Remote Debugger?
+    let enabled = gPrefService.getBoolPref("devtools.debugger.remote-enabled");
+    if (enabled) {
+      let cmd = document.getElementById("Tools:RemoteDebugger");
+      cmd.removeAttribute("disabled");
+      cmd.removeAttribute("hidden");
+
+      cmd = document.getElementById("Tools:RemoteWebConsole");
+      cmd.removeAttribute("disabled");
+      cmd.removeAttribute("hidden");
+    }
+
+    // Enable Chrome Debugger?
+    let enabled = gPrefService.getBoolPref("devtools.chrome.enabled") &&
+                  gPrefService.getBoolPref("devtools.debugger.chrome-enabled") &&
+                  gPrefService.getBoolPref("devtools.debugger.remote-enabled");
+    if (enabled) {
+      let cmd = document.getElementById("Tools:ChromeDebugger");
+      cmd.removeAttribute("disabled");
+      cmd.removeAttribute("hidden");
+    }
+
     // Enable Error Console?
     // Temporarily enabled. See bug 798925.
     let consoleEnabled = true || gPrefService.getBoolPref("devtools.errorconsole.enabled") ||
@@ -1427,6 +1476,14 @@ var gBrowserInit = {
       cmd.removeAttribute("hidden");
     }
 
+    // Enable Style Editor?
+    let styleEditorEnabled = gPrefService.getBoolPref(StyleEditor.prefEnabledName);
+    if (styleEditorEnabled) {
+      let cmd = document.getElementById("Tools:StyleEditor");
+      cmd.removeAttribute("disabled");
+      cmd.removeAttribute("hidden");
+    }
+
 #ifdef MENUBAR_CAN_AUTOHIDE
     // If the user (or the locale) hasn't enabled the top-level "Character
     // Encoding" menu via the "browser.menu.showCharacterEncoding" preference,
@@ -1444,9 +1501,6 @@ var gBrowserInit = {
       cmd.removeAttribute("hidden");
     }
 
-    // Add Devtools menuitems and listeners
-    gDevTools.registerBrowserWindow(window);
-
     let appMenuButton = document.getElementById("appmenu-button");
     let appMenuPopup = document.getElementById("appmenu-popup");
     if (appMenuButton && appMenuPopup) {
@@ -1489,7 +1543,8 @@ var gBrowserInit = {
     if (!gStartupRan)
       return;
 
-    gDevTools.forgetBrowserWindow(window);
+    if (!__lookupGetter__("InspectorUI"))
+      InspectorUI.destroy();
 
     // First clean up services initialized in gBrowserInit.onLoad (or those whose
     // uninit methods don't depend on the services having been initialized).
@@ -1587,7 +1642,7 @@ var gBrowserInit = {
                          'viewToolbarsMenu', 'viewSidebarMenuMenu', 'Browser:Reload',
                          'viewFullZoomMenu', 'pageStyleMenu', 'charsetMenu', 'View:PageSource', 'View:FullScreen',
                          'viewHistorySidebar', 'Browser:AddBookmarkAs', 'Browser:BookmarkAllTabs',
-                         'View:PageInfo', 'Browser:ToggleTabView', 'Browser:ToggleAddonBar'];
+                         'View:PageInfo', 'Tasks:InspectPage', 'Browser:ToggleTabView', 'Browser:ToggleAddonBar'];
     var element;
 
     for (let disabledItem of disabledItems) {
@@ -7393,12 +7448,6 @@ var TabContextMenu = {
   }
 };
 
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource:///modules/devtools/gDevTools.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "DevToolsXULCommands",
-                                  "resource:///modules/devtools/gDevTools.jsm");
-
 XPCOMUtils.defineLazyGetter(this, "HUDConsoleUI", function () {
   let tempScope = {};
   Cu.import("resource:///modules/HUDService.jsm", tempScope);
@@ -7495,6 +7544,41 @@ XPCOMUtils.defineLazyGetter(ResponsiveUI, "ResponsiveUIManager", function() {
   return tmp.ResponsiveUIManager;
 });
 
+var StyleEditor = {
+  prefEnabledName: "devtools.styleeditor.enabled",
+  /**
+   * Opens the style editor. If the UI is already open, it will be focused.
+   *
+   * @param {CSSStyleSheet} [aSelectedStyleSheet] default Stylesheet.
+   * @param {Number} [aLine] Line to which the caret should be moved (one-indexed).
+   * @param {Number} [aCol] Column to which the caret should be moved (one-indexed).
+   */
+  openChrome: function SE_openChrome(aSelectedStyleSheet, aLine, aCol)
+  {
+    let contentWindow = gBrowser.selectedBrowser.contentWindow;
+    let win = this.StyleEditorManager.getEditorForWindow(contentWindow);
+    if (win) {
+      this.StyleEditorManager.selectEditor(win);
+      return win;
+    } else {
+      return this.StyleEditorManager.newEditor(contentWindow, window,
+                                               aSelectedStyleSheet, aLine, aCol);
+    }
+  },
+
+  toggle: function SE_toggle()
+  {
+    this.StyleEditorManager.toggleEditor(gBrowser.contentWindow, window);
+  }
+};
+
+XPCOMUtils.defineLazyGetter(StyleEditor, "StyleEditorManager", function() {
+  let tmp = {};
+  Cu.import("resource:///modules/devtools/StyleEditor.jsm", tmp);
+  return new tmp.StyleEditorManager(window);
+});
+
+
 XPCOMUtils.defineLazyGetter(window, "gShowPageResizers", function () {
 #ifdef XP_WIN
   // Only show resizers on Windows 2000 and XP
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index e49cf24da6e7..38d9462e5644 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -278,6 +278,22 @@
            noautofocus="true"
            position="topcenter topright"/>
 
+    <menupopup id="inspector-node-popup">
+      <menuitem id="inspectorHTMLCopyInner"
+                label="&inspectorHTMLCopyInner.label;"
+                accesskey="&inspectorHTMLCopyInner.accesskey;"
+                command="Inspector:CopyInner"/>
+      <menuitem id="inspectorHTMLCopyOuter"
+                label="&inspectorHTMLCopyOuter.label;"
+                accesskey="&inspectorHTMLCopyOuter.accesskey;"
+                command="Inspector:CopyOuter"/>
+      <menuseparator/>
+      <menuitem id="inspectorHTMLDelete"
+                label="&inspectorHTMLDelete.label;"
+                accesskey="&inspectorHTMLDelete.accesskey;"
+                command="Inspector:DeleteNode"/>
+    </menupopup>
+
     <menupopup id="toolbar-context-menu"
                onpopupshowing="onViewToolbarsPopupShowing(event);">
       <menuseparator/>
@@ -1048,6 +1064,19 @@
       <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
       <statuspanel id="statusbar-display" inactive="true"/>
     </vbox>
+    <splitter id="devtools-side-splitter" hidden="true"/>
+    <vbox id="devtools-sidebar-box" hidden="true"
+          style="min-width: 18em; width: 22em; max-width: 42em;" persist="width">
+      <toolbar id="devtools-sidebar-toolbar"
+               class="devtools-toolbar"
+               nowindowdrag="true">
+        <spacer flex="1"/>
+        <toolbarbutton tooltiptext="&inspectSidebarCloseButton.tooltiptext;"
+                       class="devtools-closebutton"
+                       command="Inspector:Sidebar"/>
+      </toolbar>
+      <deck id="devtools-sidebar-deck" flex="1"/>
+    </vbox>
     <splitter id="social-sidebar-splitter"
               class="chromeclass-extrachrome sidebar-splitter"
               observes="socialSidebarBroadcaster"/>
@@ -1086,6 +1115,52 @@
   </hbox>
 
   <vbox id="browser-bottombox" layer="true">
+    <toolbar id="inspector-toolbar"
+             class="devtools-toolbar"
+             nowindowdrag="true"
+             hidden="true">
+#ifdef XP_MACOSX
+      <toolbarbutton id="highlighter-closebutton"
+                     class="devtools-closebutton"
+                     oncommand="InspectorUI.closeInspectorUI(false);"
+                     tooltiptext="&inspectCloseButton.tooltiptext;"/>
+#endif
+      <toolbarbutton id="inspector-inspect-toolbutton"
+                     class="devtools-toolbarbutton"
+                     command="Inspector:Inspect"/>
+      <toolbarbutton id="inspector-treepanel-toolbutton"
+                     class="devtools-toolbarbutton"
+                     tabindex="0"
+                     aria-label="&markupButton.arialabel;"
+                     accesskey="&markupButton.accesskey;"
+                     command="Inspector:HTMLPanel"/>
+      <arrowscrollbox id="inspector-breadcrumbs"
+                      flex="1" orient="horizontal"
+                      clicktoscroll="true"/>
+      <hbox id="inspector-tools">
+        <toolbarbutton id="inspector-3D-button"
+                       class="devtools-toolbarbutton"
+                       hidden="true"
+                       label="&inspect3DViewButton.label;"
+                       accesskey="&inspect3DViewButton.accesskey;"
+                       tabindex="0"
+                       command="Inspector:Tilt"/>
+        <toolbarbutton id="inspector-style-button"
+                       class="devtools-toolbarbutton"
+                       label="&inspectStyleButton.label;"
+                       accesskey="&inspectStyleButton.accesskey;"
+                       tabindex="0"
+                       command="Inspector:Sidebar"/>
+        <!-- registered tools go here -->
+      </hbox>
+#ifndef XP_MACOSX
+      <toolbarbutton id="highlighter-closebutton"
+                     class="devtools-closebutton"
+                     oncommand="InspectorUI.closeInspectorUI(false);"
+                     tooltiptext="&inspectCloseButton.tooltiptext;"/>
+#endif
+    </toolbar>
+
     <toolbar id="developer-toolbar"
              class="devtools-toolbar"
              hidden="true">
@@ -1102,9 +1177,36 @@
             <hbox class="gclitoolbar-complete-node"/>
             <textbox class="gclitoolbar-input-node" rows="1"/>
           </stack>
-          <toolbarbutton id="developer-toolbar-toolbox-button"
+          <toolbarbutton id="developer-toolbar-webconsole"
                          class="developer-toolbar-button"
-                         observes="devtoolsMenuBroadcaster_DevToolbox"/>
+                         observes="devtoolsMenuBroadcaster_WebConsole"/>
+          <toolbarbutton id="developer-toolbar-inspector"
+                         class="developer-toolbar-button"
+                         observes="devtoolsMenuBroadcaster_Inspect"/>
+          <toolbarbutton id="developer-toolbar-styleeditor"
+                         class="developer-toolbar-button"
+                         observes="devtoolsMenuBroadcaster_StyleEditor"/>
+          <toolbarbutton id="developer-toolbar-debugger"
+                         class="developer-toolbar-button"
+                         observes="devtoolsMenuBroadcaster_Debugger"/>
+          <toolbarbutton id="developer-toolbar-other-tools"
+                         type="menu"
+                         class="developer-toolbar-button"
+                         label="&devToolbarOtherToolsButton.label;">
+            <menupopup position="before_end">
+               <menuitem observes="devtoolsMenuBroadcaster_DevToolbar"/>
+               <menuitem observes="devtoolsMenuBroadcaster_ResponsiveUI"/>
+               <menuitem observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
+               <menuitem observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
+               <menuitem observes="devtoolsMenuBroadcaster_Scratchpad"/>
+               <menuitem observes="devtoolsMenuBroadcaster_StyleEditor"/>
+               <menuitem observes="devtoolsMenuBroadcaster_PageSource"/>
+               <menuitem observes="devtoolsMenuBroadcaster_ErrorConsole"/>
+               <menuseparator/>
+               <menuitem observes="devtoolsMenuBroadcaster_GetMoreTools"/>
+            </menupopup>
+          </toolbarbutton>
+
 #ifndef XP_MACOSX
           <toolbarbutton id="developer-toolbar-closebutton"
                          class="devtools-closebutton"
diff --git a/browser/base/content/highlighter.css b/browser/base/content/highlighter.css
index 0992a877a5b7..574060d5ca32 100644
--- a/browser/base/content/highlighter.css
+++ b/browser/base/content/highlighter.css
@@ -2,60 +2,64 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
-.highlighter-container {
+#highlighter-container {
   pointer-events: none;
 }
 
-.highlighter-controls {
+#highlighter-controls {
   position: absolute;
   top: 0;
   left: 0;
 }
 
-.highlighter-outline-container {
+#highlighter-outline-container {
   overflow: hidden;
   position: relative;
 }
 
-.highlighter-outline {
+#highlighter-outline {
   position: absolute;
 }
 
-.highlighter-outline[hidden] {
+#highlighter-outline[hidden] {
   opacity: 0;
   pointer-events: none;
   display: -moz-box;
 }
 
-.highlighter-outline:not([disable-transitions]) {
+#highlighter-outline:not([disable-transitions]) {
   transition-property: opacity, top, left, width, height;
   transition-duration: 0.1s;
   transition-timing-function: linear;
 }
 
+.inspector-breadcrumbs-button {
+  direction: ltr;
+}
+
 /*
  * Node Infobar
  */
 
-.highlighter-nodeinfobar-container {
+#highlighter-nodeinfobar-container {
   position: absolute;
   max-width: 95%;
 }
 
-.highlighter-nodeinfobar-container[hidden] {
+#highlighter-nodeinfobar-container[hidden] {
   opacity: 0;
   pointer-events: none;
   display: -moz-box;
 }
 
-.highlighter-nodeinfobar-container:not([disable-transitions]),
-.highlighter-nodeinfobar-container[disable-transitions][force-transitions] {
+#highlighter-nodeinfobar-container:not([disable-transitions]),
+#highlighter-nodeinfobar-container[disable-transitions][force-transitions] {
   transition-property: transform, opacity, top, left;
   transition-duration: 0.1s;
   transition-timing-function: linear;
 }
 
-.highlighter-nodeinfobar-text {
+#highlighter-nodeinfobar-text {
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -66,19 +70,19 @@
   display: none;
 }
 
-.highlighter-nodeinfobar-container:not([locked]):not(:hover) > .highlighter-nodeinfobar > .highlighter-nodeinfobar-button {
+#highlighter-nodeinfobar-container:not([locked]):not(:hover) > #highlighter-nodeinfobar > .highlighter-nodeinfobar-button {
   visibility: hidden;
 }
 
-.highlighter-nodeinfobar-container[locked] > .highlighter-nodeinfobar,
-.highlighter-nodeinfobar-container:not([locked]):hover > .highlighter-nodeinfobar {
+#highlighter-nodeinfobar-container[locked] > #highlighter-nodeinfobar,
+#highlighter-nodeinfobar-container:not([locked]):hover > #highlighter-nodeinfobar {
   pointer-events: auto;
 }
 
-html|*.highlighter-nodeinfobar-id,
-html|*.highlighter-nodeinfobar-classes,
-html|*.highlighter-nodeinfobar-pseudo-classes,
-html|*.highlighter-nodeinfobar-tagname {
+html|*#highlighter-nodeinfobar-id,
+html|*#highlighter-nodeinfobar-classes,
+html|*#highlighter-nodeinfobar-pseudo-classes,
+html|*#highlighter-nodeinfobar-tagname {
   -moz-user-select: text;
   cursor: text;
 }
@@ -87,18 +91,41 @@ html|*.highlighter-nodeinfobar-tagname {
   display: none;
 }
 
-.highlighter-nodeinfobar-container[position="top"]:not([hide-arrow]) > .highlighter-nodeinfobar-arrow-bottom {
+#highlighter-nodeinfobar-container[position="top"]:not([hide-arrow]) > #highlighter-nodeinfobar-arrow-bottom {
   display: block;
 }
 
-.highlighter-nodeinfobar-container[position="bottom"]:not([hide-arrow]) > .highlighter-nodeinfobar-arrow-top {
+#highlighter-nodeinfobar-container[position="bottom"]:not([hide-arrow]) > #highlighter-nodeinfobar-arrow-top {
   display: block;
 }
 
-.highlighter-nodeinfobar-container[disabled] {
+#highlighter-nodeinfobar-container[disabled] {
   visibility: hidden;
 }
 
-html|*.highlighter-nodeinfobar-tagname {
+html|*#highlighter-nodeinfobar-tagname {
   text-transform: lowercase;
 }
+
+.devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
+  display: none;
+}
+
+#inspector-option-toolbarbutton > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+#inspector-layoutview-container > iframe {
+  /* header size */
+  height: 28px;
+}
+
+#inspector-layoutview-container:not([disable-transitions]) > iframe {
+  transition-property: height;
+  transition-duration: 0.2s;
+}
+
+#inspector-layoutview-container > iframe[open] {
+  /* header size + layout view size: 28px + 145px */
+  height: 173px;
+}
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 29c015ed16d4..397aad3bd1f6 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -412,19 +412,11 @@ nsContextMenu.prototype = {
   },
 
   inspectNode: function CM_inspectNode() {
-    let gBrowser = this.browser.ownerDocument.defaultView.gBrowser;
-    let imported = {};
-    Cu.import("resource:///modules/devtools/Target.jsm", imported);
-    var target = imported.TargetFactory.forTab(gBrowser.selectedTab);
-    let inspector = gDevTools.getPanelForTarget("inspector", target);
-    if (inspector && inspector.isReady) {
-      inspector.selection.setNode(this.target);
+    if (InspectorUI.isTreePanelOpen) {
+      InspectorUI.inspectNode(this.target);
+      InspectorUI.stopInspecting();
     } else {
-      let toolbox = gDevTools.openToolboxForTab(target, "inspector");
-      toolbox.once("inspector-ready", function(event, panel) {
-        let inspector = gDevTools.getPanelForTarget("inspector", target);
-        inspector.selection.setNode(this.target, "browser-context-menu");
-      }.bind(this));
+      InspectorUI.openInspectorUI(this.target);
     }
   },
 
diff --git a/browser/devtools/Makefile.in b/browser/devtools/Makefile.in
index 9823172f2f6b..5a40eafa26a7 100644
--- a/browser/devtools/Makefile.in
+++ b/browser/devtools/Makefile.in
@@ -13,7 +13,7 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 DIRS = \
-  inspector \
+  highlighter \
   markupview \
   webconsole \
   commandline \
@@ -26,7 +26,6 @@ DIRS = \
   layoutview \
   shared \
   responsivedesign \
-  framework \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/commandline/CmdBreak.jsm b/browser/devtools/commandline/CmdBreak.jsm
index e132ec25913d..819e7002b255 100644
--- a/browser/devtools/commandline/CmdBreak.jsm
+++ b/browser/devtools/commandline/CmdBreak.jsm
@@ -12,12 +12,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "HUDService",
                                   "resource:///modules/HUDService.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
-                                  "resource:///modules/devtools/Target.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource:///modules/devtools/gDevTools.jsm");
-
 /**
  * 'break' command
  */
@@ -36,15 +30,12 @@ gcli.addCommand({
   description: gcli.lookup("breaklistDesc"),
   returnType: "html",
   exec: function(args, context) {
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
-
+    let win = HUDService.currentContext();
+    let dbg = win.DebuggerUI.getDebugger();
     if (!dbg) {
       return gcli.lookup("breakaddDebuggerStopped");
     }
-
-    let breakpoints = dbg.getAllBreakpoints();
+    let breakpoints = dbg.breakpoints;
 
     if (Object.keys(breakpoints).length === 0) {
       return gcli.lookup("breaklistNone");
@@ -85,13 +76,11 @@ gcli.addCommand({
       type: {
         name: "selection",
         data: function() {
-          let gBrowser = HUDService.currentContext().gBrowser;
-          let target = TargetFactory.forTab(gBrowser.selectedTab);
-          let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
-
+          let win = HUDService.currentContext();
+          let dbg = win.DebuggerUI.getDebugger();
           let files = [];
           if (dbg) {
-            let sourcesView = dbg.panelWin.DebuggerView.Sources;
+            let sourcesView = dbg.contentWindow.DebuggerView.Sources;
             for (let item in sourcesView) {
               files.push(item.value);
             }
@@ -110,11 +99,8 @@ gcli.addCommand({
   returnType: "html",
   exec: function(args, context) {
     args.type = "line";
-
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
-
+    let win = HUDService.currentContext();
+    let dbg = win.DebuggerUI.getDebugger();
     if (!dbg) {
       return gcli.lookup("breakaddDebuggerStopped");
     }
@@ -145,14 +131,12 @@ gcli.addCommand({
         name: "number",
         min: 0,
         max: function() {
-          let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-          let target = TargetFactory.forTab(gBrowser.selectedTab);
-          let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
-
+          let win = HUDService.currentContext();
+          let dbg = win.DebuggerUI.getDebugger();
           if (!dbg) {
             return gcli.lookup("breakaddDebuggerStopped");
           }
-          return Object.keys(dbg.getAllBreakpoints()).length - 1;
+          return Object.keys(dbg.breakpoints).length - 1;
         },
       },
       description: gcli.lookup("breakdelBreakidDesc")
@@ -160,16 +144,14 @@ gcli.addCommand({
   ],
   returnType: "html",
   exec: function(args, context) {
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
-
+    let win = HUDService.currentContext();
+    let dbg = win.DebuggerUI.getDebugger();
     if (!dbg) {
       return gcli.lookup("breakaddDebuggerStopped");
     }
 
-    let breakpoints = dbg.getAllBreakpoints();
-    let id = Object.keys(breakpoints)[args.breakid];
+    let breakpoints = dbg.breakpoints;
+    let id = Object.keys(dbg.breakpoints)[args.breakid];
     if (!id || !(id in breakpoints)) {
       return gcli.lookup("breakNotFound");
     }
diff --git a/browser/devtools/commandline/CmdCalllog.jsm b/browser/devtools/commandline/CmdCalllog.jsm
index ef60785a72f7..d143a4b2a69a 100644
--- a/browser/devtools/commandline/CmdCalllog.jsm
+++ b/browser/devtools/commandline/CmdCalllog.jsm
@@ -9,8 +9,8 @@ this.EXPORTED_SYMBOLS = [ ];
 Cu.import("resource:///modules/devtools/gcli.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource:///modules/devtools/gDevTools.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "HUDService",
+                                  "resource:///modules/HUDService.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "Debugger", function() {
   let JsDebugger = {};
@@ -22,9 +22,6 @@ XPCOMUtils.defineLazyGetter(this, "Debugger", function() {
   return global.Debugger;
 });
 
-XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
-                                  "resource:///modules/devtools/Target.jsm");
-
 let debuggers = [];
 
 /**
@@ -53,9 +50,8 @@ gcli.addCommand({
 
     debuggers.push(dbg);
 
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    gDevTools.openToolboxForTab(target, "webconsole");
+    let tab = context.environment.chromeDocument.defaultView.gBrowser.selectedTab;
+    HUDService.activateHUDForContext(tab);
 
     return gcli.lookup("calllogStartReply");
   },
diff --git a/browser/devtools/commandline/CmdCalllogChrome.jsm b/browser/devtools/commandline/CmdCalllogChrome.jsm
index 60545fe8a1ce..80aa141155ce 100644
--- a/browser/devtools/commandline/CmdCalllogChrome.jsm
+++ b/browser/devtools/commandline/CmdCalllogChrome.jsm
@@ -10,10 +10,8 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 Cu.import("resource:///modules/devtools/gcli.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource:///modules/devtools/gDevTools.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
-                                  "resource:///modules/devtools/Target.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "HUDService",
+                                  "resource:///modules/HUDService.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "Debugger", function() {
   let JsDebugger = {};
@@ -110,9 +108,8 @@ gcli.addCommand({
                                 ": " + this.callDescription(frame));
     }.bind(this);
 
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    gDevTools.openToolboxForTab(target, "webconsole");
+    let tab = context.environment.chromeDocument.defaultView.gBrowser.selectedTab;
+    HUDService.activateHUDForContext(tab);
 
     return gcli.lookup("calllogChromeStartReply");
   },
diff --git a/browser/devtools/commandline/CmdConsole.jsm b/browser/devtools/commandline/CmdConsole.jsm
index 4a602b6a4c76..391ced0b7be7 100644
--- a/browser/devtools/commandline/CmdConsole.jsm
+++ b/browser/devtools/commandline/CmdConsole.jsm
@@ -11,10 +11,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "HUDService",
                                   "resource:///modules/HUDService.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource:///modules/devtools/gDevTools.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
-                                  "resource:///modules/devtools/Target.jsm");
 
 /**
  * 'console' command
@@ -48,9 +44,8 @@ gcli.addCommand({
   name: "console close",
   description: gcli.lookup("consolecloseDesc"),
   exec: function Command_consoleClose(args, context) {
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    gDevTools.closeToolbox(target);
+    let tab = context.environment.chromeDocument.defaultView.gBrowser.selectedTab
+    HUDService.deactivateHUDForContext(tab);
   }
 });
 
@@ -61,8 +56,7 @@ gcli.addCommand({
   name: "console open",
   description: gcli.lookup("consoleopenDesc"),
   exec: function Command_consoleOpen(args, context) {
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    gDevTools.openToolboxForTab(target, "webconsole");
+    let tab = context.environment.chromeDocument.defaultView.gBrowser.selectedTab
+    HUDService.activateHUDForContext(tab);
   }
 });
diff --git a/browser/devtools/commandline/CmdDbg.jsm b/browser/devtools/commandline/CmdDbg.jsm
index c0dc1b30b857..257efd2afc2b 100644
--- a/browser/devtools/commandline/CmdDbg.jsm
+++ b/browser/devtools/commandline/CmdDbg.jsm
@@ -9,11 +9,6 @@ this.EXPORTED_SYMBOLS = [ ];
 Cu.import("resource:///modules/devtools/gcli.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource:///modules/devtools/gDevTools.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
-                                  "resource:///modules/devtools/Target.jsm");
-
 /**
  * 'dbg' command
  */
@@ -31,9 +26,19 @@ gcli.addCommand({
   description: gcli.lookup("dbgOpen"),
   params: [],
   exec: function (args, context) {
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    gDevTools.openToolboxForTab(target, "jsdebugger");
+    let win = context.environment.chromeDocument.defaultView;
+    let tab = win.gBrowser.selectedTab;
+    let dbg = win.DebuggerUI.findDebugger();
+
+    if (dbg) {
+      if (dbg.ownerTab !== tab) {
+        win.DebuggerUI.toggleDebugger();
+      }
+
+      return;
+    }
+
+    win.DebuggerUI.toggleDebugger();
   }
 });
 
@@ -45,12 +50,12 @@ gcli.addCommand({
   description: gcli.lookup("dbgClose"),
   params: [],
   exec: function (args, context) {
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+    let win = context.environment.chromeDocument.defaultView;
+    let tab = win.gBrowser.selectedTab;
+    let dbg = win.DebuggerUI.findDebugger();
 
-    if (dbg /* FIXME: and debugger panel is currently active */) {
-      gDevTools.closeToolbox(target);
+    if (dbg) {
+      dbg.close();
     }
   }
 });
@@ -63,12 +68,11 @@ gcli.addCommand({
   description: gcli.lookup("dbgInterrupt"),
   params: [],
   exec: function(args, context) {
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+    let win = context.environment.chromeDocument.defaultView;
+    let dbg = win.DebuggerUI.getDebugger();
 
     if (dbg) {
-      let controller = dbg._controller;
+      let controller = dbg.contentWindow.DebuggerController;
       let thread = controller.activeThread;
       if (!thread.paused) {
         thread.interrupt();
@@ -85,12 +89,11 @@ gcli.addCommand({
   description: gcli.lookup("dbgContinue"),
   params: [],
   exec: function(args, context) {
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+    let win = context.environment.chromeDocument.defaultView;
+    let dbg = win.DebuggerUI.getDebugger();
 
     if (dbg) {
-      let controller = dbg._controller;
+      let controller = dbg.contentWindow.DebuggerController;
       let thread = controller.activeThread;
       if (thread.paused) {
         thread.resume();
@@ -118,12 +121,11 @@ gcli.addCommand({
   description: gcli.lookup("dbgStepOverDesc"),
   params: [],
   exec: function(args, context) {
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+    let win = context.environment.chromeDocument.defaultView;
+    let dbg = win.DebuggerUI.getDebugger();
 
     if (dbg) {
-      let controller = dbg._controller;
+      let controller = dbg.contentWindow.DebuggerController;
       let thread = controller.activeThread;
       if (thread.paused) {
         thread.stepOver();
@@ -140,12 +142,11 @@ gcli.addCommand({
   description: gcli.lookup("dbgStepInDesc"),
   params: [],
   exec: function(args, context) {
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+    let win = context.environment.chromeDocument.defaultView;
+    let dbg = win.DebuggerUI.getDebugger();
 
     if (dbg) {
-      let controller = dbg._controller;
+      let controller = dbg.contentWindow.DebuggerController;
       let thread = controller.activeThread;
       if (thread.paused) {
         thread.stepIn();
@@ -162,12 +163,11 @@ gcli.addCommand({
   description: gcli.lookup("dbgStepOutDesc"),
   params: [],
   exec: function(args, context) {
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
+    let win = context.environment.chromeDocument.defaultView;
+    let dbg = win.DebuggerUI.getDebugger();
 
     if (dbg) {
-      let controller = dbg._controller;
+      let controller = dbg.contentWindow.DebuggerController;
       let thread = controller.activeThread;
       if (thread.paused) {
         thread.stepOut();
diff --git a/browser/devtools/commandline/Commands.jsm b/browser/devtools/commandline/Commands.jsm
index 452f27789124..c1ca7dd0ffac 100644
--- a/browser/devtools/commandline/Commands.jsm
+++ b/browser/devtools/commandline/Commands.jsm
@@ -24,4 +24,3 @@ Cu.import("resource:///modules/devtools/CmdResize.jsm");
 Cu.import("resource:///modules/devtools/CmdRestart.jsm");
 Cu.import("resource:///modules/devtools/CmdScreenshot.jsm");
 Cu.import("resource:///modules/devtools/CmdTilt.jsm");
-Cu.import("resource:///modules/devtools/CmdScratchpad.jsm");
diff --git a/browser/devtools/commandline/test/browser_dbg_cmd.js b/browser/devtools/commandline/test/browser_dbg_cmd.js
index bb950d877609..d6e6f4cffc6d 100644
--- a/browser/devtools/commandline/test/browser_dbg_cmd.js
+++ b/browser/devtools/commandline/test/browser_dbg_cmd.js
@@ -1,11 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
 function test() {
   const TEST_URI = "http://example.com/browser/browser/devtools/commandline/" +
                    "test/browser_dbg_cmd.html";
@@ -15,40 +7,54 @@ function test() {
   });
 }
 
-function testCommands(dbg, cmd) {
-  // Wait for the initial resume...
-  dbg._controller.activeThread.addOneTimeListener("resumed", function () {
-    info("Starting tests.");
+function testDbgCmd() {
+  DeveloperToolbarTest.exec({
+    typed: "dbg open",
+    blankOutput: true
+  });
 
-    let contentDoc = content.window.document;
-    let output = contentDoc.querySelector("input[type=text]");
-    let btnDoit = contentDoc.querySelector("input[type=button]");
+  let pane = DebuggerUI.findDebugger();
+  ok(pane, "Debugger was opened.");
+  let frame = pane._frame;
 
-    cmd("dbg interrupt", function() {
-      ok(true, "debugger is paused");
-      dbg._controller.activeThread.addOneTimeListener("resumed", function () {
-        ok(true, "debugger continued");
-        dbg._controller.activeThread.addOneTimeListener("paused", function() {
-          cmd("dbg step in", function() {
+  frame.addEventListener("Debugger:Connected", function dbgConnected(aEvent) {
+    frame.removeEventListener("Debugger:Connected", dbgConnected, true);
+
+    // Wait for the initial resume...
+    aEvent.target.ownerDocument.defaultView.gClient
+        .addOneTimeListener("resumed", function() {
+
+      info("Starting tests.");
+
+      let contentDoc = content.window.document;
+      let output = contentDoc.querySelector("input[type=text]");
+      let btnDoit = contentDoc.querySelector("input[type=button]");
+
+      cmd("dbg interrupt", function() {
+        ok(true, "debugger is paused");
+        pane.contentWindow.gClient.addOneTimeListener("resumed", function() {
+          ok(true, "debugger continued");
+          pane.contentWindow.gClient.addOneTimeListener("paused", function() {
             cmd("dbg step in", function() {
               cmd("dbg step in", function() {
-                is(output.value, "step in", "debugger stepped in");
-                cmd("dbg step over", function() {
-                  is(output.value, "step over", "debugger stepped over");
-                  cmd("dbg step out", function() {
-                    is(output.value, "step out", "debugger stepped out");
-                    cmd("dbg continue", function() {
+                cmd("dbg step in", function() {
+                  is(output.value, "step in", "debugger stepped in");
+                  cmd("dbg step over", function() {
+                    is(output.value, "step over", "debugger stepped over");
+                    cmd("dbg step out", function() {
+                      is(output.value, "step out", "debugger stepped out");
                       cmd("dbg continue", function() {
-                        is(output.value, "dbg continue", "debugger continued");
-                        DeveloperToolbarTest.exec({
-                          typed: "dbg close",
-                          blankOutput: true
-                        });
+                        cmd("dbg continue", function() {
+                          is(output.value, "dbg continue", "debugger continued");
+                          DeveloperToolbarTest.exec({
+                            typed: "dbg close",
+                            blankOutput: true
+                          });
 
-                        let target = TargetFactory.forTab(gBrowser.selectedTab);
-                        ok(!gDevTools.getToolboxForTarget(target),
-                          "Debugger was closed.");
-                        finish();
+                          let dbg = DebuggerUI.findDebugger();
+                          ok(!dbg, "Debugger was closed.");
+                          finish();
+                        });
                       });
                     });
                   });
@@ -56,42 +62,21 @@ function testCommands(dbg, cmd) {
               });
             });
           });
+          EventUtils.sendMouseEvent({type:"click"}, btnDoit);
+        });
+        DeveloperToolbarTest.exec({
+          typed: "dbg continue",
+          blankOutput: true
         });
-        EventUtils.sendMouseEvent({type:"click"}, btnDoit);
-      });
-      DeveloperToolbarTest.exec({
-        typed: "dbg continue",
-        blankOutput: true
       });
     });
-  });
-}
-
-function testDbgCmd() {
-  DeveloperToolbarTest.exec({
-    typed: "dbg open",
-    blankOutput: true
-  });
-
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  let toolbox = gDevTools.getToolboxForTarget(target);
-
-  toolbox.once("jsdebugger-ready", function dbgReady() {
-    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
-    ok(dbg, "DebuggerPanel exists");
 
     function cmd(aTyped, aCallback) {
-      dbg._controller.activeThread.addOneTimeListener("paused", aCallback);
+      pane.contentWindow.gClient.addOneTimeListener("paused", aCallback);
       DeveloperToolbarTest.exec({
         typed: aTyped,
         blankOutput: true
       });
     }
-
-    if (dbg._controller.activeThread) {
-      testCommands(dbg, cmd);
-    } else {
-      dbg.once("connected", testCommands.bind(null, dbg, cmd));
-    }
   });
 }
diff --git a/browser/devtools/commandline/test/browser_dbg_cmd_break.js b/browser/devtools/commandline/test/browser_dbg_cmd_break.js
index 9d66767b0349..f3299f4c2e30 100644
--- a/browser/devtools/commandline/test/browser_dbg_cmd_break.js
+++ b/browser/devtools/commandline/test/browser_dbg_cmd_break.js
@@ -6,10 +6,6 @@
 const TEST_URI = "http://example.com/browser/browser/devtools/commandline/" +
                  "test/browser_dbg_cmd_break.html";
 
-let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
 function test() {
   DeveloperToolbarTest.test(TEST_URI, [ testBreakCommands ]);
 }
@@ -39,84 +35,86 @@ function testBreakCommands() {
     status: 'ERROR'
   });
 
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  let toolbox = gDevTools.openToolboxForTab(target, "jsdebugger");
-  toolbox.once("jsdebugger-ready", function dbgReady() {
-    let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
-    ok(dbg, "DebuggerPanel exists");
-    dbg.once("connected", function() {
-      // Wait for the initial resume...
-      dbg.panelWin.gClient.addOneTimeListener("resumed", function() {
-        dbg._view.Variables.lazyEmpty = false;
+  let pane = DebuggerUI.toggleDebugger();
 
-        var client = dbg.panelWin.gClient;
-        var framesAdded = DeveloperToolbarTest.checkCalled(function() {
-          helpers.setInput('break add line ' + TEST_URI + ' ' + content.wrappedJSObject.line0);
+  var dbgConnected = DeveloperToolbarTest.checkCalled(function() {
+    pane._frame.removeEventListener("Debugger:Connected", dbgConnected, true);
+
+    // Wait for the initial resume.
+    let client = pane.contentWindow.gClient;
+
+    var resumed = DeveloperToolbarTest.checkCalled(function() {
+
+      var framesAdded = DeveloperToolbarTest.checkCalled(function() {
+        helpers.setInput('break add line ' + TEST_URI + ' ' + content.wrappedJSObject.line0);
+        helpers.check({
+          hints: '',
+          status: 'VALID',
+          args: {
+            file: { value: TEST_URI },
+            line: { value: content.wrappedJSObject.line0 },
+          }
+        });
+
+        DeveloperToolbarTest.exec({
+          args: {
+            type: 'line',
+            file: TEST_URI,
+            line: content.wrappedJSObject.line0
+          },
+          completed: false
+        });
+
+        helpers.setInput('break list');
+        helpers.check({
+          input:  'break list',
+          hints:            '',
+          markup: 'VVVVVVVVVV',
+          status: 'VALID'
+        });
+
+        DeveloperToolbarTest.exec();
+
+        var cleanup = DeveloperToolbarTest.checkCalled(function() {
+          helpers.setInput('break del 9');
           helpers.check({
-            hints: '',
+            input:  'break del 9',
+            hints:             '',
+            markup: 'VVVVVVVVVVE',
+            status: 'ERROR',
+            args: {
+              breakid: { status: 'ERROR', message: '9 is greater than maximum allowed: 0.' },
+            }
+          });
+
+          helpers.setInput('break del 0');
+          helpers.check({
+            input:  'break del 0',
+            hints:             '',
+            markup: 'VVVVVVVVVVV',
             status: 'VALID',
             args: {
-              file: { value: TEST_URI },
-              line: { value: content.wrappedJSObject.line0 },
+              breakid: { value: 0 },
             }
           });
 
           DeveloperToolbarTest.exec({
-            args: {
-              type: 'line',
-              file: TEST_URI,
-              line: content.wrappedJSObject.line0
-            },
+            args: { breakid: 0 },
             completed: false
           });
-
-          helpers.setInput('break list');
-          helpers.check({
-            input:  'break list',
-            hints:            '',
-            markup: 'VVVVVVVVVV',
-            status: 'VALID'
-          });
-
-          DeveloperToolbarTest.exec();
-
-          var cleanup = DeveloperToolbarTest.checkCalled(function() {
-            helpers.setInput('break del 9');
-            helpers.check({
-              input:  'break del 9',
-              hints:             '',
-              markup: 'VVVVVVVVVVE',
-              status: 'ERROR',
-              args: {
-                breakid: { status: 'ERROR', message: '9 is greater than maximum allowed: 0.' },
-              }
-            });
-
-            helpers.setInput('break del 0');
-            helpers.check({
-              input:  'break del 0',
-              hints:             '',
-              markup: 'VVVVVVVVVVV',
-              status: 'VALID',
-              args: {
-                breakid: { value: 0 },
-              }
-            });
-
-            DeveloperToolbarTest.exec({
-              args: { breakid: 0 },
-              completed: false
-            });
-          });
-
-          client.activeThread.resume(cleanup);
         });
 
-        client.activeThread.addOneTimeListener("framesadded", framesAdded);
-
-        // Trigger newScript notifications using eval.
-        content.wrappedJSObject.firstCall();
+        client.activeThread.resume(cleanup);
       });
+
+      client.activeThread.addOneTimeListener("framesadded", framesAdded);
+
+      // Trigger newScript notifications using eval.
+      content.wrappedJSObject.firstCall();
     });
+
+    client.addOneTimeListener("resumed", resumed);
   });
+
+  pane._frame.addEventListener("Debugger:Connected", dbgConnected, true);
 }
diff --git a/browser/devtools/debugger/DebuggerPanel.jsm b/browser/devtools/debugger/DebuggerPanel.jsm
deleted file mode 100644
index ec60045741fe..000000000000
--- a/browser/devtools/debugger/DebuggerPanel.jsm
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
-this.EXPORTED_SYMBOLS = ["DebuggerDefinition"];
-
-const STRINGS_URI = "chrome://browser/locale/devtools/debugger.properties";
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "Services",
-                                  "resource://gre/modules/Services.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "EventEmitter",
-                                  "resource:///modules/devtools/EventEmitter.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "DebuggerServer",
-                                  "resource://gre/modules/devtools/dbg-server.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource:///modules/devtools/gDevTools.jsm");
-XPCOMUtils.defineLazyGetter(this, "_strings",
-  function() Services.strings.createBundle(STRINGS_URI));
-
-XPCOMUtils.defineLazyGetter(this, "osString", function() {
-  return Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
-});
-
-this.DebuggerDefinition = {
-  id: "jsdebugger",
-  key: l10n("open.commandkey"),
-  accesskey: l10n("debuggerMenu.accesskey"),
-  modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
-  ordinal: 1,
-  killswitch: "devtools.debugger.enabled",
-  icon: "chrome://browser/skin/devtools/tools-icons-small.png",
-  url: "chrome://browser/content/debugger.xul",
-  label: l10n("ToolboxDebugger.label"),
-
-  isTargetSupported: function(target) {
-    return true;
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new DebuggerPanel(iframeWindow, toolbox);
-  }
-};
-
-
-function DebuggerPanel(iframeWindow, toolbox) {
-  this._toolbox = toolbox;
-  this._controller = iframeWindow.DebuggerController;
-  this._view = iframeWindow.DebuggerView;
-  this._controller._target = this.target;
-  this._bkp = this._controller.Breakpoints;
-  this.panelWin = iframeWindow;
-
-  this._ensureOnlyOneRunningDebugger();
-  if (!this.target.isRemote) {
-    if (!DebuggerServer.initialized) {
-      DebuggerServer.init();
-      DebuggerServer.addBrowserActors();
-    }
-  }
-
-  let onDebuggerLoaded = function () {
-    iframeWindow.removeEventListener("Debugger:Loaded", onDebuggerLoaded, true);
-    this.setReady();
-  }.bind(this);
-
-  let onDebuggerConnected = function () {
-    iframeWindow.removeEventListener("Debugger:Connected",
-      onDebuggerConnected, true);
-    this.emit("connected");
-  }.bind(this);
-
-  iframeWindow.addEventListener("Debugger:Loaded", onDebuggerLoaded, true);
-  iframeWindow.addEventListener("Debugger:Connected",
-    onDebuggerConnected, true);
-
-  new EventEmitter(this);
-}
-
-DebuggerPanel.prototype = {
-  // DevToolPanel API
-  get target() this._toolbox.target,
-
-  get isReady() this._isReady,
-
-  setReady: function() {
-    this._isReady = true;
-    this.emit("ready");
-  },
-
-  destroy: function() {
-    delete this._toolbox;
-    delete this._target;
-    delete this._controller;
-    delete this._view;
-    delete this._bkp;
-    delete this.panelWin;
-  },
-
-  // DebuggerPanel API
-
-  addBreakpoint: function() {
-    this._bkp.addBreakpoint.apply(this._bkp, arguments);
-  },
-
-  removeBreakpoint: function() {
-    this._bkp.removeBreakpoint.apply(this._bkp, arguments);
-  },
-
-  getBreakpoint: function() {
-    return this._bkp.getBreakpoint.apply(this._bkp, arguments);
-  },
-
-  getAllBreakpoints: function() {
-    return this._bkp.store;
-  },
-
-  // Private
-
-  _ensureOnlyOneRunningDebugger: function() {
-    // FIXME
-  },
-};
-
-/**
- * Lookup l10n string from a string bundle.
- * @param {string} aName The key to lookup.
- * @returns A localized version of the given key.
- */
-function l10n(aName)
-{
-  try {
-    return _strings.GetStringFromName(aName);
-  } catch (ex) {
-    Services.console.logStringMessage("Error reading '" + aName + "'");
-    throw new Error("l10n error with " + aName);
-  }
-}
diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js
index aaa1e18ebe66..110d872834e9 100644
--- a/browser/devtools/debugger/debugger-controller.js
+++ b/browser/devtools/debugger/debugger-controller.js
@@ -48,7 +48,6 @@ let DebuggerController = {
       return;
     }
     this._isInitialized = true;
-
     window.removeEventListener("load", this._startupDebugger, true);
 
     DebuggerView.initialize(function() {
@@ -146,32 +145,14 @@ let DebuggerController = {
    * wiring event handlers as necessary.
    */
   _connect: function DC__connect() {
-    function callback() {
-      window.dispatchEvent("Debugger:Connected");
-    }
-
-    let client;
-    // Remote debugging gets the debuggee from a RemoteTarget object.
-    if (this._target.isRemote) {
-      client = this.client = this._target.client;
-
-      this._target.on("close", this._onTabDetached);
-      this._target.on("navigate", this._onTabNavigated);
-
-      if (this._target.chrome) {
-        let dbg = this._target.form.chromeDebugger;
-        this._startChromeDebugging(client, dbg, callback);
-      } else {
-        this._startDebuggingTab(client, this._target.form, callback);
-      }
+    if (window._isRemoteDebugger && !this._prepareConnection()) {
       return;
     }
+    let transport = (window._isChromeDebugger || window._isRemoteDebugger)
+      ? debuggerSocketConnect(Prefs.remoteHost, Prefs.remotePort)
+      : DebuggerServer.connectPipe();
 
-    // Content debugging can connect directly to the page.
-    // TODO: convert this to use a TabTarget.
-    let transport = DebuggerServer.connectPipe();
-    client = this.client = new DebuggerClient(transport);
-
+    let client = this.client = new DebuggerClient(transport);
     client.addListener("tabNavigated", this._onTabNavigated);
     client.addListener("tabDetached", this._onTabDetached);
 
@@ -179,11 +160,12 @@ let DebuggerController = {
       client.listTabs(function(aResponse) {
         if (window._isChromeDebugger) {
           let dbg = aResponse.chromeDebugger;
-          this._startChromeDebugging(client, dbg, callback);
+          this._startChromeDebugging(client, dbg);
         } else {
           let tab = aResponse.tabs[aResponse.selected];
-          this._startDebuggingTab(client, tab, callback);
+          this._startDebuggingTab(client, tab);
         }
+        window.dispatchEvent("Debugger:Connected");
       }.bind(this));
     }.bind(this));
   },
@@ -198,12 +180,9 @@ let DebuggerController = {
     }
     this.client.removeListener("tabNavigated", this._onTabNavigated);
     this.client.removeListener("tabDetached", this._onTabDetached);
+    this.client.close();
 
-    if (!this._target.isRemote) {
-      this.client.close();
-      this.client = null;
-    }
-
+    this.client = null;
     this.tabClient = null;
     this.activeThread = null;
   },
@@ -233,8 +212,7 @@ let DebuggerController = {
    * @param object aTabGrip
    *        The remote protocol grip of the tab.
    */
-  _startDebuggingTab: function DC__startDebuggingTab
-      (aClient, aTabGrip, aCallback=function(){}) {
+  _startDebuggingTab: function DC__startDebuggingTab(aClient, aTabGrip) {
     if (!aClient) {
       Cu.reportError("No client found!");
       return;
@@ -260,7 +238,6 @@ let DebuggerController = {
         this.SourceScripts.connect();
         aThreadClient.resume();
 
-        aCallback();
       }.bind(this));
     }.bind(this));
   },
@@ -273,8 +250,7 @@ let DebuggerController = {
    * @param object aChromeDebugger
    *        The remote protocol grip of the chrome debugger.
    */
-  _startChromeDebugging: function DC__startChromeDebugging
-      (aClient, aChromeDebugger, aCallback=function(){}) {
+  _startChromeDebugging: function DC__startChromeDebugging(aClient, aChromeDebugger) {
     if (!aClient) {
       Cu.reportError("No client found!");
       return;
@@ -293,7 +269,6 @@ let DebuggerController = {
       this.SourceScripts.connect();
       aThreadClient.resume();
 
-      aCallback();
     }.bind(this));
   },
 
diff --git a/browser/devtools/debugger/debugger-toolbar.js b/browser/devtools/debugger/debugger-toolbar.js
index 547eae695ca9..8f0341a6a4b1 100644
--- a/browser/devtools/debugger/debugger-toolbar.js
+++ b/browser/devtools/debugger/debugger-toolbar.js
@@ -25,6 +25,7 @@ ToolbarView.prototype = {
    */
   initialize: function DVT_initialize() {
     dumpn("Initializing the ToolbarView");
+    this._closeButton = document.getElementById("close");
     this._togglePanesButton = document.getElementById("toggle-panes");
     this._resumeButton = document.getElementById("resume");
     this._stepOverButton = document.getElementById("step-over");
@@ -43,6 +44,7 @@ ToolbarView.prototype = {
     this._stepInTooltip = L10N.getFormatStr("stepInTooltip", [stepInKey]);
     this._stepOutTooltip = L10N.getFormatStr("stepOutTooltip", [stepOutKey]);
 
+    this._closeButton.addEventListener("click", this._onCloseClick, false);
     this._togglePanesButton.addEventListener("mousedown", this._onTogglePanesPressed, false);
     this._resumeButton.addEventListener("mousedown", this._onResumePressed, false);
     this._stepOverButton.addEventListener("mousedown", this._onStepOverPressed, false);
@@ -53,6 +55,7 @@ ToolbarView.prototype = {
     this._stepInButton.setAttribute("tooltiptext", this._stepInTooltip);
     this._stepOutButton.setAttribute("tooltiptext", this._stepOutTooltip);
 
+    this.toggleCloseButton(!window._isRemoteDebugger && !window._isChromeDebugger);
     // TODO: bug 806775
     // this.toggleChromeGlobalsContainer(window._isChromeDebugger);
   },
@@ -62,6 +65,7 @@ ToolbarView.prototype = {
    */
   destroy: function DVT_destroy() {
     dumpn("Destroying the ToolbarView");
+    this._closeButton.removeEventListener("click", this._onCloseClick, false);
     this._togglePanesButton.removeEventListener("mousedown", this._onTogglePanesPressed, false);
     this._resumeButton.removeEventListener("mousedown", this._onResumePressed, false);
     this._stepOverButton.removeEventListener("mousedown", this._onStepOverPressed, false);
@@ -69,6 +73,16 @@ ToolbarView.prototype = {
     this._stepOutButton.removeEventListener("mousedown", this._onStepOutPressed, false);
   },
 
+  /**
+   * Sets the close button hidden or visible. It's hidden by default.
+   *
+   * @param boolean aVisibleFlag
+   *        Specifies the intended visibility.
+   */
+  toggleCloseButton: function DVT_toggleCloseButton(aVisibleFlag) {
+    this._closeButton.setAttribute("hidden", !aVisibleFlag);
+  },
+
   /**
    * Sets the resume button state based on the debugger active thread.
    *
@@ -163,6 +177,7 @@ ToolbarView.prototype = {
     }
   },
 
+  _closeButton: null,
   _togglePanesButton: null,
   _resumeButton: null,
   _stepOverButton: null,
diff --git a/browser/devtools/debugger/debugger.xul b/browser/devtools/debugger/debugger.xul
index db84ee6797c8..c63b714650d7 100644
--- a/browser/devtools/debugger/debugger.xul
+++ b/browser/devtools/debugger/debugger.xul
@@ -153,6 +153,11 @@
 
   <vbox id="body" flex="1">
     <toolbar id="dbg-toolbar" class="devtools-toolbar">
+#ifdef XP_MACOSX
+      <toolbarbutton id="close"
+                     class="devtools-closebutton"
+                     tooltiptext="&debuggerUI.closeButton.tooltip;"/>
+#endif
       <hbox id="debugger-controls">
         <toolbarbutton id="resume"
                        class="devtools-toolbarbutton"
@@ -181,6 +186,11 @@
                      class="devtools-option-toolbarbutton"
                      tooltiptext="&debuggerUI.optsButton.tooltip;"
                      popup="debuggerPrefsContextMenu"/>
+#ifndef XP_MACOSX
+      <toolbarbutton id="close"
+                     class="devtools-closebutton"
+                     tooltiptext="&debuggerUI.closeButton.tooltip;"/>
+#endif
     </toolbar>
 
     <panel id="searchbox-panel"
diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in
index df30cdce8ced..0918e802d399 100644
--- a/browser/devtools/debugger/test/Makefile.in
+++ b/browser/devtools/debugger/test/Makefile.in
@@ -12,9 +12,9 @@ include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_leaktest.js \
-	$(warning browser_dbg_createChrome.js disabled until issue 156 is fixed) \
-	$(browser_dbg_debugger-tab-switch.js disabled until issues 106, 40 are fixed) \
-	$(browser_dbg_debugger-tab-switch-window.js disabled until issues 106, 40 are fixed) \
+	browser_dbg_createChrome.js \
+	browser_dbg_debugger-tab-switch.js \
+	browser_dbg_debugger-tab-switch-window.js \
 	browser_dbg_debuggerstatement.js \
 	browser_dbg_listtabs.js \
 	browser_dbg_tabactor-01.js \
@@ -45,6 +45,7 @@ MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_propertyview-reexpand.js \
 	browser_dbg_reload-same-script.js \
 	browser_dbg_pane-collapse.js \
+	browser_dbg_panesize.js \
 	browser_dbg_panesize-inner.js \
 	browser_dbg_stack-01.js \
 	browser_dbg_stack-02.js \
@@ -81,6 +82,7 @@ MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_iframes.js \
 	browser_dbg_pause-exceptions.js \
 	browser_dbg_multiple-windows.js \
+	browser_dbg_menustatus.js \
 	browser_dbg_bfcache.js \
 	browser_dbg_breakpoint-new-script.js \
 	browser_dbg_bug737803_editor_actual_location.js \
diff --git a/browser/devtools/debugger/test/browser_dbg_bfcache.js b/browser/devtools/debugger/test/browser_dbg_bfcache.js
index a008a179b745..c430ebcb7507 100644
--- a/browser/devtools/debugger/test/browser_dbg_bfcache.js
+++ b/browser/devtools/debugger/test/browser_dbg_bfcache.js
@@ -20,7 +20,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testInitialLoad();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_breakpoint-new-script.js b/browser/devtools/debugger/test/browser_dbg_breakpoint-new-script.js
index 63d180b95a2d..c7e865a4596a 100644
--- a/browser/devtools/debugger/test/browser_dbg_breakpoint-new-script.js
+++ b/browser/devtools/debugger/test/browser_dbg_breakpoint-new-script.js
@@ -17,7 +17,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebuggee = aDebuggee;
 
     testAddBreakpoint();
diff --git a/browser/devtools/debugger/test/browser_dbg_bug723069_editor-breakpoints.js b/browser/devtools/debugger/test/browser_dbg_bug723069_editor-breakpoints.js
index e440239ccf99..ee38ccc3c765 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug723069_editor-breakpoints.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug723069_editor-breakpoints.js
@@ -31,11 +31,9 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     resumed = true;
 
-    gDebugger.addEventListener("Debugger:SourceShown", onScriptShown);
-
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
       executeSoon(startTest);
@@ -52,10 +50,12 @@ function test()
     executeSoon(startTest);
   }
 
+  window.addEventListener("Debugger:SourceShown", onScriptShown);
+
   function startTest()
   {
     if (scriptShown && framesAdded && resumed && !testStarted) {
-      gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown);
+      window.removeEventListener("Debugger:SourceShown", onScriptShown);
       testStarted = true;
       Services.tm.currentThread.dispatch({ run: performTest }, 0);
     }
@@ -77,7 +77,7 @@ function test()
     isnot(gScripts.selectedValue, gScripts.values[0],
           "the correct script is selected");
 
-    gBreakpoints = gPane.getAllBreakpoints();
+    gBreakpoints = gPane.breakpoints;
     is(Object.keys(gBreakpoints), 0, "no breakpoints");
     ok(!gPane.getBreakpoint("foo", 3), "getBreakpoint('foo', 3) returns falsey");
 
@@ -127,7 +127,7 @@ function test()
       is(Object.keys(gBreakpoints).length, 1,
          "the list of debugger breakpoints holds only one breakpoint");
       is(gPane.getBreakpoint(gScripts.selectedValue, 6), aBreakpointClient,
-         "getBreakpoint returns the correct breakpoint");
+         "getBreakpoint(selectedScript, 2) returns the correct breakpoint");
 
       info("remove the first breakpoint");
       gEditor.addEventListener(SourceEditor.EVENTS.BREAKPOINT_CHANGE,
diff --git a/browser/devtools/debugger/test/browser_dbg_bug723071_editor-breakpoints-pane.js b/browser/devtools/debugger/test/browser_dbg_bug723071_editor-breakpoints-pane.js
index b6144947fda6..a923bf3c0b87 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug723071_editor-breakpoints-pane.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug723071_editor-breakpoints-pane.js
@@ -29,11 +29,9 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     resumed = true;
 
-    gDebugger.addEventListener("Debugger:SourceShown", onScriptShown);
-
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
       executeSoon(startTest);
@@ -50,10 +48,12 @@ function test()
     executeSoon(startTest);
   }
 
+  window.addEventListener("Debugger:SourceShown", onScriptShown);
+
   function startTest()
   {
     if (scriptShown && framesAdded && resumed && !testStarted) {
-      gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown);
+      window.removeEventListener("Debugger:SourceShown", onScriptShown);
       testStarted = true;
       Services.tm.currentThread.dispatch({ run: performTest }, 0);
     }
@@ -79,7 +79,7 @@ function test()
     isnot(gScripts.selectedValue, gScripts.values[0],
           "the correct script is selected");
 
-    gBreakpoints = gPane.getAllBreakpoints();
+    gBreakpoints = gPane.breakpoints;
     is(Object.keys(gBreakpoints), 0, "no breakpoints");
     ok(!gPane.getBreakpoint("chocolate", 3), "getBreakpoint('chocolate', 3) returns falsey");
 
diff --git a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js
index d9491b120369..9e938e2f510c 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js
@@ -19,7 +19,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gWatch = gDebugger.DebuggerView.WatchExpressions;
 
     gDebugger.DebuggerView.togglePanes({ visible: true, animated: false });
diff --git a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-02.js b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-02.js
index 5f596654c1c4..53f9a22031b7 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-02.js
@@ -20,7 +20,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gWatch = gDebugger.DebuggerView.WatchExpressions;
     gVars = gDebugger.DebuggerView.Variables;
 
diff --git a/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js b/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
index d8e4d7017980..9ac7911df420 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
@@ -28,7 +28,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     resumed = true;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_bug737803_editor_actual_location.js b/browser/devtools/debugger/test/browser_dbg_bug737803_editor_actual_location.js
index 90325b241375..4a32b2428f16 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug737803_editor_actual_location.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug737803_editor_actual_location.js
@@ -30,11 +30,9 @@ function test() {
     gTab = aTab;
     gPane = aPane;
     gDebuggee = aDebuggee;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     resumed = true;
 
-    gDebugger.addEventListener("Debugger:SourceShown", onScriptShown);
-
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function () {
       framesAdded = true;
       executeSoon(startTest);
@@ -50,9 +48,11 @@ function test() {
     executeSoon(startTest);
   }
 
+  window.addEventListener("Debugger:SourceShown", onScriptShown);
+
   function startTest() {
     if (scriptShown && framesAdded && resumed && !testStarted) {
-      gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown);
+      window.removeEventListener("Debugger:SourceShown", onScriptShown);
       testStarted = true;
       Services.tm.currentThread.dispatch({ run: performTest }, 0);
     }
@@ -61,7 +61,7 @@ function test() {
   function performTest() {
     gScripts = gDebugger.DebuggerView.Sources;
     gEditor = gDebugger.editor;
-    gBreakpoints = gPane.getAllBreakpoints();
+    gBreakpoints = gPane.breakpoints;
     is(Object.keys(gBreakpoints), 0, "There are no breakpoints");
 
     gEditor.addEventListener(SourceEditor.EVENTS.BREAKPOINT_CHANGE,
diff --git a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js
index 8061fc8c3c3c..d1d3ca2f4ad0 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js
@@ -29,7 +29,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gBreakpoints = gDebugger.DebuggerController.Breakpoints;
     gBreakpointsPane = gDebugger.DebuggerView.Breakpoints;
 
@@ -79,7 +79,7 @@ function test()
     is(gScripts.selectedValue, gScripts.values[0],
           "The correct script is selected");
 
-    gBreakpoints = gPane.getAllBreakpoints();
+    gBreakpoints = gPane.breakpoints;
     is(Object.keys(gBreakpoints).length, 13, "thirteen breakpoints");
     ok(!gPane.getBreakpoint("foo", 3), "getBreakpoint('foo', 3) returns falsey");
 
diff --git a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-02.js b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-02.js
index a8d15758e1cc..e7206d1576af 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-02.js
@@ -33,7 +33,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gBreakpoints = gDebugger.DebuggerController.Breakpoints;
     gBreakpointsPane = gDebugger.DebuggerView.Breakpoints;
 
@@ -83,7 +83,7 @@ function test()
     is(gScripts.selectedValue, gScripts.values[0],
           "The correct script is selected");
 
-    gBreakpoints = gPane.getAllBreakpoints();
+    gBreakpoints = gPane.breakpoints;
     is(Object.keys(gBreakpoints), 0, "no breakpoints");
     ok(!gPane.getBreakpoint("foo", 3), "getBreakpoint('foo', 3) returns falsey");
 
diff --git a/browser/devtools/debugger/test/browser_dbg_bug786070_hide_nonenums.js b/browser/devtools/debugger/test/browser_dbg_bug786070_hide_nonenums.js
index d0cb74a16a5d..cf68ee5ca7be 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug786070_hide_nonenums.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug786070_hide_nonenums.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testNonEnumProperties();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_clean-exit.js b/browser/devtools/debugger/test/browser_dbg_clean-exit.js
index fe0a496f2dc4..2530328b84e3 100644
--- a/browser/devtools/debugger/test/browser_dbg_clean-exit.js
+++ b/browser/devtools/debugger/test/browser_dbg_clean-exit.js
@@ -15,7 +15,7 @@ function test() {
   debug_tab_pane(DEBUGGER_TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testCleanExit();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_createRemote.js b/browser/devtools/debugger/test/browser_dbg_createRemote.js
index ff4f5bb6b7a0..4abcd7561a6d 100644
--- a/browser/devtools/debugger/test/browser_dbg_createRemote.js
+++ b/browser/devtools/debugger/test/browser_dbg_createRemote.js
@@ -18,7 +18,7 @@ function test() {
   debug_remote(TEST_URL, function(aTab, aDebuggee, aWindow) {
     gTab = aTab;
     gWindow = aWindow;
-    let gDebugger = gWindow.panelWin;
+    let gDebugger = gWindow.contentWindow;
 
     info("Current remote window x: " +
       Services.prefs.getIntPref("devtools.debugger.ui.win-x"));
diff --git a/browser/devtools/debugger/test/browser_dbg_displayName.js b/browser/devtools/debugger/test/browser_dbg_displayName.js
index 785fc0fabe83..40afa0837692 100644
--- a/browser/devtools/debugger/test/browser_dbg_displayName.js
+++ b/browser/devtools/debugger/test/browser_dbg_displayName.js
@@ -18,7 +18,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testAnonCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_iframes.js b/browser/devtools/debugger/test/browser_dbg_iframes.js
index 78f3c28d7a5a..3411df6adb0a 100644
--- a/browser/devtools/debugger/test/browser_dbg_iframes.js
+++ b/browser/devtools/debugger/test/browser_dbg_iframes.js
@@ -14,7 +14,10 @@ function test() {
   debug_tab_pane(TEST_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    let gDebugger = gPane.panelWin;
+    let gDebugger = gPane.contentWindow;
+
+    is(gDebugger.document.getElementById("close").getAttribute("hidden"), "false",
+      "The close button should be visible in a normal content debugger.");
 
     is(gDebugger.DebuggerController.activeThread.paused, false,
       "Should be running after debug_tab_pane.");
diff --git a/browser/devtools/debugger/test/browser_dbg_leaktest.js b/browser/devtools/debugger/test/browser_dbg_leaktest.js
index 3b4e0993c944..8cd601145bfc 100644
--- a/browser/devtools/debugger/test/browser_dbg_leaktest.js
+++ b/browser/devtools/debugger/test/browser_dbg_leaktest.js
@@ -24,7 +24,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     resumed = true;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js b/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js
index 3e90fb754a47..b631cac16398 100644
--- a/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js
+++ b/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js
@@ -20,7 +20,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes-new.js b/browser/devtools/debugger/test/browser_dbg_location-changes-new.js
index 7df75c656159..cfad4119c06b 100644
--- a/browser/devtools/debugger/test/browser_dbg_location-changes-new.js
+++ b/browser/devtools/debugger/test/browser_dbg_location-changes-new.js
@@ -20,7 +20,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes.js b/browser/devtools/debugger/test/browser_dbg_location-changes.js
index 586e754e3dc1..8ccb8b6451d4 100644
--- a/browser/devtools/debugger/test/browser_dbg_location-changes.js
+++ b/browser/devtools/debugger/test/browser_dbg_location-changes.js
@@ -17,7 +17,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_pane-collapse.js b/browser/devtools/debugger/test/browser_dbg_pane-collapse.js
index 39f644816610..96c3a3f23375 100644
--- a/browser/devtools/debugger/test/browser_dbg_pane-collapse.js
+++ b/browser/devtools/debugger/test/browser_dbg_pane-collapse.js
@@ -16,7 +16,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gView = gDebugger.DebuggerView;
 
     testPanesState();
diff --git a/browser/devtools/debugger/test/browser_dbg_panesize-inner.js b/browser/devtools/debugger/test/browser_dbg_panesize-inner.js
index 440363d4a830..d7d9c73ee17e 100644
--- a/browser/devtools/debugger/test/browser_dbg_panesize-inner.js
+++ b/browser/devtools/debugger/test/browser_dbg_panesize-inner.js
@@ -7,70 +7,65 @@
 function test() {
   var tab1 = addTab(TAB1_URL, function() {
     gBrowser.selectedTab = tab1;
-    let target1 = TargetFactory.forTab(tab1);
 
-    ok(!gDevTools.getPanelForTarget("jsdebugger", target1),
-      "Shouldn't have a debugger panel for this tab yet.");
+    ok(!DebuggerUI.getDebugger(),
+      "Shouldn't have a debugger pane for this tab yet.");
 
-    let toolbox = gDevTools.openToolboxForTab(target1, "jsdebugger");
-    toolbox.once("jsdebugger-ready", function dbgReady() {
-      let dbg = gDevTools.getPanelForTarget("jsdebugger", target1);
-      ok(dbg, "We should have a debugger panel.");
+    let pane = DebuggerUI.toggleDebugger();
+    ok(pane, "toggleDebugger() should return a pane.");
 
-      let preferredSfw = Services.prefs.getIntPref("devtools.debugger.ui.stackframes-width");
-      let preferredBpw = Services.prefs.getIntPref("devtools.debugger.ui.variables-width");
-      let someWidth1, someWidth2;
+    let preferredSfw = Services.prefs.getIntPref("devtools.debugger.ui.stackframes-width");
+    let preferredBpw = Services.prefs.getIntPref("devtools.debugger.ui.variables-width");
+    let someWidth1, someWidth2;
 
-      do {
-        someWidth1 = parseInt(Math.random() * 200) + 100;
-        someWidth2 = parseInt(Math.random() * 200) + 100;
-      } while (someWidth1 == preferredSfw ||
-               someWidth2 == preferredBpw)
+    do {
+      someWidth1 = parseInt(Math.random() * 200) + 100;
+      someWidth2 = parseInt(Math.random() * 200) + 100;
+    } while (someWidth1 == preferredSfw ||
+             someWidth2 == preferredBpw)
 
-      let someWidth1 = parseInt(Math.random() * 200) + 100;
-      let someWidth2 = parseInt(Math.random() * 200) + 100;
+    info("Preferred stackframes width: " + preferredSfw);
+    info("Preferred variables width: " + preferredBpw);
+    info("Generated stackframes width: " + someWidth1);
+    info("Generated variables width: " + someWidth2);
 
-      info("Preferred stackframes width: " + preferredSfw);
-      info("Preferred variables width: " + preferredBpw);
-      info("Generated stackframes width: " + someWidth1);
-      info("Generated variables width: " + someWidth2);
+    is(DebuggerUI.getDebugger(), pane,
+      "getDebugger() should return the same pane as toggleDebugger().");
 
-      let content = dbg.panelWin;
-      let stackframes;
-      let variables;
+    let content = pane.contentWindow;
+    let stackframes;
+    let variables;
 
-      wait_for_connect_and_resume(function() {
-        ok(content.Prefs.stackframesWidth,
-          "The debugger preferences should have a saved stackframesWidth value.");
-        ok(content.Prefs.variablesWidth,
-          "The debugger preferences should have a saved variablesWidth value.");
+    wait_for_connect_and_resume(function() {
+      ok(content.Prefs.stackframesWidth,
+        "The debugger preferences should have a saved stackframesWidth value.");
+      ok(content.Prefs.variablesWidth,
+        "The debugger preferences should have a saved variablesWidth value.");
 
-        stackframes = content.document.getElementById("stackframes+breakpoints");
-        variables = content.document.getElementById("variables+expressions");
+      stackframes = content.document.getElementById("stackframes+breakpoints");
+      variables = content.document.getElementById("variables+expressions");
 
-        is(content.Prefs.stackframesWidth, stackframes.getAttribute("width"),
-          "The stackframes pane width should be the same as the preferred value.");
-        is(content.Prefs.variablesWidth, variables.getAttribute("width"),
-          "The variables pane width should be the same as the preferred value.");
+      is(content.Prefs.stackframesWidth, stackframes.getAttribute("width"),
+        "The stackframes pane width should be the same as the preferred value.");
+      is(content.Prefs.variablesWidth, variables.getAttribute("width"),
+        "The variables pane width should be the same as the preferred value.");
 
-        stackframes.setAttribute("width", someWidth1);
-        variables.setAttribute("width", someWidth2);
+      stackframes.setAttribute("width", someWidth1);
+      variables.setAttribute("width", someWidth2);
 
-        removeTab(tab1);
-      }, tab1);
-
-      window.addEventListener("Debugger:Shutdown", function dbgShutdown() {
-        window.removeEventListener("Debugger:Shutdown", dbgShutdown, true);
-
-        is(content.Prefs.stackframesWidth, stackframes.getAttribute("width"),
-          "The stackframes pane width should have been saved by now.");
-        is(content.Prefs.variablesWidth, variables.getAttribute("width"),
-          "The variables pane width should have been saved by now.");
-
-        finish();
-
-      }, true);
+      removeTab(tab1);
     });
 
+    window.addEventListener("Debugger:Shutdown", function dbgShutdown() {
+      window.removeEventListener("Debugger:Shutdown", dbgShutdown, true);
+
+      is(content.Prefs.stackframesWidth, stackframes.getAttribute("width"),
+        "The stackframes pane width should have been saved by now.");
+      is(content.Prefs.variablesWidth, variables.getAttribute("width"),
+        "The variables pane width should have been saved by now.");
+
+      finish();
+
+    }, true);
   });
 }
diff --git a/browser/devtools/debugger/test/browser_dbg_panesize.js b/browser/devtools/debugger/test/browser_dbg_panesize.js
new file mode 100644
index 000000000000..754f489e2e19
--- /dev/null
+++ b/browser/devtools/debugger/test/browser_dbg_panesize.js
@@ -0,0 +1,55 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+function test() {
+  var tab1 = addTab(TAB1_URL, function() {
+    gBrowser.selectedTab = tab1;
+
+    ok(!DebuggerUI.getDebugger(),
+      "Shouldn't have a debugger pane for this tab yet.");
+
+    let pane = DebuggerUI.toggleDebugger();
+    ok(pane, "toggleDebugger() should return a pane.");
+
+    let preferredHeight = Services.prefs.getIntPref("devtools.debugger.ui.height");
+    let someHeight;
+
+    do {
+      someHeight = parseInt(Math.random() * 200) + 200;
+    } while (someHeight == preferredHeight)
+
+    info("Preferred pane height: " + preferredHeight);
+    info("Generated pane height: " + someHeight);
+
+    is(DebuggerUI.getDebugger(), pane,
+      "getDebugger() should return the same pane as toggleDebugger().");
+
+    ok(DebuggerUI.preferences.height,
+      "The debugger preferences should have a saved height value.");
+
+    is(DebuggerUI.preferences.height, pane._frame.height,
+      "The debugger pane height should be the same as the preferred value.");
+
+    pane._frame.height = someHeight;
+
+    ok(DebuggerUI.preferences.height !== someHeight,
+      "Height preferences shouldn't have been updated yet.");
+
+    wait_for_connect_and_resume(function() {
+      removeTab(tab1);
+    });
+
+    window.addEventListener("Debugger:Shutdown", function dbgShutdown() {
+      window.removeEventListener("Debugger:Shutdown", dbgShutdown, true);
+
+      is(DebuggerUI.preferences.height, someHeight,
+        "Height preferences should have been updated by now.");
+
+      finish();
+
+    }, true);
+  });
+}
diff --git a/browser/devtools/debugger/test/browser_dbg_pause-exceptions.js b/browser/devtools/debugger/test/browser_dbg_pause-exceptions.js
index aafa987086ba..5067c9f06391 100644
--- a/browser/devtools/debugger/test/browser_dbg_pause-exceptions.js
+++ b/browser/devtools/debugger/test/browser_dbg_pause-exceptions.js
@@ -20,7 +20,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
     gDebugger.DebuggerView.Variables.nonEnumVisible = false;
@@ -30,7 +30,7 @@ function test()
 
 function testWithFrame()
 {
-  gPane.panelWin.gClient.addOneTimeListener("paused", function() {
+  gPane.contentWindow.gClient.addOneTimeListener("paused", function() {
     gDebugger.addEventListener("Debugger:FetchedVariables", function testA() {
       // We expect 2 Debugger:FetchedVariables events, one from the global object
       // scope and the regular one.
@@ -48,7 +48,7 @@ function testWithFrame()
       gDebugger.DebuggerView.Options._togglePauseOnExceptions();
 
       gCount = 0;
-      gPane.panelWin.gClient.addOneTimeListener("resumed", function() {
+      gPane.contentWindow.gClient.addOneTimeListener("resumed", function() {
         gDebugger.addEventListener("Debugger:FetchedVariables", function testB() {
           // We expect 2 Debugger:FetchedVariables events, one from the global object
           // scope and the regular one.
@@ -96,7 +96,7 @@ function testWithFrame()
 }
 
 function resumeAndFinish() {
-  gPane.panelWin.gClient.addOneTimeListener("resumed", function() {
+  gPane.contentWindow.gClient.addOneTimeListener("resumed", function() {
     Services.tm.currentThread.dispatch({ run: function() {
 
       closeDebuggerAndFinish(false);
diff --git a/browser/devtools/debugger/test/browser_dbg_pause-resume.js b/browser/devtools/debugger/test/browser_dbg_pause-resume.js
index 4922acf217db..476aaa9b6a26 100644
--- a/browser/devtools/debugger/test/browser_dbg_pause-resume.js
+++ b/browser/devtools/debugger/test/browser_dbg_pause-resume.js
@@ -15,7 +15,7 @@ function test() {
   debug_tab_pane(STACK_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gView = gDebugger.DebuggerView;
     gLH = gDebugger.LayoutHelpers;
     gL10N = gDebugger.L10N;
diff --git a/browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js b/browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js
index 76f934df723a..73e1ed50fac6 100644
--- a/browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js
+++ b/browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js
@@ -18,7 +18,7 @@ function test() {
   debug_tab_pane(TEST_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    let gDebugger = gPane.panelWin;
+    let gDebugger = gPane.contentWindow;
 
     is(gDebugger.DebuggerController._isInitialized, true,
       "Controller should be initialized after debug_tab_pane.");
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-01.js b/browser/devtools/debugger/test/browser_dbg_propertyview-01.js
index 46a02e4c3445..ff5dcdc1fcef 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-01.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-02.js b/browser/devtools/debugger/test/browser_dbg_propertyview-02.js
index ac7c1ced3780..b24e2a2ea4d3 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-02.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-03.js b/browser/devtools/debugger/test/browser_dbg_propertyview-03.js
index 06e1b8b5372c..6fe0d9388a19 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-03.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-03.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-04.js b/browser/devtools/debugger/test/browser_dbg_propertyview-04.js
index 3a80ef5c6eaf..2b1bfd0edef3 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-04.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-04.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-05.js b/browser/devtools/debugger/test/browser_dbg_propertyview-05.js
index ad887d324983..e56bfa67e4b6 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-05.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-05.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-06.js b/browser/devtools/debugger/test/browser_dbg_propertyview-06.js
index 194160c9dbc6..06c908fabfe5 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-06.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-06.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-07.js b/browser/devtools/debugger/test/browser_dbg_propertyview-07.js
index 23d242115bb0..c7c77f2808d7 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-07.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-07.js
@@ -17,7 +17,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testFrameParameters();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-08.js b/browser/devtools/debugger/test/browser_dbg_propertyview-08.js
index b822d77bed8d..7c43b7e76410 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-08.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-08.js
@@ -17,7 +17,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testFrameParameters();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-09.js b/browser/devtools/debugger/test/browser_dbg_propertyview-09.js
index b9c6a4aad377..d89c0c29080b 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-09.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-09.js
@@ -19,7 +19,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
     gDebugger.DebuggerView.Variables.nonEnumVisible = false;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-10.js b/browser/devtools/debugger/test/browser_dbg_propertyview-10.js
index c3cb4c45e04a..811f8f881551 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-10.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-10.js
@@ -19,7 +19,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
     gDebugger.DebuggerView.Variables.nonEnumVisible = false;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-data.js b/browser/devtools/debugger/test/browser_dbg_propertyview-data.js
index 9c67c7461494..456a39f22c0c 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-data.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-data.js
@@ -18,7 +18,7 @@ function test()
   debug_tab_pane(TAB1_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gVariablesView = gDebugger.DebuggerView.Variables;
 
     testVariablesView();
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js b/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js
index 6b7ca2c5594e..f3ae5f48a649 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js
@@ -18,7 +18,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
     gDebugger.DebuggerView.Variables.nonEnumVisible = false;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js
index a846cfb02b77..a56797e0dda1 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js
@@ -21,7 +21,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebuggee = aDebuggee;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js
index dae519960b9c..c70af5d07756 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js
@@ -21,7 +21,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebuggee = aDebuggee;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-03.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-03.js
index 596e2b920e5e..c183b6382c63 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-03.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-03.js
@@ -24,7 +24,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebuggee = aDebuggee;
 
     testSearchbox();
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-04.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-04.js
index 8fd71d0b8588..bfc6808c533e 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-04.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-04.js
@@ -24,7 +24,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebuggee = aDebuggee;
 
     testSearchbox();
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js
index 49f6b0f0613a..7f5101cde92d 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js
@@ -21,7 +21,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebuggee = aDebuggee;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-06.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-06.js
index 715edec78a7a..29d8b18336b1 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-06.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-06.js
@@ -21,7 +21,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebuggee = aDebuggee;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = false;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js
index 1d06831c063e..b3063230ec72 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js
@@ -21,7 +21,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebuggee = aDebuggee;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js
index 5086d2158e24..5f9c1b0e3971 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js
@@ -21,7 +21,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebuggee = aDebuggee;
 
     gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-reexpand.js b/browser/devtools/debugger/test/browser_dbg_propertyview-reexpand.js
index 945427c0b01f..4d108ffb5505 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-reexpand.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-reexpand.js
@@ -20,7 +20,7 @@ function test()
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebuggee = aDebuggee;
 
     addBreakpoint();
diff --git a/browser/devtools/debugger/test/browser_dbg_reload-same-script.js b/browser/devtools/debugger/test/browser_dbg_reload-same-script.js
index 4878978d307e..7d3bd91a418a 100644
--- a/browser/devtools/debugger/test/browser_dbg_reload-same-script.js
+++ b/browser/devtools/debugger/test/browser_dbg_reload-same-script.js
@@ -28,7 +28,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gView = gDebugger.DebuggerView;
     resumed = true;
 
diff --git a/browser/devtools/debugger/test/browser_dbg_script-switching.js b/browser/devtools/debugger/test/browser_dbg_script-switching.js
index cc794044e92a..56e1d988e87e 100644
--- a/browser/devtools/debugger/test/browser_dbg_script-switching.js
+++ b/browser/devtools/debugger/test/browser_dbg_script-switching.js
@@ -25,7 +25,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     resumed = true;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js
index 328328e3bfd9..cb54d0379214 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js
@@ -24,7 +24,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js
index 18c045e7a36c..39b8ee2a72e9 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js
@@ -26,7 +26,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-03.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-03.js
index 41d5936cab51..e7f58a302a16 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-03.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-03.js
@@ -27,7 +27,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-04.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-04.js
index a885e39e86b8..a938d6ee4ff5 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-04.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-04.js
@@ -27,7 +27,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js
index 297b906f5a8c..eaa7b9287c8c 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js
@@ -27,7 +27,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-06.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-06.js
index 022b7f4b6900..4191b16b0d11 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-06.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-06.js
@@ -27,7 +27,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-07.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-07.js
index 89f60d54a6d9..33ca5cdbf7c8 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-07.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-07.js
@@ -28,7 +28,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-08.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-08.js
index afd1b4107abd..44c05d6b66b2 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-08.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-08.js
@@ -27,7 +27,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gDebugger.SourceResults.prototype.alwaysExpand = false;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-popup.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-popup.js
index 3fa523e70365..3e07f69fe5a2 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-popup.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-popup.js
@@ -18,7 +18,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       runTest();
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-sorting.js b/browser/devtools/debugger/test/browser_dbg_scripts-sorting.js
index cd3d523e8416..1fdcf0071896 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-sorting.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-sorting.js
@@ -13,7 +13,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_select-line.js b/browser/devtools/debugger/test/browser_dbg_select-line.js
index cbe3116cc64f..bc9a9e586553 100644
--- a/browser/devtools/debugger/test/browser_dbg_select-line.js
+++ b/browser/devtools/debugger/test/browser_dbg_select-line.js
@@ -24,7 +24,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testSelectLine();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_stack-01.js b/browser/devtools/debugger/test/browser_dbg_stack-01.js
index 340f4442939b..d6ad154864c1 100644
--- a/browser/devtools/debugger/test/browser_dbg_stack-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_stack-01.js
@@ -14,7 +14,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testSimpleCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_stack-02.js b/browser/devtools/debugger/test/browser_dbg_stack-02.js
index 7dd6f7379dac..14067e835a26 100644
--- a/browser/devtools/debugger/test/browser_dbg_stack-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_stack-02.js
@@ -14,7 +14,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testEvalCall();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_stack-03.js b/browser/devtools/debugger/test/browser_dbg_stack-03.js
index 028ecf9e7cb4..dc11eff6800e 100644
--- a/browser/devtools/debugger/test/browser_dbg_stack-03.js
+++ b/browser/devtools/debugger/test/browser_dbg_stack-03.js
@@ -14,7 +14,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testRecurse();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_stack-04.js b/browser/devtools/debugger/test/browser_dbg_stack-04.js
index d65708b5b37e..ce5fc209f268 100644
--- a/browser/devtools/debugger/test/browser_dbg_stack-04.js
+++ b/browser/devtools/debugger/test/browser_dbg_stack-04.js
@@ -14,7 +14,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     testEvalCallResume();
   });
diff --git a/browser/devtools/debugger/test/browser_dbg_stack-05.js b/browser/devtools/debugger/test/browser_dbg_stack-05.js
index efa211f7559c..515bfcaf6f40 100644
--- a/browser/devtools/debugger/test/browser_dbg_stack-05.js
+++ b/browser/devtools/debugger/test/browser_dbg_stack-05.js
@@ -22,7 +22,7 @@ function test() {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
diff --git a/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js b/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js
index 3e163206a7a8..acb4100b4038 100644
--- a/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js
+++ b/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js
@@ -29,7 +29,7 @@ function test()
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
-    gDebugger = gPane.panelWin;
+    gDebugger = gPane.contentWindow;
     gScripts = gDebugger.DebuggerView.Sources._container;
     resumed = true;
 
diff --git a/browser/devtools/debugger/test/head.js b/browser/devtools/debugger/test/head.js
index e643521080e3..f71d21a8e9d2 100644
--- a/browser/devtools/debugger/test/head.js
+++ b/browser/devtools/debugger/test/head.js
@@ -14,10 +14,6 @@ let DebuggerServer = tempScope.DebuggerServer;
 let DebuggerTransport = tempScope.DebuggerTransport;
 let DebuggerClient = tempScope.DebuggerClient;
 let Services = tempScope.Services;
-Cu.import("resource:///modules/devtools/gDevTools.jsm", tempScope);
-let gDevTools = tempScope.gDevTools;
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
 
 const EXAMPLE_URL = "http://example.com/browser/browser/devtools/debugger/test/";
 const TAB1_URL = EXAMPLE_URL + "browser_dbg_tab1.html";
@@ -90,25 +86,11 @@ function removeTab(aTab, aWindow) {
 }
 
 function closeDebuggerAndFinish(aRemoteFlag, aCallback, aWindow) {
+  let targetWindow = aWindow || window;
+  let debuggerUI = targetWindow.DebuggerUI;
+
   let debuggerClosed = false;
   let debuggerDisconnected = false;
-  // let targetWindow = aWindow || window;
-  ok(gTab, "There is a gTab to use for getting a toolbox reference");
-  let target = TargetFactory.forTab(gTab);
-
-  // let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
-  window.addEventListener("Debugger:Shutdown", function cleanup() {
-    window.removeEventListener("Debugger:Shutdown", cleanup, false);
-    debuggerDisconnected = true;
-    _maybeFinish();
-  }, false);
-
-  let toolbox = gDevTools.getToolboxForTarget(target);
-  toolbox.once("destroyed", function() {
-    debuggerClosed = true;
-    _maybeFinish();
-  });
-  toolbox.destroy();
 
   function _maybeFinish() {
     if (debuggerClosed && debuggerDisconnected) {
@@ -118,15 +100,20 @@ function closeDebuggerAndFinish(aRemoteFlag, aCallback, aWindow) {
     }
   }
 
-  // if (!aRemoteFlag) {
-  //   dbg.getDebugger().close(function() {
-  //     debuggerClosed = true;
-  //     _maybeFinish();
-  //   });
-  // } else {
-  //   debuggerClosed = true;
-  //   dbg.getRemoteDebugger().close();
-  // }
+  debuggerUI.chromeWindow.addEventListener("Debugger:Shutdown", function cleanup() {
+    debuggerUI.chromeWindow.removeEventListener("Debugger:Shutdown", cleanup, false);
+    debuggerDisconnected = true;
+    _maybeFinish();
+  }, false);
+  if (!aRemoteFlag) {
+    debuggerUI.getDebugger().close(function() {
+      debuggerClosed = true;
+      _maybeFinish();
+    });
+  } else {
+    debuggerClosed = true;
+    debuggerUI.getRemoteDebugger().close();
+  }
 }
 
 function get_tab_actor_for_url(aClient, aURL, aCallback) {
@@ -142,7 +129,7 @@ function get_tab_actor_for_url(aClient, aURL, aCallback) {
 
 function attach_tab_actor_for_url(aClient, aURL, aCallback) {
   get_tab_actor_for_url(aClient, aURL, function(actor) {
-    aClient.attachTab(actor.actor, function(aResponse) {
+    aClient.request({ to: actor.actor, type: "attach" }, function(aResponse) {
       aCallback(actor, aResponse);
     });
   });
@@ -150,44 +137,45 @@ function attach_tab_actor_for_url(aClient, aURL, aCallback) {
 
 function attach_thread_actor_for_url(aClient, aURL, aCallback) {
   attach_tab_actor_for_url(aClient, aURL, function(aTabActor, aResponse) {
-    aClient.attachThread(actor.threadActor, function(aResponse, aThreadClient) {
+    aClient.request({ "to": actor.threadActor, "type": "attach" }, function(aResponse) {
       // We don't care about the pause right now (use
       // get_actor_for_url() if you do), so resume it.
-      aThreadClient.resume(function(aResponse) {
+      aClient.request({ to: actor.threadActor, type: "resume" }, function(aResponse) {
         aCallback(actor);
       });
     });
   });
 }
 
-function wait_for_connect_and_resume(aOnDebugging, aTab) {
-  let target = TargetFactory.forTab(aTab);
-  let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
-  dbg.once("connected", function dbgConnected() {
+function wait_for_connect_and_resume(aOnDebugging, aWindow) {
+  let targetWindow = aWindow || window;
+  let targetDocument = targetWindow.document;
+
+  targetDocument.addEventListener("Debugger:Connected", function dbgConnected(aEvent) {
+    targetDocument.removeEventListener("Debugger:Connected", dbgConnected, true);
+
     // Wait for the initial resume...
-    dbg.panelWin.gClient.addOneTimeListener("resumed", function() {
+    aEvent.target.ownerDocument.defaultView.gClient.addOneTimeListener("resumed", function() {
       aOnDebugging();
     });
-  });
+  }, true);
 }
 
 function debug_tab_pane(aURL, aOnDebugging) {
   let tab = addTab(aURL, function() {
     gBrowser.selectedTab = gTab;
-    let debuggee = gBrowser.selectedTab.linkedBrowser.contentWindow.wrappedJSObject;
+    let debuggee = tab.linkedBrowser.contentWindow.wrappedJSObject;
 
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let toolbox = gDevTools.openToolboxForTab(target, "jsdebugger");
-    toolbox.once("jsdebugger-ready", function dbgReady() {
-      let dbg = gDevTools.getPanelForTarget("jsdebugger", target);
-      dbg.once("connected", function() {
-        // Wait for the initial resume...
-        dbg.panelWin.gClient.addOneTimeListener("resumed", function() {
-          dbg._view.Variables.lazyEmpty = false;
-          aOnDebugging(tab, debuggee, dbg);
-        });
+    let pane = DebuggerUI.toggleDebugger();
+    pane._frame.addEventListener("Debugger:Connected", function dbgConnected() {
+      pane._frame.removeEventListener("Debugger:Connected", dbgConnected, true);
+
+      // Wait for the initial resume...
+      pane.contentWindow.gClient.addOneTimeListener("resumed", function() {
+        pane.contentWindow.DebuggerView.Variables.lazyEmpty = false;
+        aOnDebugging(tab, debuggee, pane);
       });
-    });
+    }, true);
   });
 }
 
@@ -204,7 +192,7 @@ function debug_remote(aURL, aOnDebugging, aBeforeTabAdded) {
       win._dbgwin.removeEventListener("Debugger:Connected", dbgConnected, true);
 
       // Wait for the initial resume...
-      win.panelWin.gClient.addOneTimeListener("resumed", function() {
+      win.contentWindow.gClient.addOneTimeListener("resumed", function() {
         win._dbgwin.DebuggerView.Variables.lazyEmpty = false;
         aOnDebugging(tab, debuggee, win);
       });
diff --git a/browser/devtools/framework/Makefile.in b/browser/devtools/framework/Makefile.in
deleted file mode 100644
index df206dadd999..000000000000
--- a/browser/devtools/framework/Makefile.in
+++ /dev/null
@@ -1,18 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-TEST_DIRS += test
-
-include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
diff --git a/browser/devtools/framework/Sidebar.jsm b/browser/devtools/framework/Sidebar.jsm
deleted file mode 100644
index ad77f3462172..000000000000
--- a/browser/devtools/framework/Sidebar.jsm
+++ /dev/null
@@ -1,191 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const Cc = Components.classes;
-const Cu = Components.utils;
-const Ci = Components.interfaces;
-
-this.EXPORTED_SYMBOLS = ["ToolSidebar"];
-
-Cu.import("resource:///modules/devtools/EventEmitter.jsm");
-
-const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-/**
- * ToolSidebar provides methods to register tabs in the sidebar.
- * It's assumed that the sidebar contains a xul:tabbox.
- *
- * @param {Node} tabbox
- *  <tabbox> node;
- * @param {ToolPanel} panel
- *  Related ToolPanel instance;
- * @param {Boolean} showTabstripe
- *  Show the tabs.
- */
-this.ToolSidebar = function ToolSidebar(tabbox, panel, showTabstripe=true)
-{
-  new EventEmitter(this);
-
-  this._tabbox = tabbox;
-  this._panelDoc = this._tabbox.ownerDocument;
-  this._toolPanel = panel;
-
-  this._tabbox.tabpanels.addEventListener("select", this, true);
-
-  this._tabs = new Map();
-
-  if (!showTabstripe) {
-    this._tabbox.setAttribute("hidetabs", "true");
-  }
-}
-
-ToolSidebar.prototype = {
-  /**
-   * Register a tab. A tab is a document.
-   * The document must have a title, which will be used as the name of the tab.
-   *
-   * @param {string} tab uniq id
-   * @param {string} url
-   */
-  addTab: function ToolSidebar_addTab(id, url, selected=false) {
-    let iframe = this._panelDoc.createElementNS(XULNS, "iframe");
-    iframe.className = "iframe-" + id;
-    iframe.setAttribute("flex", "1");
-    iframe.setAttribute("src", url);
-
-    let tab = this._tabbox.tabs.appendItem();
-
-    let onIFrameLoaded = function() {
-      tab.setAttribute("label", iframe.contentDocument.title);
-      iframe.removeEventListener("DOMContentLoaded", onIFrameLoaded, true);
-      if ("setPanel" in iframe.contentWindow) {
-        iframe.contentWindow.setPanel(this._toolPanel, iframe);
-      }
-      this.emit(id + "-ready");
-    }.bind(this);
-
-    iframe.addEventListener("DOMContentLoaded", onIFrameLoaded, true);
-
-    let tabpanel = this._panelDoc.createElementNS(XULNS, "tabpanel");
-    tabpanel.setAttribute("id", "sidebar-panel-" + id);
-    tabpanel.appendChild(iframe);
-    this._tabbox.tabpanels.appendChild(tabpanel);
-
-    tab.linkedPanel = "sidebar-panel-" + id;
-
-    // We store the index of this tab.
-    this._tabs.set(id, tab);
-
-    if (selected) {
-      // For some reason I don't understand, if we call this.select in this
-      // event loop (after inserting the tab), the tab will never get the
-      // the "selected" attribute set to true.
-      this._panelDoc.defaultView.setTimeout(function() {
-        this.select(id);
-      }.bind(this), 0);
-    }
-
-    this.emit("new-tab-registered", id);
-  },
-
-  /**
-   * Select a specific tab.
-   */
-  select: function ToolSidebar_select(id) {
-    let tab = this._tabs.get(id);
-    if (tab) {
-      this._tabbox.selectedTab = tab;
-    }
-  },
-
-  /**
-   * Return the id of the selected tab.
-   */
-  getCurrentTabID: function ToolSidebar_getCurrentTabID() {
-    let currentID = null;
-    for (let [id, tab] of this._tabs) {
-      if (this._tabbox.tabs.selectedItem == tab) {
-        currentID = id;
-        break;
-      }
-    }
-    return currentID;
-  },
-
-  /**
-   * Event handler.
-   */
-  handleEvent: function ToolSidebar_eventHandler(event) {
-    if (event.type == "select") {
-      let previousTool = this._currentTool;
-      this._currentTool = this.getCurrentTabID();
-      if (previousTool) {
-        this.emit(previousTool + "-unselected");
-      }
-
-      this.emit(this._currentTool + "-selected");
-      this.emit("select", this._currentTool);
-    }
-  },
-
-
-  /**
-   * Toggle sidebar's visibility state.
-   */
-  toggle: function ToolSidebar_toggle() {
-    if (this._tabbox.hasAttribute("hidden")) {
-      this.show();
-    } else {
-      this.hide();
-    }
-  },
-
-  /**
-   * Show the sidebar.
-   */
-  show: function ToolSidebar_show() {
-    this._tabbox.removeAttribute("hidden");
-  },
-
-  /**
-   * Show the sidebar.
-   */
-  hide: function ToolSidebar_hide() {
-    this._tabbox.setAttribute("hidden", "true");
-  },
-
-  /**
-   * Return the window containing the tab content.
-   */
-  getWindowForTab: function ToolSidebar_getWindowForTab(id) {
-    if (!this._tabs.has(id)) {
-      return null;
-    }
-
-    let panel = this._panelDoc.getElementById(this._tabs.get(id).linkedPanel);
-    return panel.firstChild.contentWindow;
-  },
-
-  /**
-   * Clean-up.
-   */
-  destroy: function ToolSidebar_destroy() {
-    this._tabbox.removeEventListener("select", this, true);
-
-    while (this._tabbox.tabpanels.hasChildNodes()) {
-      this._tabbox.tabpanels.removeChild(this._tabbox.tabpanels.firstChild);
-    }
-
-    while (this._tabbox.tabs.hasChildNodes()) {
-      this._tabbox.tabs.removeChild(this._tabbox.tabs.firstChild);
-    }
-
-    this._tabs = null;
-    this._tabbox = null;
-    this._panelDoc = null;
-    this._toolPanel = null;
-  },
-}
diff --git a/browser/devtools/framework/Target.jsm b/browser/devtools/framework/Target.jsm
deleted file mode 100644
index 2438a16b94ea..000000000000
--- a/browser/devtools/framework/Target.jsm
+++ /dev/null
@@ -1,385 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-this.EXPORTED_SYMBOLS = [ "TargetFactory" ];
-
-const Cu = Components.utils;
-const Ci = Components.interfaces;
-Cu.import("resource:///modules/devtools/EventEmitter.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-
-const targets = new WeakMap();
-
-/**
- * Functions for creating Targets
- */
-this.TargetFactory = {
-  /**
-   * Construct a Target
-   * @param {XULTab} tab
-   *        The tab to use in creating a new target
-   * @return A target object
-   */
-  forTab: function TF_forTab(tab) {
-    let target = targets.get(tab);
-    if (target == null) {
-      target = new TabTarget(tab);
-      targets.set(tab, target);
-    }
-    return target;
-  },
-
-  /**
-   * Creating a target for a tab that is being closed is a problem because it
-   * allows a leak as a result of coming after the close event which normally
-   * clears things up. This function allows us to ask if there is a known
-   * target for a tab without creating a target
-   * @return true/false
-   */
-  isKnownTab: function TF_isKnownTab(tab) {
-    return targets.has(tab);
-  },
-
-  /**
-   * Construct a Target
-   * @param {nsIDOMWindow} window
-   *        The chromeWindow to use in creating a new target
-   * @return A target object
-   */
-  forWindow: function TF_forWindow(window) {
-    let target = targets.get(window);
-    if (target == null) {
-      target = new WindowTarget(window);
-      targets.set(window, target);
-    }
-    return target;
-  },
-
-  /**
-   * Construct a Target for a remote global
-   * @param {Object} form
-   *        The serialized form of a debugging protocol actor.
-   * @param {DebuggerClient} client
-   *        The debuger client instance to communicate with the server.
-   * @param {boolean} chrome
-   *        A flag denoting that the debugging target is the remote process as a
-   *        whole and not a single tab.
-   * @return A target object
-   */
-  forRemote: function TF_forRemote(form, client, chrome) {
-    let target = targets.get(form);
-    if (target == null) {
-      target = new RemoteTarget(form, client, chrome);
-      targets.set(form, target);
-    }
-    return target;
-  },
-
-  /**
-   * Get all of the targets known to some browser instance (local if null)
-   * @return An array of target objects
-   */
-  allTargets: function TF_allTargets() {
-    let windows = [];
-    let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                       .getService(Components.interfaces.nsIWindowMediator);
-    let en = wm.getXULWindowEnumerator(null);
-    while (en.hasMoreElements()) {
-      windows.push(en.getNext());
-    }
-
-    return windows.map(function(window) {
-      return TargetFactory.forWindow(window);
-    });
-  },
-};
-
-/**
- * The 'version' property allows the developer tools equivalent of browser
- * detection. Browser detection is evil, however while we don't know what we
- * will need to detect in the future, it is an easy way to postpone work.
- * We should be looking to use 'supports()' in place of version where
- * possible.
- */
-function getVersion() {
-  // FIXME: return something better
-  return 20;
-}
-
-/**
- * A better way to support feature detection, but we're not yet at a place
- * where we have the features well enough defined for this to make lots of
- * sense.
- */
-function supports(feature) {
-  // FIXME: return something better
-  return false;
-};
-
-/**
- * A Target represents something that we can debug. Targets are generally
- * read-only. Any changes that you wish to make to a target should be done via
- * a Tool that attaches to the target. i.e. a Target is just a pointer saying
- * "the thing to debug is over there".
- *
- * Providing a generalized abstraction of a web-page or web-browser (available
- * either locally or remotely) is beyond the scope of this class (and maybe
- * also beyond the scope of this universe) However Target does attempt to
- * abstract some common events and read-only properties common to many Tools.
- *
- * Supported read-only properties:
- * - name, isRemote, url
- *
- * Target extends EventEmitter and provides support for the following events:
- * - close: The target window has been closed. All tools attached to this
- *     target should close. This event is not currently cancelable.
- * - navigate: The target window has navigated to a different URL
- *
- * Optional events:
- * - will-navigate: The target window will navigate to a different URL
- * - hidden: The target is not visible anymore (for TargetTab, another tab is selected)
- * - visible: The target is visible (for TargetTab, tab is selected)
- *
- * Target also supports 2 functions to help allow 2 different versions of
- * Firefox debug each other. The 'version' property is the equivalent of
- * browser detection - simple and easy to implement but gets fragile when things
- * are not quite what they seem. The 'supports' property is the equivalent of
- * feature detection - harder to setup, but more robust long-term.
- *
- * Comparing Targets: 2 instances of a Target object can point at the same
- * thing, so t1 !== t2 and t1 != t2 even when they represent the same object.
- * To compare to targets use 't1.equals(t2)'.
- */
-function Target() {
-  throw new Error("Use TargetFactory.newXXX or Target.getXXX to create a Target in place of 'new Target()'");
-}
-
-Object.defineProperty(Target.prototype, "version", {
-  get: getVersion,
-  enumerable: true
-});
-
-
-/**
- * A TabTarget represents a page living in a browser tab. Generally these will
- * be web pages served over http(s), but they don't have to be.
- */
-function TabTarget(tab) {
-  new EventEmitter(this);
-  this._tab = tab;
-  this._setupListeners();
-}
-
-TabTarget.prototype = {
-  _webProgressListener: null,
-
-  supports: supports,
-  get version() { return getVersion(); },
-
-  get tab() {
-    return this._tab;
-  },
-
-  get name() {
-    return this._tab.linkedBrowser.contentDocument.title;
-  },
-
-  get url() {
-    return this._tab.linkedBrowser.contentDocument.location.href;
-  },
-
-  get isRemote() {
-    return false;
-  },
-
-  /**
-   * Listen to the different tabs events.
-   */
-  _setupListeners: function TabTarget__setupListeners() {
-    this._webProgressListener = new TabWebProgressListener(this);
-    this.tab.linkedBrowser.addProgressListener(this._webProgressListener);
-    this.tab.addEventListener("TabClose", this);
-    this.tab.parentNode.addEventListener("TabSelect", this);
-  },
-
-  /**
-   * Handle tabs events.
-   */
-  handleEvent: function (event) {
-    switch (event.type) {
-      case "TabClose":
-        this.destroy();
-        break;
-      case "TabSelect":
-        if (this.tab.selected) {
-          this.emit("visible", event);
-        } else {
-          this.emit("hidden", event);
-        }
-        break;
-    }
-  },
-
-
-  /**
-   * Target is not alive anymore.
-   */
-  destroy: function() {
-    if (this._destroyed) {
-      return;
-    }
-    this.tab.linkedBrowser.removeProgressListener(this._webProgressListener)
-    this._webProgressListener.target = null;
-    this._webProgressListener = null;
-    this.tab.removeEventListener("TabClose", this);
-    this.tab.parentNode.removeEventListener("TabSelect", this);
-    this._destroyed = true;
-    this.emit("close");
-
-    targets.delete(this._tab);
-    this._tab = null;
-  },
-
-  toString: function() {
-    return 'TabTarget:' + this.tab;
-  },
-};
-
-
-/**
- * WebProgressListener for TabTarget.
- *
- * @param object aTarget
- *        The TabTarget instance to work with.
- */
-function TabWebProgressListener(aTarget) {
-  this.target = aTarget;
-}
-
-TabWebProgressListener.prototype = {
-  target: null,
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener, Ci.nsISupportsWeakReference]),
-
-  onStateChange: function TWPL_onStateChange(progress, request, flag, status) {
-    let isStart = flag & Ci.nsIWebProgressListener.STATE_START;
-    let isDocument = flag & Ci.nsIWebProgressListener.STATE_IS_DOCUMENT;
-    let isNetwork = flag & Ci.nsIWebProgressListener.STATE_IS_NETWORK;
-    let isRequest = flag & Ci.nsIWebProgressListener.STATE_IS_REQUEST;
-
-    // Skip non-interesting states.
-    if (!isStart || !isDocument || !isRequest || !isNetwork) {
-      return;
-    }
-
-    if (this.target) {
-      this.target.emit("will-navigate", request);
-    }
-  },
-
-  onProgressChange: function() {},
-  onSecurityChange: function() {},
-  onStatusChange: function() {},
-
-  onLocationChange: function TwPL_onLocationChange(webProgress) {
-    let window = webProgress.DOMWindow;
-    if (this.target) {
-      this.target.emit("navigate", window);
-    }
-  },
-};
-
-
-/**
- * A WindowTarget represents a page living in a xul window or panel. Generally
- * these will have a chrome: URL
- */
-function WindowTarget(window) {
-  new EventEmitter(this);
-  this._window = window;
-}
-
-WindowTarget.prototype = {
-  supports: supports,
-  get version() { return getVersion(); },
-
-  get window() {
-    return this._window;
-  },
-
-  get name() {
-    return this._window.document.title;
-  },
-
-  get url() {
-    return this._window.document.location.href;
-  },
-
-  get isRemote() {
-    return false;
-  },
-
-  toString: function() {
-    return 'WindowTarget:' + this.window;
-  },
-};
-
-/**
- * A RemoteTarget represents a page living in a remote Firefox instance.
- */
-function RemoteTarget(form, client, chrome) {
-  new EventEmitter(this);
-  this._client = client;
-  this._form = form;
-  this._chrome = chrome;
-
-  this.destroy = this.destroy.bind(this);
-  this.client.addListener("tabDetached", this.destroy);
-
-  this._onTabNavigated = function onRemoteTabNavigated() {
-    this.emit("navigate");
-  }.bind(this);
-  this.client.addListener("tabNavigated", this._onTabNavigated);
-}
-
-RemoteTarget.prototype = {
-  supports: supports,
-  get version() getVersion(),
-
-  get isRemote() true,
-
-  get chrome() this._chrome,
-
-  get name() this._form._title,
-
-  get url() this._form._url,
-
-  get client() this._client,
-
-  get form() this._form,
-
-  /**
-   * Target is not alive anymore.
-   */
-  destroy: function RT_destroy() {
-    if (this._destroyed) {
-      return;
-    }
-    this.client.removeListener("tabNavigated", this._onTabNavigated);
-    this.client.removeListener("tabDetached", this.destroy);
-
-    this._client.close(function onClosed() {
-      this._client = null;
-      this._destroyed = true;
-      this.emit("close");
-    }.bind(this));
-  },
-
-  toString: function() {
-    return 'RemoteTarget:' + this.form.actor;
-  },
-};
diff --git a/browser/devtools/framework/ToolDefinitions.jsm b/browser/devtools/framework/ToolDefinitions.jsm
deleted file mode 100644
index ef794b4a548c..000000000000
--- a/browser/devtools/framework/ToolDefinitions.jsm
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-this.EXPORTED_SYMBOLS = [ "defaultTools" ];
-
-Components.utils.import("resource:///modules/WebConsolePanel.jsm");
-Components.utils.import("resource:///modules/devtools/DebuggerPanel.jsm");
-Components.utils.import("resource:///modules/devtools/StyleEditorDefinition.jsm");
-Components.utils.import("resource:///modules/devtools/InspectorDefinition.jsm");
-
-this.defaultTools = [
-  StyleEditorDefinition,
-  WebConsoleDefinition,
-  DebuggerDefinition,
-  InspectorDefinition,
-];
diff --git a/browser/devtools/framework/Toolbox.jsm b/browser/devtools/framework/Toolbox.jsm
deleted file mode 100644
index db5ed26b7b55..000000000000
--- a/browser/devtools/framework/Toolbox.jsm
+++ /dev/null
@@ -1,523 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/devtools/EventEmitter.jsm");
-Cu.import("resource:///modules/devtools/ToolboxHosts.jsm");
-Cu.import("resource:///modules/devtools/gcli.jsm");
-Cu.import('resource://gre/modules/XPCOMUtils.jsm');
-
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource:///modules/devtools/gDevTools.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "CommandUtils",
-                                  "resource:///modules/devtools/DeveloperToolbar.jsm");
-
-Components.utils.import("resource://gre/modules/devtools/Require.jsm");
-
-let Requisition = require('gcli/cli').Requisition;
-let CommandOutputManager = require('gcli/canon').CommandOutputManager;
-
-this.EXPORTED_SYMBOLS = [ "Toolbox" ];
-
-/**
- * A "Toolbox" is the component that holds all the tools for one specific
- * target. Visually, it's a document that includes the tools tabs and all
- * the iframes where the tool panels will be living in.
- *
- * @param {object} target
- *        The object the toolbox is debugging.
- * @param {Toolbox.HostType} hostType
- *        Type of host that will host the toolbox (e.g. sidebar, window)
- * @param {string} selectedTool
- *        Tool to select initially
- */
-this.Toolbox = function Toolbox(target, hostType, selectedTool) {
-  this._target = target;
-  this._toolPanels = new Map();
-
-  this._onLoad = this._onLoad.bind(this);
-  this._toolRegistered = this._toolRegistered.bind(this);
-  this._toolUnregistered = this._toolUnregistered.bind(this);
-  this.destroy = this.destroy.bind(this);
-
-  this._target.once("close", this.destroy);
-
-  if (!hostType) {
-    hostType = Services.prefs.getCharPref(this._prefs.LAST_HOST);
-  }
-  if (!selectedTool) {
-    selectedTool = Services.prefs.getCharPref(this._prefs.LAST_TOOL);
-  }
-  let definitions = gDevTools.getToolDefinitions();
-  if (!definitions.get(selectedTool)) {
-    selectedTool = "webconsole";
-  }
-  this._defaultToolId = selectedTool;
-
-  this._host = this._createHost(hostType);
-
-  new EventEmitter(this);
-
-  gDevTools.on("tool-registered", this._toolRegistered);
-  gDevTools.on("tool-unregistered", this._toolUnregistered);
-}
-
-/**
- * The toolbox can be 'hosted' either embedded in a browser window
- * or in a separate window.
- */
-Toolbox.HostType = {
-  BOTTOM: "bottom",
-  SIDE: "side",
-  WINDOW: "window"
-}
-
-Toolbox.prototype = {
-  _URL: "chrome://browser/content/devtools/framework/toolbox.xul",
-
-  _prefs: {
-    LAST_HOST: "devtools.toolbox.host",
-    LAST_TOOL: "devtools.toolbox.selectedTool",
-    SIDE_ENABLED: "devtools.toolbox.sideEnabled"
-  },
-
-  HostType: Toolbox.HostType,
-
-  /**
-   * Returns a *copy* of the _toolPanels collection.
-   *
-   * @return {Map} panels
-   *         All the running panels in the toolbox
-   */
-  getToolPanels: function TB_getToolPanels() {
-    let panels = new Map();
-
-    for (let [key, value] of this._toolPanels) {
-      panels.set(key, value);
-    }
-    return panels;
-  },
-
-  /**
-   * Get/alter the target of a Toolbox so we're debugging something different.
-   * See Target.jsm for more details.
-   * TODO: Do we allow |toolbox.target = null;| ?
-   */
-  get target() {
-    return this._target;
-  },
-
-  set target(value) {
-    this._target = value;
-  },
-
-  /**
-   * Get/alter the host of a Toolbox, i.e. is it in browser or in a separate
-   * tab. See HostType for more details.
-   */
-  get hostType() {
-    return this._host.type;
-  },
-
-  set hostType(value) {
-    this._switchToHost(value);
-  },
-
-  /**
-   * Get/alter the currently displayed tool.
-   */
-  get currentToolId() {
-    return this._currentToolId;
-  },
-
-  set currentToolId(value) {
-    this._currentToolId = value;
-  },
-
-  /**
-   * Get the iframe containing the toolbox UI.
-   */
-  get frame() {
-    return this._host.frame;
-  },
-
-  /**
-   * Shortcut to the document containing the toolbox UI
-   */
-  get doc() {
-    return this.frame.contentDocument;
-  },
-
-  /**
-   * Open the toolbox
-   */
-  open: function TBOX_open() {
-    this._host.once("ready", function(event, iframe) {
-      iframe.addEventListener("DOMContentLoaded", this._onLoad, true);
-      iframe.setAttribute("src", this._URL);
-    }.bind(this));
-
-    this._host.open();
-  },
-
-  /**
-   * Build the buttons for changing hosts. Called every time
-   * the host changes.
-   */
-  _buildDockButtons: function TBOX_createDockButtons() {
-    let dockBox = this.doc.getElementById("toolbox-dock-buttons");
-
-    while (dockBox.firstChild) {
-      dockBox.removeChild(dockBox.firstChild);
-    }
-
-    let sideEnabled = Services.prefs.getBoolPref(this._prefs.SIDE_ENABLED);
-
-    for each (let position in this.HostType) {
-      if (position == this.hostType ||
-         (!sideEnabled && position == this.HostType.SIDE)) {
-        continue;
-      }
-
-      let button = this.doc.createElement("toolbarbutton");
-      button.id = "toolbox-dock-" + position;
-      button.className = "toolbox-dock-button";
-      button.addEventListener("command", function(position) {
-        this.hostType = position;
-      }.bind(this, position));
-
-      dockBox.appendChild(button);
-    }
-  },
-
-  /**
-   * Onload handler for the toolbox's iframe
-   */
-  _onLoad: function TBOX_onLoad() {
-    this.frame.removeEventListener("DOMContentLoaded", this._onLoad, true);
-    this.isReady = true;
-
-    let closeButton = this.doc.getElementById("toolbox-close");
-    closeButton.addEventListener("command", this.destroy, true);
-
-    this._buildDockButtons();
-
-    this._buildTabs();
-    this._buildButtons(this.frame);
-
-    this.selectTool(this._defaultToolId);
-
-    this.emit("ready");
-  },
-
-  /**
-   * Add tabs to the toolbox UI for registered tools
-   */
-  _buildTabs: function TBOX_buildTabs() {
-    for (let [id, definition] of gDevTools.getToolDefinitions()) {
-      this._buildTabForTool(definition);
-    }
-  },
-
-  /**
-   * Add buttons to the UI as specified in the devtools.window.toolbarSpec pref
-   *
-   * @param {iframe} frame
-   *        The iframe to contain the buttons
-   */
-  _buildButtons: function TBOX_buildButtons(frame) {
-    let toolbarSpec = CommandUtils.getCommandbarSpec("devtools.toolbox.toolbarSpec");
-    let environment = { chromeDocument: frame.ownerDocument };
-    let requisition = new Requisition(environment);
-    requisition.commandOutputManager = new CommandOutputManager();
-
-    let buttons = CommandUtils.createButtons(toolbarSpec, this.doc, requisition);
-
-    let container = this.doc.getElementById("toolbox-buttons");
-    buttons.forEach(function(button) {
-      container.appendChild(button);
-    }.bind(this));
-  },
-
-  /**
-   * Build a tab for one tool definition and add to the toolbox
-   *
-   * @param {string} toolDefinition
-   *        Tool definition of the tool to build a tab for.
-   */
-  _buildTabForTool: function TBOX_buildTabForTool(toolDefinition) {
-    const MAX_ORDINAL = 99;
-    if (!toolDefinition.isTargetSupported(this._target)) {
-      return;
-    }
-
-    let tabs = this.doc.getElementById("toolbox-tabs");
-    let deck = this.doc.getElementById("toolbox-deck");
-
-    let id = toolDefinition.id;
-
-    let radio = this.doc.createElement("radio");
-    radio.setAttribute("label", toolDefinition.label);
-    radio.className = "toolbox-tab devtools-tab";
-    radio.id = "toolbox-tab-" + id;
-    radio.setAttribute("toolid", id);
-
-    let ordinal = (typeof toolDefinition.ordinal == "number") ?
-                  toolDefinition.ordinal : MAX_ORDINAL;
-    radio.setAttribute("ordinal", ordinal);
-
-    radio.addEventListener("command", function(id) {
-      this.selectTool(id);
-    }.bind(this, id));
-
-    let vbox = this.doc.createElement("vbox");
-    vbox.className = "toolbox-panel";
-    vbox.id = "toolbox-panel-" + id;
-
-    tabs.appendChild(radio);
-    deck.appendChild(vbox);
-  },
-
-  /**
-   * Switch to the tool with the given id
-   *
-   * @param {string} id
-   *        The id of the tool to switch to
-   */
-  selectTool: function TBOX_selectTool(id) {
-    if (!this.isReady) {
-      throw new Error("Can't select tool, wait for toolbox 'ready' event");
-    }
-    let tab = this.doc.getElementById("toolbox-tab-" + id);
-
-    if (!tab) {
-      throw new Error("No tool found");
-    }
-
-    let tabstrip = this.doc.getElementById("toolbox-tabs");
-
-    // select the right tab
-    let index = -1;
-    let tabs = tabstrip.childNodes;
-    for (let i = 0; i < tabs.length; i++) {
-      if (tabs[i] === tab) {
-        index = i;
-        break;
-      }
-    }
-    tabstrip.selectedIndex = index;
-
-    // and select the right iframe
-    let deck = this.doc.getElementById("toolbox-deck");
-    deck.selectedIndex = index;
-
-    let definition = gDevTools.getToolDefinitions().get(id);
-
-    let iframe = this.doc.getElementById("toolbox-panel-iframe-" + id);
-    if (!iframe) {
-      iframe = this.doc.createElement("iframe");
-      iframe.className = "toolbox-panel-iframe";
-      iframe.id = "toolbox-panel-iframe-" + id;
-      iframe.setAttribute("flex", 1);
-
-      let vbox = this.doc.getElementById("toolbox-panel-" + id);
-      vbox.appendChild(iframe);
-
-      let boundLoad = function() {
-        iframe.removeEventListener("DOMContentLoaded", boundLoad, true);
-        let panel = definition.build(iframe.contentWindow, this);
-        this._toolPanels.set(id, panel);
-
-        let panelReady = function() {
-          this.emit(id + "-ready", panel);
-          this.emit("select", id);
-          this.emit(id + "-selected", panel);
-          gDevTools.emit(id + "-ready", this, panel);
-        }.bind(this);
-
-        if (panel.isReady) {
-          panelReady();
-        } else {
-          panel.once("ready", panelReady);
-        }
-      }.bind(this);
-
-      iframe.addEventListener("DOMContentLoaded", boundLoad, true);
-      iframe.setAttribute("src", definition.url);
-    } else {
-      let panel = this._toolPanels.get(id);
-      // only emit 'select' event if the iframe has been loaded
-      if (panel) {
-        this.emit("select", id);
-        this.emit(id + "-selected", panel);
-      }
-    }
-
-    Services.prefs.setCharPref(this._prefs.LAST_TOOL, id);
-
-    this._currentToolId = id;
-  },
-
-  /**
-   * Create a host object based on the given host type.
-   *
-   * @param {string} hostType
-   *        The host type of the new host object
-   *
-   * @return {Host} host
-   *        The created host object
-   */
-  _createHost: function TBOX_createHost(hostType) {
-    let hostTab = this._getHostTab();
-    if (!Hosts[hostType]) {
-      throw new Error('Unknown hostType: '+ hostType);
-    }
-    let newHost = new Hosts[hostType](hostTab);
-
-    // clean up the toolbox if its window is closed
-    newHost.on("window-closed", this.destroy);
-
-    return newHost;
-  },
-
-  /**
-   * Switch to a new host for the toolbox UI. E.g.
-   * bottom, sidebar, separate window.
-   *
-   * @param {string} hostType
-   *        The host type of the new host object
-   */
-  _switchToHost: function TBOX_switchToHost(hostType) {
-    if (hostType == this._host.type) {
-      return;
-    }
-
-    let newHost = this._createHost(hostType);
-
-    newHost.once("ready", function(event, iframe) {
-      // change toolbox document's parent to the new host
-      iframe.QueryInterface(Components.interfaces.nsIFrameLoaderOwner);
-      iframe.swapFrameLoaders(this.frame);
-
-      this._host.off("window-closed", this.destroy);
-      this._host.destroy();
-
-      this._host = newHost;
-
-      Services.prefs.setCharPref(this._prefs.LAST_HOST, this._host.type);
-
-      this._buildDockButtons();
-
-      this.emit("host-changed");
-    }.bind(this));
-
-    newHost.open();
-  },
-
-  /**
-   * Get the most appropriate host tab, either the target or the current tab
-   */
-  _getHostTab: function TBOX_getHostTab() {
-    if (!this._target.isRemote && !this._target.isChrome) {
-      return this._target.tab;
-    } else {
-      let win = Services.wm.getMostRecentWindow("navigator:browser");
-      return win.gBrowser.selectedTab;
-    }
-  },
-
-  /**
-   * Handler for the tool-registered event.
-   * @param  {string} event
-   *         Name of the event ("tool-registered")
-   * @param  {string} toolId
-   *         Id of the tool that was registered
-   */
-  _toolRegistered: function TBOX_toolRegistered(event, toolId) {
-    let defs = gDevTools.getToolDefinitions();
-    let tool = defs.get(toolId);
-
-    this._buildTabForTool(tool);
-  },
-
-  /**
-   * Handler for the tool-unregistered event.
-   * @param  {string} event
-   *         Name of the event ("tool-unregistered")
-   * @param  {string} toolId
-   *         Id of the tool that was unregistered
-   */
-  _toolUnregistered: function TBOX_toolUnregistered(event, toolId) {
-    let radio = this.doc.getElementById("toolbox-tab-" + toolId);
-    let panel = this.doc.getElementById("toolbox-panel-" + toolId);
-
-    if (this._currentToolId == toolId) {
-      let nextToolName = null;
-      if (radio.nextSibling) {
-        nextToolName = radio.nextSibling.getAttribute("toolid");
-      }
-      if (radio.previousSibling) {
-        nextToolName = radio.previousSibling.getAttribute("toolid");
-      }
-      if (nextToolName) {
-        this.selectTool(nextToolName);
-      }
-    }
-
-    if (radio) {
-      radio.parentNode.removeChild(radio);
-    }
-
-    if (panel) {
-      panel.parentNode.removeChild(panel);
-    }
-
-    if (this._toolPanels.has(toolId)) {
-      let instance = this._toolPanels.get(toolId);
-      instance.destroy();
-      this._toolPanels.delete(toolId);
-    }
-  },
-
-
-  /**
-   * Get the toolbox's notification box
-   *
-   * @return The notification box element.
-   */
-  getNotificationBox: function TBOX_getNotificationBox() {
-    return this.doc.getElementById("toolbox-notificationbox");
-  },
-
-  /**
-   * Remove all UI elements, detach from target and clear up
-   */
-  destroy: function TBOX_destroy() {
-    if (this._destroyed) {
-      return;
-    }
-
-    // Remote targets need to be notified that the toolbox is being torn down.
-    if (this._target && this._target.isRemote) {
-      this._target.destroy();
-    }
-    this._target = null;
-
-    for (let [id, panel] of this._toolPanels) {
-      panel.destroy();
-    }
-
-    this._host.destroy();
-
-    gDevTools.off("tool-registered", this._toolRegistered);
-    gDevTools.off("tool-unregistered", this._toolUnregistered);
-
-    this._destroyed = true;
-    this.emit("destroyed");
-  }
-};
diff --git a/browser/devtools/framework/ToolboxHosts.jsm b/browser/devtools/framework/ToolboxHosts.jsm
deleted file mode 100644
index 23371c950e95..000000000000
--- a/browser/devtools/framework/ToolboxHosts.jsm
+++ /dev/null
@@ -1,208 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/devtools/EventEmitter.jsm");
-
-this.EXPORTED_SYMBOLS = [ "Hosts" ];
-
-/**
- * A toolbox host represents an object that contains a toolbox (e.g. the
- * sidebar or a separate window). Any host object should implement the
- * following functions:
- *
- * open() - create the UI and emit a 'ready' event when the UI is ready to use
- * destroy() - destroy the host's UI
- */
-
-this.Hosts = {
-  "bottom": BottomHost,
-  "side": SidebarHost,
-  "window": WindowHost
-}
-
-/**
- * Host object for the dock on the bottom of the browser
- */
-function BottomHost(hostTab) {
-  this.hostTab = hostTab;
-
-  new EventEmitter(this);
-}
-
-BottomHost.prototype = {
-  type: "bottom",
-
-  heightPref: "devtools.toolbox.footer.height",
-
-  /**
-   * Create a box at the bottom of the host tab.
-   */
-  open: function BH_open() {
-    let gBrowser = this.hostTab.ownerDocument.defaultView.gBrowser;
-    let ownerDocument = gBrowser.ownerDocument;
-
-    this._splitter = ownerDocument.createElement("splitter");
-    this._splitter.setAttribute("class", "devtools-horizontal-splitter");
-
-    this.frame = ownerDocument.createElement("iframe");
-    this.frame.id = "devtools-toolbox-bottom-iframe";
-    this.frame.height = Services.prefs.getIntPref(this.heightPref);
-
-    this._nbox = gBrowser.getNotificationBox(this.hostTab.linkedBrowser);
-    this._nbox.appendChild(this._splitter);
-    this._nbox.appendChild(this.frame);
-
-    let frameLoad = function() {
-      this.frame.removeEventListener("DOMContentLoaded", frameLoad, true);
-      this.emit("ready", this.frame);
-    }.bind(this);
-
-    this.frame.addEventListener("DOMContentLoaded", frameLoad, true);
-
-    // we have to load something so we can switch documents if we have to
-    this.frame.setAttribute("src", "about:blank");
-
-    focusTab(this.hostTab);
-  },
-
-  /**
-   * Destroy the bottom dock.
-   */
-  destroy: function BH_destroy() {
-    if (this._destroyed) {
-      return;
-    }
-    this._destroyed = true;
-    Services.prefs.setIntPref(this.heightPref, this.frame.height);
-
-    this._nbox.removeChild(this._splitter);
-    this._nbox.removeChild(this.frame);
-  }
-}
-
-
-/**
- * Host object for the in-browser sidebar
- */
-function SidebarHost(hostTab) {
-  this.hostTab = hostTab;
-
-  new EventEmitter(this);
-}
-
-SidebarHost.prototype = {
-  type: "side",
-
-  widthPref: "devtools.toolbox.sidebar.width",
-
-  /**
-   * Create a box in the sidebar of the host tab.
-   */
-  open: function RH_open() {
-    let gBrowser = this.hostTab.ownerDocument.defaultView.gBrowser;
-    let ownerDocument = gBrowser.ownerDocument;
-
-    this._splitter = ownerDocument.createElement("splitter");
-    this._splitter.setAttribute("class", "devtools-side-splitter");
-
-    this.frame = ownerDocument.createElement("iframe");
-    this.frame.id = "devtools-toolbox-side-iframe";
-    this.frame.width = Services.prefs.getIntPref(this.widthPref);
-
-    this._sidebar = gBrowser.getSidebarContainer(this.hostTab.linkedBrowser);
-    this._sidebar.appendChild(this._splitter);
-    this._sidebar.appendChild(this.frame);
-
-    let frameLoad = function() {
-      this.frame.removeEventListener("DOMContentLoaded", frameLoad, true);
-      this.emit("ready", this.frame);
-    }.bind(this);
-
-    this.frame.addEventListener("DOMContentLoaded", frameLoad, true);
-    this.frame.setAttribute("src", "about:blank");
-
-    focusTab(this.hostTab);
-  },
-
-  /**
-   * Destroy the sidebar.
-   */
-  destroy: function RH_destroy() {
-    Services.prefs.setIntPref(this.widthPref, this.frame.width);
-
-    this._sidebar.removeChild(this._splitter);
-    this._sidebar.removeChild(this.frame);
-  }
-}
-
-/**
- * Host object for the toolbox in a separate window
- */
-function WindowHost() {
-  this._boundUnload = this._boundUnload.bind(this);
-
-  new EventEmitter(this);
-}
-
-WindowHost.prototype = {
-  type: "window",
-
-  WINDOW_URL: "chrome://browser/content/devtools/framework/toolbox-window.xul",
-
-  /**
-   * Create a new xul window to contain the toolbox.
-   */
-  open: function WH_open() {
-    let flags = "chrome,centerscreen,resizable,dialog=no";
-    let win = Services.ww.openWindow(null, this.WINDOW_URL, "_blank",
-                                     flags, null);
-
-    let frameLoad = function(event) {
-      win.removeEventListener("load", frameLoad, true);
-      this.frame = win.document.getElementById("toolbox-iframe");
-      this.emit("ready", this.frame);
-    }.bind(this);
-
-    win.addEventListener("load", frameLoad, true);
-    win.addEventListener("unload", this._boundUnload);
-
-    win.focus();
-
-    this._window = win;
-  },
-
-  /**
-   * Catch the user closing the window.
-   */
-  _boundUnload: function(event) {
-    if (event.target.location != this.WINDOW_URL) {
-      return;
-    }
-    this._window.removeEventListener("unload", this._boundUnload);
-
-    this.emit("window-closed");
-  },
-
-  /**
-   * Destroy the window.
-   */
-  destroy: function WH_destroy() {
-    this._window.removeEventListener("unload", this._boundUnload);
-    this._window.close();
-  }
-}
-
-/**
- *  Switch to the given tab in a browser and focus the browser window
- */
-function focusTab(tab) {
-  let browserWindow = tab.ownerDocument.defaultView;
-  browserWindow.focus();
-  browserWindow.gBrowser.selectedTab = tab;
-}
diff --git a/browser/devtools/framework/connect/connect.css b/browser/devtools/framework/connect/connect.css
deleted file mode 100644
index a7acc39936e9..000000000000
--- a/browser/devtools/framework/connect/connect.css
+++ /dev/null
@@ -1,87 +0,0 @@
-html {
-  background: url("chrome://browser/skin/newtab/noise.png");
-}
-
-body {
-  font-family: Arial;
-  padding: 20px;
-  border-radius: 3px;
-  max-width: 600px;
-  min-height: 400px;
-  margin: 10px auto 0;
-}
-
-label {
-  display: block;
-  margin: 10px;
-  font-size: 0;
-}
-
-label > span {
-  display: inline-block;
-  min-width: 150px;
-  font-size: 0.8rem;
-  text-align: right;
-  margin-right: 10px;
-}
-
-#submit {
-  margin-left: 160px;
-}
-
-
-#actors, #connection-form {
-  margin: 20px;
-}
-
-input {
-  border: 1px solid grey;
-}
-
-#connection-form,
-#connecting,
-#actors-list {
-  display: none;
-}
-
-body:not(.actors-mode):not(.connecting) > #connection-form {
-  display: block;
-}
-
-body.actors-mode > #actors-list {
-  display: block;
-}
-
-body.connecting > #connecting {
-  display: block;
-}
-
-#connecting {
-  text-align: center;
-}
-
-#throbber {
-  height: 7px; width: 7px;
-  border-radius: 50%;
-  background: black;
-  display: inline-block;
-  animation-duration: 0.6s;
-  animation-name: anim;
-  animation-direction: alternate;
-  animation-iteration-count: infinite;
-  animation-timing-function: linear;
-}
-@keyframes anim {to {
-    transform: scale(0.5) rotate(0.1deg);
-}}
-
-#actors {
-  padding-left: 0;
-  font-size: 0.9rem;
-}
-
-#actors > a {
-  display: block;
-  margin: 5px;
-  padding: 5px;
-}
diff --git a/browser/devtools/framework/connect/connect.js b/browser/devtools/framework/connect/connect.js
deleted file mode 100644
index 169e57ec0e80..000000000000
--- a/browser/devtools/framework/connect/connect.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const Cu = Components.utils;
-Cu.import("resource:///modules/devtools/Target.jsm");
-Cu.import("resource:///modules/devtools/Toolbox.jsm");
-Cu.import("resource:///modules/devtools/gDevTools.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
-
-let gClient;
-
-function submit() {
-  document.body.classList.add("connecting");
-
-  let host = document.getElementById("host").value;
-  let port = document.getElementById("port").value;
-  if (!host) {
-    host = Services.prefs.getCharPref("devtools.debugger.remote-host");
-  } else {
-    Services.prefs.setCharPref("devtools.debugger.remote-host", host);
-  }
-  if (!port) {
-    port = Services.prefs.getIntPref("devtools.debugger.remote-port");
-  } else {
-    Services.prefs.setIntPref("devtools.debugger.remote-port", port);
-  }
-
-  let transport = debuggerSocketConnect(host, port);
-  let client = gClient = new DebuggerClient(transport);
-
-  client.connect(function(aType, aTraits) {
-    client.listTabs(function(aResponse) {
-      document.body.classList.remove("connecting");
-      document.body.classList.add("actors-mode");
-
-      let parent = document.getElementById("actors");
-      let focusSet = false;
-
-      // Add Global Process debugging...
-      let globals = JSON.parse(JSON.stringify(aResponse));
-      delete globals.tabs;
-      delete globals.selected;
-      // ...only if there are appropriate actors (a 'from' property will always
-      // be there).
-      if (Object.keys(globals).length > 1) {
-        let a = document.createElement("a");
-        a.onclick = function() {
-          connect(globals, true);
-        }
-
-        a.title = a.textContent = "Remote process";
-        a.href = "#";
-
-        parent.appendChild(a);
-      }
-
-      // Add one entry for each open tab.
-      if (aResponse.tabs.length > 0) {
-        let header = document.createElement("div");
-        header.innerHTML = "Tabs:";
-        parent.appendChild(header);
-      }
-      for (let i = 0; i < aResponse.tabs.length; i++) {
-        let tab = aResponse.tabs[i];
-
-        let a = document.createElement("a");
-        a.onclick = function() {
-          connect(tab);
-        }
-
-        a.title = a.textContent = tab.title;
-        a.href = "#";
-
-        if (i == aResponse.selected) {
-          a.title += " [*]";
-          a.textContent = a.title;
-        }
-
-        parent.appendChild(a);
-
-        if (!focusSet) {
-          a.focus();
-          focusSet = true;
-        }
-      }
-    });
-  });
-}
-
-function connect(form, chrome=false) {
-  let target = TargetFactory.forRemote(form, gClient, chrome);
-  gDevTools.openToolbox(target, Toolbox.HostType.WINDOW, "webconsole");
-  window.close();
-}
diff --git a/browser/devtools/framework/connect/connect.xhtml b/browser/devtools/framework/connect/connect.xhtml
deleted file mode 100644
index 466170d07de9..000000000000
--- a/browser/devtools/framework/connect/connect.xhtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE html [
-<!ENTITY % connectionDTD SYSTEM "chrome://browser/locale/devtools/connection-screen.dtd" >
- %connectionDTD;
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <head>
-    <title>&title;</title>
-    <link rel="stylesheet" href="chrome://browser/content/devtools/connect.css" type="text/css"/>
-    <script type="application/javascript;version=1.8" src="connect.js"></script>
-  </head>
-  <body>
-    <p>
-    </p>
-    <section id="connection-form">
-      <form onsubmit="window.submit()" action="#">
-        <label>
-          <span>&host;</span>
-          <input id="host" type="text" placeholder="localhost"></input>
-        </label>
-        <label>
-          <span>&port;</span>
-          <input id="port" type="number" placeholder="6000"></input>
-        </label>
-        <label>
-          <input id="submit" type="submit" value="&connect;"></input>
-        </label>
-      </form>
-    </section>
-    <section id="actors-list">
-      <p>&availability;</p>
-      <ul id="actors"></ul>
-    </section>
-    <section id="connecting">
-      <p>&connecting;</p>
-      <div id="throbber"></div>
-    </section>
-  </body>
-</html>
diff --git a/browser/devtools/framework/gDevTools.jsm b/browser/devtools/framework/gDevTools.jsm
deleted file mode 100644
index 6c22ebdf3847..000000000000
--- a/browser/devtools/framework/gDevTools.jsm
+++ /dev/null
@@ -1,543 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-this.EXPORTED_SYMBOLS = [ "gDevTools", "DevTools", "DevToolsXULCommands" ];
-
-const Cu = Components.utils;
-const Ci = Components.interfaces;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/devtools/EventEmitter.jsm");
-Cu.import("resource:///modules/devtools/ToolDefinitions.jsm");
-Cu.import("resource:///modules/devtools/Toolbox.jsm");
-Cu.import("resource:///modules/devtools/Target.jsm");
-
-const FORBIDDEN_IDS = new Set("toolbox", "");
-
-/**
- * DevTools is a class that represents a set of developer tools, it holds a
- * set of tools and keeps track of open toolboxes in the browser.
- */
-this.DevTools = function DevTools() {
-  this._tools = new Map();
-  this._toolboxes = new Map();
-
-  // destroy() is an observer's handler so we need to preserve context.
-  this.destroy = this.destroy.bind(this);
-
-  this._trackedBrowserWindows = new Set();
-
-  // Bind _updateMenuCheckbox() to preserve context.
-  this._updateMenuCheckbox = this._updateMenuCheckbox.bind(this);
-
-  new EventEmitter(this);
-
-  Services.obs.addObserver(this.destroy, "quit-application", false);
-
-  /**
-   * Register the set of default tools
-   */
-  for (let definition of defaultTools) {
-    this.registerTool(definition);
-  }
-}
-
-DevTools.prototype = {
-  /**
-   * Register a new developer tool.
-   *
-   * A definition is a light object that holds different information about a
-   * developer tool. This object is not supposed to have any operational code.
-   * See it as a "manifest".
-   * The only actual code lives in the build() function, which will be used to
-   * start an instance of this tool.
-   *
-   * Each toolDefinition has the following properties:
-   * - id: Unique identifier for this tool (string|required)
-   * - killswitch: Property name to allow us to turn this tool on/off globally
-   *               (string|required) (TODO: default to devtools.{id}.enabled?)
-   * - icon: URL pointing to a graphic which will be used as the src for an
-   *         16x16 img tag (string|required)
-   * - url: URL pointing to a XUL/XHTML document containing the user interface
-   *        (string|required)
-   * - label: Localized name for the tool to be displayed to the user
-   *          (string|required)
-   * - build: Function that takes an iframe, which has been populated with the
-   *          markup from |url|, and also the toolbox containing the panel.
-   *          And returns an instance of ToolPanel (function|required)
-   */
-  registerTool: function DT_registerTool(toolDefinition) {
-    let toolId = toolDefinition.id;
-
-    if (!toolId || FORBIDDEN_IDS.has(toolId)) {
-      throw new Error("Invalid definition.id");
-    }
-
-    toolDefinition.killswitch = toolDefinition.killswitch ||
-      "devtools." + toolId + ".enabled";
-    this._tools.set(toolId, toolDefinition);
-
-    this._addToolToWindows(toolDefinition);
-
-    this.emit("tool-registered", toolId);
-  },
-
-  /**
-   * Removes all tools that match the given |toolId|
-   * Needed so that add-ons can remove themselves when they are deactivated
-   *
-   * @param {string} toolId
-   *        id of the tool to unregister
-   */
-  unregisterTool: function DT_unregisterTool(toolId) {
-    this._tools.delete(toolId);
-
-    this._removeToolFromWindows(toolId);
-
-    this.emit("tool-unregistered", toolId);
-  },
-
-  /**
-   * Allow ToolBoxes to get at the list of tools that they should populate
-   * themselves with.
-   *
-   * @return {Map} tools
-   *         A map of the the tool definitions registered in this instance
-   */
-  getToolDefinitions: function DT_getToolDefinitions() {
-    let tools = new Map();
-
-    for (let [key, value] of this._tools) {
-      let enabled;
-
-      try {
-        enabled = Services.prefs.getBoolPref(value.killswitch);
-      } catch(e) {
-        enabled = true;
-      }
-
-      if (enabled) {
-        tools.set(key, value);
-      }
-    }
-    return tools;
-  },
-
-  /**
-   * Create a toolbox to debug |target| using a window displayed in |hostType|
-   * (optionally with |defaultToolId| opened)
-   *
-   * @param {Target} target
-   *         The target the toolbox will debug
-   * @param {Toolbox.HostType} hostType
-   *        The type of host (bottom, top, side)
-   * @param {string} defaultToolId
-   *        The id of the initial tool to show
-   *
-   * @return {Toolbox} toolbox
-   *        The toolbox that was opened
-   */
-  openToolbox: function DT_openToolbox(target, hostType, defaultToolId) {
-    if (this._toolboxes.has(target)) {
-      // only allow one toolbox per target
-      return this._toolboxes.get(target);
-    }
-
-    let tb = new Toolbox(target, hostType, defaultToolId);
-
-    this._toolboxes.set(target, tb);
-    tb.once("destroyed", function() {
-      this._toolboxes.delete(target);
-      this._updateMenuCheckbox();
-      this.emit("toolbox-destroyed", target);
-    }.bind(this));
-
-    tb.once("ready", function() {
-      this.emit("toolbox-ready", tb);
-      this._updateMenuCheckbox();
-    }.bind(this));
-
-    tb.open();
-
-    return tb;
-  },
-
-  /**
-   * Close the toolbox for a given target
-   */
-  closeToolbox: function DT_closeToolbox(target) {
-    let toolbox = this._toolboxes.get(target);
-    if (toolbox == null) {
-      return;
-    }
-    toolbox.destroy();
-  },
-
-  /**
-   * Open the toolbox for a specific target (not tab).
-   * FIXME: We should probably merge this function and openToolbox
-   *
-   * @param  {Target} target
-   *         The target that the toolbox should be debugging
-   * @param  {String} toolId
-   *         The id of the tool to open
-   *
-   * @return {Toolbox} toolbox
-   *         The toolbox that has been opened
-   */
-  openToolboxForTab: function DT_openToolboxForTab(target, toolId) {
-    let tb = this.getToolboxForTarget(target);
-
-    if (tb) {
-      tb.selectTool(toolId);
-    } else {
-      tb = this.openToolbox(target, null, toolId);
-    }
-    return tb;
-  },
-
-  /**
-   * This function is for the benefit of command#Tools:DevToolbox in
-   * browser/base/content/browser-sets.inc and should not be used outside
-   * of there
-   */
-  toggleToolboxCommand: function(gBrowser, toolId=null) {
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    this.toggleToolboxForTarget(target, toolId);
-  },
-
-  /**
-   * Toggle a toolbox for the given target.
-   *
-   * @param  {Target} target
-   *         The target the toolbox is debugging
-   * @param  {string} toolId
-   *         The id of the tool to show in the toolbox, if it's to be opened.
-   */
-  toggleToolboxForTarget: function DT_toggleToolboxForTarget(target, toolId) {
-    let tb = this.getToolboxForTarget(target);
-
-    if (tb /* FIXME: && tool is showing */ ) {
-      tb.destroy();
-    } else {
-      this.openToolboxForTab(target, toolId);
-    }
-  },
-
-  /**
-   * Return the toolbox for a given target.
-   *
-   * @param  {object} target
-   *         Target value e.g. the target that owns this toolbox
-   *
-   * @return {Toolbox} toolbox
-   *         The toobox that is debugging the given target
-   */
-  getToolboxForTarget: function DT_getToolboxForTarget(target) {
-    return this._toolboxes.get(target);
-  },
-
-  /**
-   * Return a tool panel for a given tool and target.
-   *
-   * @param  {String} toolId
-   *         The id of the tool to open.
-   * @param  {object} target
-   *         The toolbox's target.
-   *
-   * @return {ToolPanel} panel
-   *         Panel for the tool with the toolid
-   */
-  getPanelForTarget: function DT_getPanelForTarget(toolId, target) {
-    let toolbox = this.getToolboxForTarget(target);
-    if (!toolbox) {
-      return undefined;
-    }
-    return toolbox.getToolPanels().get(toolId);
-  },
-
-  /**
-   * Add this DevTools's presence to a browser window's document
-   *
-   * @param  {XULDocument} doc
-   *         The document to which menuitems and handlers are to be added
-   */
-  registerBrowserWindow: function DT_registerBrowserWindow(win) {
-    this._trackedBrowserWindows.add(win);
-    this._addAllToolsToMenu(win.document);
-
-    let tabContainer = win.document.getElementById("tabbrowser-tabs")
-    tabContainer.addEventListener("TabSelect", this._updateMenuCheckbox, false);
-  },
-
-  /**
-   * Add the menuitem for a tool to all open browser windows.
-   *
-   * @param {object} toolDefinition
-   *        properties of the tool to add
-   */
-  _addToolToWindows: function DT_addToolToWindows(toolDefinition) {
-    for (let win of this._trackedBrowserWindows) {
-      this._addToolToMenu(toolDefinition, win.document);
-    }
-  },
-
-  /**
-   * Add all tools to the developer tools menu of a window.
-   *
-   * @param {XULDocument} doc
-   *        The document to which the tool items are to be added.
-   */
-  _addAllToolsToMenu: function DT_addAllToolsToMenu(doc) {
-    let fragCommands = doc.createDocumentFragment();
-    let fragKeys = doc.createDocumentFragment();
-    let fragBroadcasters = doc.createDocumentFragment();
-    let fragAppMenuItems = doc.createDocumentFragment();
-    let fragMenuItems = doc.createDocumentFragment();
-
-    for (let [key, toolDefinition] of this._tools) {
-      let frags = this._addToolToMenu(toolDefinition, doc, true);
-
-      if (!frags) {
-        return;
-      }
-
-      let [cmd, key, bc, appmenuitem, menuitem] = frags;
-
-      fragCommands.appendChild(cmd);
-      if (key) {
-        fragKeys.appendChild(key);
-      }
-      fragBroadcasters.appendChild(bc);
-      fragAppMenuItems.appendChild(appmenuitem);
-      fragMenuItems.appendChild(menuitem);
-    }
-
-    let mcs = doc.getElementById("mainCommandSet");
-    mcs.appendChild(fragCommands);
-
-    let mks = doc.getElementById("mainKeyset");
-    mks.appendChild(fragKeys);
-
-    let mbs = doc.getElementById("mainBroadcasterSet");
-    mbs.appendChild(fragBroadcasters);
-
-    let amp = doc.getElementById("appmenu_webDeveloper_popup");
-    if (amp) {
-      let amps = doc.getElementById("appmenu_devtools_separator");
-      amp.insertBefore(fragAppMenuItems, amps);
-    }
-
-    let mp = doc.getElementById("menuWebDeveloperPopup");
-    let mps = doc.getElementById("menu_devtools_separator");
-    mp.insertBefore(fragMenuItems, mps);
-  },
-
-  /**
-   * Add a menu entry for a tool definition
-   *
-   * @param {string} toolDefinition
-   *        Tool definition of the tool to add a menu entry.
-   * @param {XULDocument} doc
-   *        The document to which the tool menu item is to be added.
-   * @param {Boolean} [noAppend]
-   *        Return an array of elements instead of appending them to the
-   *        document. Default is false.
-   */
-  _addToolToMenu: function DT_addToolToMenu(toolDefinition, doc, noAppend) {
-    let id = toolDefinition.id;
-
-    // Prevent multiple entries for the same tool.
-    if (doc.getElementById("Tools:" + id)) {
-      return;
-    }
-
-    let cmd = doc.createElement("command");
-    cmd.id = "Tools:" + id;
-    cmd.setAttribute("oncommand",
-        'gDevTools.toggleToolboxCommand(gBrowser, "' + id + '");');
-
-    let key = null;
-    if (toolDefinition.key) {
-      key = doc.createElement("key");
-      key.id = "key_" + id;
-
-      if (toolDefinition.key.startsWith("VK_")) {
-        key.setAttribute("keycode", toolDefinition.key);
-      } else {
-        key.setAttribute("key", toolDefinition.key);
-      }
-
-      key.setAttribute("oncommand",
-          'gDevTools.toggleToolboxCommand(gBrowser, "' + id + '");');
-      key.setAttribute("modifiers", toolDefinition.modifiers);
-    }
-
-    let bc = doc.createElement("broadcaster");
-    bc.id = "devtoolsMenuBroadcaster_" + id;
-    bc.setAttribute("label", toolDefinition.label);
-    bc.setAttribute("command", "Tools:" + id);
-
-    if (key) {
-      bc.setAttribute("key", "key_" + id);
-    }
-
-    let appmenuitem = doc.createElement("menuitem");
-    appmenuitem.id = "appmenuitem_" + id;
-    appmenuitem.setAttribute("observes", "devtoolsMenuBroadcaster_" + id);
-
-    let menuitem = doc.createElement("menuitem");
-    menuitem.id = "menuitem_" + id;
-    menuitem.setAttribute("observes", "devtoolsMenuBroadcaster_" + id);
-
-    if (toolDefinition.accesskey) {
-      menuitem.setAttribute("accesskey", toolDefinition.accesskey);
-    }
-
-    if (noAppend) {
-      return [cmd, key, bc, appmenuitem, menuitem];
-    } else {
-      let mcs = doc.getElementById("mainCommandSet");
-      mcs.appendChild(cmd);
-
-      if (key) {
-        let mks = doc.getElementById("mainKeyset");
-        mks.appendChild(key);
-      }
-
-      let mbs = doc.getElementById("mainBroadcasterSet");
-      mbs.appendChild(bc);
-
-      let amp = doc.getElementById("appmenu_webDeveloper_popup");
-      if (amp) {
-        let amps = doc.getElementById("appmenu_devtools_separator");
-        amp.insertBefore(appmenuitem, amps);
-      }
-
-      let mp = doc.getElementById("menuWebDeveloperPopup");
-      let mps = doc.getElementById("menu_devtools_separator");
-      mp.insertBefore(menuitem, mps);
-    }
-  },
-
-  /**
-   * Update the "Toggle Toolbox" checkbox in the developer tools menu. This is
-   * called when a toolbox is created or destroyed.
-   */
-  _updateMenuCheckbox: function DT_updateMenuCheckbox() {
-    for (let win of this._trackedBrowserWindows) {
-
-      let hasToolbox = false;
-      if (TargetFactory.isKnownTab(win.gBrowser.selectedTab)) {
-        let target = TargetFactory.forTab(win.gBrowser.selectedTab);
-        if (this._toolboxes.has(target)) {
-          hasToolbox = true;
-        }
-      }
-
-      let broadcaster = win.document.getElementById("devtoolsMenuBroadcaster_DevToolbox");
-      if (hasToolbox) {
-        broadcaster.setAttribute("checked", "true");
-      } else {
-        broadcaster.removeAttribute("checked");
-      }
-    }
-  },
-
-  /**
-   * Remove the menuitem for a tool to all open browser windows.
-   *
-   * @param {object} toolId
-   *        id of the tool to remove
-   */
-  _removeToolFromWindows: function DT_removeToolFromWindows(toolId) {
-    for (let win of this._trackedBrowserWindows) {
-      this._removeToolFromMenu(toolId, win.document);
-    }
-  },
-
-  /**
-   * Remove a tool's menuitem from a window
-   *
-   * @param {string} toolId
-   *        Id of the tool to add a menu entry for
-   * @param {XULDocument} doc
-   *        The document to which the tool menu item is to be removed from
-   */
-  _removeToolFromMenu: function DT_removeToolFromMenu(toolId, doc) {
-    let command = doc.getElementById("Tools:" + toolId);
-    command.parentNode.removeChild(command);
-
-    let key = doc.getElementById("key_" + toolId);
-    if (key) {
-      key.parentNode.removeChild(key);
-    }
-
-    let bc = doc.getElementById("devtoolsMenuBroadcaster_" + toolId);
-    bc.parentNode.removeChild(bc);
-
-    /*
-    // FIXME: item is null in testing. This is the only place to use
-    // "appmenu_devToolbar" + toolId, so it seems clear that this is wrong
-    let item = doc.getElementById("appmenu_devToolbar" + toolId);
-    item.parentNode.removeChild(item);
-    */
-  },
-
-  /**
-   * Called on browser unload to remove menu entries, toolboxes and event
-   * listeners from the closed browser window.
-   *
-   * @param  {XULWindow} win
-   *         The window containing the menu entry
-   */
-  forgetBrowserWindow: function DT_forgetBrowserWindow(win) {
-    if (!this._tools) {
-      return;
-    }
-
-    this._trackedBrowserWindows.delete(win);
-
-    // Destroy toolboxes for closed window
-    for (let [target, toolbox] of this._toolboxes) {
-      if (toolbox.frame.ownerDocument.defaultView == win) {
-        toolbox.destroy();
-      }
-    }
-
-    let tabContainer = win.document.getElementById("tabbrowser-tabs")
-    tabContainer.removeEventListener("TabSelect",
-                                     this._updateMenuCheckbox, false);
-  },
-
-  /**
-   * All browser windows have been closed, tidy up remaining objects.
-   */
-  destroy: function() {
-    Services.obs.removeObserver(this.destroy, "quit-application");
-
-    delete this._trackedBrowserWindows;
-    delete this._tools;
-    delete this._toolboxes;
-  },
-};
-
-/**
- * gDevTools is a singleton that controls the Firefox Developer Tools.
- *
- * It is an instance of a DevTools class that holds a set of tools. It has the
- * same lifetime as the browser.
- */
-this.gDevTools = new DevTools();
-
-/**
- * DevToolsXULCommands exposes methods used by browser's <command>s.
- */
-this.DevToolsXULCommands = {
-  openConnectScreen: function(gBrowser) {
-    gBrowser.selectedTab = gBrowser.addTab("chrome://browser/content/devtools/connect.xhtml");
-  },
-}
diff --git a/browser/devtools/framework/test/Makefile.in b/browser/devtools/framework/test/Makefile.in
deleted file mode 100644
index 618e044c4929..000000000000
--- a/browser/devtools/framework/test/Makefile.in
+++ /dev/null
@@ -1,26 +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/.
-
-DEPTH			= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH			= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MOCHITEST_BROWSER_FILES = \
-		head.js \
-		browser_devtools_api.js \
-		browser_new_activation_workflow.js \
-		browser_toolbox_dynamic_registration.js \
-		browser_toolbox_hosts.js \
-		browser_toolbox_ready.js \
-		browser_toolbox_select_event.js \
-		browser_target_events.js \
-		browser_toolbox_tool_ready.js \
-		browser_toolbox_sidebar.js \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/framework/test/browser_devtools_api.js b/browser/devtools/framework/test/browser_devtools_api.js
deleted file mode 100644
index 205a26808ab5..000000000000
--- a/browser/devtools/framework/test/browser_devtools_api.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Tests devtools API
-
-const Cu = Components.utils;
-const toolId = "test-tool";
-
-let tempScope = {};
-Cu.import("resource:///modules/devtools/EventEmitter.jsm", tempScope);
-let EventEmitter = tempScope.EventEmitter;
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
-function test() {
-  addTab("about:blank", function(aBrowser, aTab) {
-    runTests(aTab);
-  });
-}
-
-function runTests(aTab) {
-  let toolDefinition = {
-    id: toolId,
-    isTargetSupported: function() true,
-    killswitch: "devtools.test-tool.enabled",
-    url: "about:blank",
-    label: "someLabel",
-    build: function(iframeWindow, toolbox) {
-      let panel = new DevToolPanel(iframeWindow, toolbox);
-      return panel;
-    },
-  };
-
-  ok(gDevTools, "gDevTools exists");
-  is(gDevTools.getToolDefinitions().has(toolId), false,
-    "The tool is not registered");
-
-  gDevTools.registerTool(toolDefinition);
-  is(gDevTools.getToolDefinitions().has(toolId), true,
-    "The tool is registered");
-
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-
-  function onNewToolbox(event, toolboxFromEvent) {
-    let toolBoxes = gDevTools._toolboxes;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let tb = toolBoxes.get(target);
-    is(toolboxFromEvent, tb, "'toolbox-ready' event fired. Correct toolbox value.");
-    is(tb.target, target, "toolbox target is correct");
-    is(tb._host.hostTab, gBrowser.selectedTab, "toolbox host is correct");
-    gDevTools.once(toolId + "-ready", continueTests);
-  }
-
-  function onToolboxClosed(event, targetFromEvent) {
-    is(targetFromEvent, target, "'toolbox-destroyed' event fired. Correct tab value.");
-    finishUp();
-  }
-
-
-  gDevTools.once("toolbox-ready", onNewToolbox);
-  gDevTools.once("toolbox-destroyed", onToolboxClosed);
-
-  executeSoon(function() {
-    gDevTools.openToolbox(target, "bottom", toolId);
-  });
-}
-
-function continueTests(event, toolbox, panel) {
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  is(toolbox, gDevTools._toolboxes.get(target), "{toolId}-ready event received, with correct toolbox value");
-  is(panel, toolbox.getToolPanels().get(toolId), "panel value is correct");
-
-  is(toolbox.currentToolId, toolId, "toolbox _currentToolId is correct");
-
-  let toolDefinitions = gDevTools.getToolDefinitions();
-  is(toolDefinitions.has(toolId), true, "The tool is in gDevTools");
-
-  let toolDefinition = toolDefinitions.get(toolId);
-  is(toolDefinition.id, toolId, "toolDefinition id is correct");
-
-  gDevTools.unregisterTool(toolId);
-  is(gDevTools.getToolDefinitions().has(toolId), false,
-    "The tool is no longer registered");
-
-  toolbox.destroy();
-}
-
-function finishUp() {
-  tempScope = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
-
-/**
-* When a Toolbox is started it creates a DevToolPanel for each of the tools
-* by calling toolDefinition.build(). The returned object should
-* at least implement these functions. They will be used by the ToolBox.
-*
-* There may be no benefit in doing this as an abstract type, but if nothing
-* else gives us a place to write documentation.
-*/
-function DevToolPanel(iframeWindow, toolbox) {
-  new EventEmitter(this);
-
-  this._toolbox = toolbox;
-
-  /*let doc = iframeWindow.document
-  let label = doc.createElement("label");
-  let textNode = doc.createTextNode("Some Tool");
-
-  label.appendChild(textNode);
-  doc.body.appendChild(label);*/
-
-  executeSoon(function() {
-    this.setReady();
-  }.bind(this));
-}
-
-DevToolPanel.prototype = {
-  get target() this._toolbox.target,
-
-  get toolbox() this._toolbox,
-
-  get isReady() this._isReady,
-
-  _isReady: false,
-
-  setReady: function() {
-    this._isReady = true;
-    this.emit("ready");
-  },
-
-  destroy: function DTI_destroy()
-  {
-
-  },
-};
diff --git a/browser/devtools/framework/test/browser_new_activation_workflow.js b/browser/devtools/framework/test/browser_new_activation_workflow.js
deleted file mode 100644
index 242b725dcc5b..000000000000
--- a/browser/devtools/framework/test/browser_new_activation_workflow.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Tests devtools API
-
-const Cu = Components.utils;
-
-let toolbox;
-
-let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
-function test() {
-  addTab("about:blank", function(aBrowser, aTab) {
-    loadWebConsole(aTab);
-  });
-}
-
-function loadWebConsole(aTab) {
-  ok(gDevTools, "gDevTools exists");
-
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  toolbox = gDevTools.openToolbox(target, "bottom", "webconsole");
-  toolbox.once("webconsole-ready", checkToolLoading);
-}
-
-function checkToolLoading() {
-  is(toolbox.currentToolId, "webconsole", "The web console is selected");
-  selectAndCheckById("jsdebugger");
-  selectAndCheckById("styleeditor");
-  testToggle();
-}
-
-function selectAndCheckById(id) {
-  let doc = toolbox.frame.contentDocument;
-
-  toolbox.selectTool(id);
-  let tab = doc.getElementById("toolbox-tab-" + id);
-  is(tab.selected, true, "The " + id + " tab is selected");
-}
-
-function testToggle() {
-  toolbox.once("destroyed", function() {
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    toolbox = gDevTools.openToolbox(target, "bottom", "styleeditor");
-    toolbox.once("styleeditor-ready", checkStyleEditorLoaded);
-  }.bind(this));
-
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  gDevTools.toggleToolboxForTarget(target);
-}
-
-function checkStyleEditorLoaded() {
-  is(toolbox.currentToolId, "styleeditor", "The style editor is selected");
-  finishUp();
-}
-
-function finishUp() {
-  toolbox.destroy();
-  toolbox = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
diff --git a/browser/devtools/framework/test/browser_target_events.js b/browser/devtools/framework/test/browser_target_events.js
deleted file mode 100644
index 56496fea2d64..000000000000
--- a/browser/devtools/framework/test/browser_target_events.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-var tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-var TargetFactory = tempScope.TargetFactory;
-
-var target;
-
-function test()
-{
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", onLoad, true);
-}
-
-function onLoad(evt) {
-  gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
-
-  target = TargetFactory.forTab(gBrowser.selectedTab);
-
-  is(target.tab, gBrowser.selectedTab, "Target linked to the right tab.");
-
-  target.once("hidden", onHidden);
-  gBrowser.selectedTab = gBrowser.addTab();
-}
-
-function onHidden() {
-  ok(true, "Hidden event received");
-  target.once("visible", onVisible);
-  gBrowser.removeCurrentTab();
-}
-
-function onVisible() {
-  ok(true, "Visible event received");
-  target.once("will-navigate", onWillNavigate);
-  gBrowser.contentWindow.location = "data:text/html,test navigation";
-}
-
-function onWillNavigate(event, request) {
-  ok(true, "will-navigate event received");
-  target.once("navigate", onNavigate);
-}
-
-function onNavigate() {
-  ok(true, "navigate event received");
-  target.once("close", onClose);
-  gBrowser.removeCurrentTab();
-}
-
-function onClose() {
-  ok(true, "close event received");
-
-  target = null;
-  finish();
-}
diff --git a/browser/devtools/framework/test/browser_toolbox_dynamic_registration.js b/browser/devtools/framework/test/browser_toolbox_dynamic_registration.js
deleted file mode 100644
index 848dbef8aac0..000000000000
--- a/browser/devtools/framework/test/browser_toolbox_dynamic_registration.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let toolbox;
-
-let temp = {};
-Cu.import("resource:///modules/devtools/Target.jsm", temp);
-let TargetFactory = temp.TargetFactory;
-
-function test()
-{
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
-    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
-    openToolbox();
-  }, true);
-
-  content.location = "data:text/html,test for dynamically registering and unregistering tools";
-}
-
-function openToolbox()
-{
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  toolbox = gDevTools.openToolbox(target);
-
-  toolbox.once("ready", testRegister);
-}
-
-
-function testRegister()
-{
-  gDevTools.once("tool-registered", toolRegistered);
-
-  gDevTools.registerTool({
-    id: "test-tool",
-    label: "Test Tool",
-    isTargetSupported: function() true,
-    build: function() {}
-  });
-}
-
-function toolRegistered(event, toolId)
-{
-  is(toolId, "test-tool", "tool-registered event handler sent tool id");
-
-  ok(gDevTools.getToolDefinitions().has(toolId), "tool added to map");
-
-  // test that it appeared in the UI
-  let doc = toolbox.frame.contentDocument;
-  let tab = doc.getElementById("toolbox-tab-" + toolId);
-  ok(tab, "new tool's tab exists in toolbox UI");
-
-  let panel = doc.getElementById("toolbox-panel-" + toolId);
-  ok(panel, "new tool's panel exists in toolbox UI");
-
-  for (let win of getAllBrowserWindows()) {
-    let command = win.document.getElementById("Tools:" + toolId);
-    ok(command, "command for new tool added to every browser window");
-  }
-
-  // then unregister it
-  testUnregister();
-}
-
-function getAllBrowserWindows() {
-  let wins = [];
-  let enumerator = Services.wm.getEnumerator("navigator:browser");
-  while (enumerator.hasMoreElements()) {
-    wins.push(enumerator.getNext());
-  }
-  return wins;
-}
-
-function testUnregister()
-{
-  gDevTools.once("tool-unregistered", toolUnregistered);
-
-  gDevTools.unregisterTool("test-tool");
-}
-
-function toolUnregistered(event, toolId)
-{
-  is(toolId, "test-tool", "tool-unregistered event handler sent tool id");
-
-  ok(!gDevTools.getToolDefinitions().has(toolId), "tool removed from map");
-
-  // test that it disappeared from the UI
-  let doc = toolbox.frame.contentDocument;
-  let tab = doc.getElementById("toolbox-tab-" + toolId);
-  ok(!tab, "tool's tab was removed from the toolbox UI");
-
-  let panel = doc.getElementById("toolbox-panel-" + toolId);
-  ok(!panel, "tool's panel was removed from toolbox UI");
-
-  for (let win of getAllBrowserWindows()) {
-    let command = win.document.getElementById("Tools:" + toolId);
-    ok(!command, "command removed from every browser window");
-  }
-
-  cleanup();
-}
-
-function cleanup()
-{
-  toolbox.destroy();
-  toolbox = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
diff --git a/browser/devtools/framework/test/browser_toolbox_hosts.js b/browser/devtools/framework/test/browser_toolbox_hosts.js
deleted file mode 100644
index 5edbad6a3278..000000000000
--- a/browser/devtools/framework/test/browser_toolbox_hosts.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let temp = {}
-Cu.import("resource:///modules/devtools/gDevTools.jsm", temp);
-let DevTools = temp.DevTools;
-
-Cu.import("resource:///modules/devtools/Toolbox.jsm", temp);
-let Toolbox = temp.Toolbox;
-
-Cu.import("resource:///modules/devtools/Target.jsm", temp);
-let TargetFactory = temp.TargetFactory;
-
-let toolbox;
-
-function test()
-{
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
-    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
-    openToolbox(testBottomHost);
-  }, true);
-
-  content.location = "data:text/html,test for opening toolbox in different hosts";
-}
-
-function openToolbox(callback)
-{
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  gDevTools.toggleToolboxForTarget(target);
-
-  toolbox = gDevTools.getToolboxForTarget(target);
-  toolbox.once("ready", callback);
-}
-
-function testBottomHost()
-{
-  checkHostType(Toolbox.HostType.BOTTOM);
-
-  // test UI presence
-  let iframe = document.getElementById("devtools-toolbox-bottom-iframe");
-  ok(iframe, "toolbox bottom iframe exists");
-
-  checkToolboxLoaded(iframe);
-
-  toolbox.once("host-changed", testSidebarHost);
-  toolbox.hostType = Toolbox.HostType.SIDE;
-}
-
-function testSidebarHost()
-{
-  checkHostType(Toolbox.HostType.SIDE);
-
-  // test UI presence
-  let bottom = document.getElementById("devtools-toolbox-bottom-iframe");
-  ok(!bottom, "toolbox bottom iframe doesn't exist");
-
-  let iframe = document.getElementById("devtools-toolbox-side-iframe");
-  ok(iframe, "toolbox side iframe exists");
-
-  checkToolboxLoaded(iframe);
-
-  toolbox.once("host-changed", testWindowHost);
-  toolbox.hostType = Toolbox.HostType.WINDOW;
-}
-
-function testWindowHost()
-{
-  checkHostType(Toolbox.HostType.WINDOW);
-
-  let sidebar = document.getElementById("devtools-toolbox-side-iframe");
-  ok(!sidebar, "toolbox sidebar iframe doesn't exist");
-
-  let win = Services.wm.getMostRecentWindow("devtools:toolbox");
-  ok(win, "toolbox separate window exists");
-
-  let iframe = win.document.getElementById("toolbox-iframe");
-  checkToolboxLoaded(iframe);
-
-  testToolSelect();
-}
-
-function testToolSelect()
-{
-  // make sure we can load a tool after switching hosts
-  toolbox.once("inspector-ready", testDestroy);
-  toolbox.selectTool("inspector");
-}
-
-function testDestroy()
-{
-  toolbox.once("destroyed", function() {
-    openToolbox(testRememberHost);
-  });
-
-  toolbox.destroy();
-}
-
-function testRememberHost()
-{
-  // last host was the window - make sure it's the same when re-opening
-  is(toolbox.hostType, Toolbox.HostType.WINDOW, "host remembered");
-
-  let win = Services.wm.getMostRecentWindow("devtools:toolbox");
-  ok(win, "toolbox separate window exists");
-
-  cleanup();
-}
-
-function checkHostType(hostType)
-{
-  is(toolbox.hostType, hostType, "host type is " + hostType);
-
-  let pref = Services.prefs.getCharPref("devtools.toolbox.host");
-  is(pref, hostType, "host pref is " + hostType);
-}
-
-function checkToolboxLoaded(iframe)
-{
-  let tabs = iframe.contentDocument.getElementById("toolbox-tabs");
-  ok(tabs, "toolbox UI has been loaded into iframe");
-}
-
-function cleanup()
-{
-  Services.prefs.setCharPref("devtools.toolbox.host", Toolbox.HostType.BOTTOM);
-
-  toolbox.destroy();
-  DevTools = Toolbox = toolbox = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
diff --git a/browser/devtools/framework/test/browser_toolbox_ready.js b/browser/devtools/framework/test/browser_toolbox_ready.js
deleted file mode 100644
index cbf6d89efe22..000000000000
--- a/browser/devtools/framework/test/browser_toolbox_ready.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
-let toolbox;
-
-function test()
-{
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
-    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
-    openToolbox();
-  }, true);
-
-  content.location = "data:text/html,test for dynamically registering and unregistering tools";
-}
-
-function openToolbox()
-{
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  gDevTools.toggleToolboxForTarget(target);
-
-  toolbox = gDevTools.getToolboxForTarget(target);
-
-  ok(!toolbox.isReady, "toolbox isReady isn't set yet");
-
-  try {
-    toolbox.selectTool("webconsole");
-    ok(false, "Should throw when selectTool() called before toolbox is ready");
-  }
-  catch(error) {
-    is(error.message, "Can't select tool, wait for toolbox 'ready' event")
-  }
-
-  toolbox.once("ready", testReady);
-}
-
-function testReady()
-{
-  ok(toolbox.isReady, "toolbox isReady is set");
-  cleanup();
-}
-
-function cleanup()
-{
-  toolbox.destroy();
-  toolbox = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
diff --git a/browser/devtools/framework/test/browser_toolbox_select_event.js b/browser/devtools/framework/test/browser_toolbox_select_event.js
deleted file mode 100644
index 191bd80896f9..000000000000
--- a/browser/devtools/framework/test/browser_toolbox_select_event.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let toolbox;
-
-function test() {
-  addTab("about:blank", function() {
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    toolbox = gDevTools.openToolbox(target, "bottom", "webconsole");
-    toolbox.once("ready", testSelect);
-  });
-}
-
-let called = {
-  inspector: false,
-  webconsole: false,
-  styleeditor: false,
-  //jsdebugger: false,
-}
-
-function testSelect() {
-  info("Toolbox fired a `ready` event");
-
-  toolbox.on("select", selectCB);
-
-  toolbox.selectTool("inspector");
-  toolbox.selectTool("webconsole");
-  toolbox.selectTool("styleeditor");
-  //toolbox.selectTool("jsdebugger");
-}
-
-function selectCB(event, id) {
-  called[id] = true;
-  info("toolbox-select event from " + id);
-
-  for (let tool in called) {
-    if (!called[tool]) {
-      return;
-    }
-  }
-
-  ok(true, "All the tools fired a 'select event'");
-  toolbox.off("select", selectCB);
-
-  reselect();
-}
-
-function reselect() {
-  for (let tool in called) {
-    called[tool] = false;
-  }
-
-  toolbox.once("inspector-selected", function() {
-    tidyUpIfAllCalled("inspector");
-  });
-
-  toolbox.once("webconsole-selected", function() {
-    tidyUpIfAllCalled("webconsole");
-  });
-
-  /*
-  toolbox.once("jsdebugger-selected", function() {
-    tidyUpIfAllCalled("jsdebugger");
-  });
-  */
-
-  toolbox.once("styleeditor-selected", function() {
-    tidyUpIfAllCalled("styleeditor");
-  });
-
-  toolbox.selectTool("inspector");
-  toolbox.selectTool("webconsole");
-  toolbox.selectTool("styleeditor");
-  //toolbox.selectTool("jsdebugger");
-}
-
-function tidyUpIfAllCalled(id) {
-  called[id] = true;
-  info("select event from " + id);
-
-  for (let tool in called) {
-    if (!called[tool]) {
-      return;
-    }
-  }
-
-  ok(true, "All the tools fired a {id}-selected event");
-  tidyUp();
-}
-
-function tidyUp() {
-  toolbox.destroy();
-  gBrowser.removeCurrentTab();
-
-  toolbox = null;
-  finish();
-}
diff --git a/browser/devtools/framework/test/browser_toolbox_sidebar.js b/browser/devtools/framework/test/browser_toolbox_sidebar.js
deleted file mode 100644
index b7c17b04f1c5..000000000000
--- a/browser/devtools/framework/test/browser_toolbox_sidebar.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-function test() {
-  const Cu = Components.utils;
-  let tempScope = {};
-  Cu.import("resource:///modules/devtools/gDevTools.jsm", tempScope);
-  Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-  Cu.import("resource:///modules/devtools/Sidebar.jsm", tempScope);
-  let {TargetFactory: TargetFactory, gDevTools: gDevTools, ToolSidebar: ToolSidebar} = tempScope;
-
-  const toolURL = "data:text/xml;charset=utf8,<?xml version='1.0'?>" +
-                  "<?xml-stylesheet href='chrome://browser/skin/devtools/common.css' type='text/css'?>" +
-                  "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>" +
-                  "<hbox flex='1'><description flex='1'>foo</description><splitter class='devtools-side-splitter'/>" +
-                  "<tabbox flex='1' id='sidebar' class='devtools-sidebar-tabs'><tabs/><tabpanels flex='1'/></tabbox>" +
-                  "</hbox>" +
-                  "</window>";
-
-  const tab1URL = "data:text/html;charset=utf8,<title>1</title><p>1</p>";
-  const tab2URL = "data:text/html;charset=utf8,<title>2</title><p>2</p>";
-  const tab3URL = "data:text/html;charset=utf8,<title>3</title><p>3</p>";
-
-  let panelDoc;
-
-  let registeredTabs = {};
-  let readyTabs = {};
-
-  let toolDefinition = {
-    id: "fakeTool4242",
-    killswitch: "devtools.fakeTool4242.enabled",
-    url: toolURL,
-    label: "FAKE TOOL!!!",
-    isTargetSupported: function() true,
-    build: function(iframeWindow, toolbox) {
-      let panel = {
-        target: toolbox.target,
-        toolbox: toolbox,
-        isReady: true,
-        destroy: function(){},
-        panelDoc: iframeWindow.document,
-      }
-      return panel;
-    },
-  };
-
-  gDevTools.registerTool(toolDefinition);
-
-  addTab("about:blank", function(aBrowser, aTab) {
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let toolbox = gDevTools.openToolbox(target, "bottom", "fakeTool4242");
-    toolbox.once("fakeTool4242-ready", function(event, panel) {
-      ok(true, "Tool open");
-
-      let tabbox = panel.panelDoc.getElementById("sidebar");
-      panel.sidebar = new ToolSidebar(tabbox, panel, true);
-
-      panel.sidebar.on("new-tab-registered", function(event, id) {
-        registeredTabs[id] = true;
-      });
-
-      panel.sidebar.once("tab1-ready", function(event) {
-        readyTabs.tab1 = true;
-        if (readyTabs.tab1 && readyTabs.tab2 && readyTabs.tab3) {
-          allTabsReady(panel);
-        }
-      });
-
-      panel.sidebar.once("tab2-ready", function(event) {
-        readyTabs.tab2 = true;
-        if (readyTabs.tab1 && readyTabs.tab2 && readyTabs.tab3) {
-          allTabsReady(panel);
-        }
-      });
-
-      panel.sidebar.once("tab3-ready", function(event) {
-        readyTabs.tab3 = true;
-        if (readyTabs.tab1 && readyTabs.tab2 && readyTabs.tab3) {
-          allTabsReady(panel);
-        }
-      });
-
-      panel.sidebar.addTab("tab1", tab1URL, true);
-      panel.sidebar.addTab("tab2", tab2URL);
-      panel.sidebar.addTab("tab3", tab3URL);
-
-      panel.sidebar.show();
-    });
-  });
-
-  function allTabsReady(panel) {
-    ok(registeredTabs.tab1, "tab1 registered");
-    ok(registeredTabs.tab2, "tab2 registered");
-    ok(registeredTabs.tab3, "tab3 registered");
-    ok(readyTabs.tab1, "tab1 ready");
-    ok(readyTabs.tab2, "tab2 ready");
-    ok(readyTabs.tab3, "tab3 ready");
-
-    let tabs = panel.sidebar._tabbox.querySelectorAll("tab");
-    let panels = panel.sidebar._tabbox.querySelectorAll("tabpanel");
-    let label = 1;
-    for (let tab of tabs) {
-      is(tab.getAttribute("label"), label++, "Tab has the right title");
-    }
-    is(label, 4, "Found the right amount of tabs.");
-    is(panel.sidebar._tabbox.selectedPanel, panels[0], "First tab is selected");
-    ok(panel.sidebar.getCurrentTabID(), "tab1", "getCurrentTabID() is correct");
-
-    panel.sidebar.once("tab1-unselected", function() {
-      ok(true, "received 'unselected' event");
-      panel.sidebar.once("tab2-selected", function() {
-        ok(true, "received 'selected' event");
-        panel.sidebar.hide();
-        is(panel.sidebar._tabbox.getAttribute("hidden"), "true", "Sidebar hidden");
-        is(panel.sidebar.getWindowForTab("tab1").location.href, tab1URL, "Window is accessible");
-        finishUp(panel);
-      });
-    });
-
-    panel.sidebar.select("tab2");
-  }
-
-  function finishUp(panel) {
-    panel.sidebar.destroy();
-    gDevTools.unregisterTool(toolDefinition.id);
-
-    executeSoon(function() {
-      gBrowser.removeCurrentTab();
-      finish();
-    });
-  }
-}
diff --git a/browser/devtools/framework/test/browser_toolbox_tool_ready.js b/browser/devtools/framework/test/browser_toolbox_tool_ready.js
deleted file mode 100644
index 98a537f03ca6..000000000000
--- a/browser/devtools/framework/test/browser_toolbox_tool_ready.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let temp = [];
-Cu.import("resource:///modules/devtools/Target.jsm", temp);
-let TargetFactory = temp.TargetFactory;
-
-function test() {
-  waitForExplicitFinish();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
-    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
-    openAllTools();
-  }, true);
-
-  function openAllTools() {
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-
-    let tools = gDevTools.getToolDefinitions();
-    let expectedCallbacksCount = tools.size;
-
-    let firstTool = null;
-    // we transform the map to a [id, eventHasBeenFiredYet] map
-    for (let [id] of tools) {
-      if (!firstTool)
-        firstTool = id;
-      tools.set(id, false);
-    }
-
-    let toolbox = gDevTools.openToolbox(target, undefined, firstTool);
-
-    // We add the event listeners
-    for (let [toolId] of tools) {
-      let id = toolId;
-      info("Registering listener for " + id);
-      tools.set(id, false);
-      toolbox.on(id + "-ready", function(event, panel) {
-        expectedCallbacksCount--;
-        info("Got event "  + event);
-        is(toolbox.getToolPanels().get(id), panel, "Got the right tool panel for " + id);
-        tools.set(id, true);
-        if (expectedCallbacksCount == 0) {
-          // "executeSoon" because we want to let a chance
-          // to falsy code to fire unexpected ready events.
-          executeSoon(theEnd);
-        }
-        if (expectedCallbacksCount < 0) {
-          ok(false, "we are receiving too many events");
-        }
-      });
-    }
-
-    toolbox.once("ready", function() {
-      // We open all the 
-      for (let [id] of tools) {
-        if (id != firstTool) {
-          toolbox.selectTool(id);
-        }
-      }
-    });
-
-    function theEnd() {
-      for (let [id, called] of tools) {
-        ok(called, "Tool " + id + " has fired its ready event");
-      }
-      toolbox.destroy();
-      gBrowser.removeCurrentTab();
-      finish();
-    }
-  }
-}
diff --git a/browser/devtools/framework/test/head.js b/browser/devtools/framework/test/head.js
deleted file mode 100644
index 796a7946c2d0..000000000000
--- a/browser/devtools/framework/test/head.js
+++ /dev/null
@@ -1,36 +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/. */
-
-let tempScope = {};
-Components.utils.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-Components.utils.import("resource:///modules/devtools/Console.jsm", tempScope);
-let console = tempScope.console;
-
-/**
- * Open a new tab at a URL and call a callback on load
- */
-function addTab(aURL, aCallback)
-{
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  content.location = aURL;
-
-  let tab = gBrowser.selectedTab;
-  let browser = gBrowser.getBrowserForTab(tab);
-
-  function onTabLoad() {
-    browser.removeEventListener("load", onTabLoad, true);
-    aCallback(browser, tab, browser.contentDocument);
-  }
-
-  browser.addEventListener("load", onTabLoad, true);
-}
-
-registerCleanupFunction(function tearDown() {
-  while (gBrowser.tabs.length > 1) {
-    gBrowser.removeCurrentTab();
-  }
-});
diff --git a/browser/devtools/framework/toolbox-window.xul b/browser/devtools/framework/toolbox-window.xul
deleted file mode 100644
index 774747b531d9..000000000000
--- a/browser/devtools/framework/toolbox-window.xul
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!DOCTYPE window [
-<!ENTITY % toolboxDTD SYSTEM "chrome://browser/locale/devtools/toolbox.dtd" >
- %toolboxDTD;
-]>
-
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="devtools-toolbox-window"
-        title="&window.title;"
-        macanimationtype="document"
-        fullscreenbutton="true"
-        windowtype="devtools:toolbox"
-        width="700" height="320"
-        persist="screenX screenY width height sizemode">
-
-  <commandset id="toolbox-commandset">
-    <command id="toolbox-cmd-close" oncommand="window.close();"/>
-  </commandset>
-
-  <keyset id="toolbox-keyset">
-    <key id="toolbox-key-close"
-         key="&closeCmd.key;"
-         command="toolbox-cmd-close"
-         modifiers="accel"/>
-  </keyset>
-
-  <iframe id="toolbox-iframe" flex="1"></iframe>
-</window>
diff --git a/browser/devtools/framework/toolbox.css b/browser/devtools/framework/toolbox.css
deleted file mode 100644
index 57f18006c237..000000000000
--- a/browser/devtools/framework/toolbox.css
+++ /dev/null
@@ -1,10 +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/. */
-
-.devtools-tab > .radio-check,
-.devtools-tab > .radio-check-box1,
-.devtools-tab > .radio-spacer-box {
-  display: none;
-}
-
diff --git a/browser/devtools/framework/toolbox.xul b/browser/devtools/framework/toolbox.xul
deleted file mode 100644
index 744278c12d3e..000000000000
--- a/browser/devtools/framework/toolbox.xul
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/devtools/shared/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/devtools/framework/toolbox.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/devtools/toolbox.css" type="text/css"?>
-<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
-<?xul-overlay href="chrome://browser/content/source-editor-overlay.xul"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <notificationbox id="toolbox-notificationbox" flex="1">
-    <toolbar class="devtools-tabbar">
-      <hbox id="toolbox-controls">
-        <toolbarbutton id="toolbox-close" class="devtools-closebutton"></toolbarbutton>
-        <hbox id="toolbox-dock-buttons"/>
-      </hbox>
-      <radiogroup id="toolbox-tabs" orient="horizontal">
-      </radiogroup>
-      <hbox id="toolbox-buttons" flex="1" pack="end"/>
-    </toolbar>
-    <deck id="toolbox-deck" flex="1">
-    </deck>
-  </notificationbox>
-</window>
diff --git a/browser/devtools/highlighter/CmdInspect.jsm b/browser/devtools/highlighter/CmdInspect.jsm
new file mode 100644
index 000000000000..c352c96cb285
--- /dev/null
+++ b/browser/devtools/highlighter/CmdInspect.jsm
@@ -0,0 +1,29 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+this.EXPORTED_SYMBOLS = [ ];
+
+Cu.import("resource:///modules/devtools/gcli.jsm");
+
+/**
+ * 'inspect' command
+ */
+gcli.addCommand({
+  name: "inspect",
+  description: gcli.lookup("inspectDesc"),
+  manual: gcli.lookup("inspectManual"),
+  params: [
+    {
+      name: "selector",
+      type: "node",
+      description: gcli.lookup("inspectNodeDesc"),
+      manual: gcli.lookup("inspectNodeManual")
+    }
+  ],
+  exec: function Command_inspect(args, context) {
+    let document = context.environment.chromeDocument;
+    document.defaultView.InspectorUI.openInspectorUI(args.selector);
+  }
+});
diff --git a/browser/devtools/inspector/Makefile.in b/browser/devtools/highlighter/Makefile.in
similarity index 68%
rename from browser/devtools/inspector/Makefile.in
rename to browser/devtools/highlighter/Makefile.in
index 02dcc9f605ac..8187267f5b74 100644
--- a/browser/devtools/inspector/Makefile.in
+++ b/browser/devtools/highlighter/Makefile.in
@@ -10,9 +10,17 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+EXTRA_JS_MODULES = \
+	highlighter.jsm \
+	$(NULL)
+
+EXTRA_PP_JS_MODULES = \
+	inspector.jsm \
+	$(NULL)
+
 TEST_DIRS += test
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
-	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools/
+	$(NSINSTALL) $(srcdir)/CmdInspect.jsm $(FINAL_TARGET)/modules/devtools
diff --git a/browser/devtools/inspector/Highlighter.jsm b/browser/devtools/highlighter/highlighter.jsm
similarity index 64%
rename from browser/devtools/inspector/Highlighter.jsm
rename to browser/devtools/highlighter/highlighter.jsm
index 587b4978e2e9..e94d41bfa557 100644
--- a/browser/devtools/inspector/Highlighter.jsm
+++ b/browser/devtools/highlighter/highlighter.jsm
@@ -11,10 +11,21 @@ const Ci = Components.interfaces;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/devtools/EventEmitter.jsm");
 
 this.EXPORTED_SYMBOLS = ["Highlighter"];
 
+const INSPECTOR_INVISIBLE_ELEMENTS = {
+  "head": true,
+  "base": true,
+  "basefont": true,
+  "isindex": true,
+  "link": true,
+  "meta": true,
+  "script": true,
+  "style": true,
+  "title": true,
+};
+
 const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
   // add ":visited" and ":link" after bug 713106 is fixed
 
@@ -28,9 +39,22 @@ const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
  * API:
  *
  *   // Constructor and destructor.
- *   Highlighter(aTab, aInspector)
+ *   // @param aWindow - browser.xul window.
+ *   Highlighter(aWindow);
  *   void destroy();
  *
+ *   // Highlight a node.
+ *   // @param aNode - node to highlight
+ *   // @param aScroll - scroll to ensure the node is visible
+ *   void highlight(aNode, aScroll);
+ *
+ *   // Get the selected node.
+ *   DOMNode getNode();
+ *
+ *   // Lock and unlock the select node.
+ *   void lock();
+ *   void unlock();
+ *
  *   // Show and hide the highlighter
  *   void show();
  *   void hide();
@@ -39,27 +63,44 @@ const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
  *   // Redraw the highlighter if the visible portion of the node has changed.
  *   void invalidateSize(aScroll);
  *
+ *   // Is a node highlightable.
+ *   boolean isNodeHighlightable(aNode);
+ *
+ *   // Show/hide the outline and the infobar
+ *   void showInfobar();
+ *   void hideInfobar();
+ *   void showOutline();
+ *   void hideOutline();
+ *
+ *   // Add/Remove listeners
+ *   // @param aEvent - event name
+ *   // @param aListener - function callback
+ *   void addListener(aEvent, aListener);
+ *   void removeListener(aEvent, aListener);
+ *
  * Events:
  *
  *   "closed" - Highlighter is closing
+ *   "nodeselected" - A new node has been selected
  *   "highlighting" - Highlighter is highlighting
  *   "locked" - The selected node has been locked
  *   "unlocked" - The selected ndoe has been unlocked
+ *   "pseudoclasstoggled" - A pseudo-class lock has changed on the selected node
  *
  * Structure:
- *  <stack class="highlighter-container">
- *    <box class="highlighter-outline-container">
- *      <box class="highlighter-outline" locked="true/false"/>
+ *  <stack id="highlighter-container">
+ *    <box id="highlighter-outline-container">
+ *      <box id="highlighter-outline" locked="true/false"/>
  *    </box>
- *    <box class="highlighter-controls">
- *      <box class="highlighter-nodeinfobar-container" position="top/bottom" locked="true/false">
- *        <box class="highlighter-nodeinfobar-arrow highlighter-nodeinfobar-arrow-top"/>
- *        <hbox class="highlighter-nodeinfobar">
- *          <toolbarbutton class="highlighter-nodeinfobar-inspectbutton highlighter-nodeinfobar-button"/>
- *          <hbox class="highlighter-nodeinfobar-text">tagname#id.class1.class2</hbox>
- *          <toolbarbutton class="highlighter-nodeinfobar-menu highlighter-nodeinfobar-button">…</toolbarbutton>
+ *    <box id="highlighter-controls">
+ *      <box id="highlighter-nodeinfobar-container" position="top/bottom" locked="true/false">
+ *        <box class="highlighter-nodeinfobar-arrow" id="highlighter-nodeinfobar-arrow-top"/>
+ *        <hbox id="highlighter-nodeinfobar">
+ *          <toolbarbutton id="highlighter-nodeinfobar-inspectbutton" class="highlighter-nodeinfobar-button"/>
+ *          <hbox id="highlighter-nodeinfobar-text">tagname#id.class1.class2</hbox>
+ *          <toolbarbutton id="highlighter-nodeinfobar-menu" class="highlighter-nodeinfobar-button">…</toolbarbutton>
  *        </hbox>
- *        <box class="highlighter-nodeinfobar-arrow highlighter-nodeinfobar-arrow-bottom"/>
+ *        <box class="highlighter-nodeinfobar-arrow" id="highlighter-nodeinfobar-arrow-bottom"/>
  *      </box>
  *    </box>
  *  </stack>
@@ -70,54 +111,40 @@ const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
 /**
  * Constructor.
  *
- * @param aTarget The inspection target.
- * @param aInspector Inspector panel.
- * @param aToolbox The toolbox holding the inspector.
+ * @param object aWindow
  */
-this.Highlighter = function Highlighter(aTarget, aInspector, aToolbox)
+this.Highlighter = function Highlighter(aWindow)
 {
-  this.target = aTarget;
-  this.tab = aTarget.tab;
-  this.toolbox = aToolbox;
-  this.browser = this.tab.linkedBrowser;
-  this.chromeDoc = this.tab.ownerDocument;
-  this.chromeWin = this.chromeDoc.defaultView;
-  this.inspector = aInspector
-
-  new EventEmitter(this);
+  this.chromeWin = aWindow;
+  this.tabbrowser = aWindow.gBrowser;
+  this.chromeDoc = aWindow.document;
+  this.browser = aWindow.gBrowser.selectedBrowser;
+  this.events = {};
 
   this._init();
 }
 
 Highlighter.prototype = {
-  get selection() {
-    return this.inspector.selection;
-  },
-
   _init: function Highlighter__init()
   {
-    this.unlock = this.unlock.bind(this);
-    this.updateInfobar = this.updateInfobar.bind(this);
-    this.highlight = this.highlight.bind(this);
-
     let stack = this.browser.parentNode;
     this.win = this.browser.contentWindow;
     this._highlighting = false;
 
     this.highlighterContainer = this.chromeDoc.createElement("stack");
-    this.highlighterContainer.className = "highlighter-container";
+    this.highlighterContainer.id = "highlighter-container";
 
     this.outline = this.chromeDoc.createElement("box");
-    this.outline.className = "highlighter-outline";
+    this.outline.id = "highlighter-outline";
 
     let outlineContainer = this.chromeDoc.createElement("box");
     outlineContainer.appendChild(this.outline);
-    outlineContainer.className = "highlighter-outline-container";
+    outlineContainer.id = "highlighter-outline-container";
 
     // The controlsBox will host the different interactive
     // elements of the highlighter (buttons, toolbars, ...).
     let controlsBox = this.chromeDoc.createElement("box");
-    controlsBox.className = "highlighter-controls";
+    controlsBox.id = "highlighter-controls";
     this.highlighterContainer.appendChild(outlineContainer);
     this.highlighterContainer.appendChild(controlsBox);
 
@@ -131,23 +158,8 @@ Highlighter.prototype = {
 
     this.unlock();
 
-    this.selection.on("new-node", this.highlight);
-    this.selection.on("new-node", this.updateInfobar);
-    this.selection.on("detached", this.highlight);
-    this.selection.on("pseudoclass", this.updateInfobar);
-    this.selection.on("attribute-changed", this.updateInfobar);
-
-    this.onToolSelected = function(event, id) {
-      if (id != "inspector") {
-        this.hide();
-      } else {
-        this.show();
-      }
-    }.bind(this);
-    this.toolbox.on("select", this.onToolSelected);
-
     this.hidden = true;
-    this.highlight();
+    this.show();
   },
 
   /**
@@ -155,18 +167,6 @@ Highlighter.prototype = {
    */
   destroy: function Highlighter_destroy()
   {
-    this.inspectButton.removeEventListener("command", this.unlock);
-    this.inspectButton = null;
-
-    this.toolbox.off("select", this.onToolSelected);
-    this.toolbox = null;
-
-    this.selection.off("new-node", this.highlight);
-    this.selection.off("new-node", this.updateInfobar);
-    this.selection.off("detached", this.highlight);
-    this.selection.off("pseudoclass", this.updateInfobar);
-    this.selection.off("attribute-changed", this.updateInfobar);
-
     this.detachMouseListeners();
     this.detachPageListeners();
 
@@ -177,6 +177,7 @@ Highlighter.prototype = {
     this._highlightRect = null;
     this._highlighting = false;
     this.outline = null;
+    this.node = null;
     this.nodeInfo = null;
     this.highlighterContainer.parentNode.removeChild(this.highlighterContainer);
     this.highlighterContainer = null;
@@ -186,59 +187,92 @@ Highlighter.prototype = {
     this.chromeWin = null;
     this.tabbrowser = null;
 
-    this.emit("closed");
+    this.emitEvent("closed");
+    this.removeAllListeners();
   },
 
   /**
    * Show the outline, and select a node.
+   * If no node is specified, the previous selected node is highlighted if any.
+   * If no node was selected, the root element is selected.
+   *
+   * @param aNode [optional] - The node to be selected.
+   * @param aScroll [optional] boolean
+   *        Should we scroll to ensure that the selected node is visible.
    */
-  highlight: function Highlighter_highlight()
+  highlight: function Highlighter_highlight(aNode, aScroll)
   {
-    if (this.selection.reason != "highlighter") {
-      this.lock();
-    }
-
-    let canHighlightNode = this.selection.isNode() &&
-                          this.selection.isConnected() &&
-                          this.selection.isElementNode();
-
-    if (canHighlightNode) {
+    if (this.hidden)
       this.show();
-      this.updateInfobar();
-      this.invalidateSize();
-      if (!this._highlighting &&
-          this.selection.reason != "highlighter") {
-        LayoutHelpers.scrollIntoViewIfNeeded(this.selection.node);
-      }
+
+    let oldNode = this.node;
+
+    if (!aNode) {
+      if (!this.node)
+        this.node = this.win.document.documentElement;
     } else {
-      this.hide();
+      this.node = aNode;
     }
+
+    if (oldNode !== this.node) {
+      this.updateInfobar();
+    }
+
+    this.invalidateSize(!!aScroll);
+
+    if (oldNode !== this.node) {
+      this.emitEvent("nodeselected");
+    }
+  },
+
+  /**
+   * Notify that a pseudo-class lock was toggled on the highlighted element
+   *
+   * @param aPseudo - The pseudo-class to toggle, e.g. ":hover".
+   */
+  pseudoClassLockToggled: function Highlighter_pseudoClassLockToggled(aPseudo)
+  {
+    this.emitEvent("pseudoclasstoggled", [aPseudo]);
+    this.updateInfobar();
+    this.moveInfobar();
   },
 
   /**
    * Update the highlighter size and position.
    */
-  invalidateSize: function Highlighter_invalidateSize()
+  invalidateSize: function Highlighter_invalidateSize(aScroll)
   {
-    let canHiglightNode = this.selection.isNode() &&
-                          this.selection.isConnected() &&
-                          this.selection.isElementNode();
+    let rect = null;
 
-    if (!canHiglightNode)
-      return;
+    if (this.node && this.isNodeHighlightable(this.node)) {
+
+      if (aScroll &&
+          this.node.scrollIntoView) { // XUL elements don't have such method
+        this.node.scrollIntoView();
+      }
+      let clientRect = this.node.getBoundingClientRect();
+      rect = LayoutHelpers.getDirtyRect(this.node);
+    }
 
-    let clientRect = this.selection.node.getBoundingClientRect();
-    let rect = LayoutHelpers.getDirtyRect(this.selection.node);
     this.highlightRectangle(rect);
 
     this.moveInfobar();
 
     if (this._highlighting) {
       this.showOutline();
-      this.emit("highlighting");
+      this.emitEvent("highlighting");
     }
   },
 
+  /**
+   * Returns the selected node.
+   *
+   * @returns node
+   */
+  getNode: function() {
+    return this.node;
+  },
+
   /**
    * Show the highlighter if it has been hidden.
    */
@@ -281,7 +315,7 @@ Highlighter.prototype = {
     this.nodeInfo.container.setAttribute("locked", "true");
     this.detachMouseListeners();
     this.locked = true;
-    this.emit("locked");
+    this.emitEvent("locked");
   },
 
   /**
@@ -294,12 +328,28 @@ Highlighter.prototype = {
     this.nodeInfo.container.removeAttribute("locked");
     this.attachMouseListeners();
     this.locked = false;
-    this.chromeWin.focus();
-    if (this.selection.isElementNode() &&
-        this.selection.isConnected()) {
-      this.showOutline();
+    this.showOutline();
+    this.emitEvent("unlocked");
+  },
+
+  /**
+   * Is the specified node highlightable?
+   *
+   * @param nsIDOMNode aNode
+   *        the DOM element in question
+   * @returns boolean
+   *          True if the node is highlightable or false otherwise.
+   */
+  isNodeHighlightable: function Highlighter_isNodeHighlightable(aNode)
+  {
+    if (!LayoutHelpers.isNodeConnected(aNode)) {
+      return false;
     }
-    this.emit("unlocked");
+    if (aNode.nodeType != aNode.ELEMENT_NODE) {
+      return false;
+    }
+    let nodeName = aNode.nodeName.toLowerCase();
+    return !INSPECTOR_INVISIBLE_ELEMENTS[nodeName];
   },
 
   /**
@@ -337,19 +387,19 @@ Highlighter.prototype = {
   /**
    * Build the node Infobar.
    *
-   * <box class="highlighter-nodeinfobar-container">
-   *   <box class="Highlighter-nodeinfobar-arrow-top"/>
-   *   <hbox class="highlighter-nodeinfobar">
-   *     <toolbarbutton class="highlighter-nodeinfobar-button highlighter-nodeinfobar-inspectbutton"/>
-   *     <hbox class="highlighter-nodeinfobar-text">
-   *       <xhtml:span class="highlighter-nodeinfobar-tagname"/>
-   *       <xhtml:span class="highlighter-nodeinfobar-id"/>
-   *       <xhtml:span class="highlighter-nodeinfobar-classes"/>
-   *       <xhtml:span class="highlighter-nodeinfobar-pseudo-classes"/>
+   * <box id="highlighter-nodeinfobar-container">
+   *   <box id="Highlighter-nodeinfobar-arrow-top"/>
+   *   <hbox id="highlighter-nodeinfobar">
+   *     <toolbarbutton class="highlighter-nodeinfobar-button" id="highlighter-nodeinfobar-inspectbutton"/>
+   *     <hbox id="highlighter-nodeinfobar-text">
+   *       <xhtml:span id="highlighter-nodeinfobar-tagname"/>
+   *       <xhtml:span id="highlighter-nodeinfobar-id"/>
+   *       <xhtml:span id="highlighter-nodeinfobar-classes"/>
+   *       <xhtml:span id="highlighter-nodeinfobar-pseudo-classes"/>
    *     </hbox>
-   *     <toolbarbutton class="highlighter-nodeinfobar-button highlighter-nodeinfobar-menu"/>
+   *     <toolbarbutton class="highlighter-nodeinfobar-button" id="highlighter-nodeinfobar-menu"/>
    *   </hbox>
-   *   <box class="Highlighter-nodeinfobar-arrow-bottom"/>
+   *   <box id="Highlighter-nodeinfobar-arrow-bottom"/>
    * </box>
    *
    * @param nsIDOMElement aParent
@@ -358,71 +408,90 @@ Highlighter.prototype = {
   buildInfobar: function Highlighter_buildInfobar(aParent)
   {
     let container = this.chromeDoc.createElement("box");
-    container.className = "highlighter-nodeinfobar-container";
+    container.id = "highlighter-nodeinfobar-container";
     container.setAttribute("position", "top");
     container.setAttribute("disabled", "true");
 
     let nodeInfobar = this.chromeDoc.createElement("hbox");
-    nodeInfobar.className = "highlighter-nodeinfobar";
+    nodeInfobar.id = "highlighter-nodeinfobar";
+
+    nodeInfobar.addEventListener("mousedown", function(aEvent) {
+      this.emitEvent("nodeselected");
+    }.bind(this), true);
 
     let arrowBoxTop = this.chromeDoc.createElement("box");
-    arrowBoxTop.className = "highlighter-nodeinfobar-arrow highlighter-nodeinfobar-arrow-top";
+    arrowBoxTop.className = "highlighter-nodeinfobar-arrow";
+    arrowBoxTop.id = "highlighter-nodeinfobar-arrow-top";
 
     let arrowBoxBottom = this.chromeDoc.createElement("box");
-    arrowBoxBottom.className = "highlighter-nodeinfobar-arrow highlighter-nodeinfobar-arrow-bottom";
+    arrowBoxBottom.className = "highlighter-nodeinfobar-arrow";
+    arrowBoxBottom.id = "highlighter-nodeinfobar-arrow-bottom";
 
     let tagNameLabel = this.chromeDoc.createElementNS("http://www.w3.org/1999/xhtml", "span");
-    tagNameLabel.className = "highlighter-nodeinfobar-tagname";
+    tagNameLabel.id = "highlighter-nodeinfobar-tagname";
 
     let idLabel = this.chromeDoc.createElementNS("http://www.w3.org/1999/xhtml", "span");
-    idLabel.className = "highlighter-nodeinfobar-id";
+    idLabel.id = "highlighter-nodeinfobar-id";
 
     let classesBox = this.chromeDoc.createElementNS("http://www.w3.org/1999/xhtml", "span");
-    classesBox.className = "highlighter-nodeinfobar-classes";
+    classesBox.id = "highlighter-nodeinfobar-classes";
 
     let pseudoClassesBox = this.chromeDoc.createElementNS("http://www.w3.org/1999/xhtml", "span");
-    pseudoClassesBox.className = "highlighter-nodeinfobar-pseudo-classes";
+    pseudoClassesBox.id = "highlighter-nodeinfobar-pseudo-classes";
 
     // Add some content to force a better boundingClientRect down below.
     pseudoClassesBox.textContent = "&nbsp;";
 
     // Create buttons
 
-    this.inspectButton = this.chromeDoc.createElement("toolbarbutton");
-    this.inspectButton.className = "highlighter-nodeinfobar-button highlighter-nodeinfobar-inspectbutton"
-    let toolbarInspectButton = this.inspector.panelDoc.getElementById("inspector-inspect-toolbutton");
-    this.inspectButton.setAttribute("tooltiptext", toolbarInspectButton.getAttribute("tooltiptext"));
-    this.inspectButton.addEventListener("command", this.unlock);
+    let inspect = this.chromeDoc.createElement("toolbarbutton");
+    inspect.id = "highlighter-nodeinfobar-inspectbutton";
+    inspect.className = "highlighter-nodeinfobar-button"
+    let toolbarInspectButton =
+      this.chromeDoc.getElementById("inspector-inspect-toolbutton");
+    inspect.setAttribute("tooltiptext",
+                         toolbarInspectButton.getAttribute("tooltiptext"));
+    inspect.setAttribute("command", "Inspector:Inspect");
 
     let nodemenu = this.chromeDoc.createElement("toolbarbutton");
     nodemenu.setAttribute("type", "menu");
-    nodemenu.className = "highlighter-nodeinfobar-button highlighter-nodeinfobar-menu"
+    nodemenu.id = "highlighter-nodeinfobar-menu";
+    nodemenu.className = "highlighter-nodeinfobar-button"
     nodemenu.setAttribute("tooltiptext",
                           this.strings.GetStringFromName("nodeMenu.tooltiptext"));
 
-    nodemenu.onclick = function() {
-      this.inspector.showNodeMenu(nodemenu, "after_start");
-    }.bind(this);
+    let menu = this.chromeDoc.getElementById("inspector-node-popup");
+    menu = menu.cloneNode(true);
+    menu.id = "highlighter-node-menu";
 
-    // <hbox class="highlighter-nodeinfobar-text"/>
+    let separator = this.chromeDoc.createElement("menuseparator");
+    menu.appendChild(separator);
+
+    menu.addEventListener("popupshowing", function() {
+      let items = menu.getElementsByClassName("highlighter-pseudo-class-menuitem");
+      let i = items.length;
+      while (i--) {
+        menu.removeChild(items[i]);
+      }
+
+      let fragment = this.buildPseudoClassMenu();
+      menu.appendChild(fragment);
+    }.bind(this), true);
+
+    nodemenu.appendChild(menu);
+
+    // <hbox id="highlighter-nodeinfobar-text"/>
     let texthbox = this.chromeDoc.createElement("hbox");
-    texthbox.className = "highlighter-nodeinfobar-text";
+    texthbox.id = "highlighter-nodeinfobar-text";
     texthbox.setAttribute("align", "center");
     texthbox.setAttribute("flex", "1");
 
-    texthbox.addEventListener("mousedown", function(aEvent) {
-      // On click, show the node:
-      if (this.selection.isElementNode()) {
-        LayoutHelpers.scrollIntoViewIfNeeded(this.selection.node);
-      }
-    }.bind(this), true);
-
     texthbox.appendChild(tagNameLabel);
     texthbox.appendChild(idLabel);
     texthbox.appendChild(classesBox);
     texthbox.appendChild(pseudoClassesBox);
 
-    nodeInfobar.appendChild(this.inspectButton);
+    nodeInfobar.appendChild(inspect);
     nodeInfobar.appendChild(texthbox);
     nodeInfobar.appendChild(nodemenu);
 
@@ -444,6 +513,30 @@ Highlighter.prototype = {
     };
   },
 
+  /**
+   * Create the menuitems for toggling the selection's pseudo-class state
+   *
+   * @returns DocumentFragment. The menuitems for toggling pseudo-classes.
+   */
+  buildPseudoClassMenu: function IUI_buildPseudoClassesMenu()
+  {
+    let fragment = this.chromeDoc.createDocumentFragment();
+    for (let i = 0; i < PSEUDO_CLASSES.length; i++) {
+      let pseudo = PSEUDO_CLASSES[i];
+      let item = this.chromeDoc.createElement("menuitem");
+      item.id = "highlighter-pseudo-class-menuitem-" + pseudo;
+      item.setAttribute("type", "checkbox");
+      item.setAttribute("label", pseudo);
+      item.className = "highlighter-pseudo-class-menuitem";
+      item.setAttribute("checked", DOMUtils.hasPseudoClassLock(this.node,
+                        pseudo));
+      item.addEventListener("command",
+                            this.pseudoClassLockToggled.bind(this, pseudo), false);
+      fragment.appendChild(item);
+    }
+    return fragment;
+  },
+
   /**
    * Highlight a rectangular region.
    *
@@ -506,31 +599,21 @@ Highlighter.prototype = {
    */
   updateInfobar: function Highlighter_updateInfobar()
   {
-    if (!this.selection.isElementNode()) {
-      this.nodeInfo.tagNameLabel.textContent = "";
-      this.nodeInfo.idLabel.textContent = "";
-      this.nodeInfo.classesBox.textContent = "";
-      this.nodeInfo.pseudoClassesBox.textContent = "";
-      return;
-    }
-
-    let node = this.selection.node;
-
     // Tag name
-    this.nodeInfo.tagNameLabel.textContent = node.tagName;
+    this.nodeInfo.tagNameLabel.textContent = this.node.tagName;
 
     // ID
-    this.nodeInfo.idLabel.textContent = node.id ? "#" + node.id : "";
+    this.nodeInfo.idLabel.textContent = this.node.id ? "#" + this.node.id : "";
 
     // Classes
     let classes = this.nodeInfo.classesBox;
 
-    classes.textContent = node.classList.length ?
-                            "." + Array.join(node.classList, ".") : "";
+    classes.textContent = this.node.classList.length ?
+                            "." + Array.join(this.node.classList, ".") : "";
 
     // Pseudo-classes
     let pseudos = PSEUDO_CLASSES.filter(function(pseudo) {
-      return DOMUtils.hasPseudoClassLock(node, pseudo);
+      return DOMUtils.hasPseudoClassLock(this.node, pseudo);
     }, this);
 
     let pseudoBox = this.nodeInfo.pseudoClassesBox;
@@ -614,6 +697,46 @@ Highlighter.prototype = {
       .fullZoom;
   },
 
+  /////////////////////////////////////////////////////////////////////////
+  //// Event Emitter Mechanism
+
+  addListener: function Highlighter_addListener(aEvent, aListener)
+  {
+    if (!(aEvent in this.events))
+      this.events[aEvent] = [];
+    this.events[aEvent].push(aListener);
+  },
+
+  removeListener: function Highlighter_removeListener(aEvent, aListener)
+  {
+    if (!(aEvent in this.events))
+      return;
+    let idx = this.events[aEvent].indexOf(aListener);
+    if (idx > -1)
+      this.events[aEvent].splice(idx, 1);
+  },
+
+  emitEvent: function Highlighter_emitEvent(aEvent, aArgv)
+  {
+    if (!(aEvent in this.events))
+      return;
+
+    let listeners = this.events[aEvent];
+    let highlighter = this;
+    listeners.forEach(function(aListener) {
+      try {
+        aListener.apply(highlighter, aArgv);
+      } catch(e) {}
+    });
+  },
+
+  removeAllListeners: function Highlighter_removeAllIsteners()
+  {
+    for (let event in this.events) {
+      delete this.events[event];
+    }
+  },
+
   /////////////////////////////////////////////////////////////////////////
   //// Event Handling
 
@@ -742,8 +865,6 @@ Highlighter.prototype = {
     if (aEvent.button == 0) {
       let win = aEvent.target.ownerDocument.defaultView;
       this.lock();
-      let node = this.selection.node;
-      this.selection.setNode(node, "highlighter-lock");
       win.focus();
       aEvent.preventDefault();
       aEvent.stopPropagation();
@@ -765,8 +886,8 @@ Highlighter.prototype = {
     if (doc && doc != this.chromeDoc) {
       let element = LayoutHelpers.getElementFromPoint(aEvent.target.ownerDocument,
         aEvent.clientX, aEvent.clientY);
-      if (element && element != this.selection.node) {
-        this.selection.setNode(element, "highlighter");
+      if (element && element != this.node) {
+        this.highlight(element);
       }
     }
   },
diff --git a/browser/devtools/highlighter/inspector.jsm b/browser/devtools/highlighter/inspector.jsm
new file mode 100644
index 000000000000..2ffbaf77cec5
--- /dev/null
+++ b/browser/devtools/highlighter/inspector.jsm
@@ -0,0 +1,2414 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const Cc = Components.classes;
+const Cu = Components.utils;
+const Ci = Components.interfaces;
+const Cr = Components.results;
+
+this.EXPORTED_SYMBOLS = ["InspectorUI"];
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource:///modules/devtools/MarkupView.jsm");
+Cu.import("resource:///modules/highlighter.jsm");
+Cu.import("resource:///modules/devtools/LayoutView.jsm");
+Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
+Cu.import("resource:///modules/devtools/EventEmitter.jsm");
+Cu.import("resource:///modules/devtools/DOMHelpers.jsm");
+
+// Inspector notifications dispatched through the nsIObserverService.
+const INSPECTOR_NOTIFICATIONS = {
+  // Fires once the Inspector completes the initialization and opens up on
+  // screen.
+  OPENED: "inspector-opened",
+
+  // Fires once the Inspector is closed.
+  CLOSED: "inspector-closed",
+
+  // Fires once the Inspector is destroyed. Not fired on tab switch.
+  DESTROYED: "inspector-destroyed",
+
+  // Fires when the Inspector is reopened after tab-switch.
+  STATE_RESTORED: "inspector-state-restored",
+
+  // Fires when the Tree Panel is opened and initialized.
+  TREEPANELREADY: "inspector-treepanel-ready",
+
+  // Event notifications for the attribute-value editor
+  EDITOR_OPENED: "inspector-editor-opened",
+  EDITOR_CLOSED: "inspector-editor-closed",
+  EDITOR_SAVED: "inspector-editor-saved",
+};
+
+const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
+
+// Timer, in milliseconds, between change events fired by
+// things like resize events.
+const LAYOUT_CHANGE_TIMER = 250;
+
+/**
+ * Represents an open instance of the Inspector for a tab.
+ * This is the object handed out to sidebars and other API consumers.
+ *
+ * Right now it's a thin layer over InspectorUI, but we will
+ * start moving per-tab state into this object soon, eventually
+ * replacing the per-winID InspectorStore objects.
+ *
+ * The lifetime of this object is also not yet correct.  This object
+ * is currently destroyed when the inspector is torn down, either by user
+ * closing the inspector or by user switching the tab.  This should
+ * only be destroyed when user closes the inspector.
+ */
+function Inspector(aIUI)
+{
+  this._IUI = aIUI;
+  this._winID = aIUI.winID;
+  this._browser = aIUI.browser;
+  this._eventEmitter = new EventEmitter();
+
+  this._browser.addEventListener("resize", this, true);
+
+  this._markupButton = this._IUI.chromeDoc.getElementById("inspector-treepanel-toolbutton");
+
+  if (Services.prefs.getBoolPref("devtools.inspector.htmlPanelOpen")) {
+    this.openMarkup();
+  } else {
+    this.closeMarkup();
+  }
+
+}
+
+Inspector.prototype = {
+  /**
+   * True if the highlighter is locked on a node.
+   */
+  get locked() {
+    return !this._IUI.inspecting;
+  },
+
+  /**
+   * The currently selected node in the highlighter.
+   */
+  get selection() {
+    return this._IUI.selection;
+  },
+
+  /**
+   * Indicate that a tool has modified the state of the page.  Used to
+   * decide whether to show the "are you sure you want to navigate"
+   * notification.
+   */
+  markDirty: function Inspector_markDirty()
+  {
+    this._IUI.isDirty = true;
+  },
+
+  /**
+   * The chrome window the inspector lives in.
+   */
+  get chromeWindow() {
+    return this._IUI.chromeWin;
+  },
+
+  /**
+   * Notify the inspector that the current selection has changed.
+   *
+   * @param string aContext
+   *        An string that will be passed to the change event.  Allows
+   *        a tool to recognize when it sent a change notification itself
+   *        to avoid unnecessary refresh.
+   */
+  change: function Inspector_change(aContext)
+  {
+    this._cancelLayoutChange();
+    this._IUI.nodeChanged(aContext);
+  },
+
+  /**
+   * Returns true if a given sidebar panel is currently visible.
+   * @param string aPanelName
+   *        The panel name as registered with registerSidebar
+   */
+  isPanelVisible: function Inspector_isPanelVisible(aPanelName)
+  {
+    return this._IUI.sidebar.visible &&
+           this._IUI.sidebar.activePanel === aPanelName;
+  },
+
+  /**
+   * Called by the InspectorUI when the inspector is being destroyed.
+   */
+  _destroy: function Inspector__destroy()
+  {
+    this._cancelLayoutChange();
+    this._destroyMarkup();
+    this._browser.removeEventListener("resize", this, true);
+    delete this._IUI;
+    delete this._eventEmitter;
+  },
+
+  /**
+   * Event handler for DOM events.
+   *
+   * @param DOMEvent aEvent
+   */
+  handleEvent: function Inspector_handleEvent(aEvent)
+  {
+    switch(aEvent.type) {
+      case "resize":
+        this._scheduleLayoutChange();
+    }
+  },
+
+  /**
+   * Schedule a low-priority change event for things like paint
+   * and resize.
+   */
+  _scheduleLayoutChange: function Inspector_scheduleLayoutChange()
+  {
+    if (this._timer) {
+      return null;
+    }
+    this._timer = this._IUI.win.setTimeout(function() {
+      this.change("layout");
+    }.bind(this), LAYOUT_CHANGE_TIMER);
+  },
+
+  /**
+   * Cancel a pending low-priority change event if any is
+   * scheduled.
+   */
+  _cancelLayoutChange: function Inspector_cancelLayoutChange()
+  {
+    if (this._timer) {
+      this._IUI.win.clearTimeout(this._timer);
+      delete this._timer;
+    }
+  },
+
+  toggleMarkup: function Inspector_toggleMarkup()
+  {
+    if (this._markupFrame) {
+      this.closeMarkup();
+      Services.prefs.setBoolPref("devtools.inspector.htmlPanelOpen", false);
+    } else {
+      this.openMarkup(true);
+      Services.prefs.setBoolPref("devtools.inspector.htmlPanelOpen", true);
+    }
+  },
+
+  /**
+   * XXX: The sidebar has an object that exists and is manipulated
+   * separately from its actual loading.  So the public api for
+   * the sidebar looks like:
+   *
+   * if (inspector.sidebar.visible) { inspector.sidebar.close() }
+   *
+   * whereas the markup API looks more like
+   *
+   * if (inspector.markupOpen) { inspector.closeMarkup() }
+   *
+   * Maybe we should add an InspectorMarkup object that presents
+   * the public api for the markup panel?
+   */
+  get markupOpen() {
+    return this._markupOpen;
+  },
+
+  openMarkup: function Inspector_openMarkup(aFocus)
+  {
+    this._markupButton.setAttribute("checked", "true");
+    this._markupOpen = true;
+    if (!this._markupFrame) {
+      this._initMarkup(aFocus);
+    }
+  },
+
+  closeMarkup: function Inspector_closeMarkup()
+  {
+    this._markupButton.removeAttribute("checked");
+    this._markupOpen = false;
+    this._destroyMarkup();
+  },
+
+  _initMarkup: function Inspector_initMarkupPane(aFocus)
+  {
+    let doc = this._IUI.chromeDoc;
+
+    this._markupBox = doc.createElement("vbox");
+    try {
+      this._markupBox.height =
+        Services.prefs.getIntPref("devtools.inspector.htmlHeight");
+    } catch(e) {
+      this._markupBox.height = 112;
+    }
+    this._markupBox.minHeight = 64;
+
+    this._markupSplitter = doc.createElement("splitter");
+    this._markupSplitter.className = "devtools-horizontal-splitter";
+
+    let container = doc.getElementById("appcontent");
+    container.appendChild(this._markupSplitter);
+    container.appendChild(this._markupBox);
+
+    // create tool iframe
+    this._markupFrame = doc.createElement("iframe");
+    this._markupFrame.setAttribute("flex", "1");
+    this._markupFrame.setAttribute("tooltip", "aHTMLTooltip");
+    this._markupFrame.setAttribute("context", "inspector-node-popup");
+
+    // This is needed to enable tooltips inside the iframe document.
+    this._boundMarkupFrameLoad = function Inspector_initMarkupPanel_onload() {
+      if (aFocus) {
+        this._markupFrame.contentWindow.focus();
+      }
+      this._onMarkupFrameLoad();
+    }.bind(this);
+    this._markupFrame.addEventListener("load", this._boundMarkupFrameLoad, true);
+
+    this._markupSplitter.setAttribute("hidden", true);
+    this._markupBox.setAttribute("hidden", true);
+    this._markupBox.appendChild(this._markupFrame);
+    this._markupFrame.setAttribute("src", "chrome://browser/content/devtools/markup-view.xhtml");
+  },
+
+  _onMarkupFrameLoad: function Inspector__onMarkupFrameLoad()
+  {
+    this._markupFrame.removeEventListener("load", this._boundMarkupFrameLoad, true);
+    delete this._boundMarkupFrameLoad;
+
+    this._markupSplitter.removeAttribute("hidden");
+    this._markupBox.removeAttribute("hidden");
+
+    this.markup = new MarkupView(this, this._markupFrame);
+    this.emit("markuploaded");
+  },
+
+  _destroyMarkup: function Inspector__destroyMarkup()
+  {
+    if (this._boundMarkupFrameLoad) {
+      this._markupFrame.removeEventListener("load", this._boundMarkupFrameLoad, true);
+      delete this._boundMarkupFrameLoad;
+    }
+
+    if (this.markup) {
+      this.markup.destroy();
+      delete this.markup;
+    }
+
+    if (this._markupFrame) {
+      delete this._markupFrame;
+    }
+
+    if (this._markupBox) {
+      Services.prefs.setIntPref("devtools.inspector.htmlHeight", this._markupBox.height);
+      this._markupBox.parentNode.removeChild(this._markupBox);
+      delete this._markupBox;
+    }
+
+    if (this._markupSplitter) {
+      this._markupSplitter.parentNode.removeChild(this._markupSplitter);
+      delete this._markupSplitter;
+    }
+  },
+
+  /**
+   * Called by InspectorUI after a tab switch, when the
+   * inspector is no longer the active tab.
+   */
+  _freeze: function Inspector__freeze()
+  {
+    if (this._markupBox) {
+      this._markupSplitter.setAttribute("hidden", true);
+      this._markupBox.setAttribute("hidden", true);
+    }
+    this._cancelLayoutChange();
+    this._browser.removeEventListener("resize", this, true);
+    this._frozen = true;
+  },
+
+  /**
+   * Called by InspectorUI after a tab switch when the
+   * inspector is back to being the active tab.
+   */
+  _thaw: function Inspector__thaw()
+  {
+    if (!this._frozen) {
+      return;
+    }
+
+    if (this._markupOpen && !this._boundMarkupFrameLoad) {
+      this._markupSplitter.removeAttribute("hidden");
+      this._markupBox.removeAttribute("hidden");
+    }
+    this._browser.addEventListener("resize", this, true);
+    delete this._frozen;
+  },
+
+  /// Forward the events related calls to the event emitter.
+
+  /**
+   * Connect a listener to this object.
+   *
+   * @param string aEvent
+   *        The event name to which we're connecting.
+   * @param function aListener
+   *        Called when the event is fired.
+   */
+  on: function Inspector_on(aEvent, aListener)
+  {
+    this._eventEmitter.on(aEvent, aListener);
+  },
+
+  /**
+   * Listen for the next time an event is fired.
+   *
+   * @param string aEvent
+   *        The event name to which we're connecting.
+   * @param function aListener
+   *        Called when the event is fired.  Will be called at most one time.
+   */
+  once: function Inspector_once(aEvent, aListener)
+  {
+    this._eventEmitter.once(aEvent, aListener);
+  },
+
+  /**
+   * Remove a previously-registered event listener.  Works for events
+   * registered with either on or once.
+   *
+   * @param string aEvent
+   *        The event name whose listener we're disconnecting.
+   * @param function aListener
+   *        The listener to remove.
+   */
+  off: function Inspector_removeListener(aEvent, aListener)
+  {
+    this._eventEmitter.off(aEvent, aListener);
+  },
+
+  /**
+   * Emit an event on the inspector.  All arguments to this method will
+   * be sent to listner functions.
+   */
+  emit: function Inspector_emit()
+  {
+    this._eventEmitter.emit.apply(this._eventEmitter, arguments);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////
+//// InspectorUI
+
+/**
+ * Main controller class for the Inspector.
+ *
+ * @constructor
+ * @param nsIDOMWindow aWindow
+ *        The chrome window for which the Inspector instance is created.
+ */
+this.InspectorUI = function InspectorUI(aWindow)
+{
+  // Let style inspector tools register themselves.
+  let tmp = {};
+  Cu.import("resource:///modules/devtools/StyleInspector.jsm", tmp);
+
+  this.chromeWin = aWindow;
+  this.chromeDoc = aWindow.document;
+  this.tabbrowser = aWindow.gBrowser;
+  this.tools = {};
+  this.toolEvents = {};
+  this.store = new InspectorStore();
+  this.INSPECTOR_NOTIFICATIONS = INSPECTOR_NOTIFICATIONS;
+  this.buildButtonsTooltip();
+}
+
+InspectorUI.prototype = {
+  browser: null,
+  tools: null,
+  toolEvents: null,
+  inspecting: false,
+  ruleViewEnabled: true,
+  isDirty: false,
+  store: null,
+
+  _currentInspector: null,
+  _sidebar: null,
+
+  /**
+   * The Inspector object for the current tab.
+   */
+  get currentInspector() this._currentInspector,
+
+  /**
+   * The InspectorStyleSidebar for the current tab.
+   */
+  get sidebar() this._sidebar,
+
+  /**
+   * Toggle the inspector interface elements on or off.
+   *
+   * @param aEvent
+   *        The event that requested the UI change. Toolbar button or menu.
+   */
+  toggleInspectorUI: function IUI_toggleInspectorUI(aEvent)
+  {
+    if (this.isInspectorOpen) {
+      this.closeInspectorUI();
+    } else {
+      this.openInspectorUI();
+    }
+  },
+
+  /**
+   * Add a tooltip to the Inspect and Markup buttons.
+   * The tooltips include the related keyboard shortcut.
+   */
+  buildButtonsTooltip: function IUI_buildButtonsTooltip()
+  {
+    let keysbundle = Services.strings.createBundle("chrome://global-platform/locale/platformKeys.properties");
+    let separator = keysbundle.GetStringFromName("MODIFIER_SEPARATOR");
+
+    let button, tooltip;
+
+    // Inspect Button - the shortcut string is built from the <key> element
+
+    let key = this.chromeDoc.getElementById("key_inspect");
+
+    if (key) {
+      let modifiersAttr = key.getAttribute("modifiers");
+
+      let combo = [];
+
+      if (modifiersAttr.match("accel"))
+#ifdef XP_MACOSX
+        combo.push(keysbundle.GetStringFromName("VK_META"));
+#else
+        combo.push(keysbundle.GetStringFromName("VK_CONTROL"));
+#endif
+      if (modifiersAttr.match("shift"))
+        combo.push(keysbundle.GetStringFromName("VK_SHIFT"));
+      if (modifiersAttr.match("alt"))
+        combo.push(keysbundle.GetStringFromName("VK_ALT"));
+      if (modifiersAttr.match("ctrl"))
+        combo.push(keysbundle.GetStringFromName("VK_CONTROL"));
+      if (modifiersAttr.match("meta"))
+        combo.push(keysbundle.GetStringFromName("VK_META"));
+
+      combo.push(key.getAttribute("key"));
+
+      tooltip = this.strings.formatStringFromName("inspectButtonWithShortcutKey.tooltip",
+        [combo.join(separator)], 1);
+    } else {
+      tooltip = this.strings.GetStringFromName("inspectButton.tooltip");
+    }
+
+    button = this.chromeDoc.getElementById("inspector-inspect-toolbutton");
+    button.setAttribute("tooltiptext", tooltip);
+
+    // Markup Button - the shortcut string is built from the accesskey attribute
+
+    button = this.chromeDoc.getElementById("inspector-treepanel-toolbutton");
+#ifdef XP_MACOSX
+    // On Mac, no accesskey
+    tooltip = this.strings.GetStringFromName("markupButton.tooltip");
+#else
+    let altString = keysbundle.GetStringFromName("VK_ALT");
+    let accesskey = button.getAttribute("accesskey");
+    let shortcut = altString + separator + accesskey;
+    tooltip = this.strings.formatStringFromName("markupButton.tooltipWithAccesskey",
+      [shortcut], 1);
+#endif
+    button.setAttribute("tooltiptext", tooltip);
+
+  },
+
+  /**
+   * Toggle the status of the inspector, starting or stopping it. Invoked
+   * from the toolbar's Inspect button.
+   */
+  toggleInspection: function IUI_toggleInspection()
+  {
+    if (!this.isInspectorOpen) {
+      this.openInspectorUI();
+      return;
+    }
+
+    if (this.inspecting) {
+      this.stopInspecting();
+    } else {
+      this.startInspecting();
+    }
+  },
+
+  /**
+   * Show or hide the sidebar. Called from the Styling button on the
+   * highlighter toolbar.
+   */
+  toggleSidebar: function IUI_toggleSidebar()
+  {
+    if (!this.sidebar.visible) {
+      this.sidebar.show();
+    } else {
+      this.sidebar.hide();
+    }
+  },
+
+  /**
+   * Toggle the TreePanel.
+   */
+  toggleHTMLPanel: function IUI_toggleHTMLPanel()
+  {
+    this.currentInspector.toggleMarkup();
+  },
+
+  /**
+   * Is the inspector UI open? Simply check if the toolbar is visible or not.
+   *
+   * @returns boolean
+   */
+  get isInspectorOpen()
+  {
+    return !!(this.toolbar && !this.toolbar.hidden && this.highlighter);
+  },
+
+  /**
+   * Return the default selection element for the inspected document.
+   */
+  get defaultSelection()
+  {
+    let doc = this.win.document;
+    return doc.documentElement ? doc.documentElement.lastElementChild : null;
+  },
+
+  /**
+   * Open inspector UI and HTML tree. Add listeners for document scrolling,
+   * resize, tabContainer.TabSelect and others. If a node is provided, then
+   * start inspecting it.
+   *
+   * @param [optional] aNode
+   *        The node to inspect.
+   */
+  openInspectorUI: function IUI_openInspectorUI(aNode)
+  {
+    // InspectorUI is already up and running. Lock a node if asked (via context).
+    if (this.isInspectorOpen) {
+      if (aNode) {
+        this.inspectNode(aNode);
+        this.stopInspecting();
+      }
+      return;
+    }
+
+    // Observer used to inspect the specified element from content after the
+    // inspector UI has been opened (via the content context menu).
+    function inspectObserver(aElement) {
+      Services.obs.removeObserver(boundInspectObserver,
+                                  INSPECTOR_NOTIFICATIONS.OPENED,
+                                  false);
+      this.inspectNode(aElement);
+      this.stopInspecting();
+    };
+
+    var boundInspectObserver = inspectObserver.bind(this, aNode);
+
+    if (aNode) {
+      // Add the observer to inspect the node after initialization finishes.
+      Services.obs.addObserver(boundInspectObserver,
+                               INSPECTOR_NOTIFICATIONS.OPENED,
+                               false);
+    }
+    // Start initialization.
+    this.browser = this.tabbrowser.selectedBrowser;
+    this.win = this.browser.contentWindow;
+    this.winID = this.getWindowID(this.win);
+    this.toolbar = this.chromeDoc.getElementById("inspector-toolbar");
+    this.inspectCommand = this.chromeDoc.getElementById("Inspector:Inspect");
+
+    // Update menus:
+    this.inspectorUICommand = this.chromeDoc.getElementById("Tools:Inspect");
+    this.inspectorUICommand.setAttribute("checked", "true");
+
+    this.chromeWin.Tilt.setup();
+
+    this.toolbar.hidden = false;
+
+    // initialize the HTML Breadcrumbs
+    this.breadcrumbs = new HTMLBreadcrumbs(this);
+
+    this.isDirty = false;
+
+    this.progressListener = new InspectorProgressListener(this);
+
+    this.chromeWin.addEventListener("keypress", this, false);
+
+    // initialize the highlighter
+    this.highlighter = new Highlighter(this.chromeWin);
+
+    this.initializeStore();
+
+    this._sidebar = new InspectorStyleSidebar({
+      document: this.chromeDoc,
+      inspector: this._currentInspector,
+    });
+
+    // Fade out the highlighter when needed
+    let deck = this.chromeDoc.getElementById("devtools-sidebar-deck");
+    deck.addEventListener("mouseenter", this, true);
+    deck.addEventListener("mouseleave", this, true);
+
+    // Create UI for any sidebars registered with
+    // InspectorUI.registerSidebar()
+    for each (let tool in InspectorUI._registeredSidebars) {
+      this._sidebar.addTool(tool);
+    }
+
+    this.setupNavigationKeys();
+    this.highlighterReady();
+
+    // Focus the first focusable element in the toolbar
+    this.chromeDoc.commandDispatcher.advanceFocusIntoSubtree(this.toolbar);
+
+    // If nothing is focused in the toolbar, it means that the focus manager
+    // is limited to some specific elements and has moved the focus somewhere else.
+    // So in this case, we want to focus the content window.
+    // See: https://developer.mozilla.org/en/XUL_Tutorial/Focus_and_Selection#Platform_Specific_Behaviors
+    if (!this.toolbar.querySelector(":-moz-focusring")) {
+      this.win.focus();
+    }
+
+  },
+
+  /**
+   * Initialize the InspectorStore.
+   */
+  initializeStore: function IUI_initializeStore()
+  {
+    // First time opened, add the TabSelect listener
+    if (this.store.isEmpty()) {
+      this.tabbrowser.tabContainer.addEventListener("TabSelect", this, false);
+    }
+
+    // Has this windowID been inspected before?
+    if (this.store.hasID(this.winID)) {
+      this._currentInspector = this.store.getInspector(this.winID);
+      this._currentInspector._thaw();
+      let selectedNode = this.currentInspector._selectedNode;
+      if (selectedNode) {
+        this.inspectNode(selectedNode);
+      }
+      this.isDirty = this.currentInspector._isDirty;
+    } else {
+      // First time inspecting, set state to no selection + live inspection.
+      let inspector = new Inspector(this);
+      this.store.addInspector(this.winID, inspector);
+      inspector._selectedNode = null;
+      inspector._inspecting = true;
+      inspector._isDirty = this.isDirty;
+
+      inspector._htmlPanelOpen =
+        Services.prefs.getBoolPref("devtools.inspector.htmlPanelOpen");
+
+      inspector._sidebarOpen =
+        Services.prefs.getBoolPref("devtools.inspector.sidebarOpen");
+
+      inspector._activeSidebar =
+        Services.prefs.getCharPref("devtools.inspector.activeSidebar");
+
+      this.win.addEventListener("pagehide", this, true);
+
+      this._currentInspector = inspector;
+    }
+  },
+
+  /**
+   * Browse nodes according to the breadcrumbs layout, only for some specific
+   * elements of the UI.
+   */
+   setupNavigationKeys: function IUI_setupNavigationKeys()
+   {
+     // UI elements that are arrow keys sensitive:
+     // - the Inspector toolbar.
+
+     this.onKeypress = this.onKeypress.bind(this);
+
+     this.toolbar.addEventListener("keypress", this.onKeypress, true);
+   },
+
+  /**
+   * Remove the event listeners for the arrowkeys.
+   */
+   removeNavigationKeys: function IUI_removeNavigationKeys()
+   {
+      this.toolbar.removeEventListener("keypress", this.onKeypress, true);
+   },
+
+  /**
+   * Close inspector UI and associated panels. Unhighlight and stop inspecting.
+   * Remove event listeners for document scrolling, resize,
+   * tabContainer.TabSelect and others.
+   *
+   * @param boolean aKeepInspector
+   *        Tells if you want the inspector associated to the current tab/window to
+   *        be cleared or not. Set this to true to save the inspector, or false
+   *        to destroy it.
+   */
+  closeInspectorUI: function IUI_closeInspectorUI(aKeepInspector)
+  {
+    if (this.closing || !this.win || !this.browser) {
+      return;
+    }
+
+    let winId = new String(this.winID); // retain this to notify observers.
+
+    this.closing = true;
+    this.toolbar.hidden = true;
+
+    this.removeNavigationKeys();
+
+    this.progressListener.destroy();
+    delete this.progressListener;
+
+    if (!aKeepInspector) {
+      this.win.removeEventListener("pagehide", this, true);
+      this.clearPseudoClassLocks();
+    } else {
+      // Update the inspector before closing.
+      if (this.selection) {
+        this.currentInspector._selectedNode = this.selection;
+      }
+      this.currentInspector._inspecting = this.inspecting;
+      this.currentInspector._isDirty = this.isDirty;
+    }
+
+    if (this.store.isEmpty()) {
+      this.tabbrowser.tabContainer.removeEventListener("TabSelect", this, false);
+    }
+
+    this.chromeWin.removeEventListener("keypress", this, false);
+
+    this.stopInspecting();
+
+    // close the sidebar
+    if (this._sidebar) {
+      this._sidebar.destroy();
+      this._sidebar = null;
+    }
+
+    let deck = this.chromeDoc.getElementById("devtools-sidebar-deck");
+    deck.removeEventListener("mouseenter", this, true);
+    deck.removeEventListener("mouseleave", this, true);
+
+    this.highlighter.destroy();
+    this.highlighter = null;
+
+    if (this.breadcrumbs) {
+      this.breadcrumbs.destroy();
+      this.breadcrumbs = null;
+    }
+
+    if (aKeepInspector) {
+      this._currentInspector._freeze();
+    } else {
+      this.store.deleteInspector(this.winID);
+    }
+    delete this._currentInspector;
+
+    this.inspectorUICommand.setAttribute("checked", "false");
+
+    this.browser = this.win = null; // null out references to browser and window
+    this.winID = null;
+    this.selection = null;
+    this.closing = false;
+    this.isDirty = false;
+
+    delete this.stylePanel;
+    delete this.inspectorUICommand;
+    delete this.inspectCommand;
+    delete this.toolbar;
+
+    Services.obs.notifyObservers(null, INSPECTOR_NOTIFICATIONS.CLOSED, null);
+
+    if (!aKeepInspector)
+      Services.obs.notifyObservers(null, INSPECTOR_NOTIFICATIONS.DESTROYED, winId);
+  },
+
+  /**
+   * Begin inspecting webpage, attach page event listeners, activate
+   * highlighter event listeners.
+   */
+  startInspecting: function IUI_startInspecting()
+  {
+    this.inspectCommand.setAttribute("checked", "true");
+
+    this.inspecting = true;
+    this.highlighter.unlock();
+    this._notifySelected();
+    this._currentInspector.emit("unlocked");
+  },
+
+  _notifySelected: function IUI__notifySelected(aFrom)
+  {
+    this._currentInspector._cancelLayoutChange();
+    this._currentInspector.emit("select", aFrom);
+  },
+
+  /**
+   * Stop inspecting webpage, detach page listeners, disable highlighter
+   * event listeners.
+   * @param aPreventScroll
+   *        Prevent scroll in the HTML tree?
+   */
+  stopInspecting: function IUI_stopInspecting(aPreventScroll)
+  {
+    if (!this.inspecting) {
+      return;
+    }
+
+    this.inspectCommand.setAttribute("checked", "false");
+
+    this.inspecting = false;
+
+    if (this.closing)
+      return;
+
+    if (this.highlighter.getNode()) {
+      this.select(this.highlighter.getNode(), true, !aPreventScroll);
+    } else {
+      this.select(null, true, true);
+    }
+
+    this.highlighter.lock();
+    this._notifySelected();
+    this._currentInspector.emit("locked");
+  },
+
+  /**
+   * Select an object in the inspector.
+   * @param aNode
+   *        node to inspect
+   * @param forceUpdate
+   *        force an update?
+   * @param aScroll boolean
+   *        scroll the tree panel?
+   * @param aFrom [optional] string
+   *        which part of the UI the selection occured from
+   */
+  select: function IUI_select(aNode, forceUpdate, aScroll, aFrom)
+  {
+    if (!aNode)
+      aNode = this.defaultSelection;
+
+    if (forceUpdate || aNode != this.selection) {
+      if (aFrom != "breadcrumbs") {
+        this.clearPseudoClassLocks();
+      }
+
+      this.selection = aNode;
+      if (!this.inspecting) {
+        this.highlighter.highlight(this.selection);
+      }
+    }
+
+    this.breadcrumbs.update();
+    this.chromeWin.Tilt.update(aNode);
+
+    this._notifySelected(aFrom);
+  },
+
+  /**
+   * Toggle the pseudo-class lock on the currently inspected element. If the
+   * pseudo-class is :hover or :active, that pseudo-class will also be toggled
+   * on every ancestor of the element, mirroring real :hover and :active
+   * behavior.
+   * 
+   * @param aPseudo the pseudo-class lock to toggle, e.g. ":hover"
+   */
+  togglePseudoClassLock: function IUI_togglePseudoClassLock(aPseudo)
+  {
+    if (DOMUtils.hasPseudoClassLock(this.selection, aPseudo)) {
+      this.breadcrumbs.nodeHierarchy.forEach(function(crumb) {
+        DOMUtils.removePseudoClassLock(crumb.node, aPseudo);
+      });
+    } else {
+      let hierarchical = aPseudo == ":hover" || aPseudo == ":active";
+      let node = this.selection;
+      do {
+        DOMUtils.addPseudoClassLock(node, aPseudo);
+        node = node.parentNode;
+      } while (hierarchical && node.parentNode)
+    }
+    this.nodeChanged("pseudoclass");
+  },
+
+  /**
+   * Clear all pseudo-class locks applied to elements in the node hierarchy
+   */
+  clearPseudoClassLocks: function IUI_clearPseudoClassLocks()
+  {
+    this.breadcrumbs.nodeHierarchy.forEach(function(crumb) {
+      if (LayoutHelpers.isNodeConnected(crumb.node)) {
+        DOMUtils.clearPseudoClassLocks(crumb.node);
+      }
+    });
+  },
+
+  /**
+   * Called when the highlighted node is changed by a tool.
+   *
+   * @param object aUpdater
+   *        The tool that triggered the update (if any), that tool's
+   *        onChanged will not be called.
+   */
+  nodeChanged: function IUI_nodeChanged(aUpdater)
+  {
+    this.highlighter.updateInfobar();
+    this.highlighter.invalidateSize();
+    this.breadcrumbs.updateSelectors();
+    this._currentInspector.emit("change", aUpdater);
+  },
+
+  /////////////////////////////////////////////////////////////////////////
+  //// Event Handling
+
+  highlighterReady: function IUI_highlighterReady()
+  {
+    let self = this;
+
+    this.highlighter.addListener("locked", function() {
+      self.stopInspecting();
+    });
+
+    this.highlighter.addListener("unlocked", function() {
+      self.startInspecting();
+    });
+
+    this.highlighter.addListener("nodeselected", function() {
+      self.select(self.highlighter.getNode(), false, false);
+    });
+
+    this.highlighter.addListener("pseudoclasstoggled", function(aPseudo) {
+      self.togglePseudoClassLock(aPseudo);
+    });
+
+    if (this.currentInspector._inspecting) {
+      this.startInspecting();
+      this.highlighter.unlock();
+    } else {
+      this.highlighter.lock();
+    }
+
+    Services.obs.notifyObservers(null, INSPECTOR_NOTIFICATIONS.STATE_RESTORED, null);
+
+    this.highlighter.highlight();
+
+    if (this.currentInspector._sidebarOpen) {
+      this._sidebar.show();
+    }
+
+    Services.obs.notifyObservers({wrappedJSObject: this},
+                                 INSPECTOR_NOTIFICATIONS.OPENED, null);
+  },
+
+  /**
+   * Main callback handler for events.
+   *
+   * @param event
+   *        The event to be handled.
+   */
+  handleEvent: function IUI_handleEvent(event)
+  {
+    let winID = null;
+    let win = null;
+    let inspectorClosed = false;
+
+    switch (event.type) {
+      case "TabSelect":
+        winID = this.getWindowID(this.tabbrowser.selectedBrowser.contentWindow);
+        if (this.isInspectorOpen && winID != this.winID) {
+          this.closeInspectorUI(true);
+          inspectorClosed = true;
+        }
+
+        if (winID && this.store.hasID(winID)) {
+          if (inspectorClosed && this.closing) {
+            Services.obs.addObserver(function reopenInspectorForTab() {
+              Services.obs.removeObserver(reopenInspectorForTab,
+                INSPECTOR_NOTIFICATIONS.CLOSED, false);
+
+              this.openInspectorUI();
+            }.bind(this), INSPECTOR_NOTIFICATIONS.CLOSED, false);
+          } else {
+            this.openInspectorUI();
+          }
+        }
+
+        if (this.store.isEmpty()) {
+          this.tabbrowser.tabContainer.removeEventListener("TabSelect", this,
+                                                         false);
+        }
+        break;
+      case "keypress":
+        switch (event.keyCode) {
+          case this.chromeWin.KeyEvent.DOM_VK_ESCAPE:
+            this.closeInspectorUI(false);
+            event.preventDefault();
+            event.stopPropagation();
+            break;
+      }
+      case "pagehide":
+        win = event.originalTarget.defaultView;
+        // Skip iframes/frames.
+        if (!win || win.frameElement || win.top != win) {
+          break;
+        }
+
+        win.removeEventListener(event.type, this, true);
+
+        winID = this.getWindowID(win);
+        if (winID && winID != this.winID) {
+          this.store.deleteInspector(winID);
+        }
+
+        if (this.store.isEmpty()) {
+          this.tabbrowser.tabContainer.removeEventListener("TabSelect", this,
+                                                         false);
+        }
+        break;
+      case "mouseleave":
+        this.highlighter.show();
+        break;
+      case "mouseenter":
+        this.highlighter.hide();
+        break;
+    }
+  },
+
+  /*
+   * handles "keypress" events.
+  */
+  onKeypress: function IUI_onKeypress(event)
+  {
+    let node = null;
+    let bc = this.breadcrumbs;
+    switch (event.keyCode) {
+      case this.chromeWin.KeyEvent.DOM_VK_LEFT:
+        if (bc.currentIndex != 0)
+          node = bc.nodeHierarchy[bc.currentIndex - 1].node;
+        if (node && this.highlighter.isNodeHighlightable(node))
+          this.highlighter.highlight(node);
+        event.preventDefault();
+        event.stopPropagation();
+        break;
+      case this.chromeWin.KeyEvent.DOM_VK_RIGHT:
+        if (bc.currentIndex < bc.nodeHierarchy.length - 1)
+          node = bc.nodeHierarchy[bc.currentIndex + 1].node;
+        if (node && this.highlighter.isNodeHighlightable(node)) {
+          this.highlighter.highlight(node);
+        }
+        event.preventDefault();
+        event.stopPropagation();
+        break;
+      case this.chromeWin.KeyEvent.DOM_VK_UP:
+        if (this.selection) {
+          // Find a previous sibling that is highlightable.
+          node = this.selection.previousSibling;
+          while (node && !this.highlighter.isNodeHighlightable(node)) {
+            node = node.previousSibling;
+          }
+        }
+        if (node && this.highlighter.isNodeHighlightable(node)) {
+          this.highlighter.highlight(node, true);
+        }
+        event.preventDefault();
+        event.stopPropagation();
+        break;
+      case this.chromeWin.KeyEvent.DOM_VK_DOWN:
+        if (this.selection) {
+          // Find a next sibling that is highlightable.
+          node = this.selection.nextSibling;
+          while (node && !this.highlighter.isNodeHighlightable(node)) {
+            node = node.nextSibling;
+          }
+        }
+        if (node && this.highlighter.isNodeHighlightable(node)) {
+          this.highlighter.highlight(node, true);
+        }
+        event.preventDefault();
+        event.stopPropagation();
+        break;
+    }
+  },
+
+  /**
+   * Return the currently-selected node for the purposes of the
+   * context menu.  This is usually the highlighter selection, unless
+   * the markup panel has a selected node that can't be highlighted
+   * (such as a text node).  This will be fixed once the highlighter/inspector
+   * is confortable with non-element nodes being the current selection.
+   * See bug 785180.
+   */
+  _contextSelection: function IUI__contextSelection()
+  {
+    let inspector = this.currentInspector;
+    if (inspector.markup) {
+      return inspector.markup.selected;
+    }
+    return this.selection;
+  },
+
+  /**
+   * Copy the innerHTML of the selected Node to the clipboard. Called via the
+   * Inspector:CopyInner command.
+   */
+  copyInnerHTML: function IUI_copyInnerHTML()
+  {
+    let selection = this._contextSelection();
+    clipboardHelper.copyString(selection.innerHTML, selection.ownerDocument);
+  },
+
+  /**
+   * Copy the outerHTML of the selected Node to the clipboard. Called via the
+   * Inspector:CopyOuter command.
+   */
+  copyOuterHTML: function IUI_copyOuterHTML()
+  {
+    let selection = this._contextSelection();
+    clipboardHelper.copyString(selection.outerHTML, selection.ownerDocument);
+  },
+
+  /**
+   * Delete the selected node. Called via the Inspector:DeleteNode command.
+   */
+  deleteNode: function IUI_deleteNode()
+  {
+    let selection = this._contextSelection();
+
+    let root = selection.ownerDocument.documentElement;
+    if (selection === root) {
+      // We can't delete the root element.
+      return;
+    }
+
+    let parent = selection.parentNode;
+
+    // If the markup panel is active, use the markup panel to delete
+    // the node, making this an undoable action.
+    let markup = this.currentInspector.markup;
+    if (markup) {
+      markup.deleteNode(selection);
+    } else {
+      // remove the node from content
+      parent.removeChild(selection);
+    }
+
+    // Otherwise, just delete the node.
+    this.breadcrumbs.invalidateHierarchy();
+
+    // select the parent node in the highlighter and breadcrumbs
+    this.inspectNode(parent);
+  },
+
+  /////////////////////////////////////////////////////////////////////////
+  //// Utility Methods
+
+  /**
+   * inspect the given node, highlighting it on the page and selecting the
+   * correct row in the tree panel
+   *
+   * @param aNode
+   *        the element in the document to inspect
+   * @param aScroll
+   *        force scroll?
+   */
+  inspectNode: function IUI_inspectNode(aNode, aScroll)
+  {
+    if (aNode.ownerDocument === this.chromeDoc) {
+      // This should never happen, but just in case, we don't let the inspector
+      // inspect browser nodes.
+      return;
+    }
+    this.select(aNode, true, true);
+    this.highlighter.highlight(aNode, aScroll);
+  },
+
+  ///////////////////////////////////////////////////////////////////////////
+  //// Utility functions
+
+  /**
+   * Retrieve the unique ID of a window object.
+   *
+   * @param nsIDOMWindow aWindow
+   * @returns integer ID
+   */
+  getWindowID: function IUI_getWindowID(aWindow)
+  {
+    if (!aWindow) {
+      return null;
+    }
+
+    let util = {};
+
+    try {
+      util = aWindow.QueryInterface(Ci.nsIInterfaceRequestor).
+        getInterface(Ci.nsIDOMWindowUtils);
+    } catch (ex) { }
+
+    return util.currentInnerWindowID;
+  },
+
+  /**
+   * @param msg
+   *        text message to send to the log
+   */
+  _log: function LOG(msg)
+  {
+    Services.console.logStringMessage(msg);
+  },
+
+  /**
+   * Debugging function.
+   * @param msg
+   *        text to show with the stack trace.
+   */
+  _trace: function TRACE(msg)
+  {
+    this._log("TRACE: " + msg);
+    let frame = Components.stack.caller;
+    while (frame = frame.caller) {
+      if (frame.language == Ci.nsIProgrammingLanguage.JAVASCRIPT ||
+          frame.language == Ci.nsIProgrammingLanguage.JAVASCRIPT2) {
+        this._log("filename: " + frame.filename + " lineNumber: " + frame.lineNumber +
+          " functionName: " + frame.name);
+      }
+    }
+    this._log("END TRACE");
+  },
+
+  /**
+   * Get the toolbar button name for a given id string. Used by the
+   * registerTools API to retrieve a consistent name for toolbar buttons
+   * based on the ID of the tool.
+   * @param anId String
+   *        id of the tool to be buttonized
+   * @returns String
+   */
+  getToolbarButtonId: function IUI_createButtonId(anId)
+  {
+    return "inspector-" + anId + "-toolbutton";
+  },
+
+  /**
+   * Destroy the InspectorUI instance. This is called by the InspectorUI API
+   * "user", see gBrowserInit.onUnload() in browser.js.
+   */
+  destroy: function IUI_destroy()
+  {
+    if (this.isInspectorOpen) {
+      this.closeInspectorUI();
+    }
+
+    delete this.store;
+    delete this.chromeDoc;
+    delete this.chromeWin;
+    delete this.tabbrowser;
+  },
+};
+
+/**
+ * The Inspector store is used for storing data specific to each tab window.
+ * @constructor
+ */
+function InspectorStore()
+{
+  this.store = {};
+}
+InspectorStore.prototype = {
+  length: 0,
+
+  /**
+   * Check if there is any data recorded for any tab/window.
+   *
+   * @returns boolean True if there are no stores for any window/tab, or false
+   * otherwise.
+   */
+  isEmpty: function IS_isEmpty()
+  {
+    return this.length == 0 ? true : false;
+  },
+
+  /**
+   * Add a new inspector.
+   *
+   * @param string aID The Store ID you want created.
+   * @param Inspector aInspector The inspector to add.
+   * @returns boolean True if the store was added successfully, or false
+   * otherwise.
+   */
+  addInspector: function IS_addInspector(aID, aInspector)
+  {
+    let result = false;
+
+    if (!(aID in this.store)) {
+      this.store[aID] = aInspector;
+      this.length++;
+      result = true;
+    }
+
+    return result;
+  },
+
+  /**
+   * Get the inspector for a window, if any.
+   *
+   * @param string aID The Store ID you want created.
+   */
+  getInspector: function IS_getInspector(aID)
+  {
+    return this.store[aID] || null;
+  },
+
+  /**
+   * Delete an inspector by ID.
+   *
+   * @param string aID The store ID you want deleted.
+   * @returns boolean True if the store was removed successfully, or false
+   * otherwise.
+   */
+  deleteInspector: function IS_deleteInspector(aID)
+  {
+    let result = false;
+
+    if (aID in this.store) {
+      this.store[aID]._destroy();
+      delete this.store[aID];
+      this.length--;
+      result = true;
+    }
+
+    return result;
+  },
+
+  /**
+   * Check store existence.
+   *
+   * @param string aID The store ID you want to check.
+   * @returns boolean True if the store ID is registered, or false otherwise.
+   */
+  hasID: function IS_hasID(aID)
+  {
+    return (aID in this.store);
+  },
+};
+
+/**
+ * The InspectorProgressListener object is an nsIWebProgressListener which
+ * handles onStateChange events for the inspected browser. If the user makes
+ * changes to the web page and he tries to navigate away, he is prompted to
+ * confirm page navigation, such that he's given the chance to prevent the loss
+ * of edits.
+ *
+ * @constructor
+ * @param object aInspector
+ *        InspectorUI instance object.
+ */
+function InspectorProgressListener(aInspector)
+{
+  this.IUI = aInspector;
+  this.IUI.tabbrowser.addProgressListener(this);
+}
+
+InspectorProgressListener.prototype = {
+  onStateChange:
+  function IPL_onStateChange(aProgress, aRequest, aFlag, aStatus)
+  {
+    // Remove myself if the Inspector is no longer open.
+    if (!this.IUI.isInspectorOpen) {
+      this.destroy();
+      return;
+    }
+
+    let isStart = aFlag & Ci.nsIWebProgressListener.STATE_START;
+    let isDocument = aFlag & Ci.nsIWebProgressListener.STATE_IS_DOCUMENT;
+    let isNetwork = aFlag & Ci.nsIWebProgressListener.STATE_IS_NETWORK;
+    let isRequest = aFlag & Ci.nsIWebProgressListener.STATE_IS_REQUEST;
+
+    // Skip non-interesting states.
+    if (!isStart || !isDocument || !isRequest || !isNetwork) {
+      return;
+    }
+
+    // If the request is about to happen in a new window, we are not concerned
+    // about the request.
+    if (aProgress.DOMWindow != this.IUI.win) {
+      return;
+    }
+
+    if (this.IUI.isDirty) {
+      this.showNotification(aRequest);
+    } else {
+      this.IUI.closeInspectorUI();
+    }
+  },
+
+  /**
+   * Show an asynchronous notification which asks the user to confirm or cancel
+   * the page navigation request.
+   *
+   * @param nsIRequest aRequest
+   *        The request initiated by the user or by the page itself.
+   * @returns void
+   */
+  showNotification: function IPL_showNotification(aRequest)
+  {
+    aRequest.suspend();
+
+    let notificationBox = this.IUI.tabbrowser.getNotificationBox(this.IUI.browser);
+    let notification = notificationBox.
+      getNotificationWithValue("inspector-page-navigation");
+
+    if (notification) {
+      notificationBox.removeNotification(notification, true);
+    }
+
+    let cancelRequest = function onCancelRequest() {
+      if (aRequest) {
+        aRequest.cancel(Cr.NS_BINDING_ABORTED);
+        aRequest.resume(); // needed to allow the connection to be cancelled.
+        aRequest = null;
+      }
+    };
+
+    let eventCallback = function onNotificationCallback(aEvent) {
+      if (aEvent == "removed") {
+        cancelRequest();
+      }
+    };
+
+    let buttons = [
+      {
+        id: "inspector.confirmNavigationAway.buttonLeave",
+        label: this.IUI.strings.
+          GetStringFromName("confirmNavigationAway.buttonLeave"),
+        accessKey: this.IUI.strings.
+          GetStringFromName("confirmNavigationAway.buttonLeaveAccesskey"),
+        callback: function onButtonLeave() {
+          if (aRequest) {
+            aRequest.resume();
+            aRequest = null;
+            this.IUI.closeInspectorUI();
+            return true;
+          }
+          return false;
+        }.bind(this),
+      },
+      {
+        id: "inspector.confirmNavigationAway.buttonStay",
+        label: this.IUI.strings.
+          GetStringFromName("confirmNavigationAway.buttonStay"),
+        accessKey: this.IUI.strings.
+          GetStringFromName("confirmNavigationAway.buttonStayAccesskey"),
+        callback: cancelRequest
+      },
+    ];
+
+    let message = this.IUI.strings.
+      GetStringFromName("confirmNavigationAway.message");
+
+    notification = notificationBox.appendNotification(message,
+      "inspector-page-navigation", "chrome://browser/skin/Info.png",
+      notificationBox.PRIORITY_WARNING_HIGH, buttons, eventCallback);
+
+    // Make sure this not a transient notification, to avoid the automatic
+    // transient notification removal.
+    notification.persistence = -1;
+  },
+
+  /**
+   * Destroy the progress listener instance.
+   */
+  destroy: function IPL_destroy()
+  {
+    this.IUI.tabbrowser.removeProgressListener(this);
+
+    let notificationBox = this.IUI.tabbrowser.getNotificationBox(this.IUI.browser);
+    let notification = notificationBox.
+      getNotificationWithValue("inspector-page-navigation");
+
+    if (notification) {
+      notificationBox.removeNotification(notification, true);
+    }
+
+    delete this.IUI;
+  },
+};
+
+InspectorUI._registeredSidebars = [];
+
+/**
+ * Register an inspector sidebar template.
+ * Already running sidebars will not be affected, see bug 740665.
+ *
+ * @param aRegistration Object
+ * {
+ *   id: "toolname",
+ *   label: "Button or tab label",
+ *   icon: "chrome://somepath.png",
+ *   tooltiptext: "Button tooltip",
+ *   accesskey: "S",
+ *   contentURL: string URI, source of the tool's iframe content.
+ *   load: Called when the sidebar has been created and the contentURL loaded.
+ *         Passed an Inspector object and an iframe object.
+ *   destroy: Called when the sidebar is destroyed by the inspector.
+ *     Passed whatever was returned by the tool's create function.
+ * }
+ */
+InspectorUI.registerSidebar = function IUI_registerSidebar(aRegistration)
+{
+  // Only allow a given tool ID to be registered once.
+  if (InspectorUI._registeredSidebars.some(function(elt) elt.id == aRegistration.id))
+    return false;
+
+  InspectorUI._registeredSidebars.push(aRegistration);
+
+  return true;
+}
+
+/**
+ * Unregister a previously-registered inspector sidebar.
+ * Already running sidebars will not be affected, see bug 740665.
+ *
+ * @param aID string
+ */
+InspectorUI.unregisterSidebar = function IUI_unregisterSidebar(aID)
+{
+  InspectorUI._registeredSidebars = InspectorUI._registeredSidebars.filter(function(aReg) aReg.id != aID);
+}
+
+///////////////////////////////////////////////////////////////////////////
+//// Style Sidebar
+
+/**
+ * Manages the UI and loading of registered sidebar tools.
+ * @param aOptions object
+ *   Initialization information for the style sidebar, including:
+ *     document: The chrome document in which the style sidebar
+ *             should be created.
+ *     inspector: The Inspector object tied to this sidebar.
+ */
+function InspectorStyleSidebar(aOptions)
+{
+  this._tools = {};
+  this._chromeDoc = aOptions.document;
+  this._inspector = aOptions.inspector;
+}
+
+InspectorStyleSidebar.prototype = {
+
+  get visible() !this._box.hasAttribute("hidden"),
+  get activePanel() this._deck.selectedPanel._toolID,
+
+  destroy: function ISS_destroy()
+  {
+    // close the Layout View
+    if (this._layoutview) {
+      this._layoutview.destroy();
+      this._layoutview = null;
+    }
+
+    for each (let toolID in Object.getOwnPropertyNames(this._tools)) {
+      this.removeTool(toolID);
+    }
+    delete this._tools;
+    this._teardown();
+  },
+
+  /**
+   * Called by InspectorUI to create the UI for a registered sidebar tool.
+   * Will create a toolbar button and an iframe for the tool.
+   * @param aRegObj object
+   *        See the documentation for InspectorUI.registerSidebar().
+   */
+  addTool: function ISS_addTool(aRegObj)
+  {
+    if (aRegObj.id in this._tools) {
+      return;
+    }
+
+    let btn = this._chromeDoc.createElement("toolbarbutton");
+    btn.setAttribute("label", aRegObj.label);
+    btn.setAttribute("class", "devtools-toolbarbutton");
+    btn.setAttribute("tooltiptext", aRegObj.tooltiptext);
+    btn.setAttribute("accesskey", aRegObj.accesskey);
+    btn.setAttribute("image", aRegObj.icon || "");
+    btn.setAttribute("type", "radio");
+    btn.setAttribute("group", "sidebar-tools");
+
+    let spacer = this._toolbar.querySelector("spacer");
+    this._toolbar.insertBefore(btn, spacer);
+    // create tool iframe
+    let frame = this._chromeDoc.createElement("iframe");
+    frame.setAttribute("flex", "1");
+    frame._toolID = aRegObj.id;
+
+    // This is needed to enable tooltips inside the iframe document.
+    frame.setAttribute("tooltip", "aHTMLTooltip");
+
+    this._deck.appendChild(frame);
+
+    // wire up button to show the iframe
+    let onClick = function() {
+      this.activatePanel(aRegObj.id);
+    }.bind(this);
+    btn.addEventListener("click", onClick, true);
+
+    this._tools[aRegObj.id] = {
+      id: aRegObj.id,
+      registration: aRegObj,
+      button: btn,
+      frame: frame,
+      loaded: false,
+      context: null,
+      onClick: onClick
+    };
+  },
+
+  /**
+   * Remove a tool from the sidebar.
+   *
+   * @param aID string
+   *        The string ID of the tool to remove.
+   */
+  removeTool: function ISS_removeTool(aID)
+  {
+    if (!aID in this._tools) {
+      return;
+    }
+    let tool = this._tools[aID];
+    delete this._tools[aID];
+
+    if (tool.loaded && tool.registration.destroy) {
+      tool.registration.destroy(tool.context);
+    }
+
+    if (tool.onLoad) {
+      tool.frame.removeEventListener("load", tool.onLoad, true);
+      delete tool.onLoad;
+    }
+
+    if (tool.onClick) {
+      tool.button.removeEventListener("click", tool.onClick, true);
+      delete tool.onClick;
+    }
+
+    tool.button.parentNode.removeChild(tool.button);
+    tool.frame.parentNode.removeChild(tool.frame);
+  },
+
+  /**
+   * Hide or show the sidebar.
+   */
+  toggle: function ISS_toggle()
+  {
+    if (!this.visible) {
+      this.show();
+    } else {
+      this.hide();
+    }
+  },
+
+  /**
+   * Shows the sidebar, updating the stored visibility pref.
+   */
+  show: function ISS_show()
+  {
+    this._box.removeAttribute("hidden");
+    this._splitter.removeAttribute("hidden");
+    this._toggleButton.checked = true;
+
+    this._showDefault();
+
+    this._inspector._sidebarOpen = true;
+    Services.prefs.setBoolPref("devtools.inspector.sidebarOpen", true);
+
+    // Instantiate the Layout View if needed.
+    if (Services.prefs.getBoolPref("devtools.layoutview.enabled")
+        && !this._layoutview) {
+      this._layoutview = new LayoutView({
+        document: this._chromeDoc,
+        inspector: this._inspector,
+      });
+    }
+  },
+
+  /**
+   * Hides the sidebar, updating the stored visibility pref.
+   */
+  hide: function ISS_hide()
+  {
+    this._teardown();
+    this._inspector._sidebarOpen = false;
+    Services.prefs.setBoolPref("devtools.inspector.sidebarOpen", false);
+  },
+
+  /**
+   * Hides the sidebar UI elements.
+   */
+  _teardown: function ISS__teardown()
+  {
+    this._toggleButton.checked = false;
+    this._box.setAttribute("hidden", true);
+    this._splitter.setAttribute("hidden", true);
+  },
+
+  /**
+   * Sets the current sidebar panel.
+   *
+   * @param aID string
+   *        The ID of the panel to make visible.
+   */
+  activatePanel: function ISS_activatePanel(aID) {
+    let tool = this._tools[aID];
+    Services.prefs.setCharPref("devtools.inspector.activeSidebar", aID);
+    this._inspector._activeSidebar = aID;
+    this._deck.selectedPanel = tool.frame;
+    this._showContent(tool);
+    tool.button.setAttribute("checked", "true");
+    let hasSelected = Array.forEach(this._toolbar.children, function(btn) {
+      if (btn != tool.button) {
+        btn.removeAttribute("checked");
+      }
+    });
+  },
+
+  /**
+   * Make the iframe content of a given tool visible.  If this is the first
+   * time the tool has been shown, load its iframe content and call the
+   * registration object's load method.
+   *
+   * @param aTool object
+   *        The tool object we're loading.
+   */
+  _showContent: function ISS__showContent(aTool)
+  {
+    // If the current tool is already loaded, notify that we're
+    // showing this sidebar.
+    if (aTool.loaded) {
+      this._inspector.emit("sidebaractivated", aTool.id);
+      this._inspector.emit("sidebaractivated-" + aTool.id);
+      return;
+    }
+
+    // If we're already loading, we're done.
+    if (aTool.onLoad) {
+      return;
+    }
+
+    // This will be canceled in removeTool if necessary.
+    aTool.onLoad = function(evt) {
+      if (evt.target.location != aTool.registration.contentURL) {
+        return;
+      }
+      aTool.frame.removeEventListener("load", aTool.onLoad, true);
+      delete aTool.onLoad;
+      aTool.loaded = true;
+      aTool.context = aTool.registration.load(this._inspector, aTool.frame);
+
+      this._inspector.emit("sidebaractivated", aTool.id);
+
+      // Send an event specific to the activation of this panel.  For
+      // this initial event, include a "createpanel" argument
+      // to let panels watch sidebaractivated to refresh themselves
+      // but ignore the one immediately after their load.
+      // I don't really like this, we should find a better solution.
+      this._inspector.emit("sidebaractivated-" + aTool.id, "createpanel");
+    }.bind(this);
+    aTool.frame.addEventListener("load", aTool.onLoad, true);
+    aTool.frame.setAttribute("src", aTool.registration.contentURL);
+  },
+
+  /**
+   * For testing purposes, mostly - return the tool-provided context
+   * for a given tool.  Will only work after the tool has been loaded
+   * and instantiated.
+   */
+  _toolContext: function ISS__toolContext(aID) {
+    return aID in this._tools ? this._tools[aID].context : null;
+  },
+
+  /**
+   * Also mostly for testing, return the list of tool objects stored in
+   * the sidebar.
+   */
+  _toolObjects: function ISS__toolObjects() {
+    return [this._tools[i] for each (i in Object.getOwnPropertyNames(this._tools))];
+  },
+
+  /**
+   * If no tool is already selected, show the last-used sidebar.  If there
+   * was no last-used sidebar, just show the first one.
+   */
+  _showDefault: function ISS__showDefault()
+  {
+    let hasSelected = Array.some(this._toolbar.children,
+      function(btn) btn.hasAttribute("checked"));
+
+    // Make sure the selected panel is loaded...
+    this._showContent(this._tools[this.activePanel]);
+
+    if (hasSelected) {
+      return;
+    }
+
+    let activeID = this._inspector._activeSidebar;
+    if (!activeID || !(activeID in this._tools)) {
+      activeID = Object.getOwnPropertyNames(this._tools)[0];
+    }
+    this.activatePanel(activeID);
+  },
+
+  // DOM elements
+  get _toggleButton() this._chromeDoc.getElementById("inspector-style-button"),
+  get _box() this._chromeDoc.getElementById("devtools-sidebar-box"),
+  get _splitter() this._chromeDoc.getElementById("devtools-side-splitter"),
+  get _toolbar() this._chromeDoc.getElementById("devtools-sidebar-toolbar"),
+  get _deck() this._chromeDoc.getElementById("devtools-sidebar-deck"),
+};
+
+///////////////////////////////////////////////////////////////////////////
+//// HTML Breadcrumbs
+
+/**
+ * Display the ancestors of the current node and its children.
+ * Only one "branch" of children are displayed (only one line).
+ *
+ * Mechanism:
+ * . If no nodes displayed yet:
+ *    then display the ancestor of the selected node and the selected node;
+ *   else select the node;
+ * . If the selected node is the last node displayed, append its first (if any).
+ *
+ * @param object aInspector
+ *        The InspectorUI instance.
+ */
+function HTMLBreadcrumbs(aInspector)
+{
+  this.IUI = aInspector;
+  this.DOMHelpers = new DOMHelpers(this.IUI.win);
+  this._init();
+}
+
+HTMLBreadcrumbs.prototype = {
+  _init: function BC__init()
+  {
+    this.container = this.IUI.chromeDoc.getElementById("inspector-breadcrumbs");
+    this.container.addEventListener("mousedown", this, true);
+
+    // We will save a list of already displayed nodes in this array.
+    this.nodeHierarchy = [];
+
+    // Last selected node in nodeHierarchy.
+    this.currentIndex = -1;
+
+    // Siblings menu
+    this.menu = this.IUI.chromeDoc.createElement("menupopup");
+    this.menu.id = "inspector-breadcrumbs-menu";
+
+    let popupSet = this.IUI.chromeDoc.getElementById("mainPopupSet");
+    popupSet.appendChild(this.menu);
+
+    // By default, hide the arrows. We let the <scrollbox> show them
+    // in case of overflow.
+    this.container.removeAttribute("overflows");
+    this.container._scrollButtonUp.collapsed = true;
+    this.container._scrollButtonDown.collapsed = true;
+
+    this.onscrollboxreflow = function() {
+      if (this.container._scrollButtonDown.collapsed)
+        this.container.removeAttribute("overflows");
+      else
+        this.container.setAttribute("overflows", true);
+    }.bind(this);
+
+    this.container.addEventListener("underflow", this.onscrollboxreflow, false);
+    this.container.addEventListener("overflow", this.onscrollboxreflow, false);
+
+    this.menu.addEventListener("popuphiding", (function() {
+      while (this.menu.hasChildNodes()) {
+        this.menu.removeChild(this.menu.firstChild);
+      }
+      let button = this.container.querySelector("button[siblings-menu-open]");
+      button.removeAttribute("siblings-menu-open");
+    }).bind(this), false);
+  },
+
+  /**
+   * Build a string that represents the node: tagName#id.class1.class2.
+   *
+   * @param aNode The node to pretty-print
+   * @returns a string
+   */
+  prettyPrintNodeAsText: function BC_prettyPrintNodeText(aNode)
+  {
+    let text = aNode.tagName.toLowerCase();
+    if (aNode.id) {
+      text += "#" + aNode.id;
+    }
+    for (let i = 0; i < aNode.classList.length; i++) {
+      text += "." + aNode.classList[i];
+    }
+    for (let i = 0; i < PSEUDO_CLASSES.length; i++) {
+      let pseudo = PSEUDO_CLASSES[i];
+      if (DOMUtils.hasPseudoClassLock(aNode, pseudo)) {
+        text += pseudo;  
+      }      
+    }
+
+    return text;
+  },
+
+
+  /**
+   * Build <label>s that represent the node:
+   *   <label class="inspector-breadcrumbs-tag">tagName</label>
+   *   <label class="inspector-breadcrumbs-id">#id</label>
+   *   <label class="inspector-breadcrumbs-classes">.class1.class2</label>
+   *
+   * @param aNode The node to pretty-print
+   * @returns a document fragment.
+   */
+  prettyPrintNodeAsXUL: function BC_prettyPrintNodeXUL(aNode)
+  {
+    let fragment = this.IUI.chromeDoc.createDocumentFragment();
+
+    let tagLabel = this.IUI.chromeDoc.createElement("label");
+    tagLabel.className = "inspector-breadcrumbs-tag plain";
+
+    let idLabel = this.IUI.chromeDoc.createElement("label");
+    idLabel.className = "inspector-breadcrumbs-id plain";
+
+    let classesLabel = this.IUI.chromeDoc.createElement("label");
+    classesLabel.className = "inspector-breadcrumbs-classes plain";
+
+    let pseudosLabel = this.IUI.chromeDoc.createElement("label");
+    pseudosLabel.className = "inspector-breadcrumbs-pseudo-classes plain";
+
+    tagLabel.textContent = aNode.tagName.toLowerCase();
+    idLabel.textContent = aNode.id ? ("#" + aNode.id) : "";
+
+    let classesText = "";
+    for (let i = 0; i < aNode.classList.length; i++) {
+      classesText += "." + aNode.classList[i];
+    }
+    classesLabel.textContent = classesText;
+
+    let pseudos = PSEUDO_CLASSES.filter(function(pseudo) {
+      return DOMUtils.hasPseudoClassLock(aNode, pseudo);
+    }, this);
+    pseudosLabel.textContent = pseudos.join("");
+
+    fragment.appendChild(tagLabel);
+    fragment.appendChild(idLabel);
+    fragment.appendChild(classesLabel);
+    fragment.appendChild(pseudosLabel);
+
+    return fragment;
+  },
+
+  /**
+   * Open the sibling menu.
+   *
+   * @param aButton the button representing the node.
+   * @param aNode the node we want the siblings from.
+   */
+  openSiblingMenu: function BC_openSiblingMenu(aButton, aNode)
+  {
+    let title = this.IUI.chromeDoc.createElement("menuitem");
+    title.setAttribute("label",
+      this.IUI.strings.GetStringFromName("breadcrumbs.siblings"));
+    title.setAttribute("disabled", "true");
+
+    let separator = this.IUI.chromeDoc.createElement("menuseparator");
+
+    this.menu.appendChild(title);
+    this.menu.appendChild(separator);
+
+    let fragment = this.IUI.chromeDoc.createDocumentFragment();
+
+    let nodes = aNode.parentNode.childNodes;
+    for (let i = 0; i < nodes.length; i++) {
+      if (nodes[i].nodeType == aNode.ELEMENT_NODE) {
+        let item = this.IUI.chromeDoc.createElement("menuitem");
+        let inspector = this.IUI;
+        if (nodes[i] === aNode) {
+          item.setAttribute("disabled", "true");
+          item.setAttribute("checked", "true");
+        }
+
+        item.setAttribute("type", "radio");
+        item.setAttribute("label", this.prettyPrintNodeAsText(nodes[i]));
+
+        item.onmouseup = (function(aNode) {
+          return function() {
+            inspector.select(aNode, true, true, "breadcrumbs");
+          }
+        })(nodes[i]);
+
+        fragment.appendChild(item);
+      }
+    }
+    this.menu.appendChild(fragment);
+    this.menu.openPopup(aButton, "before_start", 0, 0, true, false);
+    aButton.setAttribute("siblings-menu-open", "true");
+  },
+
+  /**
+   * Generic event handler.
+   *
+   * @param nsIDOMEvent aEvent
+   *        The DOM event object.
+   */
+  handleEvent: function BC_handleEvent(aEvent)
+  {
+    if (aEvent.type == "mousedown" && aEvent.button == 0) {
+      // on Click and Hold, open the Siblings menu
+
+      let timer;
+      let container = this.container;
+      let window = this.IUI.win;
+
+      function openMenu(aEvent) {
+        cancelHold();
+        let target = aEvent.originalTarget;
+        if (target.tagName == "button") {
+          target.onBreadcrumbsHold();
+        }
+      }
+
+      function handleClick(aEvent) {
+        cancelHold();
+        let target = aEvent.originalTarget;
+        if (target.tagName == "button") {
+          target.onBreadcrumbsClick();
+        }
+      }
+
+      function cancelHold(aEvent) {
+        window.clearTimeout(timer);
+        container.removeEventListener("mouseout", cancelHold, false);
+        container.removeEventListener("mouseup", handleClick, false);
+      }
+
+      container.addEventListener("mouseout", cancelHold, false);
+      container.addEventListener("mouseup", handleClick, false);
+      timer = window.setTimeout(openMenu, 500, aEvent);
+    }
+  },
+
+  /**
+   * Remove nodes and delete properties.
+   */
+  destroy: function BC_destroy()
+  {
+    this.container.removeEventListener("underflow", this.onscrollboxreflow, false);
+    this.container.removeEventListener("overflow", this.onscrollboxreflow, false);
+    this.onscrollboxreflow = null;
+
+    this.empty();
+    this.container.removeEventListener("mousedown", this, true);
+    this.menu.parentNode.removeChild(this.menu);
+    this.container = null;
+    this.nodeHierarchy = null;
+  },
+
+  /**
+   * Empty the breadcrumbs container.
+   */
+  empty: function BC_empty()
+  {
+    while (this.container.hasChildNodes()) {
+      this.container.removeChild(this.container.firstChild);
+    }
+  },
+
+  /**
+   * Re-init the cache and remove all the buttons.
+   */
+  invalidateHierarchy: function BC_invalidateHierarchy()
+  {
+    this.menu.hidePopup();
+    this.nodeHierarchy = [];
+    this.empty();
+  },
+
+  /**
+   * Set which button represent the selected node.
+   *
+   * @param aIdx Index of the displayed-button to select
+   */
+  setCursor: function BC_setCursor(aIdx)
+  {
+    // Unselect the previously selected button
+    if (this.currentIndex > -1 && this.currentIndex < this.nodeHierarchy.length) {
+      this.nodeHierarchy[this.currentIndex].button.removeAttribute("checked");
+    }
+    if (aIdx > -1) {
+      this.nodeHierarchy[aIdx].button.setAttribute("checked", "true");
+      if (this.hadFocus)
+        this.nodeHierarchy[aIdx].button.focus();
+    }
+    this.currentIndex = aIdx;
+  },
+
+  /**
+   * Get the index of the node in the cache.
+   *
+   * @param aNode
+   * @returns integer the index, -1 if not found
+   */
+  indexOf: function BC_indexOf(aNode)
+  {
+    let i = this.nodeHierarchy.length - 1;
+    for (let i = this.nodeHierarchy.length - 1; i >= 0; i--) {
+      if (this.nodeHierarchy[i].node === aNode) {
+        return i;
+      }
+    }
+    return -1;
+  },
+
+  /**
+   * Remove all the buttons and their references in the cache
+   * after a given index.
+   *
+   * @param aIdx
+   */
+  cutAfter: function BC_cutAfter(aIdx)
+  {
+    while (this.nodeHierarchy.length > (aIdx + 1)) {
+      let toRemove = this.nodeHierarchy.pop();
+      this.container.removeChild(toRemove.button);
+    }
+  },
+
+  /**
+   * Build a button representing the node.
+   *
+   * @param aNode The node from the page.
+   * @returns aNode The <button>.
+   */
+  buildButton: function BC_buildButton(aNode)
+  {
+    let button = this.IUI.chromeDoc.createElement("button");
+    let inspector = this.IUI;
+    button.appendChild(this.prettyPrintNodeAsXUL(aNode));
+    button.className = "inspector-breadcrumbs-button";
+
+    button.setAttribute("tooltiptext", this.prettyPrintNodeAsText(aNode));
+
+    button.onkeypress = function onBreadcrumbsKeypress(e) {
+      if (e.charCode == Ci.nsIDOMKeyEvent.DOM_VK_SPACE ||
+          e.keyCode == Ci.nsIDOMKeyEvent.DOM_VK_RETURN)
+        button.click();
+    }
+
+    button.onBreadcrumbsClick = function onBreadcrumbsClick() {
+      inspector.stopInspecting();
+      inspector.select(aNode, true, true, "breadcrumbs");
+    };
+
+    button.onclick = (function _onBreadcrumbsRightClick(aEvent) {
+      button.focus();
+      if (aEvent.button == 2) {
+        this.openSiblingMenu(button, aNode);
+      }
+    }).bind(this);
+
+    button.onBreadcrumbsHold = (function _onBreadcrumbsHold() {
+      this.openSiblingMenu(button, aNode);
+    }).bind(this);
+    return button;
+  },
+
+  /**
+   * Connecting the end of the breadcrumbs to a node.
+   *
+   * @param aNode The node to reach.
+   */
+  expand: function BC_expand(aNode)
+  {
+      let fragment = this.IUI.chromeDoc.createDocumentFragment();
+      let toAppend = aNode;
+      let lastButtonInserted = null;
+      let originalLength = this.nodeHierarchy.length;
+      let stopNode = null;
+      if (originalLength > 0) {
+        stopNode = this.nodeHierarchy[originalLength - 1].node;
+      }
+      while (toAppend && toAppend.tagName && toAppend != stopNode) {
+        let button = this.buildButton(toAppend);
+        fragment.insertBefore(button, lastButtonInserted);
+        lastButtonInserted = button;
+        this.nodeHierarchy.splice(originalLength, 0, {node: toAppend, button: button});
+        toAppend = this.DOMHelpers.getParentObject(toAppend);
+      }
+      this.container.appendChild(fragment, this.container.firstChild);
+  },
+
+  /**
+   * Get a child of a node that can be displayed in the breadcrumbs.
+   * By default, we want a node that can highlighted by the highlighter.
+   * If no highlightable child is found, we return the first node of type
+   * ELEMENT_NODE.
+   *
+   * @param aNode The parent node.
+   * @returns nsIDOMNode|null
+   */
+  getFirstHighlightableChild: function BC_getFirstHighlightableChild(aNode)
+  {
+    let nextChild = this.DOMHelpers.getChildObject(aNode, 0);
+    let fallback = null;
+
+    while (nextChild) {
+      if (this.IUI.highlighter.isNodeHighlightable(nextChild)) {
+        return nextChild;
+      }
+      if (!fallback && nextChild.nodeType == aNode.ELEMENT_NODE) {
+        fallback = nextChild;
+      }
+      nextChild = this.DOMHelpers.getNextSibling(nextChild);
+    }
+    return fallback;
+  },
+
+  /**
+   * Find the "youngest" ancestor of a node which is already in the breadcrumbs.
+   *
+   * @param aNode
+   * @returns Index of the ancestor in the cache
+   */
+  getCommonAncestor: function BC_getCommonAncestor(aNode)
+  {
+    let node = aNode;
+    while (node) {
+      let idx = this.indexOf(node);
+      if (idx > -1) {
+        return idx;
+      } else {
+        node = this.DOMHelpers.getParentObject(node);
+      }
+    }
+    return -1;
+  },
+
+  /**
+   * Make sure that the latest node in the breadcrumbs is not the selected node
+   * if the selected node still has children.
+   */
+  ensureFirstChild: function BC_ensureFirstChild()
+  {
+    // If the last displayed node is the selected node
+    if (this.currentIndex == this.nodeHierarchy.length - 1) {
+      let node = this.nodeHierarchy[this.currentIndex].node;
+      let child = this.getFirstHighlightableChild(node);
+      // If the node has a child
+      if (child) {
+        // Show this child
+        this.expand(child);
+      }
+    }
+  },
+
+  /**
+   * Ensure the selected node is visible.
+   */
+  scroll: function BC_scroll()
+  {
+    // FIXME bug 684352: make sure its immediate neighbors are visible too.
+
+    let scrollbox = this.container;
+    let element = this.nodeHierarchy[this.currentIndex].button;
+    scrollbox.ensureElementIsVisible(element);
+  },
+  
+  updateSelectors: function BC_updateSelectors()
+  {
+    for (let i = this.nodeHierarchy.length - 1; i >= 0; i--) {
+      let crumb = this.nodeHierarchy[i];
+      let button = crumb.button;
+
+      while(button.hasChildNodes()) {
+        button.removeChild(button.firstChild);
+      }
+      button.appendChild(this.prettyPrintNodeAsXUL(crumb.node));
+      button.setAttribute("tooltiptext", this.prettyPrintNodeAsText(crumb.node));
+    }
+  },
+
+  /**
+   * Update the breadcrumbs display when a new node is selected.
+   */
+  update: function BC_update()
+  {
+    this.menu.hidePopup();
+
+    let cmdDispatcher = this.IUI.chromeDoc.commandDispatcher;
+    this.hadFocus = (cmdDispatcher.focusedElement &&
+                     cmdDispatcher.focusedElement.parentNode == this.container);
+
+    let selection = this.IUI.selection;
+    let idx = this.indexOf(selection);
+
+    // Is the node already displayed in the breadcrumbs?
+    if (idx > -1) {
+      // Yes. We select it.
+      this.setCursor(idx);
+    } else {
+      // No. Is the breadcrumbs display empty?
+      if (this.nodeHierarchy.length > 0) {
+        // No. We drop all the element that are not direct ancestors
+        // of the selection
+        let parent = this.DOMHelpers.getParentObject(selection);
+        let idx = this.getCommonAncestor(parent);
+        this.cutAfter(idx);
+      }
+      // we append the missing button between the end of the breadcrumbs display
+      // and the current node.
+      this.expand(selection);
+
+      // we select the current node button
+      idx = this.indexOf(selection);
+      this.setCursor(idx);
+    }
+    // Add the first child of the very last node of the breadcrumbs if possible.
+    this.ensureFirstChild();
+
+    // Make sure the selected node and its neighbours are visible.
+    this.scroll();
+
+    this.updateSelectors();
+  },
+
+}
+
+/////////////////////////////////////////////////////////////////////////
+//// Initializers
+
+XPCOMUtils.defineLazyGetter(InspectorUI.prototype, "strings",
+  function () {
+    return Services.strings.createBundle(
+            "chrome://browser/locale/devtools/inspector.properties");
+  });
+
+XPCOMUtils.defineLazyGetter(this, "DOMUtils", function () {
+  return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
+});
+
+XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function() {
+  return Cc["@mozilla.org/widget/clipboardhelper;1"].
+    getService(Ci.nsIClipboardHelper);
+});
diff --git a/browser/devtools/inspector/test/Makefile.in b/browser/devtools/highlighter/test/Makefile.in
similarity index 88%
rename from browser/devtools/inspector/test/Makefile.in
rename to browser/devtools/highlighter/test/Makefile.in
index 422f66485965..14c302b51623 100644
--- a/browser/devtools/inspector/test/Makefile.in
+++ b/browser/devtools/highlighter/test/Makefile.in
@@ -12,29 +12,34 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_FILES = \
-		browser_inspector_iframeTest.js \
 		browser_inspector_initialization.js \
+		browser_inspector_treeSelection.js \
 		browser_inspector_highlighter.js \
+		browser_inspector_highlighter_autohide.js \
+		browser_inspector_iframeTest.js \
 		browser_inspector_scrolling.js \
+		browser_inspector_tab_switch.js \
 		browser_inspector_bug_665880.js \
+		browser_inspector_bug_674871.js \
+		browser_inspector_bug_566084_location_changed.js \
 		browser_inspector_infobar.js \
+		browser_inspector_bug_690361.js \
+		browser_inspector_bug_672902_keyboard_shortcuts.js \
+		browser_inspector_keybindings.js \
 		browser_inspector_breadcrumbs.html \
 		browser_inspector_breadcrumbs.js \
+		browser_inspector_bug_699308_iframe_navigation.js \
+		browser_inspector_changes.js \
+		browser_inspector_ruleviewstore.js \
 		browser_inspector_invalidate.js \
+		browser_inspector_sidebarstate.js \
 		browser_inspector_menu.js \
+		browser_inspector_pseudoclass_lock.js \
 		browser_inspector_pseudoClass_menu.js \
 		browser_inspector_destroyselection.html \
 		browser_inspector_destroyselection.js \
-		browser_inspector_bug_699308_iframe_navigation.js \
-		browser_inspector_bug_672902_keyboard_shortcuts.js \
-		browser_inspector_bug_566084_location_changed.js \
-		browser_inspector_sidebarstate.js \
-		browser_inspector_pseudoclass_lock.js \
 		browser_inspector_cmd_inspect.js \
 		browser_inspector_cmd_inspect.html \
-		browser_inspector_highlighter_autohide.js \
-		browser_inspector_changes.js \
-		browser_inspector_bug_674871.js \
 		head.js \
 		helpers.js \
 		$(NULL)
diff --git a/browser/devtools/inspector/test/browser_inspector_breadcrumbs.html b/browser/devtools/highlighter/test/browser_inspector_breadcrumbs.html
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_breadcrumbs.html
rename to browser/devtools/highlighter/test/browser_inspector_breadcrumbs.html
diff --git a/browser/devtools/inspector/test/browser_inspector_breadcrumbs.js b/browser/devtools/highlighter/test/browser_inspector_breadcrumbs.js
similarity index 68%
rename from browser/devtools/inspector/test/browser_inspector_breadcrumbs.js
rename to browser/devtools/highlighter/test/browser_inspector_breadcrumbs.js
index 50ceed087e97..0b1f78290347 100644
--- a/browser/devtools/inspector/test/browser_inspector_breadcrumbs.js
+++ b/browser/devtools/highlighter/test/browser_inspector_breadcrumbs.js
@@ -18,7 +18,6 @@ function test()
   let doc;
   let nodes;
   let cursor;
-  let inspector;
 
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.selectedBrowser.addEventListener("load", function onload() {
@@ -27,7 +26,7 @@ function test()
     waitForFocus(setupTest, content);
   }, true);
 
-  content.location = "http://mochi.test:8888/browser/browser/devtools/inspector/test/browser_inspector_breadcrumbs.html";
+  content.location = "http://mochi.test:8888/browser/browser/devtools/highlighter/test/browser_inspector_breadcrumbs.html";
 
   function setupTest()
   {
@@ -37,16 +36,20 @@ function test()
       ok(nodes[i].node, "node " + nodes[i].nodeId + " found");
     }
 
-    openInspector(runTests);
+    Services.obs.addObserver(runTests,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.toggleInspectorUI();
   }
 
-  function runTests(aInspector)
+  function runTests()
   {
-    inspector = aInspector;
+    Services.obs.removeObserver(runTests,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+
     cursor = 0;
-    inspector.selection.on("new-node", nodeSelected);
     executeSoon(function() {
-      inspector.selection.setNode(nodes[0].node);
+      InspectorUI.highlighter.addListener("nodeselected", nodeSelected);
+      InspectorUI.inspectNode(nodes[0].node);
     });
   }
 
@@ -56,20 +59,24 @@ function test()
       performTest();
       cursor++;
       if (cursor >= nodes.length) {
-        inspector.selection.off("new-node", nodeSelected);
-        finishUp();
+
+        InspectorUI.highlighter.removeListener("nodeselected", nodeSelected);
+        Services.obs.addObserver(finishUp,
+          InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+
+        executeSoon(function() {
+          InspectorUI.closeInspectorUI();
+        });
       } else {
         let node = nodes[cursor].node;
-        inspector.selection.setNode(node);
+        InspectorUI.inspectNode(node);
       }
     });
   }
 
   function performTest()
   {
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let panel = gDevTools.getPanelForTarget("inspector", target);
-    let container = panel.panelDoc.getElementById("inspector-breadcrumbs");
+    let container = document.getElementById("inspector-breadcrumbs");
     let buttonsLabelIds = nodes[cursor].result.split(" ");
 
     // html > body > …
@@ -84,11 +91,11 @@ function test()
 
     let checkedButton = container.querySelector("button[checked]");
     let labelId = checkedButton.querySelector(".inspector-breadcrumbs-id");
-    let id = inspector.selection.node.id;
-    is(labelId.textContent, "#" + id, "Node " + cursor + ": selection matches");
+    is(labelId.textContent, "#" + InspectorUI.selection.id, "Node " + cursor + ": selection matches");
   }
 
   function finishUp() {
+    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
     doc = nodes = null;
     gBrowser.removeCurrentTab();
     finish();
diff --git a/browser/devtools/highlighter/test/browser_inspector_bug_566084_location_changed.js b/browser/devtools/highlighter/test/browser_inspector_bug_566084_location_changed.js
new file mode 100644
index 000000000000..71349374fcf5
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_bug_566084_location_changed.js
@@ -0,0 +1,120 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let notificationBox = null;
+
+function startLocationTests() {
+  ok(window.InspectorUI, "InspectorUI variable exists");
+  Services.obs.addObserver(runInspectorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, null);
+  InspectorUI.toggleInspectorUI();
+}
+
+function runInspectorTests() {
+  Services.obs.removeObserver(runInspectorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, null);
+
+  let para = content.document.querySelector("p");
+  ok(para, "found the paragraph element");
+  is(para.textContent, "init", "paragraph content is correct");
+
+  ok(InspectorUI.inspecting, "Inspector is highlighting");
+  ok(InspectorUI.isInspectorOpen, "Inspector is open");
+
+  InspectorUI.isDirty = true;
+
+  notificationBox = gBrowser.getNotificationBox(gBrowser.selectedBrowser);
+  notificationBox.addEventListener("AlertActive", alertActive1, false);
+
+  gBrowser.selectedBrowser.addEventListener("load", onPageLoad, true);
+
+  content.location = "data:text/html,<div>location change test 1 for " +
+    "inspector</div><p>test1</p>";
+}
+
+function alertActive1() {
+  notificationBox.removeEventListener("AlertActive", alertActive1, false);
+
+  let notification = notificationBox.
+    getNotificationWithValue("inspector-page-navigation");
+  ok(notification, "found the inspector-page-navigation notification");
+
+  // By closing the notification it is expected that page navigation is
+  // canceled.
+  executeSoon(function() {
+    notification.close();
+    locationTest2();
+  });
+}
+
+function onPageLoad() {
+  gBrowser.selectedBrowser.removeEventListener("load", onPageLoad, true);
+
+  isnot(content.location.href.indexOf("test2"), -1,
+        "page navigated to the correct location");
+
+  let para = content.document.querySelector("p");
+  ok(para, "found the paragraph element, third time");
+  is(para.textContent, "test2", "paragraph content is correct");
+
+  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
+  ok(!InspectorUI.isInspectorOpen, "Inspector Panel is not open");
+
+  testEnd();
+}
+
+function locationTest2() {
+  // Location did not change.
+  let para = content.document.querySelector("p");
+  ok(para, "found the paragraph element, second time");
+  is(para.textContent, "init", "paragraph content is correct");
+
+  ok(InspectorUI.inspecting, "Inspector is highlighting");
+  ok(InspectorUI.isInspectorOpen, "Inspector Panel is open");
+
+  notificationBox.addEventListener("AlertActive", alertActive2, false);
+
+  content.location = "data:text/html,<div>location change test 2 for " +
+    "inspector</div><p>test2</p>";
+}
+
+function alertActive2() {
+  notificationBox.removeEventListener("AlertActive", alertActive2, false);
+
+  let notification = notificationBox.
+    getNotificationWithValue("inspector-page-navigation");
+  ok(notification, "found the inspector-page-navigation notification");
+
+  let buttons = notification.querySelectorAll("button");
+  let buttonLeave = null;
+  for (let i = 0; i < buttons.length; i++) {
+    if (buttons[i].buttonInfo.id == "inspector.confirmNavigationAway.buttonLeave") {
+      buttonLeave = buttons[i];
+      break;
+    }
+  }
+
+  ok(buttonLeave, "the Leave page button was found");
+
+  // Accept page navigation.
+  executeSoon(function(){
+    buttonLeave.doCommand();
+  });
+}
+
+function testEnd() {
+  notificationBox = null;
+  gBrowser.removeCurrentTab();
+  executeSoon(finish);
+}
+
+function test() {
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onBrowserLoad() {
+    gBrowser.selectedBrowser.removeEventListener("load", onBrowserLoad, true);
+    waitForFocus(startLocationTests, content);
+  }, true);
+
+  content.location = "data:text/html,<div>location change tests for " +
+    "inspector.</div><p>init</p>";
+}
diff --git a/browser/devtools/inspector/test/browser_inspector_bug_665880.js b/browser/devtools/highlighter/test/browser_inspector_bug_665880.js
similarity index 52%
rename from browser/devtools/inspector/test/browser_inspector_bug_665880.js
rename to browser/devtools/highlighter/test/browser_inspector_bug_665880.js
index b80de1cc211c..b5e23af2bb2a 100644
--- a/browser/devtools/inspector/test/browser_inspector_bug_665880.js
+++ b/browser/devtools/highlighter/test/browser_inspector_bug_665880.js
@@ -23,25 +23,37 @@ function test()
   {
     objectNode = doc.querySelector("object");
     ok(objectNode, "we have the object node");
-    openInspector(runObjectInspectionTest);
+    Services.obs.addObserver(runObjectInspectionTest,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.toggleInspectorUI();
   }
 
-  function runObjectInspectionTest(inspector)
+  function runObjectInspectionTest()
   {
-    inspector.highlighter.once("locked", performTestComparison);
-    inspector.selection.setNode(objectNode, "");
+    Services.obs.removeObserver(runObjectInspectionTest,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+
+    executeSoon(function() {
+      InspectorUI.highlighter.addListener("nodeselected", performTestComparison);
+
+      InspectorUI.inspectNode(objectNode);
+    });
   }
 
   function performTestComparison()
   {
-    is(getActiveInspector().selection.node, objectNode, "selection matches node");
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    gDevTools.closeToolbox(target);
-    finishUp();
+    InspectorUI.highlighter.removeListener("nodeselected", performTestComparison);
+
+    is(InspectorUI.selection, objectNode, "selection matches node");
+
+    Services.obs.addObserver(finishUp,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+    InspectorUI.closeInspectorUI();
   }
 
 
   function finishUp() {
+    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
     doc = objectNode = null;
     gBrowser.removeCurrentTab();
     finish();
diff --git a/browser/devtools/inspector/test/browser_inspector_bug_672902_keyboard_shortcuts.js b/browser/devtools/highlighter/test/browser_inspector_bug_672902_keyboard_shortcuts.js
similarity index 51%
rename from browser/devtools/inspector/test/browser_inspector_bug_672902_keyboard_shortcuts.js
rename to browser/devtools/highlighter/test/browser_inspector_bug_672902_keyboard_shortcuts.js
index f44ad7ba9838..1e11ec60e944 100644
--- a/browser/devtools/inspector/test/browser_inspector_bug_672902_keyboard_shortcuts.js
+++ b/browser/devtools/highlighter/test/browser_inspector_bug_672902_keyboard_shortcuts.js
@@ -11,7 +11,6 @@ function test()
 
   let doc;
   let node;
-  let inspector;
 
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.selectedBrowser.addEventListener("load", function onload() {
@@ -27,19 +26,23 @@ function test()
 
   function setupKeyBindingsTest()
   {
-    openInspector(findAndHighlightNode);
+    Services.obs.addObserver(findAndHighlightNode,
+                             InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED,
+                             false);
+    InspectorUI.toggleInspectorUI();
   }
 
-  function findAndHighlightNode(aInspector)
+  function findAndHighlightNode()
   {
-    inspector = aInspector;
+    Services.obs.removeObserver(findAndHighlightNode,
+                                InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
 
     executeSoon(function() {
-      inspector.selection.once("new-node", highlightBodyNode);
+      InspectorUI.highlighter.addListener("nodeselected", highlightBodyNode);
       // Test that navigating around without a selected node gets us to the
       // body element.
       node = doc.querySelector("body");
-      let bc = inspector.breadcrumbs;
+      let bc = InspectorUI.breadcrumbs;
       bc.nodeHierarchy[bc.currentIndex].button.focus();
       EventUtils.synthesizeKey("VK_RIGHT", { });
     });
@@ -47,10 +50,11 @@ function test()
 
   function highlightBodyNode()
   {
-    is(inspector.selection.node, node, "selected body element");
+    InspectorUI.highlighter.removeListener("nodeselected", highlightBodyNode);
+    is(InspectorUI.selection, node, "selected body element");
 
     executeSoon(function() {
-      inspector.selection.once("new-node", highlightHeaderNode);
+      InspectorUI.highlighter.addListener("nodeselected", highlightHeaderNode);
       // Test that moving to the child works.
       node = doc.querySelector("h1");
       EventUtils.synthesizeKey("VK_RIGHT", { });
@@ -59,10 +63,11 @@ function test()
 
   function highlightHeaderNode()
   {
-    is(inspector.selection.node, node, "selected h1 element");
+    InspectorUI.highlighter.removeListener("nodeselected", highlightHeaderNode);
+    is(InspectorUI.selection, node, "selected h1 element");
 
     executeSoon(function() {
-      inspector.selection.once("new-node", highlightParagraphNode);
+      InspectorUI.highlighter.addListener("nodeselected", highlightParagraphNode);
       // Test that moving to the next sibling works.
       node = doc.querySelector("p");
       EventUtils.synthesizeKey("VK_DOWN", { });
@@ -71,10 +76,11 @@ function test()
 
   function highlightParagraphNode()
   {
-    is(inspector.selection.node, node, "selected p element");
+    InspectorUI.highlighter.removeListener("nodeselected", highlightParagraphNode);
+    is(InspectorUI.selection, node, "selected p element");
 
     executeSoon(function() {
-      inspector.selection.once("new-node", highlightHeaderNodeAgain);
+      InspectorUI.highlighter.addListener("nodeselected", highlightHeaderNodeAgain);
       // Test that moving to the previous sibling works.
       node = doc.querySelector("h1");
       EventUtils.synthesizeKey("VK_UP", { });
@@ -83,10 +89,11 @@ function test()
 
   function highlightHeaderNodeAgain()
   {
-    is(inspector.selection.node, node, "selected h1 element");
+    InspectorUI.highlighter.removeListener("nodeselected", highlightHeaderNodeAgain);
+    is(InspectorUI.selection, node, "selected h1 element");
 
     executeSoon(function() {
-      inspector.selection.once("new-node", highlightParentNode);
+      InspectorUI.highlighter.addListener("nodeselected", highlightParentNode);
       // Test that moving to the parent works.
       node = doc.querySelector("body");
       EventUtils.synthesizeKey("VK_LEFT", { });
@@ -95,11 +102,27 @@ function test()
 
   function highlightParentNode()
   {
-    is(inspector.selection.node, node, "selected body element");
-    finishUp();
+    InspectorUI.highlighter.removeListener("nodeselected", highlightParentNode);
+    is(InspectorUI.selection, node, "selected body element");
+
+    // Test that locking works.
+    synthesizeKeyFromKeyTag("key_inspect");
+
+    executeSoon(isTheNodeLocked);
+  }
+
+  function isTheNodeLocked()
+  {
+    ok(!InspectorUI.inspecting, "the node is locked");
+    Services.obs.addObserver(finishUp,
+                             InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED,
+                             false);
+    InspectorUI.closeInspectorUI();
   }
 
   function finishUp() {
+    Services.obs.removeObserver(finishUp,
+                                InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
     doc = node = null;
     gBrowser.removeCurrentTab();
     finish();
diff --git a/browser/devtools/inspector/test/browser_inspector_bug_674871.js b/browser/devtools/highlighter/test/browser_inspector_bug_674871.js
similarity index 68%
rename from browser/devtools/inspector/test/browser_inspector_bug_674871.js
rename to browser/devtools/highlighter/test/browser_inspector_bug_674871.js
index ed448d8f161b..6b6e3d167423 100644
--- a/browser/devtools/inspector/test/browser_inspector_bug_674871.js
+++ b/browser/devtools/highlighter/test/browser_inspector_bug_674871.js
@@ -1,6 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+
 function test()
 {
   waitForExplicitFinish();
@@ -45,45 +46,52 @@ function test()
     iframeBodyNode = iframeNode.contentDocument.querySelector("body");
     ok(iframeNode, "we have the iframe node");
     ok(iframeBodyNode, "we have the body node");
-    openInspector(runTests);
+    Services.obs.addObserver(runTests,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.toggleInspectorUI();
   }
 
-  function runTests(inspector)
+  function runTests()
   {
+    Services.obs.removeObserver(runTests,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+
     executeSoon(function() {
-      inspector.highlighter.once("highlighting", isTheIframeSelected);
+      InspectorUI.highlighter.addListener("nodeselected", isTheIframeSelected);
+
       moveMouseOver(iframeNode, 1, 1);
     });
   }
 
   function isTheIframeSelected()
   {
-    let inspector = getActiveInspector();
+    InspectorUI.highlighter.removeListener("nodeselected", isTheIframeSelected);
 
-    is(inspector.selection.node, iframeNode, "selection matches node");
+    is(InspectorUI.selection, iframeNode, "selection matches node");
     iframeNode.style.marginBottom = doc.defaultView.innerHeight + "px";
     doc.defaultView.scrollBy(0, 40);
 
     executeSoon(function() {
-      inspector.selection.once("new-node", isTheIframeContentSelected);
+      InspectorUI.highlighter.addListener("nodeselected", isTheIframeContentSelected);
       moveMouseOver(iframeNode, 40, 40);
     });
   }
 
   function isTheIframeContentSelected()
   {
-    let inspector = getActiveInspector();
-    is(inspector.selection.node, iframeBodyNode, "selection matches node");
+    InspectorUI.highlighter.removeListener("nodeselected", isTheIframeContentSelected);
+    is(InspectorUI.selection, iframeBodyNode, "selection matches node");
     // 184 == 200 + 11(border) + 13(padding) - 40(scroll)
-    is(inspector.highlighter._highlightRect.height, 184,
+    is(InspectorUI.highlighter._highlightRect.height, 184,
       "highlighter height");
 
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    gDevTools.closeToolbox(target);
-    finishUp();
+    Services.obs.addObserver(finishUp,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+    InspectorUI.closeInspectorUI();
   }
 
   function finishUp() {
+    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
     doc = iframeNode = iframeBodyNode = null;
     gBrowser.removeCurrentTab();
     finish();
diff --git a/browser/devtools/highlighter/test/browser_inspector_bug_690361.js b/browser/devtools/highlighter/test/browser_inspector_bug_690361.js
new file mode 100644
index 000000000000..c60a258acf5e
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_bug_690361.js
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let doc;
+let salutation;
+let closing;
+
+function createDocument()
+{
+  doc.body.innerHTML = '<div id="first" style="{ margin: 10em; ' +
+    'font-size: 14pt; font-family: helvetica, sans-serif; color: #AAA}">\n' +
+    '<h1>Some header text</h1>\n' +
+    '<p id="salutation" style="{font-size: 12pt}">hi.</p>\n' +
+    '<p id="body" style="{font-size: 12pt}">I am a test-case. This text exists ' +
+    'solely to provide some things to test the inspector initialization.</p>\n' +
+    'If you are reading this, you should go do something else instead. Maybe ' +
+    'read a book. Or better yet, write some test-cases for another bit of code. ' +
+    '<span style="{font-style: italic}">Maybe more inspector test-cases!</span></p>\n' +
+    '<p id="closing">end transmission</p>\n' +
+    '</div>';
+  doc.title = "Inspector Opening and Closing Test";
+  startInspectorTests();
+}
+
+function startInspectorTests()
+{
+  ok(InspectorUI, "InspectorUI variable exists");
+  Services.obs.addObserver(runInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.toggleInspectorUI();
+}
+
+function runInspectorTests()
+{
+  Services.obs.removeObserver(runInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+  Services.obs.addObserver(closeInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+
+  ok(InspectorUI.toolbar, "we have the toolbar.");
+  ok(!InspectorUI.toolbar.hidden, "toolbar is visible");
+  ok(InspectorUI.inspecting, "Inspector is inspecting");
+  ok(!InspectorUI.currentInspector._markupOpen, "Inspector Tree Panel is not open");
+  ok(InspectorUI.highlighter, "Highlighter is up");
+
+  salutation = doc.getElementById("salutation");
+  InspectorUI.inspectNode(salutation);
+
+  let button = document.getElementById("highlighter-closebutton");
+  button.click();
+}
+
+function closeInspectorTests()
+{
+  Services.obs.removeObserver(closeInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+  Services.obs.addObserver(inspectorOpenedTrap,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  ok(!InspectorUI.isInspectorOpen, "Inspector is not open");
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    gBrowser.removeCurrentTab();
+  }, true);
+
+  gBrowser.tabContainer.addEventListener("TabSelect", finishInspectorTests, false);
+}
+
+function inspectorOpenedTrap()
+{
+  ok(false, "Inspector opened! Should not have done so.");
+  InspectorUI.closeInspectorUI(false);
+}
+
+function finishInspectorTests()
+{
+  gBrowser.tabContainer.removeEventListener("TabSelect", finishInspectorTests, false);
+
+  Services.obs.removeObserver(inspectorOpenedTrap,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+
+  requestLongerTimeout(4); // give the inspector a chance to open
+  executeSoon(function() {
+    gBrowser.removeCurrentTab();
+    finish();
+  });
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  ignoreAllUncaughtExceptions();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,basic tests for inspector";
+}
+
diff --git a/browser/devtools/highlighter/test/browser_inspector_bug_699308_iframe_navigation.js b/browser/devtools/highlighter/test/browser_inspector_bug_699308_iframe_navigation.js
new file mode 100644
index 000000000000..50beccc16e29
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_bug_699308_iframe_navigation.js
@@ -0,0 +1,77 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let iframe;
+let iframeLoads = 0;
+let checksAfterLoads = false;
+
+function startTest() {
+  ok(window.InspectorUI, "InspectorUI variable exists");
+  Services.obs.addObserver(runInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, null);
+  InspectorUI.toggleInspectorUI();
+}
+
+function runInspectorTests() {
+  Services.obs.removeObserver(runInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, null);
+
+  iframe = content.document.querySelector("iframe");
+  ok(iframe, "found the iframe element");
+
+  ok(InspectorUI.inspecting, "Inspector is highlighting");
+  ok(InspectorUI.isInspectorOpen, "Inspector is open");
+
+  Services.obs.addObserver(finishTest,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+
+  iframe.addEventListener("load", onIframeLoad, false);
+
+  executeSoon(function() {
+    iframe.contentWindow.location = "javascript:location.reload()";
+  });
+}
+
+function onIframeLoad() {
+  if (++iframeLoads != 2) {
+    executeSoon(function() {
+      iframe.contentWindow.location = "javascript:location.reload()";
+    });
+    return;
+  }
+
+  iframe.removeEventListener("load", onIframeLoad, false);
+
+  ok(InspectorUI.inspecting, "Inspector is highlighting after iframe nav");
+  ok(InspectorUI.isInspectorOpen, "Inspector Panel is open after iframe nav");
+
+  checksAfterLoads = true;
+
+  InspectorUI.closeInspectorUI();
+}
+
+function finishTest() {
+  Services.obs.removeObserver(finishTest,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+
+  is(iframeLoads, 2, "iframe loads");
+  ok(checksAfterLoads, "the Inspector tests got the chance to run after iframe reloads");
+  ok(!InspectorUI.isInspectorOpen, "Inspector Panel is not open");
+
+  iframe = null;
+  gBrowser.removeCurrentTab();
+  executeSoon(finish);
+}
+
+function test() {
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onBrowserLoad() {
+    gBrowser.selectedBrowser.removeEventListener("load", onBrowserLoad, true);
+    waitForFocus(startTest, content);
+  }, true);
+
+  content.location = "data:text/html,<p>bug 699308 - test iframe navigation" +
+    "<iframe src='data:text/html,hello world'></iframe>";
+}
diff --git a/browser/devtools/highlighter/test/browser_inspector_changes.js b/browser/devtools/highlighter/test/browser_inspector_changes.js
new file mode 100644
index 000000000000..ce122a01341c
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_changes.js
@@ -0,0 +1,124 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+let doc;
+let testDiv;
+
+function createDocument()
+{
+  doc.body.innerHTML = '<div id="testdiv">Test div!</div>';
+  doc.title = "Inspector Change Test";
+  startInspectorTests();
+}
+
+
+function getInspectorProp(aName)
+{
+  for each (let view in computedViewTree().propertyViews) {
+    if (view.name == aName) {
+      return view;
+    }
+  }
+  return null;
+}
+
+function startInspectorTests()
+{
+  ok(InspectorUI, "InspectorUI variable exists");
+  Services.obs.addObserver(runInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.toggleInspectorUI();
+}
+
+function runInspectorTests()
+{
+  Services.obs.removeObserver(runInspectorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+  testDiv = doc.getElementById("testdiv");
+
+  testDiv.style.fontSize = "10px";
+
+  InspectorUI.inspectNode(testDiv);
+  InspectorUI.stopInspecting();
+
+  // Start up the style inspector panel...
+  Services.obs.addObserver(stylePanelTests, "StyleInspector-populated", false);
+
+  InspectorUI.sidebar.show();
+  InspectorUI.sidebar.activatePanel("computedview");
+}
+
+function stylePanelTests()
+{
+  Services.obs.removeObserver(stylePanelTests, "StyleInspector-populated");
+
+  ok(InspectorUI.sidebar.visible, "Inspector Sidebar is open");
+  ok(computedViewTree(), "Style Panel has a cssHtmlTree");
+
+  let propView = getInspectorProp("font-size");
+  is(propView.value, "10px", "Style inspector should be showing the correct font size.");
+
+  Services.obs.addObserver(stylePanelAfterChange, "StyleInspector-populated", false);
+
+  testDiv.style.fontSize = "15px";
+  InspectorUI.nodeChanged();
+}
+
+function stylePanelAfterChange()
+{
+  Services.obs.removeObserver(stylePanelAfterChange, "StyleInspector-populated");
+
+  let propView = getInspectorProp("font-size");
+  is(propView.value, "15px", "Style inspector should be showing the new font size.");
+
+  stylePanelNotActive();
+}
+
+function stylePanelNotActive()
+{
+  // Tests changes made while the style panel is not active.
+  InspectorUI.sidebar.activatePanel("ruleview");
+
+  executeSoon(function() {
+    Services.obs.addObserver(stylePanelAfterSwitch, "StyleInspector-populated", false);
+    testDiv.style.fontSize = "20px";
+    InspectorUI.nodeChanged();
+    InspectorUI.sidebar.activatePanel("computedview");
+  });
+}
+
+function stylePanelAfterSwitch()
+{
+  Services.obs.removeObserver(stylePanelAfterSwitch, "StyleInspector-populated");
+
+  let propView = getInspectorProp("font-size");
+  is(propView.value, "20px", "Style inspector should be showing the newest font size.");
+
+  Services.obs.addObserver(finishTest, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+  executeSoon(function() {
+    InspectorUI.closeInspectorUI(true);
+  });
+}
+
+function finishTest()
+{
+  Services.obs.removeObserver(finishTest,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,basic tests for inspector";
+}
+
diff --git a/browser/devtools/inspector/test/browser_inspector_cmd_inspect.html b/browser/devtools/highlighter/test/browser_inspector_cmd_inspect.html
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_cmd_inspect.html
rename to browser/devtools/highlighter/test/browser_inspector_cmd_inspect.html
diff --git a/browser/devtools/inspector/test/browser_inspector_cmd_inspect.js b/browser/devtools/highlighter/test/browser_inspector_cmd_inspect.js
similarity index 97%
rename from browser/devtools/inspector/test/browser_inspector_cmd_inspect.js
rename to browser/devtools/highlighter/test/browser_inspector_cmd_inspect.js
index 545e60799c74..3879ffbebedf 100644
--- a/browser/devtools/inspector/test/browser_inspector_cmd_inspect.js
+++ b/browser/devtools/highlighter/test/browser_inspector_cmd_inspect.js
@@ -3,7 +3,7 @@
 
 // Tests that the inspect command works as it should
 
-const TEST_URI = "http://example.com/browser/browser/devtools/inspector/" +
+const TEST_URI = "http://example.com/browser/browser/devtools/highlighter/" +
                  "test/browser_inspector_cmd_inspect.html";
 
 function test() {
diff --git a/browser/devtools/inspector/test/browser_inspector_destroyselection.html b/browser/devtools/highlighter/test/browser_inspector_destroyselection.html
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_destroyselection.html
rename to browser/devtools/highlighter/test/browser_inspector_destroyselection.html
diff --git a/browser/devtools/inspector/test/browser_inspector_destroyselection.js b/browser/devtools/highlighter/test/browser_inspector_destroyselection.js
similarity index 55%
rename from browser/devtools/inspector/test/browser_inspector_destroyselection.js
rename to browser/devtools/highlighter/test/browser_inspector_destroyselection.js
index bf24c5e34d07..73fe34d71a26 100644
--- a/browser/devtools/inspector/test/browser_inspector_destroyselection.js
+++ b/browser/devtools/highlighter/test/browser_inspector_destroyselection.js
@@ -6,7 +6,7 @@ function test()
   waitForExplicitFinish();
   //ignoreAllUncaughtExceptions();
 
-  let node, iframe, inspector;
+  let node, iframe;
 
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.selectedBrowser.addEventListener("load", function onload() {
@@ -14,28 +14,42 @@ function test()
     waitForFocus(setupTest, content);
   }, true);
 
-  content.location = "http://mochi.test:8888/browser/browser/devtools/inspector/test/browser_inspector_destroyselection.html";
+  content.location = "http://mochi.test:8888/browser/browser/devtools/highlighter/test/browser_inspector_destroyselection.html";
 
   function setupTest()
   {
     iframe = content.document.querySelector("iframe");
     node = iframe.contentDocument.querySelector("span");
-    openInspector(runTests);
+
+    Services.obs.addObserver(runTests,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.openInspectorUI(node);
   }
 
-  function runTests(aInspector)
+  function runTests()
   {
-    inspector = aInspector;
-    inspector.selection.setNode(node);
-
+    Services.obs.removeObserver(runTests,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+    is(InspectorUI.selection, node, "node selected");
     iframe.parentNode.removeChild(iframe);
     iframe = null;
 
     let tmp = {};
     Cu.import("resource:///modules/devtools/LayoutHelpers.jsm", tmp);
     ok(!tmp.LayoutHelpers.isNodeConnected(node), "Node considered as disconnected.");
-    ok(!inspector.selection.isConnected(), "Selection considered as disconnected");
 
+    Services.obs.addObserver(testBreadcrumbs,
+                             InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+
+    executeSoon(function() {
+      InspectorUI.closeInspectorUI();
+    });
+  }
+
+  function testBreadcrumbs()
+  {
+    Services.obs.removeObserver(testBreadcrumbs, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+    ok(!InspectorUI.breadcrumbs, "Breadcrumbs destroyed");
     finishUp();
   }
 
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter.js b/browser/devtools/highlighter/test/browser_inspector_highlighter.js
similarity index 78%
rename from browser/devtools/inspector/test/browser_inspector_highlighter.js
rename to browser/devtools/highlighter/test/browser_inspector_highlighter.js
index d7ad02c8486d..b2b0c133f188 100644
--- a/browser/devtools/inspector/test/browser_inspector_highlighter.js
+++ b/browser/devtools/highlighter/test/browser_inspector_highlighter.js
@@ -48,45 +48,56 @@ function createDocument()
   doc.body.appendChild(div2);
   doc.body.appendChild(div3);
 
-  openInspector(setupHighlighterTests);
+  setupHighlighterTests();
 }
 
 function setupHighlighterTests()
 {
   h1 = doc.querySelector("h1");
   ok(h1, "we have the header");
+  Services.obs.addObserver(runSelectionTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.toggleInspectorUI();
+}
 
-  let i = getActiveInspector();
-  i.highlighter.unlock();
-  i.highlighter.outline.setAttribute("disable-transitions", "true");
+function runSelectionTests(subject)
+{
+  Services.obs.removeObserver(runSelectionTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  is(subject.wrappedJSObject, InspectorUI,
+     "InspectorUI accessible in the observer");
+
+  InspectorUI.highlighter.outline.setAttribute("disable-transitions", "true");
 
   executeSoon(function() {
-    i.selection.once("new-node", performTestComparisons);
+    InspectorUI.highlighter.addListener("nodeselected", performTestComparisons);
     EventUtils.synthesizeMouse(h1, 2, 2, {type: "mousemove"}, content);
   });
 }
 
 function performTestComparisons(evt)
 {
-  let i = getActiveInspector();
-  i.highlighter.lock();
+  InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons);
+
+  InspectorUI.stopInspecting();
   ok(isHighlighting(), "highlighter is highlighting");
   is(getHighlitNode(), h1, "highlighter matches selection")
-  is(i.selection.node, h1, "selection matches node");
-  is(i.selection.node, getHighlitNode(), "selection matches highlighter");
+  is(InspectorUI.selection, h1, "selection matches node");
+  is(InspectorUI.selection, getHighlitNode(), "selection matches highlighter");
 
 
   div = doc.querySelector("div#checkOutThisWickedSpread");
 
   executeSoon(function() {
-    i.selection.once("new-node", finishTestComparisons);
-    i.selection.setNode(div);
+    InspectorUI.highlighter.addListener("nodeselected", finishTestComparisons);
+    InspectorUI.inspectNode(div);
   });
 }
 
 function finishTestComparisons()
 {
-  let i = getActiveInspector();
+  InspectorUI.highlighter.removeListener("nodeselected", finishTestComparisons);
 
   // get dimensions of div element
   let divDims = div.getBoundingClientRect();
@@ -94,7 +105,8 @@ function finishTestComparisons()
   let divHeight = divDims.height;
 
   // get dimensions of the outline
-  let outlineDims = i.highlighter.outline.getBoundingClientRect();
+  let outlineDims = 
+    InspectorUI.highlighter.outline.getBoundingClientRect();
   let outlineWidth = outlineDims.width;
   let outlineHeight = outlineDims.height;
 
@@ -103,7 +115,7 @@ function finishTestComparisons()
   //is(outlineHeight, divHeight, "outline height matches dimensions of element (no zoom)");
 
   // zoom the page by a factor of 2
-  let contentViewer = gBrowser.selectedBrowser.docShell.contentViewer
+  let contentViewer = InspectorUI.browser.docShell.contentViewer
                              .QueryInterface(Ci.nsIMarkupDocumentViewer);
   contentViewer.fullZoom = 2;
 
@@ -112,7 +124,7 @@ function finishTestComparisons()
 
   window.setTimeout(function() {
     // check what zoom factor we're at, should be 2
-    let zoom = i.highlighter.zoom;
+    let zoom = InspectorUI.highlighter.zoom;
     is(zoom, 2, "zoom is 2?");
 
     // simulate the zoomed dimensions of the div element
@@ -121,7 +133,8 @@ function finishTestComparisons()
     let divHeight = divDims.height * zoom;
 
     // now zoomed, get new dimensions the outline
-    let outlineDims = i.highlighter.outline.getBoundingClientRect();
+    let outlineDims = 
+      InspectorUI.highlighter.outline.getBoundingClientRect();
     let outlineWidth = outlineDims.width;
     let outlineHeight = outlineDims.height;
 
@@ -135,8 +148,7 @@ function finishTestComparisons()
 }
 
 function finishUp() {
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  gDevTools.closeToolbox(target);
+  InspectorUI.closeInspectorUI();
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/highlighter/test/browser_inspector_highlighter_autohide.js b/browser/devtools/highlighter/test/browser_inspector_highlighter_autohide.js
new file mode 100644
index 000000000000..5878b4f12f8f
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_highlighter_autohide.js
@@ -0,0 +1,59 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let doc;
+
+function createDocument() {
+  doc.body.innerHTML = '<h1>highlighter autohide test</h1>';
+
+  InspectorUI.openInspectorUI(doc.querySelector("h1"));
+
+  // Open the sidebar and wait for the default view (the rule view) to show.
+  InspectorUI.currentInspector.once("sidebaractivated-ruleview", inspectorRuleViewOpened);
+
+  InspectorUI.sidebar.show();
+  InspectorUI.sidebar.activatePanel("ruleview");
+}
+
+function inspectorRuleViewOpened() {
+  let deck = InspectorUI.sidebar._deck;
+
+  EventUtils.synthesizeMouse(InspectorUI.highlighter.highlighterContainer, 2, 2, {type: "mousemove"}, window);
+
+  executeSoon(function() {
+    ok(!InspectorUI.highlighter.hidden, "Outline visible (1)");
+
+    EventUtils.synthesizeMouse(deck, 10, 2, {type: "mousemove"}, window);
+
+    executeSoon(function() {
+      ok(InspectorUI.highlighter.hidden, "Outline not visible");
+
+      EventUtils.synthesizeMouse(deck, -10, 2, {type: "mousemove"}, window);
+
+      executeSoon(function() {
+        ok(!InspectorUI.highlighter.hidden, "Outline visible (2)");
+        finishTest();
+      });
+    });
+  });
+}
+
+function finishTest() {
+  InspectorUI.closeInspectorUI();
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test() {
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,basic tests for highlighter";
+}
+
+
diff --git a/browser/devtools/inspector/test/browser_inspector_iframeTest.js b/browser/devtools/highlighter/test/browser_inspector_iframeTest.js
similarity index 72%
rename from browser/devtools/inspector/test/browser_inspector_iframeTest.js
rename to browser/devtools/highlighter/test/browser_inspector_iframeTest.js
index 8d23b0493f41..f146046ef743 100644
--- a/browser/devtools/inspector/test/browser_inspector_iframeTest.js
+++ b/browser/devtools/highlighter/test/browser_inspector_iframeTest.js
@@ -32,7 +32,7 @@ function createDocument()
       div2.textContent = 'nested div';
       iframe2.contentDocument.body.appendChild(div2);
 
-      openInspector(runIframeTests);
+      setupIframeTests();
     }, false);
 
     iframe2.src = 'data:text/html,nested iframe';
@@ -49,29 +49,43 @@ function moveMouseOver(aElement)
     aElement.ownerDocument.defaultView);
 }
 
+function setupIframeTests()
+{
+  Services.obs.addObserver(runIframeTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.openInspectorUI();
+}
+
 function runIframeTests()
 {
-  getActiveInspector().selection.once("new-node", performTestComparisons1);
-  moveMouseOver(div1)
+  Services.obs.removeObserver(runIframeTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+
+  executeSoon(function() {
+    InspectorUI.highlighter.addListener("nodeselected", performTestComparisons1);
+    moveMouseOver(div1)
+  });
 }
 
 function performTestComparisons1()
 {
-  let i = getActiveInspector();
-  is(i.selection.node, div1, "selection matches div1 node");
+  InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons1);
+
+  is(InspectorUI.selection, div1, "selection matches div1 node");
   is(getHighlitNode(), div1, "highlighter matches selection");
 
-  i.selection.once("new-node", performTestComparisons2);
   executeSoon(function() {
+    InspectorUI.highlighter.addListener("nodeselected", performTestComparisons2);
     moveMouseOver(div2);
   });
 }
 
 function performTestComparisons2()
 {
-  let i = getActiveInspector();
+  InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons2);
 
-  is(i.selection.node, div2, "selection matches div2 node");
+  is(InspectorUI.selection, div2, "selection matches div2 node");
   is(getHighlitNode(), div2, "highlighter matches selection");
 
   finish();
@@ -91,8 +105,7 @@ function test() {
   content.location = "data:text/html,iframe tests for inspector";
 
   registerCleanupFunction(function () {
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    gDevTools.closeToolbox(target);
+    InspectorUI.closeInspectorUI(true);
     gBrowser.removeCurrentTab();
   });
 }
diff --git a/browser/devtools/inspector/test/browser_inspector_infobar.js b/browser/devtools/highlighter/test/browser_inspector_infobar.js
similarity index 72%
rename from browser/devtools/inspector/test/browser_inspector_infobar.js
rename to browser/devtools/highlighter/test/browser_inspector_infobar.js
index 1e20539cd1f0..1ca3ed741c9d 100644
--- a/browser/devtools/inspector/test/browser_inspector_infobar.js
+++ b/browser/devtools/highlighter/test/browser_inspector_infobar.js
@@ -9,7 +9,6 @@ function test()
   let doc;
   let nodes;
   let cursor;
-  let inspector;
 
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.selectedBrowser.addEventListener("load", function onload() {
@@ -37,15 +36,19 @@ function test()
       ok(nodes[i].node, "node " + i + " found");
     }
 
-    openInspector(runTests);
+    Services.obs.addObserver(runTests,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.toggleInspectorUI();
   }
 
-  function runTests(aInspector)
+  function runTests()
   {
-    inspector = aInspector;
+    Services.obs.removeObserver(runTests,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+
     cursor = 0;
     executeSoon(function() {
-      inspector.selection.setNode(nodes[0].node, "");
+      InspectorUI.inspectNode(nodes[0].node);
       nodeSelected();
     });
   }
@@ -56,10 +59,16 @@ function test()
       performTest();
       cursor++;
       if (cursor >= nodes.length) {
-        finishUp();
+
+        Services.obs.addObserver(finishUp,
+          InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+
+        executeSoon(function() {
+          InspectorUI.closeInspectorUI();
+        });
       } else {
         let node = nodes[cursor].node;
-        inspector.selection.setNode(node, "");
+        InspectorUI.inspectNode(node);
         nodeSelected();
       }
     });
@@ -67,23 +76,21 @@ function test()
 
   function performTest()
   {
-    let browser = gBrowser.selectedBrowser;
-    let stack = browser.parentNode;
-
-    let container = stack.querySelector(".highlighter-nodeinfobar-container");
+    let container = document.getElementById("highlighter-nodeinfobar-container");
     is(container.getAttribute("position"), nodes[cursor].position, "node " + cursor + ": position matches.");
 
-    let tagNameLabel = stack.querySelector(".highlighter-nodeinfobar-tagname");
+    let tagNameLabel = document.getElementById("highlighter-nodeinfobar-tagname");
     is(tagNameLabel.textContent, nodes[cursor].tag, "node " + cursor  + ": tagName matches.");
 
-    let idLabel = stack.querySelector(".highlighter-nodeinfobar-id");
+    let idLabel = document.getElementById("highlighter-nodeinfobar-id");
     is(idLabel.textContent, nodes[cursor].id, "node " + cursor  + ": id matches.");
 
-    let classesBox = stack.querySelector(".highlighter-nodeinfobar-classes");
+    let classesBox = document.getElementById("highlighter-nodeinfobar-classes");
     is(classesBox.textContent, nodes[cursor].classes, "node " + cursor  + ": classes match.");
   }
 
   function finishUp() {
+    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
     doc = nodes = null;
     gBrowser.removeCurrentTab();
     finish();
diff --git a/browser/devtools/highlighter/test/browser_inspector_initialization.js b/browser/devtools/highlighter/test/browser_inspector_initialization.js
new file mode 100644
index 000000000000..3c8c84b83288
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_initialization.js
@@ -0,0 +1,191 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+let doc;
+let salutation;
+let closing;
+let winId;
+
+function createDocument()
+{
+  doc.body.innerHTML = '<div id="first" style="{ margin: 10em; ' +
+    'font-size: 14pt; font-family: helvetica, sans-serif; color: #AAA}">\n' +
+    '<h1>Some header text</h1>\n' +
+    '<p id="salutation" style="{font-size: 12pt}">hi.</p>\n' +
+    '<p id="body" style="{font-size: 12pt}">I am a test-case. This text exists ' +
+    'solely to provide some things to test the inspector initialization.</p>\n' +
+    'If you are reading this, you should go do something else instead. Maybe ' +
+    'read a book. Or better yet, write some test-cases for another bit of code. ' +
+    '<span style="{font-style: italic}">Maybe more inspector test-cases!</span></p>\n' +
+    '<p id="closing">end transmission</p>\n' +
+    '</div>';
+  doc.title = "Inspector Initialization Test";
+  startInspectorTests();
+}
+
+function startInspectorTests()
+{
+  ok(InspectorUI, "InspectorUI variable exists");
+  Services.obs.addObserver(runInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.toggleInspectorUI();
+}
+
+function runInspectorTests()
+{
+  Services.obs.removeObserver(runInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+
+  ok(InspectorUI.toolbar, "we have the toolbar.");
+  ok(!InspectorUI.toolbar.hidden, "toolbar is visible");
+  ok(InspectorUI.inspecting, "Inspector is inspecting");
+  ok(!InspectorUI.markupOpen, "Inspector Tree Panel is not open");
+  ok(!InspectorUI.sidebar.visible, "Inspector sidebar should not visible.");
+  ok(InspectorUI.highlighter, "Highlighter is up");
+  InspectorUI.inspectNode(doc.body);
+  InspectorUI.stopInspecting();
+
+  InspectorUI.currentInspector.once("markuploaded", treePanelTests);
+  InspectorUI.currentInspector.openMarkup();
+}
+
+function treePanelTests()
+{
+  ok(InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is open");
+
+  InspectorUI.toggleSidebar();
+  ok(InspectorUI.sidebar.visible, "Inspector Sidebar should be open");
+  InspectorUI.toggleSidebar();
+  ok(!InspectorUI.sidebar.visible, "Inspector Sidebar should be closed");
+  InspectorUI.sidebar.show();
+  InspectorUI.currentInspector.once("sidebaractivated-computedview",
+    stylePanelTests)
+  InspectorUI.sidebar.activatePanel("computedview");
+}
+
+function stylePanelTests()
+{
+  ok(InspectorUI.sidebar.visible, "Inspector Sidebar is open");
+  is(InspectorUI.sidebar.activePanel, "computedview", "Computed View is open");
+  ok(computedViewTree(), "Computed view has a cssHtmlTree");
+
+  InspectorUI.sidebar.activatePanel("ruleview");
+  executeSoon(function() {
+    ruleViewTests();
+  });
+}
+
+function ruleViewTests()
+{
+  Services.obs.addObserver(runContextMenuTest,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+
+  is(InspectorUI.sidebar.activePanel, "ruleview", "Rule View is open");
+  ok(ruleView(), "InspectorUI has a cssRuleView");
+
+  executeSoon(function() {
+    InspectorUI.closeInspectorUI();
+  });
+}
+
+function runContextMenuTest()
+{
+  Services.obs.removeObserver(runContextMenuTest, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+  Services.obs.addObserver(inspectNodesFromContextTest, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  salutation = doc.getElementById("salutation");
+  ok(salutation, "hello, context menu test!");
+  let eventDeets = { type : "contextmenu", button : 2 };
+  let contextMenu = document.getElementById("contentAreaContextMenu");
+  ok(contextMenu, "we have the context menu");
+  let contextInspectMenuItem = document.getElementById("context-inspect");
+  ok(contextInspectMenuItem, "we have the inspect context menu item");
+  EventUtils.synthesizeMouse(salutation, 2, 2, eventDeets);
+  is(contextMenu.state, "showing", "context menu is open");
+  is(!contextInspectMenuItem.hidden, gPrefService.getBoolPref("devtools.inspector.enabled"), "is context menu item enabled?");
+  contextMenu.hidePopup();
+  executeSoon(function() {
+    InspectorUI.openInspectorUI(salutation);
+  });
+}
+
+function inspectNodesFromContextTest()
+{
+  Services.obs.removeObserver(inspectNodesFromContextTest, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  Services.obs.addObserver(openInspectorForContextTest, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+  ok(!InspectorUI.inspecting, "Inspector is not actively highlighting");
+  is(InspectorUI.selection, salutation, "Inspector is highlighting salutation");
+  executeSoon(function() {
+    InspectorUI.closeInspectorUI(true);
+  });
+}
+
+function openInspectorForContextTest()
+{
+  Services.obs.removeObserver(openInspectorForContextTest, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+  Services.obs.addObserver(inspectNodesFromContextTestWhileOpen, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  executeSoon(function() {
+    InspectorUI.openInspectorUI(salutation);
+  });
+}
+
+function inspectNodesFromContextTestWhileOpen()
+{
+  Services.obs.removeObserver(inspectNodesFromContextTestWhileOpen, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+  Services.obs.addObserver(inspectNodesFromContextTestTrap, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.highlighter.addListener("nodeselected", inspectNodesFromContextTestHighlight);
+  is(InspectorUI.selection, salutation, "Inspector is highlighting salutation");
+  closing = doc.getElementById("closing");
+  ok(closing, "we have the closing statement");
+  executeSoon(function() {
+    InspectorUI.openInspectorUI(closing);
+  });
+}
+
+function inspectNodesFromContextTestHighlight()
+{
+  winId = InspectorUI.winID;
+  InspectorUI.highlighter.removeListener("nodeselected", inspectNodesFromContextTestHighlight);
+  Services.obs.addObserver(finishInspectorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.DESTROYED, false);
+  is(InspectorUI.selection, closing, "InspectorUI.selection is header");
+  executeSoon(function() {
+    InspectorUI.closeInspectorUI();
+  });
+}
+
+function inspectNodesFromContextTestTrap()
+{
+  Services.obs.removeObserver(inspectNodesFromContextTestTrap, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+  ok(false, "Inspector UI has been opened again. We Should Not Be Here!");
+}
+
+function finishInspectorTests(subject, topic, aWinIdString)
+{
+  Services.obs.removeObserver(finishInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.DESTROYED);
+
+  is(parseInt(aWinIdString), winId, "winId of destroyed Inspector matches");
+  ok(!InspectorUI.highlighter, "Highlighter is gone");
+  ok(!InspectorUI.inspecting, "Inspector is not inspecting");
+  ok(!InspectorUI._sidebar, "Inspector Sidebar is closed");
+  ok(!InspectorUI.toolbar, "toolbar is hidden");
+
+  Services.obs.removeObserver(inspectNodesFromContextTestTrap, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,basic tests for inspector";
+}
+
diff --git a/browser/devtools/highlighter/test/browser_inspector_invalidate.js b/browser/devtools/highlighter/test/browser_inspector_invalidate.js
new file mode 100644
index 000000000000..dba5cd7862df
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_invalidate.js
@@ -0,0 +1,56 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let doc;
+let div;
+
+function createDocument()
+{
+  div = doc.createElement("div");
+  div.setAttribute("style", "width: 100px; height: 100px; background:yellow;");
+  doc.body.appendChild(div);
+
+  Services.obs.addObserver(runTest,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.toggleInspectorUI();
+}
+
+function runTest(subject)
+{
+  Services.obs.removeObserver(runTest,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  InspectorUI.highlighter.highlight(div);
+
+  executeSoon(function() {
+    let outline = InspectorUI.highlighter.outline;
+    is(outline.style.width, "100px", "selection has the right width");
+
+    div.style.width = "200px";
+    function pollTest() {
+      if (outline.style.width == "100px") {
+    	setTimeout(pollTest, 10);
+    	return;
+      }
+      is(outline.style.width, "200px", "selection updated");
+      InspectorUI.closeInspectorUI();
+      gBrowser.removeCurrentTab();
+      finish();
+    }
+    setTimeout(pollTest, 10);
+  });
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,basic tests for inspector";
+}
+
diff --git a/browser/devtools/highlighter/test/browser_inspector_keybindings.js b/browser/devtools/highlighter/test/browser_inspector_keybindings.js
new file mode 100644
index 000000000000..4e8fc459d8f4
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_keybindings.js
@@ -0,0 +1,78 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+
+function test()
+{
+  waitForExplicitFinish();
+
+  let doc;
+  let node;
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onload() {
+    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
+    doc = content.document;
+    waitForFocus(setupKeyBindingsTest, content);
+  }, true);
+
+  content.location = "data:text/html,<h1>foobar</h1>";
+
+  function setupKeyBindingsTest()
+  {
+    node = doc.querySelector("h1");
+    Services.obs.addObserver(highlightNode,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.toggleInspectorUI();
+  }
+
+  function highlightNode()
+  {
+    Services.obs.removeObserver(highlightNode,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+
+    executeSoon(function() {
+      InspectorUI.highlighter.addListener("nodeselected", lockNode);
+      InspectorUI.inspectNode(node);
+    });
+  }
+
+  function lockNode()
+  {
+    InspectorUI.highlighter.removeListener("nodeselected", lockNode);
+    synthesizeKeyFromKeyTag("key_inspect");
+    executeSoon(isTheNodeLocked);
+  }
+
+  function isTheNodeLocked()
+  {
+    is(InspectorUI.selection, node, "selection matches node");
+    ok(!InspectorUI.inspecting, "the node is locked");
+    unlockNode();
+  }
+
+  function unlockNode() {
+    synthesizeKeyFromKeyTag("key_inspect");
+    executeSoon(isTheNodeUnlocked);
+  }
+
+  function isTheNodeUnlocked()
+  {
+    ok(InspectorUI.inspecting, "the node is unlocked");
+
+    // Let's close the inspector
+    Services.obs.addObserver(finishUp,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+
+    EventUtils.synthesizeKey("VK_ESCAPE", {});
+    ok(true, "Inspector is closing successfuly");
+  }
+
+  function finishUp() {
+    Services.obs.removeObserver(finishUp,
+                                InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+    doc = node = null;
+    gBrowser.removeCurrentTab();
+    finish();
+  }
+}
diff --git a/browser/devtools/inspector/test/browser_inspector_menu.js b/browser/devtools/highlighter/test/browser_inspector_menu.js
similarity index 62%
rename from browser/devtools/inspector/test/browser_inspector_menu.js
rename to browser/devtools/highlighter/test/browser_inspector_menu.js
index 88f0c57e6de1..61c95ed1a7c3 100644
--- a/browser/devtools/inspector/test/browser_inspector_menu.js
+++ b/browser/devtools/highlighter/test/browser_inspector_menu.js
@@ -9,7 +9,6 @@ function test() {
   let doc;
   let node1;
   let div;
-  let inspector;
 
   function createDocument() {
     div = doc.createElement("div");
@@ -23,7 +22,7 @@ function test() {
     div.appendChild(p1);
     doc.body.appendChild(div);
     node1 = p1;
-    openInspector(runTests);
+    setupTest();
   }
 
   gBrowser.selectedTab = gBrowser.addTab();
@@ -35,14 +34,20 @@ function test() {
 
   content.location = content.location = "data:text/html,basic tests for inspector";;
 
-  function runTests(aInspector) {
-    inspector = aInspector;
-    inspector.selection.setNode(node1);
+  function setupTest() {
+    Services.obs.addObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.toggleInspectorUI();
+  }
+
+  function runTests() {
+    Services.obs.removeObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+    InspectorUI.stopInspecting();
+    InspectorUI.inspectNode(node1, true);
     testCopyInnerMenu();
   }
 
   function testCopyInnerMenu() {
-    let copyInner = inspector.panelDoc.getElementById("node-menu-copyinner");
+    let copyInner = document.getElementById("inspectorHTMLCopyInner");
     ok(copyInner, "the popup menu has a copy inner html menu item");
 
     waitForClipboard("This is some example text",
@@ -51,7 +56,7 @@ function test() {
   }
 
   function testCopyOuterMenu() {
-    let copyOuter = inspector.panelDoc.getElementById("node-menu-copyouter");
+    let copyOuter = document.getElementById("inspectorHTMLCopyOuter");
     ok(copyOuter, "the popup menu has a copy outer html menu item");
 
     waitForClipboard("<p>This is some example text</p>",
@@ -60,10 +65,10 @@ function test() {
   }
 
   function testDeleteNode() {
-    let deleteNode = inspector.panelDoc.getElementById("node-menu-delete");
+    let deleteNode = document.getElementById("inspectorHTMLDelete");
     ok(deleteNode, "the popup menu has a delete menu item");
 
-    inspector.selection.once("detached", deleteTest);
+    InspectorUI.highlighter.addListener("nodeselected", deleteTest);
 
     let commandEvent = document.createEvent("XULCommandEvent");
     commandEvent.initCommandEvent("command", true, true, window, 0, false, false,
@@ -72,16 +77,19 @@ function test() {
   }
 
   function deleteTest() {
+    InspectorUI.highlighter.removeListener("nodeselected", deleteTest);
+    is(InspectorUI.selection, div, "parent node selected");
     let p = doc.querySelector("P");
     is(p, null, "node deleted");
 
-    deleteRootNode();
+    InspectorUI.highlighter.addListener("nodeselected", deleteRootNode);
+    InspectorUI.inspectNode(doc.documentElement, true);
   }
 
   function deleteRootNode() {
-    inspector.selection.setNode(doc.documentElement);
-    let deleteNode = inspector.panelDoc.getElementById("node-menu-delete");
-    let commandEvent = inspector.panelDoc.createEvent("XULCommandEvent");
+    InspectorUI.highlighter.removeListener("nodeselected", deleteRootNode);
+    let deleteNode = document.getElementById("inspectorHTMLDelete");
+    let commandEvent = document.createEvent("XULCommandEvent");
     commandEvent.initCommandEvent("command", true, true, window, 0, false, false,
                                   false, false, null);
     deleteNode.dispatchEvent(commandEvent);
@@ -90,6 +98,15 @@ function test() {
 
   function isRootStillAlive() {
     ok(doc.documentElement, "Document element still alive.");
+    Services.obs.addObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+    executeSoon(function() {
+      InspectorUI.closeInspectorUI();
+    });
+  }
+
+  function finishUp() {
+    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+    doc = node1 = div = null;
     gBrowser.removeCurrentTab();
     finish();
   }
diff --git a/browser/devtools/highlighter/test/browser_inspector_pseudoClass_menu.js b/browser/devtools/highlighter/test/browser_inspector_pseudoClass_menu.js
new file mode 100644
index 000000000000..5cbcceb88dea
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_pseudoClass_menu.js
@@ -0,0 +1,87 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let DOMUtils = Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
+
+let pseudos = [":hover", ":active", ":focus"];
+
+let doc;
+let div;
+let menu;
+
+function test()
+{
+  waitForExplicitFinish();
+  ignoreAllUncaughtExceptions();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,pseudo-class lock node menu tests";
+}
+
+function createDocument()
+{
+  div = doc.createElement("div");
+  div.textContent = "test div";
+
+  doc.body.appendChild(div);
+
+  setupTests();
+}
+
+function setupTests()
+{
+  Services.obs.addObserver(selectNode,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.openInspectorUI();
+}
+
+function selectNode()
+{
+  Services.obs.removeObserver(selectNode,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+
+  executeSoon(function() {
+    InspectorUI.highlighter.addListener("nodeselected", performTests);
+    InspectorUI.inspectNode(div);
+  });
+}
+
+function performTests()
+{
+  InspectorUI.highlighter.removeListener("nodeselected", performTests);
+
+  menu = document.getElementById("highlighter-node-menu");
+  menu.addEventListener("popupshowing", testMenuItems, true);
+
+  menu.openPopup();
+}
+
+function testMenuItems()
+{
+  menu.removeEventListener("popupshowing", testMenuItems, true);
+
+  for each (let pseudo in pseudos) {
+    let menuitem = document.getElementById("highlighter-pseudo-class-menuitem-"
+                   + pseudo);
+    ok(menuitem, pseudo + " menuitem exists");
+
+    menuitem.doCommand();
+
+    is(DOMUtils.hasPseudoClassLock(div, pseudo), true,
+       "pseudo-class lock has been applied");
+  }
+  finishUp();
+}
+
+function finishUp()
+{
+  InspectorUI.closeInspectorUI();
+  doc = div = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/devtools/inspector/test/browser_inspector_pseudoclass_lock.js b/browser/devtools/highlighter/test/browser_inspector_pseudoclass_lock.js
similarity index 59%
rename from browser/devtools/inspector/test/browser_inspector_pseudoclass_lock.js
rename to browser/devtools/highlighter/test/browser_inspector_pseudoclass_lock.js
index 6f8fc29a7c48..6dcfee24d91c 100644
--- a/browser/devtools/inspector/test/browser_inspector_pseudoclass_lock.js
+++ b/browser/devtools/highlighter/test/browser_inspector_pseudoclass_lock.js
@@ -1,16 +1,10 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
 let DOMUtils = Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
 
 let doc;
 let div;
-let inspector;
-let ruleview;
 
 let pseudo = ":hover";
 
@@ -41,38 +35,57 @@ function createDocument()
   head.appendChild(style);
   doc.body.appendChild(div);
 
-  openInspector(selectNode);
+  setupTests();
 }
 
-function selectNode(aInspector)
+function setupTests()
 {
-  inspector = aInspector;
-  inspector.selection.setNode(div);
-  inspector.sidebar.once("ruleview-ready", function() {
-    ruleview = inspector.sidebar.getWindowForTab("ruleview").ruleview.view;
-    inspector.sidebar.select("ruleview");
-    performTests();
+  Services.obs.addObserver(selectNode,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.openInspectorUI();
+}
+
+function selectNode()
+{
+  Services.obs.removeObserver(selectNode,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+
+  executeSoon(function() {
+    InspectorUI.highlighter.addListener("locked", openRuleView);
+    InspectorUI.inspectNode(div);
+    InspectorUI.stopInspecting();
   });
 }
 
+function openRuleView()
+{
+  InspectorUI.sidebar.show();
+  InspectorUI.currentInspector.once("sidebaractivated-ruleview", performTests);
+  InspectorUI.sidebar.activatePanel("ruleview");
+}
+
 function performTests()
 {
+  InspectorUI.highlighter.removeListener("locked", performTests);
+
   // toggle the class
-  inspector.togglePseudoClass(pseudo);
+  InspectorUI.highlighter.pseudoClassLockToggled(pseudo);
 
   testAdded();
 
   // toggle the lock off
-  inspector.togglePseudoClass(pseudo);
+  InspectorUI.highlighter.pseudoClassLockToggled(pseudo);
 
   testRemoved();
   testRemovedFromUI();
 
   // toggle it back on
-  inspector.togglePseudoClass(pseudo);
+  InspectorUI.highlighter.pseudoClassLockToggled(pseudo);  
 
   // close the inspector
-  finishUp();
+  Services.obs.addObserver(testInspectorClosed,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+  InspectorUI.closeInspectorUI();
 }
 
 function testAdded()
@@ -86,14 +99,14 @@ function testAdded()
   } while (node.parentNode)
 
   // infobar selector contains pseudo-class
-  let pseudoClassesBox = getActiveInspector().highlighter.nodeInfo.pseudoClassesBox;
+  let pseudoClassesBox = document.getElementById("highlighter-nodeinfobar-pseudo-classes");
   is(pseudoClassesBox.textContent, pseudo, "pseudo-class in infobar selector");
-
+  
   // ruleview contains pseudo-class rule
-  is(ruleview.element.children.length, 3,
+  is(ruleView().element.children.length, 3,
      "rule view is showing 3 rules for pseudo-class locked div");
-
-  is(ruleview.element.children[1]._ruleEditor.rule.selectorText,
+     
+  is(ruleView().element.children[1]._ruleEditor.rule.selectorText,
      "div:hover", "rule view is showing " + pseudo + " rule");
 }
 
@@ -111,25 +124,27 @@ function testRemoved()
 function testRemovedFromUI()
 {
   // infobar selector doesn't contain pseudo-class
-  let pseudoClassesBox = getActiveInspector().highlighter.nodeInfo.pseudoClassesBox;
+  let pseudoClassesBox = document.getElementById("highlighter-nodeinfobar-pseudo-classes");
   is(pseudoClassesBox.textContent, "", "pseudo-class removed from infobar selector");    
 
   // ruleview no longer contains pseudo-class rule
-  is(ruleview.element.children.length, 2,
+  is(ruleView().element.children.length, 2,
      "rule view is showing 2 rules after removing lock");    
 }
 
+function testInspectorClosed()
+{
+  Services.obs.removeObserver(testInspectorClosed,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+
+  testRemoved();
+
+  finishUp();  
+}
+
 function finishUp()
 {
-  gDevTools.once("toolbox-destroyed", function() {
-    testRemoved();
-    inspector = ruleview = null;
-    doc = div = null;
-    gBrowser.removeCurrentTab();
-    finish();
-  });
-
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  let toolbox = gDevTools.getToolboxForTarget(target);
-  toolbox.destroy();
+  doc = div = null;
+  gBrowser.removeCurrentTab();
+  finish();
 }
diff --git a/browser/devtools/highlighter/test/browser_inspector_ruleviewstore.js b/browser/devtools/highlighter/test/browser_inspector_ruleviewstore.js
new file mode 100644
index 000000000000..c4c8039654db
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_ruleviewstore.js
@@ -0,0 +1,105 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Tests that properties disabled in the rule view survive a tab switch.
+ */
+
+let div;
+let tab1;
+
+function waitForRuleView(aCallback)
+{
+  InspectorUI.currentInspector.once("sidebaractivated-ruleview", aCallback);
+}
+
+function inspectorTabOpen1()
+{
+  Services.obs.addObserver(inspectorUIOpen1,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.openInspectorUI();
+}
+
+function inspectorUIOpen1()
+{
+  Services.obs.removeObserver(inspectorUIOpen1,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  // Highlight a node.
+  div = content.document.getElementsByTagName("div")[0];
+  InspectorUI.inspectNode(div);
+  InspectorUI.stopInspecting();
+
+  // Open the rule view sidebar.
+  waitForRuleView(ruleViewOpened1);
+  InspectorUI.sidebar.show();
+  InspectorUI.sidebar.activatePanel("ruleview");
+}
+
+function ruleViewOpened1()
+{
+  let prop = ruleView()._elementStyle.rules[0].textProps[0];
+  is(prop.name, "background-color", "First prop is the background color prop.");
+  prop.setEnabled(false);
+
+  // Open second tab and switch to it
+  gBrowser.selectedTab = gBrowser.addTab();
+
+  gBrowser.selectedBrowser.addEventListener("load", function(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, arguments.callee,
+                                                 true);
+    waitForFocus(inspectorTabOpen2, content);
+  }, true);
+  content.location = "data:text/html,<p>tab 2: the inspector should close now";
+}
+
+function inspectorTabOpen2()
+{
+  // Switch back to tab 1.
+  executeSoon(function() {
+    Services.obs.addObserver(inspectorFocusTab1,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    gBrowser.removeCurrentTab();
+    gBrowser.selectedTab = tab1;
+  });
+}
+
+function inspectorFocusTab1()
+{
+  Services.obs.removeObserver(inspectorFocusTab1,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  // Now wait for the rule view to load again...
+  waitForRuleView(ruleViewOpened2);
+}
+
+function ruleViewOpened2()
+{
+  let prop = ruleView()._elementStyle.rules[0].textProps[0];
+  is(prop.name, "background-color", "First prop is the background color prop.");
+  ok(!prop.enabled, "First prop should be disabled.");
+
+  InspectorUI.closeInspectorUI();
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test()
+{
+  waitForExplicitFinish();
+
+  tab1 = gBrowser.addTab();
+  gBrowser.selectedTab = tab1;
+  gBrowser.selectedBrowser.addEventListener("load", function(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, arguments.callee,
+      true);
+    waitForFocus(inspectorTabOpen1, content);
+  }, true);
+
+  content.location = "data:text/html,<p>tab switching tests for inspector" +
+    '<div style="background-color: green;">tab 1</div>';
+}
+
diff --git a/browser/devtools/inspector/test/browser_inspector_scrolling.js b/browser/devtools/highlighter/test/browser_inspector_scrolling.js
similarity index 76%
rename from browser/devtools/inspector/test/browser_inspector_scrolling.js
rename to browser/devtools/highlighter/test/browser_inspector_scrolling.js
index 85db0080e7ec..2116188fbd73 100644
--- a/browser/devtools/inspector/test/browser_inspector_scrolling.js
+++ b/browser/devtools/highlighter/test/browser_inspector_scrolling.js
@@ -7,7 +7,6 @@
 let doc;
 let div;
 let iframe;
-let inspector;
 
 function createDocument()
 {
@@ -22,25 +21,35 @@ function createDocument()
     div.textContent = "big div";
     div.setAttribute("style", "height:500px; width:500px; border:1px solid gray;");
     iframe.contentDocument.body.appendChild(div);
-    openInspector(inspectNode);
+    toggleInspector();
   }, false);
 
   iframe.src = "data:text/html,foo bar";
   doc.body.appendChild(iframe);
 }
 
-function inspectNode(aInspector)
+function toggleInspector()
 {
-  inspector = aInspector;
+  Services.obs.addObserver(inspectNode, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.toggleInspectorUI();
+}
+
+function inspectNode()
+{
+  Services.obs.removeObserver(inspectNode,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  InspectorUI.highlighter.addListener("nodeselected", performScrollingTest);
 
-  inspector.highlighter.once("locked", performScrollingTest);
   executeSoon(function() {
-    inspector.selection.setNode(div, "");
+    InspectorUI.inspectNode(div);
   });
 }
 
 function performScrollingTest()
 {
+  InspectorUI.highlighter.removeListener("nodeselected", performScrollingTest);
+
   executeSoon(function() {
     EventUtils.synthesizeWheel(div, 10, 10,
       { deltaY: 50.0, deltaMode: WheelEvent.DOM_DELTA_PIXEL },
@@ -53,9 +62,8 @@ function performScrollingTest()
 
     is(iframe.contentDocument.body.scrollTop, 50, "inspected iframe scrolled");
 
-    inspector = div = iframe = doc = null;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    gDevTools.closeToolbox(target);
+    div = iframe = doc = null;
+    InspectorUI.closeInspectorUI();
     gBrowser.removeCurrentTab();
     finish();
   }, false);
diff --git a/browser/devtools/highlighter/test/browser_inspector_sidebarstate.js b/browser/devtools/highlighter/test/browser_inspector_sidebarstate.js
new file mode 100644
index 000000000000..4c0756beccdf
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_sidebarstate.js
@@ -0,0 +1,73 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let doc;
+
+function createDocument()
+{
+  doc.body.innerHTML = '<h1>Sidebar state test</h1>';
+  doc.title = "Sidebar State Test";
+
+  InspectorUI.openInspectorUI();
+
+  // Open the sidebar and wait for the default view (the rule view) to show.
+  InspectorUI.currentInspector.once("sidebaractivated-ruleview", inspectorRuleViewOpened);
+
+  InspectorUI.sidebar.show();
+  InspectorUI.sidebar.activatePanel("ruleview");
+}
+
+function inspectorRuleViewOpened()
+{
+  is(InspectorUI.sidebar.activePanel, "ruleview", "Rule View is selected by default");
+
+  // Select the computed view and turn off the inspector.
+  InspectorUI.sidebar.activatePanel("computedview");
+
+  Services.obs.addObserver(inspectorClosed,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+  InspectorUI.closeInspectorUI();
+}
+
+function inspectorClosed()
+{
+  // Reopen the inspector, expect the computed view to be loaded.
+  Services.obs.removeObserver(inspectorClosed,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+
+  Services.obs.addObserver(computedViewPopulated,
+    "StyleInspector-populated", false);
+
+  InspectorUI.openInspectorUI();
+}
+
+function computedViewPopulated()
+{
+  Services.obs.removeObserver(computedViewPopulated,
+    "StyleInspector-populated");
+  is(InspectorUI.sidebar.activePanel, "computedview", "Computed view is selected by default.");
+
+  finishTest();
+}
+
+
+function finishTest()
+{
+  InspectorUI.closeInspectorUI();
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,basic tests for inspector";
+}
+
diff --git a/browser/devtools/highlighter/test/browser_inspector_tab_switch.js b/browser/devtools/highlighter/test/browser_inspector_tab_switch.js
new file mode 100644
index 000000000000..9b01e0ebe3d9
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_tab_switch.js
@@ -0,0 +1,247 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let div;
+let tab1;
+let tab2;
+let tab1window;
+
+function inspectorTabOpen1()
+{
+  ok(window.InspectorUI, "InspectorUI variable exists");
+  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
+  ok(InspectorUI.store.isEmpty(), "Inspector.store is empty");
+
+  Services.obs.addObserver(inspectorUIOpen1,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.openInspectorUI();
+}
+
+function inspectorUIOpen1()
+{
+  Services.obs.removeObserver(inspectorUIOpen1,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  // Make sure the inspector is open.
+  ok(InspectorUI.inspecting, "Inspector is highlighting");
+  ok(!InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is not open");
+  ok(!InspectorUI.sidebar.visible, "Inspector Sidebar is not open");
+  ok(!InspectorUI.store.isEmpty(), "InspectorUI.store is not empty");
+  is(InspectorUI.store.length, 1, "Inspector.store.length = 1");
+
+  // Highlight a node.
+  div = content.document.getElementsByTagName("div")[0];
+  InspectorUI.inspectNode(div);
+  is(InspectorUI.selection, div, "selection matches the div element");
+
+  // Open the second tab.
+  tab2 = gBrowser.addTab();
+  gBrowser.selectedTab = tab2;
+
+  gBrowser.selectedBrowser.addEventListener("load", function(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, arguments.callee,
+      true);
+    waitForFocus(inspectorTabOpen2, content);
+  }, true);
+
+  content.location = "data:text/html,<p>tab 2: the inspector should close now";
+}
+
+function inspectorTabOpen2()
+{
+  // Make sure the inspector is closed.
+  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
+  is(InspectorUI.store.length, 1, "Inspector.store.length = 1");
+
+  // Activate the inspector again.
+  executeSoon(function() {
+    Services.obs.addObserver(inspectorUIOpen2,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    clearUserPrefs();
+    InspectorUI.openInspectorUI();
+  });
+}
+
+function inspectorUIOpen2()
+{
+  Services.obs.removeObserver(inspectorUIOpen2,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  // Make sure the inspector is open.
+  ok(InspectorUI.inspecting, "Inspector is highlighting");
+  ok(!InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is not open");
+  is(InspectorUI.store.length, 2, "Inspector.store.length = 2");
+
+  // Disable highlighting.
+  InspectorUI.toggleInspection();
+  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
+
+
+  // Switch back to tab 1.
+  executeSoon(function() {
+    Services.obs.addObserver(inspectorFocusTab1,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    gBrowser.selectedTab = tab1;
+  });
+}
+
+function inspectorFocusTab1()
+{
+  Services.obs.removeObserver(inspectorFocusTab1,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  // Make sure the inspector is still open.
+  ok(InspectorUI.inspecting, "Inspector is highlighting");
+  ok(!InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is not open");
+  is(InspectorUI.store.length, 2, "Inspector.store.length = 2");
+  is(InspectorUI.selection, div, "selection matches the div element");
+
+  InspectorUI.currentInspector.once("markuploaded", inspectorOpenTreePanelTab1);
+  InspectorUI.toggleHTMLPanel();
+}
+
+function inspectorOpenTreePanelTab1()
+{
+  ok(InspectorUI.inspecting, "Inspector is highlighting");
+  ok(InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is open");
+  is(InspectorUI.store.length, 2, "Inspector.store.length = 2");
+  is(InspectorUI.selection, div, "selection matches the div element");
+
+  InspectorUI.currentInspector.once("sidebaractivated-computedview",
+    inspectorSidebarStyleView1);
+
+  executeSoon(function() {
+    InspectorUI.sidebar.show();
+    InspectorUI.sidebar.activatePanel("computedview");
+  });
+}
+
+function inspectorSidebarStyleView1()
+{
+  ok(InspectorUI.sidebar.visible, "Inspector Sidebar is open");
+  ok(computedView(), "Inspector Has a computed view Instance");
+
+  InspectorUI.sidebar._toolObjects().forEach(function (aTool) {
+    let btn = aTool.button;
+    is(btn.hasAttribute("checked"),
+      (aTool.id == "computedview"),
+      "Button " + btn.label + " has correct checked attribute");
+  });
+
+  // Switch back to tab 2.
+  Services.obs.addObserver(inspectorFocusTab2,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  gBrowser.selectedTab = tab2;
+}
+
+function inspectorFocusTab2()
+{
+  Services.obs.removeObserver(inspectorFocusTab2,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  // Make sure the inspector is still open.
+  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
+  ok(!InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is not open");
+  ok(!InspectorUI.sidebar.visible, "Inspector Sidebar is not open");
+  is(InspectorUI.store.length, 2, "Inspector.store.length is 2");
+  isnot(InspectorUI.selection, div, "selection does not match the div element");
+
+
+  executeSoon(function() {
+    // Make sure keybindings still work
+    synthesizeKeyFromKeyTag("key_inspect");
+
+    ok(InspectorUI.inspecting, "Inspector is highlighting");
+    InspectorUI.toggleInspection();
+
+    // Switch back to tab 1.
+    Services.obs.addObserver(inspectorSecondFocusTab1,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    gBrowser.selectedTab = tab1;
+  });
+}
+
+function inspectorSecondFocusTab1()
+{
+  Services.obs.removeObserver(inspectorSecondFocusTab1,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+  InspectorUI.currentInspector.once("sidebaractivated-computedview",
+    inspectorSecondFocusTabSidebarLoaded);
+}
+
+function inspectorSecondFocusTabSidebarLoaded()
+{
+  ok(InspectorUI.inspecting, "Inspector is highlighting");
+  ok(InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is open");
+  is(InspectorUI.store.length, 2, "Inspector.store.length = 2");
+  is(InspectorUI.selection, div, "selection matches the div element");
+
+  ok(InspectorUI.sidebar.visible, "Inspector Sidebar is open");
+  ok(computedView(), "Inspector Has a Style Panel Instance");
+  InspectorUI.sidebar._toolObjects().forEach(function(aTool) {
+    let btn = aTool.button;
+    is(btn.hasAttribute("checked"),
+      (aTool.id == "computedview"),
+      "Button " + btn.label + " has correct checked attribute");
+  });
+
+  // Switch back to tab 2.
+  Services.obs.addObserver(inspectorSecondFocusTab2,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  gBrowser.selectedTab = tab2;
+}
+
+function inspectorSecondFocusTab2()
+{
+  Services.obs.removeObserver(inspectorSecondFocusTab2,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+
+  // Make sure the inspector is still open.
+  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
+  ok(!InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is not open");
+  ok(!InspectorUI.isSidebarOpen, "Inspector Sidebar is not open");
+
+  is(InspectorUI.store.length, 2, "Inspector.store.length is 2");
+  isnot(InspectorUI.selection, div, "selection does not match the div element");
+
+  // Remove tab 1.
+  tab1window = gBrowser.getBrowserForTab(tab1).contentWindow;
+  tab1window.addEventListener("pagehide", inspectorTabUnload1, false);
+  gBrowser.removeTab(tab1);
+}
+
+function inspectorTabUnload1(evt)
+{
+  tab1window.removeEventListener(evt.type, arguments.callee, false);
+  tab1window = tab1 = tab2 = div = null;
+
+  // Make sure the Inspector is still open and that the state is correct.
+  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
+  ok(!InspectorUI.currentInspector.markupOpen, "Inspector Tree Panel is not open");
+  is(InspectorUI.store.length, 1, "Inspector.store.length = 1");
+
+  InspectorUI.closeInspectorUI();
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  ignoreAllUncaughtExceptions();
+
+  tab1 = gBrowser.addTab();
+  gBrowser.selectedTab = tab1;
+  gBrowser.selectedBrowser.addEventListener("load", function(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, arguments.callee,
+      true);
+    waitForFocus(inspectorTabOpen1, content);
+  }, true);
+
+  content.location = "data:text/html,<p>tab switching tests for inspector" +
+    "<div>tab 1</div>";
+}
+
diff --git a/browser/devtools/highlighter/test/browser_inspector_treeSelection.js b/browser/devtools/highlighter/test/browser_inspector_treeSelection.js
new file mode 100644
index 000000000000..6e681623377d
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_treeSelection.js
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let doc;
+let h1;
+
+function createDocument()
+{
+  let div = doc.createElement("div");
+  let h1 = doc.createElement("h1");
+  let p1 = doc.createElement("p");
+  let p2 = doc.createElement("p");
+  doc.title = "Inspector Tree Selection Test";
+  h1.textContent = "Inspector Tree Selection Test";
+  p1.textContent = "This is some example text";
+  p2.textContent = "Lorem ipsum dolor sit amet, consectetur adipisicing " +
+    "elit, sed do eiusmod tempor incididunt ut labore et dolore magna " +
+    "aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco " +
+    "laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure " +
+    "dolor in reprehenderit in voluptate velit esse cillum dolore eu " +
+    "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non " +
+    "proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+  div.appendChild(h1);
+  div.appendChild(p1);
+  div.appendChild(p2);
+  doc.body.appendChild(div);
+  setupSelectionTests();
+}
+
+function setupSelectionTests()
+{
+  h1 = doc.querySelectorAll("h1")[0];
+  ok(h1, "we have the header node");
+  Services.obs.addObserver(runSelectionTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.openInspectorUI();
+}
+
+function runSelectionTests()
+{
+  Services.obs.removeObserver(runSelectionTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  executeSoon(function() {
+    InspectorUI.highlighter.addListener("nodeselected", performTestComparisons);
+    InspectorUI.inspectNode(h1);
+  });
+}
+
+function performTestComparisons(evt)
+{
+  InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons);
+
+  is(h1, InspectorUI.selection, "selection matches node");
+  ok(isHighlighting(), "highlighter is highlighting");
+  is(getHighlitNode(), h1, "highlighter highlighting correct node");
+
+  finishUp();
+}
+
+function finishUp() {
+  InspectorUI.closeInspectorUI();
+  doc = h1 = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  ignoreAllUncaughtExceptions();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,basic tests for inspector";
+}
+
diff --git a/browser/devtools/inspector/test/browser_inspector_tree_height.js b/browser/devtools/highlighter/test/browser_inspector_tree_height.js
similarity index 100%
rename from browser/devtools/inspector/test/browser_inspector_tree_height.js
rename to browser/devtools/highlighter/test/browser_inspector_tree_height.js
diff --git a/browser/devtools/inspector/test/head.js b/browser/devtools/highlighter/test/head.js
similarity index 64%
rename from browser/devtools/inspector/test/head.js
rename to browser/devtools/highlighter/test/head.js
index 45332a27bf0c..7c34572aee6e 100644
--- a/browser/devtools/inspector/test/head.js
+++ b/browser/devtools/highlighter/test/head.js
@@ -6,44 +6,30 @@ const Cu = Components.utils;
 let tempScope = {};
 Cu.import("resource:///modules/devtools/LayoutHelpers.jsm", tempScope);
 let LayoutHelpers = tempScope.LayoutHelpers;
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
 
 // Import the GCLI test helper
 let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
 Services.scriptloader.loadSubScript(testDir + "/helpers.js", this);
 
-function openInspector(callback)
+// Clear preferences that may be set during the course of tests.
+function clearUserPrefs()
 {
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-
-  let inspector = gDevTools.getPanelForTarget("inspector", target);
-  if (inspector && inspector.isReady) {
-    callback(inspector);
-  } else {
-    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
-    toolbox.once("inspector-ready", function(event, panel) {
-      let inspector = gDevTools.getPanelForTarget("inspector", target);
-      callback(inspector);
-    });
-  }
+  Services.prefs.clearUserPref("devtools.inspector.htmlPanelOpen");
+  Services.prefs.clearUserPref("devtools.inspector.sidebarOpen");
+  Services.prefs.clearUserPref("devtools.inspector.activeSidebar");
 }
 
-function getActiveInspector()
-{
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  return gDevTools.getPanelForTarget("inspector", target);
-}
+registerCleanupFunction(clearUserPrefs);
 
 function isHighlighting()
 {
-  let outline = getActiveInspector().highlighter.outline;
+  let outline = InspectorUI.highlighter.outline;
   return !(outline.getAttribute("hidden") == "true");
 }
 
 function getHighlitNode()
 {
-  let h = getActiveInspector().highlighter;
+  let h = InspectorUI.highlighter;
   if (!isHighlighting() || !h._contentRect)
     return null;
 
@@ -75,9 +61,7 @@ function midPoint(aPointA, aPointB)
 
 function computedView()
 {
-  let sidebar = getActiveInspector().sidebar;
-  let iframe = sidebar.tabbox.querySelector(".iframe-computedview");
-  return iframe.contentWindow.computedView;
+  return InspectorUI.sidebar._toolContext("computedview");
 }
 
 function computedViewTree()
@@ -87,11 +71,8 @@ function computedViewTree()
 
 function ruleView()
 {
-  let sidebar = getActiveInspector().sidebar;
-  let iframe = sidebar.tabbox.querySelector(".iframe-ruleview");
-  return iframe.contentWindow.ruleView;
+  return InspectorUI.sidebar._toolContext("ruleview").view;
 }
-
 function synthesizeKeyFromKeyTag(aKeyId) {
   let key = document.getElementById(aKeyId);
   isnot(key, null, "Successfully retrieved the <key> node");
diff --git a/browser/devtools/inspector/test/helpers.js b/browser/devtools/highlighter/test/helpers.js
similarity index 100%
rename from browser/devtools/inspector/test/helpers.js
rename to browser/devtools/highlighter/test/helpers.js
diff --git a/browser/devtools/inspector/Breadcrumbs.jsm b/browser/devtools/inspector/Breadcrumbs.jsm
deleted file mode 100644
index b0625140a271..000000000000
--- a/browser/devtools/inspector/Breadcrumbs.jsm
+++ /dev/null
@@ -1,593 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const Cc = Components.classes;
-const Cu = Components.utils;
-const Ci = Components.interfaces;
-
-const PSEUDO_CLASSES = [":hover", ":active", ":focus"];
-
-this.EXPORTED_SYMBOLS = ["HTMLBreadcrumbs"];
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/devtools/DOMHelpers.jsm");
-Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
-
-const LOW_PRIORITY_ELEMENTS = {
-  "HEAD": true,
-  "BASE": true,
-  "BASEFONT": true,
-  "ISINDEX": true,
-  "LINK": true,
-  "META": true,
-  "SCRIPT": true,
-  "STYLE": true,
-  "TITLE": true,
-};
-
-///////////////////////////////////////////////////////////////////////////
-//// HTML Breadcrumbs
-
-/**
- * Display the ancestors of the current node and its children.
- * Only one "branch" of children are displayed (only one line).
- *
- * Mechanism:
- * . If no nodes displayed yet:
- *    then display the ancestor of the selected node and the selected node;
- *   else select the node;
- * . If the selected node is the last node displayed, append its first (if any).
- */
-this.HTMLBreadcrumbs = function HTMLBreadcrumbs(aInspector)
-{
-  this.inspector = aInspector;
-  this.selection = this.inspector.selection;
-  this.chromeWin = this.inspector.panelWin;
-  this.chromeDoc = this.inspector.panelDoc;
-  this.DOMHelpers = new DOMHelpers(this.chromeWin);
-  this._init();
-}
-
-HTMLBreadcrumbs.prototype = {
-  _init: function BC__init()
-  {
-    this.container = this.chromeDoc.getElementById("inspector-breadcrumbs");
-    this.container.addEventListener("mousedown", this, true);
-    this.container.addEventListener("keypress", this, true);
-
-    // We will save a list of already displayed nodes in this array.
-    this.nodeHierarchy = [];
-
-    // Last selected node in nodeHierarchy.
-    this.currentIndex = -1;
-
-    // By default, hide the arrows. We let the <scrollbox> show them
-    // in case of overflow.
-    this.container.removeAttribute("overflows");
-    this.container._scrollButtonUp.collapsed = true;
-    this.container._scrollButtonDown.collapsed = true;
-
-    this.onscrollboxreflow = function() {
-      if (this.container._scrollButtonDown.collapsed)
-        this.container.removeAttribute("overflows");
-      else
-        this.container.setAttribute("overflows", true);
-    }.bind(this);
-
-    this.container.addEventListener("underflow", this.onscrollboxreflow, false);
-    this.container.addEventListener("overflow", this.onscrollboxreflow, false);
-
-    this.update = this.update.bind(this);
-    this.updateSelectors = this.updateSelectors.bind(this);
-    this.selection.on("new-node", this.update);
-    this.selection.on("detached", this.update);
-    this.selection.on("pseudoclass", this.updateSelectors);
-    this.selection.on("attribute-changed", this.updateSelectors);
-    this.update();
-  },
-
-  /**
-   * Build a string that represents the node: tagName#id.class1.class2.
-   *
-   * @param aNode The node to pretty-print
-   * @returns a string
-   */
-  prettyPrintNodeAsText: function BC_prettyPrintNodeText(aNode)
-  {
-    let text = aNode.tagName.toLowerCase();
-    if (aNode.id) {
-      text += "#" + aNode.id;
-    }
-    for (let i = 0; i < aNode.classList.length; i++) {
-      text += "." + aNode.classList[i];
-    }
-    for (let i = 0; i < PSEUDO_CLASSES.length; i++) {
-      let pseudo = PSEUDO_CLASSES[i];
-      if (DOMUtils.hasPseudoClassLock(aNode, pseudo)) {
-        text += pseudo;
-      }
-    }
-
-    return text;
-  },
-
-
-  /**
-   * Build <label>s that represent the node:
-   *   <label class="inspector-breadcrumbs-tag">tagName</label>
-   *   <label class="inspector-breadcrumbs-id">#id</label>
-   *   <label class="inspector-breadcrumbs-classes">.class1.class2</label>
-   *
-   * @param aNode The node to pretty-print
-   * @returns a document fragment.
-   */
-  prettyPrintNodeAsXUL: function BC_prettyPrintNodeXUL(aNode)
-  {
-    let fragment = this.chromeDoc.createDocumentFragment();
-
-    let tagLabel = this.chromeDoc.createElement("label");
-    tagLabel.className = "inspector-breadcrumbs-tag plain";
-
-    let idLabel = this.chromeDoc.createElement("label");
-    idLabel.className = "inspector-breadcrumbs-id plain";
-
-    let classesLabel = this.chromeDoc.createElement("label");
-    classesLabel.className = "inspector-breadcrumbs-classes plain";
-
-    let pseudosLabel = this.chromeDoc.createElement("label");
-    pseudosLabel.className = "inspector-breadcrumbs-pseudo-classes plain";
-
-    tagLabel.textContent = aNode.tagName.toLowerCase();
-    idLabel.textContent = aNode.id ? ("#" + aNode.id) : "";
-
-    let classesText = "";
-    for (let i = 0; i < aNode.classList.length; i++) {
-      classesText += "." + aNode.classList[i];
-    }
-    classesLabel.textContent = classesText;
-
-    let pseudos = PSEUDO_CLASSES.filter(function(pseudo) {
-      return DOMUtils.hasPseudoClassLock(aNode, pseudo);
-    }, this);
-    pseudosLabel.textContent = pseudos.join("");
-
-    fragment.appendChild(tagLabel);
-    fragment.appendChild(idLabel);
-    fragment.appendChild(classesLabel);
-    fragment.appendChild(pseudosLabel);
-
-    return fragment;
-  },
-
-  /**
-   * Open the sibling menu.
-   *
-   * @param aButton the button representing the node.
-   * @param aNode the node we want the siblings from.
-   */
-  openSiblingMenu: function BC_openSiblingMenu(aButton, aNode)
-  {
-    // We make sure that the targeted node is selected
-    // because we want to use the nodemenu that only works
-    // for inspector.selection
-    this.selection.setNode(aNode, "breadcrumbs");
-
-    let title = this.chromeDoc.createElement("menuitem");
-    title.setAttribute("label", this.inspector.strings.GetStringFromName("breadcrumbs.siblings"));
-    title.setAttribute("disabled", "true");
-
-    let separator = this.chromeDoc.createElement("menuseparator");
-
-    let items = [title, separator];
-
-    let nodes = aNode.parentNode.childNodes;
-    for (let i = 0; i < nodes.length; i++) {
-      if (nodes[i].nodeType == aNode.ELEMENT_NODE) {
-        let item = this.chromeDoc.createElement("menuitem");
-        if (nodes[i] === aNode) {
-          item.setAttribute("disabled", "true");
-          item.setAttribute("checked", "true");
-        }
-
-        item.setAttribute("type", "radio");
-        item.setAttribute("label", this.prettyPrintNodeAsText(nodes[i]));
-
-        let selection = this.selection;
-        item.onmouseup = (function(aNode) {
-          return function() {
-            selection.setNode(aNode, "breadcrumbs");
-          }
-        })(nodes[i]);
-
-        items.push(item);
-      }
-    }
-    this.inspector.showNodeMenu(aButton, "before_start", items);
-  },
-
-  /**
-   * Generic event handler.
-   *
-   * @param nsIDOMEvent event
-   *        The DOM event object.
-   */
-  handleEvent: function BC_handleEvent(event)
-  {
-    if (event.type == "mousedown" && event.button == 0) {
-      // on Click and Hold, open the Siblings menu
-
-      let timer;
-      let container = this.container;
-
-      function openMenu(event) {
-        cancelHold();
-        let target = event.originalTarget;
-        if (target.tagName == "button") {
-          target.onBreadcrumbsHold();
-        }
-      }
-
-      function handleClick(event) {
-        cancelHold();
-        let target = event.originalTarget;
-        if (target.tagName == "button") {
-          target.onBreadcrumbsClick();
-        }
-      }
-
-      let window = this.chromeWin;
-      function cancelHold(event) {
-        window.clearTimeout(timer);
-        container.removeEventListener("mouseout", cancelHold, false);
-        container.removeEventListener("mouseup", handleClick, false);
-      }
-
-      container.addEventListener("mouseout", cancelHold, false);
-      container.addEventListener("mouseup", handleClick, false);
-      timer = window.setTimeout(openMenu, 500, event);
-    }
-
-    if (event.type == "keypress" && this.selection.isElementNode()) {
-      let node = null;
-      switch (event.keyCode) {
-        case this.chromeWin.KeyEvent.DOM_VK_LEFT:
-          if (this.currentIndex != 0) {
-            node = this.nodeHierarchy[this.currentIndex - 1].node;
-          }
-          break;
-        case this.chromeWin.KeyEvent.DOM_VK_RIGHT:
-          if (this.currentIndex < this.nodeHierarchy.length - 1) {
-            node = this.nodeHierarchy[this.currentIndex + 1].node;
-          }
-          break;
-        case this.chromeWin.KeyEvent.DOM_VK_UP:
-          node = this.selection.node.previousSibling;
-          while (node && (node.nodeType != node.ELEMENT_NODE)) {
-            node = node.previousSibling;
-          }
-          break;
-        case this.chromeWin.KeyEvent.DOM_VK_DOWN:
-          node = this.selection.node.nextSibling;
-          while (node && (node.nodeType != node.ELEMENT_NODE)) {
-            node = node.nextSibling;
-          }
-          break;
-      }
-      if (node) {
-        this.selection.setNode(node, "breadcrumbs");
-      }
-      event.preventDefault();
-      event.stopPropagation();
-    }
-  },
-
-  /**
-   * Remove nodes and delete properties.
-   */
-  destroy: function BC_destroy()
-  {
-    this.nodeHierarchy.forEach(function(crumb) {
-      if (LayoutHelpers.isNodeConnected(crumb.node)) {
-        DOMUtils.clearPseudoClassLocks(crumb.node);
-      }
-    });
-
-    this.selection.off("new-node", this.update);
-    this.selection.off("detached", this.update);
-    this.selection.off("pseudoclass", this.updateSelectors);
-    this.selection.off("attribute-changed", this.updateSelectors);
-
-    this.container.removeEventListener("underflow", this.onscrollboxreflow, false);
-    this.container.removeEventListener("overflow", this.onscrollboxreflow, false);
-    this.onscrollboxreflow = null;
-
-    this.empty();
-    this.container.removeEventListener("mousedown", this, true);
-    this.container.removeEventListener("keypress", this, true);
-    this.container = null;
-    this.nodeHierarchy = null;
-  },
-
-  /**
-   * Empty the breadcrumbs container.
-   */
-  empty: function BC_empty()
-  {
-    while (this.container.hasChildNodes()) {
-      this.container.removeChild(this.container.firstChild);
-    }
-  },
-
-  /**
-   * Re-init the cache and remove all the buttons.
-   */
-  invalidateHierarchy: function BC_invalidateHierarchy()
-  {
-    this.inspector.hideNodeMenu();
-    this.nodeHierarchy = [];
-    this.empty();
-  },
-
-  /**
-   * Set which button represent the selected node.
-   *
-   * @param aIdx Index of the displayed-button to select
-   */
-  setCursor: function BC_setCursor(aIdx)
-  {
-    // Unselect the previously selected button
-    if (this.currentIndex > -1 && this.currentIndex < this.nodeHierarchy.length) {
-      this.nodeHierarchy[this.currentIndex].button.removeAttribute("checked");
-    }
-    if (aIdx > -1) {
-      this.nodeHierarchy[aIdx].button.setAttribute("checked", "true");
-      if (this.hadFocus)
-        this.nodeHierarchy[aIdx].button.focus();
-    }
-    this.currentIndex = aIdx;
-  },
-
-  /**
-   * Get the index of the node in the cache.
-   *
-   * @param aNode
-   * @returns integer the index, -1 if not found
-   */
-  indexOf: function BC_indexOf(aNode)
-  {
-    let i = this.nodeHierarchy.length - 1;
-    for (let i = this.nodeHierarchy.length - 1; i >= 0; i--) {
-      if (this.nodeHierarchy[i].node === aNode) {
-        return i;
-      }
-    }
-    return -1;
-  },
-
-  /**
-   * Remove all the buttons and their references in the cache
-   * after a given index.
-   *
-   * @param aIdx
-   */
-  cutAfter: function BC_cutAfter(aIdx)
-  {
-    while (this.nodeHierarchy.length > (aIdx + 1)) {
-      let toRemove = this.nodeHierarchy.pop();
-      this.container.removeChild(toRemove.button);
-    }
-  },
-
-  /**
-   * Build a button representing the node.
-   *
-   * @param aNode The node from the page.
-   * @returns aNode The <button>.
-   */
-  buildButton: function BC_buildButton(aNode)
-  {
-    let button = this.chromeDoc.createElement("button");
-    button.appendChild(this.prettyPrintNodeAsXUL(aNode));
-    button.className = "inspector-breadcrumbs-button";
-
-    button.setAttribute("tooltiptext", this.prettyPrintNodeAsText(aNode));
-
-    button.onkeypress = function onBreadcrumbsKeypress(e) {
-      if (e.charCode == Ci.nsIDOMKeyEvent.DOM_VK_SPACE ||
-          e.keyCode == Ci.nsIDOMKeyEvent.DOM_VK_RETURN)
-        button.click();
-    }
-
-    button.onBreadcrumbsClick = function onBreadcrumbsClick() {
-      this.selection.setNode(aNode, "breadcrumbs");
-    }.bind(this);
-
-    button.onclick = (function _onBreadcrumbsRightClick(event) {
-      button.focus();
-      if (event.button == 2) {
-        this.openSiblingMenu(button, aNode);
-      }
-    }).bind(this);
-
-    button.onBreadcrumbsHold = (function _onBreadcrumbsHold() {
-      this.openSiblingMenu(button, aNode);
-    }).bind(this);
-    return button;
-  },
-
-  /**
-   * Connecting the end of the breadcrumbs to a node.
-   *
-   * @param aNode The node to reach.
-   */
-  expand: function BC_expand(aNode)
-  {
-      let fragment = this.chromeDoc.createDocumentFragment();
-      let toAppend = aNode;
-      let lastButtonInserted = null;
-      let originalLength = this.nodeHierarchy.length;
-      let stopNode = null;
-      if (originalLength > 0) {
-        stopNode = this.nodeHierarchy[originalLength - 1].node;
-      }
-      while (toAppend && toAppend.tagName && toAppend != stopNode) {
-        let button = this.buildButton(toAppend);
-        fragment.insertBefore(button, lastButtonInserted);
-        lastButtonInserted = button;
-        this.nodeHierarchy.splice(originalLength, 0, {node: toAppend, button: button});
-        toAppend = this.DOMHelpers.getParentObject(toAppend);
-      }
-      this.container.appendChild(fragment, this.container.firstChild);
-  },
-
-  /**
-   * Get a child of a node that can be displayed in the breadcrumbs
-   * and that is probably visible. See LOW_PRIORITY_ELEMENTS.
-   *
-   * @param aNode The parent node.
-   * @returns nsIDOMNode|null
-   */
-  getInterestingFirstNode: function BC_getInterestingFirstNode(aNode)
-  {
-    let nextChild = this.DOMHelpers.getChildObject(aNode, 0);
-    let fallback = null;
-
-    while (nextChild) {
-      if (nextChild.nodeType == aNode.ELEMENT_NODE) {
-        if (!(nextChild.tagName in LOW_PRIORITY_ELEMENTS)) {
-          return nextChild;
-        }
-        if (!fallback) {
-          fallback = nextChild;
-        }
-      }
-      nextChild = this.DOMHelpers.getNextSibling(nextChild);
-    }
-    return fallback;
-  },
-
-
-  /**
-   * Find the "youngest" ancestor of a node which is already in the breadcrumbs.
-   *
-   * @param aNode
-   * @returns Index of the ancestor in the cache
-   */
-  getCommonAncestor: function BC_getCommonAncestor(aNode)
-  {
-    let node = aNode;
-    while (node) {
-      let idx = this.indexOf(node);
-      if (idx > -1) {
-        return idx;
-      } else {
-        node = this.DOMHelpers.getParentObject(node);
-      }
-    }
-    return -1;
-  },
-
-  /**
-   * Make sure that the latest node in the breadcrumbs is not the selected node
-   * if the selected node still has children.
-   */
-  ensureFirstChild: function BC_ensureFirstChild()
-  {
-    // If the last displayed node is the selected node
-    if (this.currentIndex == this.nodeHierarchy.length - 1) {
-      let node = this.nodeHierarchy[this.currentIndex].node;
-      let child = this.getInterestingFirstNode(node);
-      // If the node has a child
-      if (child) {
-        // Show this child
-        this.expand(child);
-      }
-    }
-  },
-
-  /**
-   * Ensure the selected node is visible.
-   */
-  scroll: function BC_scroll()
-  {
-    // FIXME bug 684352: make sure its immediate neighbors are visible too.
-
-    let scrollbox = this.container;
-    let element = this.nodeHierarchy[this.currentIndex].button;
-    scrollbox.ensureElementIsVisible(element);
-  },
-
-  updateSelectors: function BC_updateSelectors()
-  {
-    for (let i = this.nodeHierarchy.length - 1; i >= 0; i--) {
-      let crumb = this.nodeHierarchy[i];
-      let button = crumb.button;
-
-      while(button.hasChildNodes()) {
-        button.removeChild(button.firstChild);
-      }
-      button.appendChild(this.prettyPrintNodeAsXUL(crumb.node));
-      button.setAttribute("tooltiptext", this.prettyPrintNodeAsText(crumb.node));
-    }
-  },
-
-  /**
-   * Update the breadcrumbs display when a new node is selected.
-   */
-  update: function BC_update()
-  {
-    this.inspector.hideNodeMenu();
-
-    let cmdDispatcher = this.chromeDoc.commandDispatcher;
-    this.hadFocus = (cmdDispatcher.focusedElement &&
-                     cmdDispatcher.focusedElement.parentNode == this.container);
-
-    if (!this.selection.isConnected()) {
-      this.cutAfter(-1); // remove all the crumbs
-      return;
-    }
-
-    if (!this.selection.isElementNode()) {
-      this.setCursor(-1); // no selection
-      return;
-    }
-
-    let idx = this.indexOf(this.selection.node);
-
-    // Is the node already displayed in the breadcrumbs?
-    if (idx > -1) {
-      // Yes. We select it.
-      this.setCursor(idx);
-    } else {
-      // No. Is the breadcrumbs display empty?
-      if (this.nodeHierarchy.length > 0) {
-        // No. We drop all the element that are not direct ancestors
-        // of the selection
-        let parent = this.DOMHelpers.getParentObject(this.selection.node);
-        let idx = this.getCommonAncestor(parent);
-        this.cutAfter(idx);
-      }
-      // we append the missing button between the end of the breadcrumbs display
-      // and the current node.
-      this.expand(this.selection.node);
-
-      // we select the current node button
-      idx = this.indexOf(this.selection.node);
-      this.setCursor(idx);
-    }
-    // Add the first child of the very last node of the breadcrumbs if possible.
-    this.ensureFirstChild();
-
-    // Make sure the selected node and its neighbours are visible.
-    this.scroll();
-
-    this.updateSelectors();
-  },
-}
-
-XPCOMUtils.defineLazyGetter(this, "DOMUtils", function () {
-  return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
-});
diff --git a/browser/devtools/inspector/CmdInspect.jsm b/browser/devtools/inspector/CmdInspect.jsm
deleted file mode 100644
index bde650c86aad..000000000000
--- a/browser/devtools/inspector/CmdInspect.jsm
+++ /dev/null
@@ -1,48 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-this.EXPORTED_SYMBOLS = [ ];
-
-Cu.import("resource:///modules/devtools/gcli.jsm");
-Cu.import('resource://gre/modules/XPCOMUtils.jsm');
-
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource:///modules/devtools/gDevTools.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
-                                  "resource:///modules/devtools/Target.jsm");
-
-/**
- * 'inspect' command
- */
-gcli.addCommand({
-  name: "inspect",
-  description: gcli.lookup("inspectDesc"),
-  manual: gcli.lookup("inspectManual"),
-  params: [
-    {
-      name: "selector",
-      type: "node",
-      description: gcli.lookup("inspectNodeDesc"),
-      manual: gcli.lookup("inspectNodeManual")
-    }
-  ],
-  exec: function Command_inspect(args, context) {
-    let gBrowser = context.environment.chromeDocument.defaultView.gBrowser;
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-
-    let node = args.selector;
-
-    let inspector = gDevTools.getPanelForTarget("inspector", target);
-    if (inspector && inspector.isReady) {
-      inspector.selection.setNode(node, "gcli");
-    } else {
-      let toolbox = gDevTools.openToolboxForTab(target, "inspector");
-      toolbox.once("inspector-ready", function(event, panel) {
-        let inspector = gDevTools.getPanelForTarget("inspector", target);
-        inspector.selection.setNode(node, "gcli");
-      }.bind(this));
-    }
-  }
-});
diff --git a/browser/devtools/inspector/InspectorDefinition.jsm b/browser/devtools/inspector/InspectorDefinition.jsm
deleted file mode 100644
index 97a9a683ea6e..000000000000
--- a/browser/devtools/inspector/InspectorDefinition.jsm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-this.EXPORTED_SYMBOLS = ["InspectorDefinition"];
-
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-const properties = "chrome://browser/locale/devtools/inspector.properties";
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyGetter(this, "osString",
-  function() Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS);
-
-XPCOMUtils.defineLazyGetter(this, "Strings",
-  function() Services.strings.createBundle(properties));
-
-function l10n(aName) Strings.GetStringFromName(aName);
-
-Cu.import("resource://gre/modules/Services.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "InspectorPanel", "resource:///modules/devtools/InspectorPanel.jsm");
-
-this.InspectorDefinition = {
-  id: "inspector",
-  accesskey: l10n("inspector.accesskey"),
-  key: l10n("inspector.commandkey"),
-  ordinal: 2,
-  modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
-  icon: "chrome://browser/skin/devtools/tools-icons-small.png",
-  url: "chrome://browser/content/devtools/inspector/inspector.xul",
-  label: l10n("inspector.label"),
-
-  isTargetSupported: function(target) {
-    return !target.isRemote;
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new InspectorPanel(iframeWindow, toolbox);
-  }
-};
diff --git a/browser/devtools/inspector/InspectorPanel.jsm b/browser/devtools/inspector/InspectorPanel.jsm
deleted file mode 100644
index 1f45c547441c..000000000000
--- a/browser/devtools/inspector/InspectorPanel.jsm
+++ /dev/null
@@ -1,536 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const Cc = Components.classes;
-const Cu = Components.utils;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-
-this.EXPORTED_SYMBOLS = ["InspectorPanel"];
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/devtools/MarkupView.jsm");
-Cu.import("resource:///modules/devtools/EventEmitter.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/devtools/gDevTools.jsm");
-Cu.import("resource:///modules/devtools/Selection.jsm");
-Cu.import("resource:///modules/devtools/Breadcrumbs.jsm");
-Cu.import("resource:///modules/devtools/Highlighter.jsm");
-Cu.import("resource:///modules/devtools/Sidebar.jsm");
-
-const LAYOUT_CHANGE_TIMER = 250;
-
-/**
- * Represents an open instance of the Inspector for a tab.
- * The inspector controls the highlighter, the breadcrumbs,
- * the markup view, and the sidebar (computed view, rule view
- * and layout view).
- */
-this.InspectorPanel = function InspectorPanel(iframeWindow, toolbox) {
-  this._toolbox = toolbox;
-  this._target = toolbox._target;
-
-  if (this.target.isRemote) {
-    throw "Unsupported target";
-  }
-
-  this.tabTarget = (this.target.tab != null);
-  this.winTarget = (this.target.window != null);
-
-  new EventEmitter(this);
-
-  this.preventNavigateAway = this.preventNavigateAway.bind(this);
-  this.onNavigatedAway = this.onNavigatedAway.bind(this);
-  this.target.on("will-navigate", this.preventNavigateAway);
-  this.target.on("navigate", this.onNavigatedAway);
-
-  this.panelDoc = iframeWindow.document;
-  this.panelWin = iframeWindow;
-  this.panelWin.inspector = this;
-
-  this.nodemenu = this.panelDoc.getElementById("inspector-node-popup");
-  this.lastNodemenuItem = this.nodemenu.lastChild;
-  this._setupNodeMenu = this._setupNodeMenu.bind(this);
-  this._resetNodeMenu = this._resetNodeMenu.bind(this);
-  this.nodemenu.addEventListener("popupshowing", this._setupNodeMenu, true);
-  this.nodemenu.addEventListener("popuphiding", this._resetNodeMenu, true);
-
-  // Create an empty selection
-  this._selection = new Selection();
-  this.onNewSelection = this.onNewSelection.bind(this);
-  this.selection.on("new-node", this.onNewSelection);
-
-  this.breadcrumbs = new HTMLBreadcrumbs(this);
-
-  if (this.tabTarget) {
-    this.browser = this.target.tab.linkedBrowser;
-    this.scheduleLayoutChange = this.scheduleLayoutChange.bind(this);
-    this.browser.addEventListener("resize", this.scheduleLayoutChange, true);
-
-    this.highlighter = new Highlighter(this.target, this, this._toolbox);
-    let button = this.panelDoc.getElementById("inspector-inspect-toolbutton");
-    button.hidden = false;
-    this.updateInspectorButton = function() {
-      if (this.highlighter.locked) {
-        button.removeAttribute("checked");
-      } else {
-        button.setAttribute("checked", "true");
-      }
-    }.bind(this);
-    this.highlighter.on("locked", this.updateInspectorButton);
-    this.highlighter.on("unlocked", this.updateInspectorButton);
-  }
-
-  this._initMarkup();
-  this.isReady = false;
-
-  this.once("markuploaded", function() {
-    this.isReady = true;
-
-    // All the components are initialized. Let's select a node.
-    if (this.tabTarget) {
-      let root = this.browser.contentDocument.documentElement;
-      this._selection.setNode(root);
-    }
-    if (this.winTarget) {
-      let root = this.target.window.document.documentElement;
-      this._selection.setNode(root);
-    }
-
-    if (this.highlighter) {
-      this.highlighter.unlock();
-    }
-
-    this.emit("ready");
-  }.bind(this));
-
-  this.setupSidebar();
-}
-
-InspectorPanel.prototype = {
-  /**
-   * Selection object (read only)
-   */
-  get selection() {
-    return this._selection;
-  },
-
-  /**
-   * Target getter.
-   */
-  get target() {
-    return this._target;
-  },
-
-  /**
-   * Target setter.
-   */
-  set target(value) {
-    this._target = value;
-  },
-
-  /**
-   * Expose gViewSourceUtils so that other tools can make use of them.
-   */
-  get viewSourceUtils() {
-    return this.panelWin.gViewSourceUtils;
-  },
-
-  /**
-   * Indicate that a tool has modified the state of the page.  Used to
-   * decide whether to show the "are you sure you want to navigate"
-   * notification.
-   */
-  markDirty: function InspectorPanel_markDirty() {
-    this.isDirty = true;
-  },
-
-  /**
-   * Build the sidebar.
-   */
-  setupSidebar: function InspectorPanel_setupSidebar() {
-    let tabbox = this.panelDoc.querySelector("#inspector-sidebar");
-    this.sidebar = new ToolSidebar(tabbox, this);
-
-    let defaultTab = Services.prefs.getCharPref("devtools.inspector.activeSidebar");
-
-    this._setDefaultSidebar = function(event, toolId) {
-      Services.prefs.setCharPref("devtools.inspector.activeSidebar", toolId);
-    }.bind(this);
-
-    this.sidebar.on("select", this._setDefaultSidebar);
-
-    this.sidebar.addTab("ruleview",
-                        "chrome://browser/content/devtools/cssruleview.xul",
-                        "ruleview" == defaultTab);
-
-    this.sidebar.addTab("computedview",
-                        "chrome://browser/content/devtools/csshtmltree.xul",
-                        "computedview" == defaultTab);
-
-    this.sidebar.addTab("layoutview",
-                        "chrome://browser/content/devtools/layoutview/view.xhtml",
-                        "layoutview" == defaultTab);
-
-    this.sidebar.show();
-  },
-
-  /**
-   * Reset the inspector on navigate away.
-   */
-  onNavigatedAway: function InspectorPanel_onNavigatedAway(event, newWindow) {
-    this.selection.setNode(null);
-    this._destroyMarkup();
-    this.isDirty = false;
-    let self = this;
-    newWindow.addEventListener("DOMContentLoaded", function onDOMReady() {
-      newWindow.removeEventListener("DOMContentLoaded", onDOMReady, true);;
-      if (!self.selection.node) {
-        self.selection.setNode(newWindow.document.documentElement);
-      }
-      self._initMarkup();
-    }, true);
-  },
-
-  /**
-   * Show a message if the inspector is dirty.
-   */
-  preventNavigateAway: function InspectorPanel_preventNavigateAway(event, request) {
-    if (!this.isDirty) {
-      return;
-    }
-
-    request.suspend();
-
-    let notificationBox = this._toolbox.getNotificationBox();
-    let notification = notificationBox.
-      getNotificationWithValue("inspector-page-navigation");
-
-    if (notification) {
-      notificationBox.removeNotification(notification, true);
-    }
-
-    let cancelRequest = function onCancelRequest() {
-      if (request) {
-        request.cancel(Cr.NS_BINDING_ABORTED);
-        request.resume(); // needed to allow the connection to be cancelled.
-        request = null;
-      }
-    };
-
-    let eventCallback = function onNotificationCallback(event) {
-      if (event == "removed") {
-        cancelRequest();
-      }
-    };
-
-    let buttons = [
-      {
-        id: "inspector.confirmNavigationAway.buttonLeave",
-        label: this.strings.GetStringFromName("confirmNavigationAway.buttonLeave"),
-        accessKey: this.strings.GetStringFromName("confirmNavigationAway.buttonLeaveAccesskey"),
-        callback: function onButtonLeave() {
-          if (request) {
-            request.resume();
-            request = null;
-            return true;
-          }
-          return false;
-        }.bind(this),
-      },
-      {
-        id: "inspector.confirmNavigationAway.buttonStay",
-        label: this.strings.GetStringFromName("confirmNavigationAway.buttonStay"),
-        accessKey: this.strings.GetStringFromName("confirmNavigationAway.buttonStayAccesskey"),
-        callback: cancelRequest
-      },
-    ];
-
-    let message = this.strings.GetStringFromName("confirmNavigationAway.message2");
-
-    notification = notificationBox.appendNotification(message,
-      "inspector-page-navigation", "chrome://browser/skin/Info.png",
-      notificationBox.PRIORITY_WARNING_HIGH, buttons, eventCallback);
-
-    // Make sure this not a transient notification, to avoid the automatic
-    // transient notification removal.
-    notification.persistence = -1;
-  },
-
-  /**
-   * When a new node is selected.
-   */
-  onNewSelection: function InspectorPanel_onNewSelection() {
-    this.cancelLayoutChange();
-  },
-
-  /**
-   * Destroy the inspector.
-   */
-  destroy: function InspectorPanel__destroy() {
-    if (this._destroyed) {
-      return;
-    }
-    this.cancelLayoutChange();
-    this._destroyed = true;
-
-    this._toolbox = null;
-
-    if (this.browser) {
-      this.browser.removeEventListener("resize", this.scheduleLayoutChange, true);
-      this.browser = null;
-    }
-
-    this.target.off("will-navigate", this.preventNavigateAway);
-    this.target.off("navigate", this.onNavigatedAway);
-
-    if (this.highlighter) {
-      this.highlighter.off("locked", this.updateInspectorButton);
-      this.highlighter.off("unlocked", this.updateInspectorButton);
-      this.highlighter.destroy();
-    }
-
-    this.sidebar.off("select", this._setDefaultSidebar);
-    this.sidebar.destroy();
-    this.sidebar = null;
-
-    this.nodemenu.removeEventListener("popupshowing", this._setupNodeMenu, true);
-    this.nodemenu.removeEventListener("popuphiding", this._resetNodeMenu, true);
-    this.breadcrumbs.destroy();
-    this.selection.off("new-node", this.onNewSelection);
-    this._destroyMarkup();
-    this._selection.destroy();
-    this._selection = null;
-    this.panelWin.inspector = null;
-    this.target = null;
-    this.panelDoc = null;
-    this.panelWin = null;
-    this.breadcrumbs = null;
-    this.lastNodemenuItem = null;
-    this.nodemenu = null;
-    this.highlighter = null;
-  },
-
-  /**
-   * Show the node menu.
-   */
-  showNodeMenu: function InspectorPanel_showNodeMenu(aButton, aPosition, aExtraItems) {
-    if (aExtraItems) {
-      for (let item of aExtraItems) {
-        this.nodemenu.appendChild(item);
-      }
-    }
-    this.nodemenu.openPopup(aButton, aPosition, 0, 0, true, false);
-  },
-
-  hideNodeMenu: function InspectorPanel_hideNodeMenu() {
-    this.nodemenu.hidePopup();
-  },
-
-  /**
-   * Disable the delete item if needed. Update the pseudo classes.
-   */
-  _setupNodeMenu: function InspectorPanel_setupNodeMenu() {
-    // Set the pseudo classes
-    for (let name of ["hover", "active", "focus"]) {
-      let menu = this.panelDoc.getElementById("node-menu-pseudo-" + name);
-      let checked = DOMUtils.hasPseudoClassLock(this.selection.node, ":" + name);
-      menu.setAttribute("checked", checked);
-    }
-
-    // Disable delete item if needed
-    let deleteNode = this.panelDoc.getElementById("node-menu-delete");
-    if (this.selection.isRoot()) {
-      deleteNode.setAttribute("disabled", "true");
-    } else {
-      deleteNode.removeAttribute("disabled");
-    }
-  },
-
-  _resetNodeMenu: function InspectorPanel_resetNodeMenu() {
-    // Remove any extra items
-    while (this.lastNodemenuItem.nextSibling) {
-      let toDelete = this.lastNodemenuItem.nextSibling;
-      toDelete.parentNode.removeChild(toDelete);
-    }
-  },
-
-  _initMarkup: function InspectorPanel_initMarkup() {
-    let doc = this.panelDoc;
-
-    this._markupBox = doc.getElementById("markup-box");
-
-    // create tool iframe
-    this._markupFrame = doc.createElement("iframe");
-    this._markupFrame.setAttribute("flex", "1");
-    this._markupFrame.setAttribute("tooltip", "aHTMLTooltip");
-    this._markupFrame.setAttribute("context", "inspector-node-popup");
-
-    // This is needed to enable tooltips inside the iframe document.
-    this._boundMarkupFrameLoad = function InspectorPanel_initMarkupPanel_onload() {
-      this._markupFrame.contentWindow.focus();
-      this._onMarkupFrameLoad();
-    }.bind(this);
-    this._markupFrame.addEventListener("load", this._boundMarkupFrameLoad, true);
-
-    this._markupBox.setAttribute("hidden", true);
-    this._markupBox.appendChild(this._markupFrame);
-    this._markupFrame.setAttribute("src", "chrome://browser/content/devtools/markup-view.xhtml");
-  },
-
-  _onMarkupFrameLoad: function InspectorPanel__onMarkupFrameLoad() {
-    this._markupFrame.removeEventListener("load", this._boundMarkupFrameLoad, true);
-    delete this._boundMarkupFrameLoad;
-
-    this._markupBox.removeAttribute("hidden");
-
-    let controllerWindow;
-    if (this.tabTarget) {
-      controllerWindow = this.target.tab.ownerDocument.defaultView;
-    } else if (this.winTarget) {
-      controllerWindow = this.target.window;
-    }
-    this.markup = new MarkupView(this, this._markupFrame, controllerWindow);
-
-    this.emit("markuploaded");
-  },
-
-  _destroyMarkup: function InspectorPanel__destroyMarkup() {
-    if (this._boundMarkupFrameLoad) {
-      this._markupFrame.removeEventListener("load", this._boundMarkupFrameLoad, true);
-      delete this._boundMarkupFrameLoad;
-    }
-
-    if (this.markup) {
-      this.markup.destroy();
-      delete this.markup;
-    }
-
-    if (this._markupFrame) {
-      this._markupFrame.parentNode.removeChild(this._markupFrame);
-      delete this._markupFrame;
-    }
-  },
-
-  /**
-   * Toggle a pseudo class.
-   */
-  togglePseudoClass: function InspectorPanel_togglePseudoClass(aPseudo) {
-    if (this.selection.isElementNode()) {
-      if (DOMUtils.hasPseudoClassLock(this.selection.node, aPseudo)) {
-        this.breadcrumbs.nodeHierarchy.forEach(function(crumb) {
-          DOMUtils.removePseudoClassLock(crumb.node, aPseudo);
-        });
-      } else {
-        let hierarchical = aPseudo == ":hover" || aPseudo == ":active";
-        let node = this.selection.node;
-        do {
-          DOMUtils.addPseudoClassLock(node, aPseudo);
-          node = node.parentNode;
-        } while (hierarchical && node.parentNode)
-      }
-    }
-    this.selection.emit("pseudoclass");
-  },
-
-  /**
-   * Copy the innerHTML of the selected Node to the clipboard.
-   */
-  copyInnerHTML: function InspectorPanel_copyInnerHTML()
-  {
-    if (!this.selection.isNode()) {
-      return;
-    }
-    let toCopy = this.selection.node.innerHTML;
-    if (toCopy) {
-      clipboardHelper.copyString(toCopy);
-    }
-  },
-
-  /**
-   * Copy the outerHTML of the selected Node to the clipboard.
-   */
-  copyOuterHTML: function InspectorPanel_copyOuterHTML()
-  {
-    if (!this.selection.isNode()) {
-      return;
-    }
-    let toCopy = this.selection.node.outerHTML;
-    if (toCopy) {
-      clipboardHelper.copyString(toCopy);
-    }
-  },
-
-  /**
-   * Delete the selected node.
-   */
-  deleteNode: function IUI_deleteNode() {
-    if (!this.selection.isNode() ||
-         this.selection.isRoot()) {
-      return;
-    }
-
-    let toDelete = this.selection.node;
-
-    let parent = this.selection.node.parentNode;
-
-    // If the markup panel is active, use the markup panel to delete
-    // the node, making this an undoable action.
-    if (this.markup) {
-      this.markup.deleteNode(toDelete);
-    } else {
-      // remove the node from content
-      parent.removeChild(toDelete);
-    }
-  },
-
-  /**
-   * Schedule a low-priority change event for things like paint
-   * and resize.
-   */
-  scheduleLayoutChange: function Inspector_scheduleLayoutChange()
-  {
-    if (this._timer) {
-      return null;
-    }
-    this._timer = this.panelWin.setTimeout(function() {
-      this.emit("layout-change");
-      this._timer = null;
-    }.bind(this), LAYOUT_CHANGE_TIMER);
-  },
-
-  /**
-   * Cancel a pending low-priority change event if any is
-   * scheduled.
-   */
-  cancelLayoutChange: function Inspector_cancelLayoutChange()
-  {
-    if (this._timer) {
-      this.panelWin.clearTimeout(this._timer);
-      delete this._timer;
-    }
-  },
-
-}
-
-/////////////////////////////////////////////////////////////////////////
-//// Initializers
-
-XPCOMUtils.defineLazyGetter(InspectorPanel.prototype, "strings",
-  function () {
-    return Services.strings.createBundle(
-            "chrome://browser/locale/devtools/inspector.properties");
-  });
-
-XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function() {
-  return Cc["@mozilla.org/widget/clipboardhelper;1"].
-    getService(Ci.nsIClipboardHelper);
-});
-
-
-XPCOMUtils.defineLazyGetter(this, "DOMUtils", function () {
-  return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
-});
diff --git a/browser/devtools/inspector/Selection.jsm b/browser/devtools/inspector/Selection.jsm
deleted file mode 100644
index a5cbf9020b2c..000000000000
--- a/browser/devtools/inspector/Selection.jsm
+++ /dev/null
@@ -1,230 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const Cu = Components.utils;
-Cu.import("resource:///modules/devtools/EventEmitter.jsm");
-
-this.EXPORTED_SYMBOLS = ["Selection"];
-
-/**
- * API
- *
- *   new Selection(node=null, track={attributes,detached});
- *   destroy()
- *   node (readonly)
- *   setNode(node, origin="unknown")
- *
- * Helpers:
- *
- *   window
- *   document
- *   isRoot()
- *   isNode()
- *   isHTMLNode()
- *
- * Check the nature of the node:
- *
- *   isElementNode()
- *   isAttributeNode()
- *   isTextNode()
- *   isCDATANode()
- *   isEntityRefNode()
- *   isEntityNode()
- *   isProcessingInstructionNode()
- *   isCommentNode()
- *   isDocumentNode()
- *   isDocumentTypeNode()
- *   isDocumentFragmentNode()
- *   isNotationNode()
- *
- * Events:
- *   "new-node" when the inner node changed
- *   "attribute-changed" when an attribute is changed (only if tracked)
- *   "detached" when the node (or one of its parents) is removed from the document (only if tracked)
- *   "reparented" when the node (or one of its parents) is moved under a different node (only if tracked)
- */
-
-/**
- * A Selection object. Hold a reference to a node.
- * Includes some helpers, fire some helpful events.
- *
- * @param node Inner node.
- *    Can be null. Can be (un)set in the future via the "node" property;
- * @param trackAttribute Tell if events should be fired when the attributes of
- *    the ndoe change.
- *
- */
-this.Selection = function Selection(node=null, track={attributes:true,detached:true}) {
-  new EventEmitter(this);
-  this._onMutations = this._onMutations.bind(this);
-  this.track = track;
-  this.setNode(node);
-}
-
-Selection.prototype = {
-  _node: null,
-
-  _onMutations: function(mutations) {
-    let attributeChange = false;
-    let detached = false;
-    for (let m of mutations) {
-      if (!attributeChange && m.type == "attributes") {
-        attributeChange = true;
-      }
-      if (m.type == "childList") {
-        if (!detached && !this.isConnected()) {
-          detached = true;
-        }
-      }
-    }
-
-    if (attributeChange)
-      this.emit("attribute-changed");
-    if (detached)
-      this.emit("detached");
-  },
-
-  _attachEvents: function SN__attachEvents() {
-    if (!this.window || !this.isNode() || !this.track) {
-      return;
-    }
-
-    if (this.track.attributes) {
-      this._nodeObserver = new this.window.MutationObserver(this._onMutations);
-      this._nodeObserver.observe(this.node, {attributes: true});
-    }
-
-    if (this.track.detached) {
-      this._docObserver = new this.window.MutationObserver(this._onMutations);
-      this._docObserver.observe(this.document.documentElement, {childList: true, subtree: true});
-    }
-  },
-
-  _detachEvents: function SN__detachEvents() {
-    // `disconnect` fail if node's document has
-    // been deleted.
-    try {
-      if (this._nodeObserver)
-        this._nodeObserver.disconnect();
-    } catch(e) {}
-    try {
-      if (this._docObserver)
-        this._docObserver.disconnect();
-    } catch(e) {}
-  },
-
-  destroy: function SN_destroy() {
-    this._detachEvents();
-    this.setNode(null);
-  },
-
-  setNode: function SN_setNode(value, reason="unknown") {
-    this.reason = reason;
-    if (value !== this._node) {
-      let previousNode = this._node;
-      this._detachEvents();
-      this._node = value;
-      this._attachEvents();
-      this.emit("new-node", previousNode, this.reason);
-    }
-  },
-
-  get node() {
-    return this._node;
-  },
-
-  get window() {
-    if (this.isNode()) {
-      return this.node.ownerDocument.defaultView;
-    }
-    return null;
-  },
-
-  get document() {
-    if (this.isNode()) {
-      return this.node.ownerDocument;
-    }
-    return null;
-  },
-
-  isRoot: function SN_isRootNode() {
-    return this.isNode() &&
-           this.isConnected() &&
-           this.node.ownerDocument.documentElement === this.node;
-  },
-
-  isNode: function SN_isNode() {
-    return (this.node &&
-            this.node.ownerDocument &&
-            this.node.ownerDocument.defaultView &&
-            this.node instanceof this.node.ownerDocument.defaultView.Node);
-  },
-
-  isConnected: function SN_isConnected() {
-    try {
-      let doc = this.document;
-      return doc && doc.defaultView && doc.documentElement.contains(this.node);
-    } catch (e) {
-      // "can't access dead object" error
-      return false;
-    }
-  },
-
-  isHTMLNode: function SN_isHTMLNode() {
-    let xhtml_ns = "http://www.w3.org/1999/xhtml";
-    return this.isNode() && this.node.namespaceURI == xhtml_ns;
-  },
-
-  // Node type
-
-  isElementNode: function SN_isElementNode() {
-    return this.isNode() && this.node.nodeType == this.window.Node.ELEMENT_NODE;
-  },
-
-  isAttributeNode: function SN_isAttributeNode() {
-    return this.isNode() && this.node.nodeType == this.window.Node.ATTRIBUTE_NODE;
-  },
-
-  isTextNode: function SN_isTextNode() {
-    return this.isNode() && this.node.nodeType == this.window.Node.TEXT_NODE;
-  },
-
-  isCDATANode: function SN_isCDATANode() {
-    return this.isNode() && this.node.nodeType == this.window.Node.CDATA_SECTION_NODE;
-  },
-
-  isEntityRefNode: function SN_isEntityRefNode() {
-    return this.isNode() && this.node.nodeType == this.window.Node.ENTITY_REFERENCE_NODE;
-  },
-
-  isEntityNode: function SN_isEntityNode() {
-    return this.isNode() && this.node.nodeType == this.window.Node.ENTITY_NODE;
-  },
-
-  isProcessingInstructionNode: function SN_isProcessingInstructionNode() {
-    return this.isNode() && this.node.nodeType == this.window.Node.PROCESSING_INSTRUCTION_NODE;
-  },
-
-  isCommentNode: function SN_isCommentNode() {
-    return this.isNode() && this.node.nodeType == this.window.Node.PROCESSING_INSTRUCTION_NODE;
-  },
-
-  isDocumentNode: function SN_isDocumentNode() {
-    return this.isNode() && this.node.nodeType == this.window.Node.DOCUMENT_NODE;
-  },
-
-  isDocumentTypeNode: function SN_isDocumentTypeNode() {
-    return this.isNode() && this.node.nodeType ==this.window. Node.DOCUMENT_TYPE_NODE;
-  },
-
-  isDocumentFragmentNode: function SN_isDocumentFragmentNode() {
-    return this.isNode() && this.node.nodeType == this.window.Node.DOCUMENT_FRAGMENT_NODE;
-  },
-
-  isNotationNode: function SN_isNotationNode() {
-    return this.isNode() && this.node.nodeType == this.window.Node.NOTATION_NODE;
-  },
-}
diff --git a/browser/devtools/inspector/inspector.css b/browser/devtools/inspector/inspector.css
deleted file mode 100644
index 981c7f547488..000000000000
--- a/browser/devtools/inspector/inspector.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.inspector-breadcrumbs-button {
-  direction: ltr;
-}
-
-.devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
-  display: none;
-}
-
-#inspector-sidebar {
-  min-width: 250px;
-}
diff --git a/browser/devtools/inspector/inspector.xul b/browser/devtools/inspector/inspector.xul
deleted file mode 100644
index 0331d35a0ad8..000000000000
--- a/browser/devtools/inspector/inspector.xul
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<?xml-stylesheet href="chrome://browser/content/devtools/inspector/inspector.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/devtools/inspector.css" type="text/css"?>
-<!DOCTYPE window [
-<!ENTITY % inspectorDTD SYSTEM "chrome://browser/locale/devtools/inspector.dtd" >
- %inspectorDTD;
-]>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/javascript"
-          src="chrome://global/content/viewSourceUtils.js"/>
-
-  <popupset id="inspectorPopupSet">
-    <!-- Used by the Markup Panel, the Highlighter and the Breadcrumbs -->
-    <menupopup id="inspector-node-popup">
-      <menuitem id="node-menu-copyinner"
-        label="&inspectorHTMLCopyInner.label;"
-        accesskey="&inspectorHTMLCopyInner.accesskey;"
-        oncommand="inspector.copyInnerHTML()"/>
-      <menuitem id="node-menu-copyouter"
-        label="&inspectorHTMLCopyOuter.label;"
-        accesskey="&inspectorHTMLCopyOuter.accesskey;"
-        oncommand="inspector.copyOuterHTML()"/>
-      <menuseparator/>
-      <menuitem id="node-menu-delete"
-        label="&inspectorHTMLDelete.label;"
-        accesskey="&inspectorHTMLDelete.accesskey;"
-        oncommand="inspector.deleteNode()"/>
-      <menuseparator/>
-      <menuitem id="node-menu-pseudo-hover"
-        label=":hover" type="checkbox"
-        oncommand="inspector.togglePseudoClass(':hover')"/>
-      <menuitem id="node-menu-pseudo-active"
-        label=":active" type="checkbox"
-        oncommand="inspector.togglePseudoClass(':active')"/>
-      <menuitem id="node-menu-pseudo-focus"
-        label=":focus" type="checkbox"
-        oncommand="inspector.togglePseudoClass(':focus')"/>
-    </menupopup>
-  </popupset>
-
-  <hbox flex="1">
-    <vbox flex="1">
-      <toolbar id="inspector-toolbar"
-        class="devtools-toolbar"
-        nowindowdrag="true">
-        <toolbarbutton id="inspector-inspect-toolbutton"
-          tooltiptext="&inspector.selectButton.tooltip;"
-          class="devtools-toolbarbutton"
-          hidden="true"
-          oncommand="inspector.highlighter.unlock()"/>
-        <arrowscrollbox id="inspector-breadcrumbs"
-          flex="1" orient="horizontal"
-          clicktoscroll="true"/>
-      </toolbar>
-      <vbox flex="1" id="markup-box">
-      </vbox>
-    </vbox>
-    <splitter class="devtools-side-splitter"/>
-    <tabbox id="inspector-sidebar" class="devtools-sidebar-tabs" hidden="true">
-      <tabs/>
-      <tabpanels flex="1"/>
-    </tabbox>
-  </hbox>
-</window>
diff --git a/browser/devtools/inspector/test/browser_inspector_bug_566084_location_changed.js b/browser/devtools/inspector/test/browser_inspector_bug_566084_location_changed.js
deleted file mode 100644
index c209f9f6e935..000000000000
--- a/browser/devtools/inspector/test/browser_inspector_bug_566084_location_changed.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
-function test() {
-  let notificationBox, inspector;
-  let alertActive1_called = false;
-  let alertActive2_called = false;
-
-  function startLocationTests() {
-    openInspector(runInspectorTests);
-  }
-
-  function runInspectorTests(aInspector) {
-    inspector = aInspector;
-
-    let para = content.document.querySelector("p");
-    ok(para, "found the paragraph element");
-    is(para.textContent, "init", "paragraph content is correct");
-
-    inspector.markDirty();
-
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let toolbox = gDevTools.getToolboxForTarget(target);
-    notificationBox = toolbox.getNotificationBox();
-    notificationBox.addEventListener("AlertActive", alertActive1, false);
-
-    ok(toolbox, "We have access to the notificationBox");
-
-    gBrowser.selectedBrowser.addEventListener("load", onPageLoad, true);
-
-    content.location = "data:text/html,<div>location change test 1 for " +
-      "inspector</div><p>test1</p>";
-  }
-
-  function alertActive1() {
-    alertActive1_called = true;
-    notificationBox.removeEventListener("AlertActive", alertActive1, false);
-
-    let notification = notificationBox.
-      getNotificationWithValue("inspector-page-navigation");
-    ok(notification, "found the inspector-page-navigation notification");
-
-    // By closing the notification it is expected that page navigation is
-    // canceled.
-    executeSoon(function() {
-      notification.close();
-      locationTest2();
-    });
-  }
-
-  function locationTest2() {
-    // Location did not change.
-    let para = content.document.querySelector("p");
-    ok(para, "found the paragraph element, second time");
-    is(para.textContent, "init", "paragraph content is correct");
-
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let inspector = gDevTools.getPanelForTarget("inspector", target);
-    ok(inspector, "Inspector still alive");
-
-    notificationBox.addEventListener("AlertActive", alertActive2, false);
-
-    content.location = "data:text/html,<div>location change test 2 for " +
-      "inspector</div><p>test2</p>";
-  }
-
-  function alertActive2() {
-    alertActive2_called = true;
-    notificationBox.removeEventListener("AlertActive", alertActive2, false);
-
-    let notification = notificationBox.
-      getNotificationWithValue("inspector-page-navigation");
-    ok(notification, "found the inspector-page-navigation notification");
-
-    let buttons = notification.querySelectorAll("button");
-    let buttonLeave = null;
-    for (let i = 0; i < buttons.length; i++) {
-      if (buttons[i].buttonInfo.id == "inspector.confirmNavigationAway.buttonLeave") {
-        buttonLeave = buttons[i];
-        break;
-      }
-    }
-
-    ok(buttonLeave, "the Leave page button was found");
-
-    // Accept page navigation.
-    executeSoon(function(){
-      buttonLeave.doCommand();
-    });
-  }
-
-  function onPageLoad() {
-    gBrowser.selectedBrowser.removeEventListener("load", onPageLoad, true);
-
-    isnot(content.location.href.indexOf("test2"), -1,
-          "page navigated to the correct location");
-
-    let para = content.document.querySelector("p");
-    ok(para, "found the paragraph element, third time");
-    is(para.textContent, "test2", "paragraph content is correct");
-
-    let root = content.document.documentElement;
-    ok(inspector.selection.node, root, "Selection is the root of the new page.");
-
-    ok(alertActive1_called, "first notification box has been showed");
-    ok(alertActive2_called, "second notification box has been showed");
-    testEnd();
-  }
-
-
-  function testEnd() {
-    notificationBox = null;
-    gBrowser.removeCurrentTab();
-    executeSoon(finish);
-  }
-
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onBrowserLoad() {
-    gBrowser.selectedBrowser.removeEventListener("load", onBrowserLoad, true);
-    waitForFocus(startLocationTests, content);
-  }, true);
-
-  content.location = "data:text/html,<div>location change tests for " +
-    "inspector.</div><p>init</p>";
-}
diff --git a/browser/devtools/inspector/test/browser_inspector_bug_699308_iframe_navigation.js b/browser/devtools/inspector/test/browser_inspector_bug_699308_iframe_navigation.js
deleted file mode 100644
index 3f9355dd7335..000000000000
--- a/browser/devtools/inspector/test/browser_inspector_bug_699308_iframe_navigation.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-function test() {
-  let iframe;
-  let iframeLoads = 0;
-  let checksAfterLoads = false;
-  let inspector;
-
-  function startTest() {
-    openInspector(runInspectorTests);
-  }
-
-  function runInspectorTests(aInspector) {
-    inspector = aInspector;
-
-    iframe = content.document.querySelector("iframe");
-    ok(iframe, "found the iframe element");
-
-    ok(inspector.highlighter._highlighting, "Inspector is highlighting");
-
-    iframe.addEventListener("load", onIframeLoad, false);
-
-    executeSoon(function() {
-      iframe.contentWindow.location = "javascript:location.reload()";
-    });
-  }
-
-  function onIframeLoad() {
-    if (++iframeLoads != 2) {
-      executeSoon(function() {
-        iframe.contentWindow.location = "javascript:location.reload()";
-      });
-      return;
-    }
-
-    iframe.removeEventListener("load", onIframeLoad, false);
-
-    ok(inspector.highlighter._highlighting, "Inspector is highlighting after iframe nav");
-
-    checksAfterLoads = true;
-
-    finishTest();
-  }
-
-  function finishTest() {
-    is(iframeLoads, 2, "iframe loads");
-    ok(checksAfterLoads, "the Inspector tests got the chance to run after iframe reloads");
-
-    iframe = null;
-    gBrowser.removeCurrentTab();
-    executeSoon(finish);
-  }
-
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onBrowserLoad() {
-    gBrowser.selectedBrowser.removeEventListener("load", onBrowserLoad, true);
-    waitForFocus(startTest, content);
-  }, true);
-
-  content.location = "data:text/html,<p>bug 699308 - test iframe navigation" +
-    "<iframe src='data:text/html,hello world'></iframe>";
-}
diff --git a/browser/devtools/inspector/test/browser_inspector_changes.js b/browser/devtools/inspector/test/browser_inspector_changes.js
deleted file mode 100644
index a3088e51d221..000000000000
--- a/browser/devtools/inspector/test/browser_inspector_changes.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-let doc;
-let testDiv;
-
-function test() {
-  let inspector;
-
-  function createDocument()
-  {
-    doc.body.innerHTML = '<div id="testdiv">Test div!</div>';
-    doc.title = "Inspector Change Test";
-    openInspector(runInspectorTests);
-  }
-
-
-  function getInspectorProp(aName)
-  {
-    let computedview = inspector.sidebar.getWindowForTab("computedview").computedview.view;
-    for each (let view in computedview.propertyViews) {
-      if (view.name == aName) {
-        return view;
-      }
-    }
-    return null;
-  }
-
-  function runInspectorTests(aInspector)
-  {
-    inspector = aInspector;
-    inspector.sidebar.once("computedview-ready", function() {
-      info("Computed View ready");
-      inspector.sidebar.select("computedview");
-
-      testDiv = doc.getElementById("testdiv");
-
-      testDiv.style.fontSize = "10px";
-
-      // Start up the style inspector panel...
-      Services.obs.addObserver(stylePanelTests, "StyleInspector-populated", false);
-
-      inspector.selection.setNode(testDiv);
-    });
-  }
-
-  function stylePanelTests()
-  {
-    Services.obs.removeObserver(stylePanelTests, "StyleInspector-populated");
-
-    let computedview = inspector.sidebar.getWindowForTab("computedview").computedview;
-    ok(computedview, "Style Panel has a cssHtmlTree");
-
-    let propView = getInspectorProp("font-size");
-    is(propView.value, "10px", "Style inspector should be showing the correct font size.");
-
-    Services.obs.addObserver(stylePanelAfterChange, "StyleInspector-populated", false);
-
-    testDiv.style.fontSize = "15px";
-    inspector.emit("layout-change");
-  }
-
-  function stylePanelAfterChange()
-  {
-    Services.obs.removeObserver(stylePanelAfterChange, "StyleInspector-populated");
-
-    let propView = getInspectorProp("font-size");
-    is(propView.value, "15px", "Style inspector should be showing the new font size.");
-
-    stylePanelNotActive();
-  }
-
-  function stylePanelNotActive()
-  {
-    // Tests changes made while the style panel is not active.
-    inspector.sidebar.select("ruleview");
-
-    executeSoon(function() {
-      Services.obs.addObserver(stylePanelAfterSwitch, "StyleInspector-populated", false);
-      testDiv.style.fontSize = "20px";
-      inspector.sidebar.select("computedview");
-    });
-  }
-
-  function stylePanelAfterSwitch()
-  {
-    Services.obs.removeObserver(stylePanelAfterSwitch, "StyleInspector-populated");
-
-    let propView = getInspectorProp("font-size");
-    is(propView.value, "20px", "Style inspector should be showing the newest font size.");
-
-    finishTest();
-  }
-
-  function finishTest()
-  {
-    gBrowser.removeCurrentTab();
-    finish();
-  }
-
-  waitForExplicitFinish();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,basic tests for inspector";
-}
diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter_autohide.js b/browser/devtools/inspector/test/browser_inspector_highlighter_autohide.js
deleted file mode 100644
index 8dfca604b74b..000000000000
--- a/browser/devtools/inspector/test/browser_inspector_highlighter_autohide.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-
-function test()
-{
-  let toolbox;
-  let inspector;
-
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onload() {
-    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
-    waitForFocus(startInspector, content);
-  }, true);
-  content.location = "data:text/html,mop"
-
-  function startInspector() {
-    info("Tab loaded");
-    openInspector(function(aInspector) {
-      inspector = aInspector;
-      ok(!inspector.highlighter.hidden, "Highlighter is visible");
-      toolbox = inspector._toolbox;
-      toolbox.once("webconsole-selected", onWebConsoleSelected);
-      toolbox.selectTool("webconsole");
-    });
-  }
-
-  function onWebConsoleSelected() {
-    executeSoon(function() {
-      ok(inspector.highlighter.hidden, "Highlighter is hidden");
-      toolbox.once("inspector-selected", onInspectorSelected);
-      toolbox.selectTool("inspector");
-    });
-  }
-
-  function onInspectorSelected() {
-    executeSoon(function() {
-      ok(!inspector.highlighter.hidden, "Highlighter is visible once inspector reopen");
-      gBrowser.removeCurrentTab();
-      finish();
-    });
-  }
-}
-
diff --git a/browser/devtools/inspector/test/browser_inspector_initialization.js b/browser/devtools/inspector/test/browser_inspector_initialization.js
deleted file mode 100644
index 4083dd29b178..000000000000
--- a/browser/devtools/inspector/test/browser_inspector_initialization.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-let doc;
-let salutation;
-
-let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
-function createDocument()
-{
-  doc.body.innerHTML = '<div id="first" style="{ margin: 10em; ' +
-    'font-size: 14pt; font-family: helvetica, sans-serif; color: #AAA}">\n' +
-    '<h1>Some header text</h1>\n' +
-    '<p id="salutation" style="{font-size: 12pt}">hi.</p>\n' +
-    '<p id="body" style="{font-size: 12pt}">I am a test-case. This text exists ' +
-    'solely to provide some things to test the inspector initialization.</p>\n' +
-    'If you are reading this, you should go do something else instead. Maybe ' +
-    'read a book. Or better yet, write some test-cases for another bit of code. ' +
-    '<span style="{font-style: italic}">Maybe more inspector test-cases!</span></p>\n' +
-    '<p id="closing">end transmission</p>\n' +
-    '</div>';
-  doc.title = "Inspector Initialization Test";
-
-  openInspector(startInspectorTests);
-}
-
-function startInspectorTests()
-{
-  ok(true, "Inspector started, and notification received.");
-
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-
-  let inspector = gDevTools.getPanelForTarget("inspector", target);
-
-  ok(inspector, "Inspector instance is accessible");
-  ok(inspector.isReady, "Inspector instance is ready");
-  is(inspector.target.tab, gBrowser.selectedTab, "Valid target");
-  ok(inspector.highlighter, "Highlighter is up");
-
-  let p = doc.querySelector("p");
-
-  inspector.selection.setNode(p);
-
-  testHighlighter(p);
-  testMarkupView(p);
-  testBreadcrumbs(p);
-
-  let span = doc.querySelector("span");
-  span.scrollIntoView();
-
-  inspector.selection.setNode(span);
-
-  testHighlighter(span);
-  testMarkupView(span);
-  testBreadcrumbs(span);
-
-  let toolbox = gDevTools.getToolboxForTarget(target);
-  toolbox.once("destroyed", function() {
-    ok("true", "'destroyed' notification received.");
-    let toolbox = gDevTools.getToolboxForTarget(target);
-    ok(!toolbox, "Toolbox destroyed.");
-    executeSoon(runContextMenuTest);
-  });
-  toolbox.destroy();
-}
-
-
-function testHighlighter(node)
-{
-  ok(isHighlighting(), "Highlighter is highlighting");
-  is(getHighlitNode(), node, "Right node is highlighted");
-}
-
-function testMarkupView(node)
-{
-  let i = getActiveInspector();
-  is(i.markup._selectedContainer.node, node, "Right node is selected in the markup view");
-}
-
-function testBreadcrumbs(node)
-{
-  let b = getActiveInspector().breadcrumbs;
-  let expectedText = b.prettyPrintNodeAsText(node);
-  let button = b.container.querySelector("button[checked=true]");
-  ok(button, "A crumbs is checked=true");
-  is(button.getAttribute("tooltiptext"), expectedText, "Crumb refers to the right node");
-}
-
-function _clickOnInspectMenuItem(node) {
-  document.popupNode = node;
-  var contentAreaContextMenu = document.getElementById("contentAreaContextMenu");
-  var contextMenu = new nsContextMenu(contentAreaContextMenu, gBrowser);
-  contextMenu.inspectNode();
-}
-
-function runContextMenuTest()
-{
-  salutation = doc.getElementById("salutation");
-  _clickOnInspectMenuItem(salutation);
-  gDevTools.once("inspector-ready", testInitialNodeIsSelected);
-}
-
-function testInitialNodeIsSelected() {
-  testHighlighter(salutation);
-  testMarkupView(salutation);
-  testBreadcrumbs(salutation);
-  inspectNodesFromContextTestWhileOpen();
-}
-
-function inspectNodesFromContextTestWhileOpen()
-{
-  let closing = doc.getElementById("closing");
-  getActiveInspector().selection.once("new-node", function() {
-    ok(true, "Get selection's 'new-node' selection");
-    executeSoon(function() {
-      testHighlighter(closing);
-      testMarkupView(closing);
-      testBreadcrumbs(closing);
-      finishInspectorTests();
-    }
-  )});
-  _clickOnInspectMenuItem(closing);
-}
-
-function finishInspectorTests(subject, topic, aWinIdString)
-{
-  gBrowser.removeCurrentTab();
-  finish();
-}
-
-function test()
-{
-  waitForExplicitFinish();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,basic tests for inspector";
-}
-
diff --git a/browser/devtools/inspector/test/browser_inspector_invalidate.js b/browser/devtools/inspector/test/browser_inspector_invalidate.js
deleted file mode 100644
index 3fc9a20434e0..000000000000
--- a/browser/devtools/inspector/test/browser_inspector_invalidate.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-function test() {
-
-  let doc;
-  let div;
-  let inspector;
-
-  function createDocument()
-  {
-    div = doc.createElement("div");
-    div.setAttribute("style", "width: 100px; height: 100px; background:yellow;");
-    doc.body.appendChild(div);
-
-    openInspector(runTest);
-  }
-
-  function runTest(inspector)
-  {
-    inspector.selection.setNode(div);
-
-    executeSoon(function() {
-      let outline = inspector.highlighter.outline;
-      is(outline.style.width, "100px", "selection has the right width");
-
-      div.style.width = "200px";
-      function pollTest() {
-        if (outline.style.width == "100px") {
-          setTimeout(pollTest, 10);
-          return;
-        }
-        is(outline.style.width, "200px", "selection updated");
-        gBrowser.removeCurrentTab();
-        finish();
-      }
-      setTimeout(pollTest, 10);
-    });
-  }
-
-  waitForExplicitFinish();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,basic tests for inspector";
-}
diff --git a/browser/devtools/inspector/test/browser_inspector_pseudoClass_menu.js b/browser/devtools/inspector/test/browser_inspector_pseudoClass_menu.js
deleted file mode 100644
index f8e2baf1ccf1..000000000000
--- a/browser/devtools/inspector/test/browser_inspector_pseudoClass_menu.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-function test() {
-
-  let DOMUtils = Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils);
-
-  let pseudos = ["hover", "active", "focus"];
-
-  let doc;
-  let div;
-  let menu;
-  let inspector;
-
-  waitForExplicitFinish();
-  ignoreAllUncaughtExceptions();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,pseudo-class lock node menu tests";
-
-  function createDocument()
-  {
-    div = doc.createElement("div");
-    div.textContent = "test div";
-
-    doc.body.appendChild(div);
-
-    openInspector(selectNode);
-  }
-
-  function selectNode(aInspector)
-  {
-    inspector = aInspector;
-    inspector.selection.setNode(div);
-    performTests();
-  }
-
-  function performTests()
-  {
-    menu = inspector.panelDoc.getElementById("inspector-node-popup");
-    menu.addEventListener("popupshowing", testMenuItems, true);
-    menu.openPopup();
-  }
-
-  function testMenuItems()
-  {
-    menu.removeEventListener("popupshowing", testMenuItems, true);
-
-    for each (let pseudo in pseudos) {
-      let menuitem = inspector.panelDoc.getElementById("node-menu-pseudo-" + pseudo);
-      ok(menuitem, ":" + pseudo + " menuitem exists");
-
-      menuitem.doCommand();
-
-      is(DOMUtils.hasPseudoClassLock(div, ":" + pseudo), true,
-        "pseudo-class lock has been applied");
-    }
-    finishUp();
-  }
-
-  function finishUp()
-  {
-    gBrowser.removeCurrentTab();
-    finish();
-  }
-}
diff --git a/browser/devtools/inspector/test/browser_inspector_sidebarstate.js b/browser/devtools/inspector/test/browser_inspector_sidebarstate.js
deleted file mode 100644
index ba51db9a584e..000000000000
--- a/browser/devtools/inspector/test/browser_inspector_sidebarstate.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
-let doc;
-let inspector;
-
-function createDocument()
-{
-  doc.body.innerHTML = '<h1>Sidebar state test</h1>';
-  doc.title = "Sidebar State Test";
-
-  openInspector(function(panel) {
-    inspector = panel;
-    inspector.sidebar.select("ruleview");
-    inspectorRuleViewOpened();
-  });
-}
-
-function inspectorRuleViewOpened()
-{
-  is(inspector.sidebar.getCurrentTabID(), "ruleview", "Rule View is selected by default");
-
-  // Select the computed view and turn off the inspector.
-  inspector.sidebar.select("computedview");
-
-  gDevTools.once("toolbox-destroyed", inspectorClosed);
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  let toolbox = gDevTools.getToolboxForTarget(target);
-  executeSoon(function() {
-    toolbox.destroy();
-  });
-}
-
-function inspectorClosed()
-{
-  openInspector(function(panel) {
-    inspector = panel;
-    if (inspector.sidebar.getCurrentTabID()) {
-      // Default sidebar already selected.
-      testNewDefaultTab();
-    } else {
-      // Default sidebar still to be selected.
-      inspector.sidebar.once("select", testNewDefaultTab);
-    }
-  });
-}
-
-function testNewDefaultTab()
-{
-  is(inspector.sidebar.getCurrentTabID(), "computedview", "Computed view is selected by default.");
-
-  finishTest();
-}
-
-
-function finishTest()
-{
-  gBrowser.removeCurrentTab();
-  finish();
-}
-
-function test()
-{
-  waitForExplicitFinish();
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    doc = content.document;
-    waitForFocus(createDocument, content);
-  }, true);
-
-  content.location = "data:text/html,basic tests for inspector";
-}
diff --git a/browser/devtools/jar.mn b/browser/devtools/jar.mn
index ea3f4638947f..d3435d620598 100644
--- a/browser/devtools/jar.mn
+++ b/browser/devtools/jar.mn
@@ -7,7 +7,7 @@ browser.jar:
     content/browser/devtools/markup-view.css      (markupview/markup-view.css)
     content/browser/NetworkPanel.xhtml            (webconsole/NetworkPanel.xhtml)
     content/browser/devtools/webconsole.js        (webconsole/webconsole.js)
-    content/browser/devtools/webconsole.xul       (webconsole/webconsole.xul)
+*   content/browser/devtools/webconsole.xul       (webconsole/webconsole.xul)
 *   content/browser/scratchpad.xul                (scratchpad/scratchpad.xul)
     content/browser/scratchpad.js                 (scratchpad/scratchpad.js)
     content/browser/splitview.css                 (shared/splitview.css)
@@ -16,12 +16,11 @@ browser.jar:
     content/browser/devtools/csshtmltree.xul      (styleinspector/csshtmltree.xul)
     content/browser/devtools/cssruleview.xul      (styleinspector/cssruleview.xul)
     content/browser/devtools/styleinspector.css   (styleinspector/styleinspector.css)
-    content/browser/devtools/layoutview/view.js   (layoutview/view.js)
     content/browser/devtools/layoutview/view.xhtml  (layoutview/view.xhtml)
     content/browser/devtools/layoutview/view.css  (layoutview/view.css)
     content/browser/orion.js                      (sourceeditor/orion/orion.js)
 *   content/browser/source-editor-overlay.xul     (sourceeditor/source-editor-overlay.xul)
-    content/browser/debugger.xul                  (debugger/debugger.xul)
+*   content/browser/debugger.xul                  (debugger/debugger.xul)
     content/browser/debugger.css                  (debugger/debugger.css)
     content/browser/debugger-controller.js        (debugger/debugger-controller.js)
     content/browser/debugger-view.js              (debugger/debugger-view.js)
@@ -30,11 +29,3 @@ browser.jar:
     content/browser/devtools/commandline.css      (commandline/commandline.css)
     content/browser/devtools/commandlineoutput.xhtml  (commandline/commandlineoutput.xhtml)
     content/browser/devtools/commandlinetooltip.xhtml  (commandline/commandlinetooltip.xhtml)
-    content/browser/devtools/framework/toolbox-window.xul    (framework/toolbox-window.xul)
-    content/browser/devtools/framework/toolbox.xul           (framework/toolbox.xul)
-    content/browser/devtools/framework/toolbox.css           (framework/toolbox.css)
-    content/browser/devtools/inspector/inspector.xul         (inspector/inspector.xul)
-    content/browser/devtools/inspector/inspector.css         (inspector/inspector.css)
-    content/browser/devtools/connect.xhtml  (framework/connect/connect.xhtml)
-    content/browser/devtools/connect.css    (framework/connect/connect.css)
-    content/browser/devtools/connect.js     (framework/connect/connect.js)
diff --git a/browser/devtools/layoutview/LayoutView.jsm b/browser/devtools/layoutview/LayoutView.jsm
new file mode 100644
index 000000000000..b07d411acff0
--- /dev/null
+++ b/browser/devtools/layoutview/LayoutView.jsm
@@ -0,0 +1,368 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const Cu = Components.utils;
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource:///modules/inspector.jsm");
+Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
+Cu.import("resource:///modules/devtools/CssLogic.jsm");
+
+this.EXPORTED_SYMBOLS = ["LayoutView"];
+
+this.LayoutView = function LayoutView(aOptions)
+{
+  this.chromeDoc = aOptions.document;
+  this.inspector = aOptions.inspector;
+  this.browser = this.inspector.chromeWindow.gBrowser;
+
+  this.init();
+}
+
+LayoutView.prototype = {
+  init: function LV_init() {
+    this.cssLogic = new CssLogic();
+
+    this.update = this.update.bind(this);
+    this.onMessage = this.onMessage.bind(this);
+
+    this.isOpen = false;
+    this.documentReady = false;
+
+    // Is the layout view was open before?
+    if (!("_layoutViewIsOpen" in this.inspector)) {
+      this.inspector._layoutViewIsOpen =
+        Services.prefs.getBoolPref("devtools.layoutview.open");
+    }
+
+    // We update the values when:
+    //  a node is locked
+    //  we get the MozAfterPaint event and the node is locked
+    function onSelect() {
+      if (this.inspector.locked) {
+        this.cssLogic.highlight(this.inspector.selection);
+        this.undim();
+        this.update();
+        // We make sure we never add 2 listeners.
+        if (!this.trackingPaint) {
+          this.browser.addEventListener("MozAfterPaint", this.update, true);
+          this.trackingPaint = true;
+        }
+      }
+    }
+
+    function onUnlock() {
+      this.browser.removeEventListener("MozAfterPaint", this.update, true);
+      this.trackingPaint = false;
+      this.dim();
+    }
+
+    this.onSelect= onSelect.bind(this);
+    this.onUnlock = onUnlock.bind(this);
+    this.inspector.on("select", this.onSelect);
+    this.inspector.on("unlocked", this.onUnlock);
+
+    // Build the layout view in the sidebar.
+    this.buildView();
+
+    this.bound_handleKeypress = this.handleKeypress.bind(this);
+    this.iframe.addEventListener("keypress", this.bound_handleKeypress, true);
+
+    // Get messages from the iframe.
+    this.inspector.chromeWindow.addEventListener("message", this.onMessage, true);
+
+    // Store for the different dimensions of the node.
+    // 'selector' refers to the element that holds the value in view.xhtml;
+    // 'property' is what we are measuring;
+    // 'value' is the computed dimension, computed in update().
+    this.map = {
+      marginTop: {selector: ".margin.top > span",
+                  property: "margin-top",
+                  value: undefined},
+      marginBottom: {selector: ".margin.bottom > span",
+                  property: "margin-bottom",
+                  value: undefined},
+      marginLeft: {selector: ".margin.left > span",
+                  property: "margin-left",
+                  value: undefined},
+      marginRight: {selector: ".margin.right > span",
+                  property: "margin-right",
+                  value: undefined},
+      paddingTop: {selector: ".padding.top > span",
+                  property: "padding-top",
+                  value: undefined},
+      paddingBottom: {selector: ".padding.bottom > span",
+                  property: "padding-bottom",
+                  value: undefined},
+      paddingLeft: {selector: ".padding.left > span",
+                  property: "padding-left",
+                  value: undefined},
+      paddingRight: {selector: ".padding.right > span",
+                  property: "padding-right",
+                  value: undefined},
+      borderTop: {selector: ".border.top > span",
+                  property: "border-top-width",
+                  value: undefined},
+      borderBottom: {selector: ".border.bottom > span",
+                  property: "border-bottom-width",
+                  value: undefined},
+      borderLeft: {selector: ".border.left > span",
+                  property: "border-left-width",
+                  value: undefined},
+      borderRight: {selector: ".border.right > span",
+                  property: "border-right-width",
+                  value: undefined},
+    };
+  },
+
+  /**
+   * Destroy the nodes. Remove listeners.
+   */
+  destroy: function LV_destroy() {
+    this.inspector.off("select", this.onSelect);
+    this.inspector.off("unlocked", this.onUnlock);
+    this.browser.removeEventListener("MozAfterPaint", this.update, true);
+    this.iframe.removeEventListener("keypress", this.bound_handleKeypress, true);
+    this.inspector.chromeWindow.removeEventListener("message", this.onMessage, true);
+    this.close();
+    this.sizeHeadingLabel = null;
+    this.sizeLabel = null;
+    this.iframe = null;
+    this.view.parentNode.removeChild(this.view);
+  },
+
+  /**
+   * Build the Layout container:
+   *
+   * <vbox id="inspector-layoutview-container">
+   *  <iframe src="chrome://browser/content/devtools/layoutview/view.xhtml"/>
+   * </vbox>
+   */
+  buildView: function LV_buildPanel() {
+    this.iframe = this.chromeDoc.createElement("iframe");
+    this.iframe.setAttribute("src", "chrome://browser/content/devtools/layoutview/view.xhtml");
+
+    this.view = this.chromeDoc.createElement("vbox");
+    this.view.id = "inspector-layoutview-container";
+    this.view.appendChild(this.iframe);
+
+    let sidebar = this.chromeDoc.getElementById("devtools-sidebar-box");
+    sidebar.appendChild(this.view);
+  },
+
+  /**
+   * Called when the iframe is loaded.
+   */
+  onDocumentReady: function LV_onDocumentReady() {
+    this.documentReady = true;
+    this.doc = this.iframe.contentDocument;
+
+    // Save reference to the labels displaying size of the node.
+    this.sizeLabel = this.doc.querySelector(".size > span");
+    this.sizeHeadingLabel = this.doc.getElementById("element-size");
+
+    // We can't do that earlier because open() and close() need to do stuff
+    // inside the iframe.
+
+    if (this.inspector.locked)
+      this.onSelect();
+    else
+      this.onUnlock();
+
+    if (this.inspector._layoutViewIsOpen) {
+      this.open();
+    } else {
+      this.close();
+    }
+
+  },
+
+  /**
+   * This is where we get messages from the layout view iframe.
+   */
+  onMessage: function LV_onMessage(e) {
+    switch (e.data) {
+      case "layoutview-toggle-view":
+        this.toggle(true);
+        break;
+      case "layoutview-ready":
+        this.onDocumentReady();
+        break;
+      default:
+        break;
+    }
+  },
+
+  /**
+   * Handle keypress.
+   */
+   handleKeypress: function LV_handleKeypress(event) {
+     let win = this.inspector.chromeWindow;
+
+     // avoid scroll
+     if (event.keyCode == win.KeyEvent.DOM_VK_LEFT ||
+         event.keyCode == win.KeyEvent.DOM_VK_RIGHT ||
+         event.keyCode == win.KeyEvent.DOM_VK_UP ||
+         event.keyCode == win.KeyEvent.DOM_VK_DOWN ||
+         event.keyCode == win.KeyEvent.DOM_VK_PAGE_UP ||
+         event.keyCode == win.KeyEvent.DOM_VK_PAGE_DOWN) {
+
+        event.preventDefault();
+     }
+
+     if (event.charCode == win.KeyEvent.DOM_VK_SPACE) {
+       this.toggle(true);
+     }
+   },
+
+  /**
+   * Open the view container.
+   *
+   * @param aUserAction Is the action triggered by the user (click on the
+   * open/close button in the view)
+   */
+  open: function LV_open(aUserAction) {
+    this.isOpen = true;
+    if (this.documentReady)
+      this.doc.body.classList.add("open");
+    if (aUserAction) {
+      this.inspector._layoutViewIsOpen = true;
+      Services.prefs.setBoolPref("devtools.layoutview.open", true);
+      this.view.removeAttribute("disable-transitions");
+    } else {
+      this.view.setAttribute("disable-transitions", "true");
+    }
+    this.iframe.setAttribute("open", "true");
+    this.update();
+  },
+
+  /**
+   * Close the view container.
+   *
+   * @param aUserAction Is the action triggered by the user (click on the
+   * open/close button in the view)
+   */
+  close: function LV_close(aUserAction) {
+    this.isOpen = false;
+    if (this.documentReady)
+      this.doc.body.classList.remove("open");
+    if (aUserAction) {
+      this.inspector._layoutViewIsOpen = false;
+      Services.prefs.setBoolPref("devtools.layoutview.open", false);
+      this.view.removeAttribute("disable-transitions");
+    } else {
+      this.view.setAttribute("disable-transitions", "true");
+    }
+    this.iframe.removeAttribute("open");
+  },
+
+  /**
+   * Toggle view container state (open/close).
+   *
+   * @param aUserAction Is the action triggered by the user (click on the
+   * open/close button in the view)
+   */
+  toggle: function LV_toggle(aUserAction) {
+    this.isOpen ? this.close(aUserAction):this.open(aUserAction);
+  },
+
+  /**
+   * Hide the layout boxes. No node are selected.
+   */
+  dim: function LV_dim() {
+    if (!this.documentReady) return;
+    this.doc.body.classList.add("dim");
+  },
+
+  /**
+   * Show the layout boxes. A node is selected.
+   */
+  undim: function LV_dim() {
+    if (!this.documentReady) return;
+    this.doc.body.classList.remove("dim");
+  },
+
+  /**
+   * Compute the dimensions of the node and update the values in
+   * the layoutview/view.xhtml document.
+   */
+  update: function LV_update() {
+    let node = this.inspector.selection;
+    if (!node ||
+        !LayoutHelpers.isNodeConnected(node) ||
+        !this.documentReady) {
+      return;
+    }
+
+    // First, we update the first part of the layout view, with
+    // the size of the element.
+
+    let clientRect = node.getBoundingClientRect();
+    let width = Math.round(clientRect.width);
+    let height = Math.round(clientRect.height);
+
+    let newLabel = width + "x" + height;
+    if (this.sizeHeadingLabel.textContent != newLabel) {
+      this.sizeHeadingLabel.textContent = newLabel;
+    }
+
+    // If the view is closed, no need to do anything more.
+    if (!this.isOpen) return;
+
+    // We compute and update the values of margins & co.
+    let style = this.browser.contentWindow.getComputedStyle(node);;
+
+    for (let i in this.map) {
+      let property = this.map[i].property;
+      this.map[i].value = parseInt(style.getPropertyValue(property));
+    }
+
+    let margins = this.processMargins(node);
+    if ("top" in margins) this.map.marginTop.value = "auto";
+    if ("right" in margins) this.map.marginRight.value = "auto";
+    if ("bottom" in margins) this.map.marginBottom.value = "auto";
+    if ("left" in margins) this.map.marginLeft.value = "auto";
+
+    for (let i in this.map) {
+      let selector = this.map[i].selector;
+      let span = this.doc.querySelector(selector);
+      if (span.textContent.length > 0 &&
+          span.textContent == this.map[i].value) {
+        continue;
+      }
+      span.textContent = this.map[i].value;
+    }
+
+    width -= this.map.borderLeft.value + this.map.borderRight.value +
+             this.map.paddingLeft.value + this.map.paddingRight.value;
+
+    height -= this.map.borderTop.value + this.map.borderBottom.value +
+              this.map.paddingTop.value + this.map.paddingBottom.value;
+
+    let newValue = width + "x" + height;
+    if (this.sizeLabel.textContent != newValue) {
+      this.sizeLabel.textContent = newValue;
+    }
+  },
+
+  /**
+   * Find margins declared 'auto'
+   */
+  processMargins: function LV_processMargins(node) {
+    let margins = {};
+
+    for each (let prop in ["top", "bottom", "left", "right"]) {
+      let info = this.cssLogic.getPropertyInfo("margin-" + prop);
+      let selectors = info.matchedSelectors;
+      if (selectors && selectors.length > 0 && selectors[0].value == "auto") {
+        margins[prop] = "auto";
+      }
+    }
+
+    return margins;
+  },
+}
diff --git a/browser/devtools/layoutview/Makefile.in b/browser/devtools/layoutview/Makefile.in
index a8d0b209397e..df206dadd999 100644
--- a/browser/devtools/layoutview/Makefile.in
+++ b/browser/devtools/layoutview/Makefile.in
@@ -13,3 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 TEST_DIRS += test
 
 include $(topsrcdir)/config/rules.mk
+
+libs::
+	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
diff --git a/browser/devtools/layoutview/test/browser_layoutview.js b/browser/devtools/layoutview/test/browser_layoutview.js
index 3767c54424f6..291b8d267b00 100644
--- a/browser/devtools/layoutview/test/browser_layoutview.js
+++ b/browser/devtools/layoutview/test/browser_layoutview.js
@@ -1,10 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
 function test() {
   waitForExplicitFinish();
 
@@ -14,7 +10,6 @@ function test() {
   let doc;
   let node;
   let view;
-  let inspector;
 
   // Expected values:
   let res1 = [
@@ -66,36 +61,44 @@ function test() {
     node = doc.querySelector("div");
     ok(node, "node found");
 
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
-    toolbox.once("inspector-ready", function(event, panel) {
-      let inspector = gDevTools.getPanelForTarget("inspector", target);
-      openLayoutView(inspector);
-    });
+    Services.obs.addObserver(openLayoutView,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.toggleInspectorUI();
   }
 
-  function openLayoutView(aInspector) {
-    inspector = aInspector;
+  function openLayoutView() {
+    Services.obs.removeObserver(openLayoutView,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
 
     info("Inspector open");
 
-    inspector.selection.setNode(node);
-    inspector.sidebar.select("layoutview");
-    inspector.sidebar.once("layoutview-ready", viewReady);
+    let highlighter = InspectorUI.highlighter;
+    highlighter.highlight(node);
+    highlighter.lock();
+
+    window.addEventListener("message", viewReady, true);
   }
 
-  function viewReady() {
+  function viewReady(e) {
+    if (e.data != "layoutview-ready") return;
+
+    window.removeEventListener("message", viewReady, true);
+
     info("Layout view ready");
 
-    view = inspector.sidebar.getWindowForTab("layoutview");
+    view = InspectorUI._sidebar._layoutview;
 
-    ok(!!view.layoutview, "LayoutView document is alive.");
+    ok(!!view, "LayoutView document is alive.");
+
+    view.open();
+
+    ok(view.iframe.getAttribute("open"), "true", "View is open.");
 
     test1();
   }
 
   function test1() {
-    let viewdoc = view.document;
+    let viewdoc = view.iframe.contentDocument;
 
     for (let i = 0; i < res1.length; i++) {
       let elt = viewdoc.querySelector(res1[i].selector);
@@ -104,14 +107,14 @@ function test() {
 
     gBrowser.selectedBrowser.addEventListener("MozAfterPaint", test2, false);
 
-    inspector.selection.node.style.height = "150px";
-    inspector.selection.node.style.paddingRight = "50px";
+    InspectorUI.selection.style.height = "150px";
+    InspectorUI.selection.style.paddingRight = "50px";
   }
 
   function test2() {
     gBrowser.selectedBrowser.removeEventListener("MozAfterPaint", test2, false);
 
-    let viewdoc = view.document;
+    let viewdoc = view.iframe.contentDocument;
 
     for (let i = 0; i < res2.length; i++) {
       let elt = viewdoc.querySelector(res2[i].selector);
@@ -119,14 +122,16 @@ function test() {
     }
 
     executeSoon(function() {
-      gDevTools.once("toolbox-destroyed", finishUp);
-      inspector._toolbox.destroy();
+      Services.obs.addObserver(finishUp,
+        InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+      InspectorUI.closeInspectorUI();
     });
   }
 
   function finishUp() {
     Services.prefs.clearUserPref("devtools.layoutview.enabled");
     Services.prefs.clearUserPref("devtools.inspector.sidebarOpen");
+    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
     gBrowser.removeCurrentTab();
     finish();
   }
diff --git a/browser/devtools/layoutview/view.css b/browser/devtools/layoutview/view.css
index 4042929f0d00..a8e9d2861b0f 100644
--- a/browser/devtools/layoutview/view.css
+++ b/browser/devtools/layoutview/view.css
@@ -38,6 +38,10 @@ body {
   -moz-box-pack: end;
 }
 
+#header:focus {
+  outline: none;
+}
+
 #main {
   margin: 0 10px 10px 10px;
   -moz-box-sizing: border-box;
diff --git a/browser/devtools/layoutview/view.js b/browser/devtools/layoutview/view.js
deleted file mode 100644
index 130b6d790bcd..000000000000
--- a/browser/devtools/layoutview/view.js
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const Cu = Components.utils;
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
-Cu.import("resource:///modules/devtools/CssLogic.jsm");
-Cu.import("resource:///modules/devtools/gDevTools.jsm");
-
-function LayoutView(aInspector, aWindow)
-{
-  this.inspector = aInspector;
-
-  // <browser> is not always available (for Chrome targets for example)
-  if (this.inspector.target.tab) {
-    this.browser = aInspector.target.tab.linkedBrowser;
-  }
-
-  this.doc = aWindow.document;
-  this.sizeLabel = this.doc.querySelector(".size > span");
-  this.sizeHeadingLabel = this.doc.getElementById("element-size");
-
-  this.init();
-}
-
-LayoutView.prototype = {
-  init: function LV_init() {
-    this.cssLogic = new CssLogic();
-
-    this.update = this.update.bind(this);
-    this.onNewNode = this.onNewNode.bind(this);
-    this.onHighlighterLocked = this.onHighlighterLocked.bind(this);
-    this.inspector.selection.on("detached", this.onNewNode);
-    this.inspector.selection.on("new-node", this.onNewNode);
-    this.inspector.sidebar.on("layoutview-selected", this.onNewNode);
-    if (this.inspector.highlighter) {
-      this.inspector.highlighter.on("locked", this.onHighlighterLocked);
-    }
-
-    // Store for the different dimensions of the node.
-    // 'selector' refers to the element that holds the value in view.xhtml;
-    // 'property' is what we are measuring;
-    // 'value' is the computed dimension, computed in update().
-    this.map = {
-      marginTop: {selector: ".margin.top > span",
-                  property: "margin-top",
-                  value: undefined},
-      marginBottom: {selector: ".margin.bottom > span",
-                  property: "margin-bottom",
-                  value: undefined},
-      marginLeft: {selector: ".margin.left > span",
-                  property: "margin-left",
-                  value: undefined},
-      marginRight: {selector: ".margin.right > span",
-                  property: "margin-right",
-                  value: undefined},
-      paddingTop: {selector: ".padding.top > span",
-                  property: "padding-top",
-                  value: undefined},
-      paddingBottom: {selector: ".padding.bottom > span",
-                  property: "padding-bottom",
-                  value: undefined},
-      paddingLeft: {selector: ".padding.left > span",
-                  property: "padding-left",
-                  value: undefined},
-      paddingRight: {selector: ".padding.right > span",
-                  property: "padding-right",
-                  value: undefined},
-      borderTop: {selector: ".border.top > span",
-                  property: "border-top-width",
-                  value: undefined},
-      borderBottom: {selector: ".border.bottom > span",
-                  property: "border-bottom-width",
-                  value: undefined},
-      borderLeft: {selector: ".border.left > span",
-                  property: "border-left-width",
-                  value: undefined},
-      borderRight: {selector: ".border.right > span",
-                  property: "border-right-width",
-                  value: undefined},
-    };
-
-    this.onNewNode();
-  },
-
-  /**
-   * Is the layoutview visible in the sidebar?
-   */
-  isActive: function LV_isActive() {
-    return this.inspector.sidebar.getCurrentTabID() == "layoutview";
-  },
-
-  /**
-   * Destroy the nodes. Remove listeners.
-   */
-  destroy: function LV_destroy() {
-    this.inspector.sidebar.off("layoutview-selected", this.onNewNode);
-    this.inspector.selection.off("new-node", this.onNewNode);
-    this.inspector.selection.off("detached", this.onNewNode);
-    if (this.browser) {
-      this.browser.removeEventListener("MozAfterPaint", this.update, true);
-    }
-    if (this.inspector.highlighter) {
-      this.inspector.highlighter.on("locked", this.onHighlighterLocked);
-    }
-    this.sizeHeadingLabel = null;
-    this.sizeLabel = null;
-    this.inspector = null;
-    this.doc = null;
-  },
-
-  /**
-   * Selection 'new-node' event handler.
-   */
-  onNewNode: function LV_onNewNode() {
-    if (this.isActive() &&
-        this.inspector.selection.isConnected() &&
-        this.inspector.selection.isElementNode() &&
-        this.inspector.selection.reason != "highlighter") {
-      this.cssLogic.highlight(this.inspector.selection.node);
-      this.undim();
-      this.update();
-    } else {
-      this.dim();
-    }
-  },
-
-  /**
-   * Highlighter 'locked' event handler
-   */
-  onHighlighterLocked: function LV_onHighlighterLocked() {
-    this.cssLogic.highlight(this.inspector.selection.node);
-    this.undim();
-    this.update();
-  },
-
-  /**
-   * Hide the layout boxes. No node are selected.
-   */
-  dim: function LV_dim() {
-    if (this.browser) {
-      this.browser.removeEventListener("MozAfterPaint", this.update, true);
-    }
-    this.trackingPaint = false;
-    this.doc.body.classList.add("dim");
-    this.dimmed = true;
-  },
-
-  /**
-   * Show the layout boxes. A node is selected.
-   */
-  undim: function LV_undim() {
-    if (!this.trackingPaint) {
-      if (this.browser) {
-        this.browser.addEventListener("MozAfterPaint", this.update, true);
-      }
-      this.trackingPaint = true;
-    }
-    this.doc.body.classList.remove("dim");
-    this.dimmed = false;
-  },
-
-  /**
-   * Compute the dimensions of the node and update the values in
-   * the layoutview/view.xhtml document.
-   */
-  update: function LV_update() {
-    if (!this.isActive() ||
-        !this.inspector.selection.isConnected() ||
-        !this.inspector.selection.isElementNode()) {
-      return;
-    }
-
-    let node = this.inspector.selection.node;
-
-    // First, we update the first part of the layout view, with
-    // the size of the element.
-
-    let clientRect = node.getBoundingClientRect();
-    let width = Math.round(clientRect.width);
-    let height = Math.round(clientRect.height);
-
-    let newLabel = width + "x" + height;
-    if (this.sizeHeadingLabel.textContent != newLabel) {
-      this.sizeHeadingLabel.textContent = newLabel;
-    }
-
-    // If the view is dimmed, no need to do anything more.
-    if (this.dimmed) return;
-
-    // We compute and update the values of margins & co.
-    let style = node.ownerDocument.defaultView.getComputedStyle(node);
-
-    for (let i in this.map) {
-      let property = this.map[i].property;
-      this.map[i].value = parseInt(style.getPropertyValue(property));
-    }
-
-    let margins = this.processMargins(node);
-    if ("top" in margins) this.map.marginTop.value = "auto";
-    if ("right" in margins) this.map.marginRight.value = "auto";
-    if ("bottom" in margins) this.map.marginBottom.value = "auto";
-    if ("left" in margins) this.map.marginLeft.value = "auto";
-
-    for (let i in this.map) {
-      let selector = this.map[i].selector;
-      let span = this.doc.querySelector(selector);
-      if (span.textContent.length > 0 &&
-          span.textContent == this.map[i].value) {
-        continue;
-      }
-      span.textContent = this.map[i].value;
-    }
-
-    width -= this.map.borderLeft.value + this.map.borderRight.value +
-             this.map.paddingLeft.value + this.map.paddingRight.value;
-
-    height -= this.map.borderTop.value + this.map.borderBottom.value +
-              this.map.paddingTop.value + this.map.paddingBottom.value;
-
-    let newValue = width + "x" + height;
-    if (this.sizeLabel.textContent != newValue) {
-      this.sizeLabel.textContent = newValue;
-    }
-  },
-
-  /**
-   * Find margins declared 'auto'
-   */
-  processMargins: function LV_processMargins(node) {
-    let margins = {};
-
-    for each (let prop in ["top", "bottom", "left", "right"]) {
-      let info = this.cssLogic.getPropertyInfo("margin-" + prop);
-      let selectors = info.matchedSelectors;
-      if (selectors && selectors.length > 0 && selectors[0].value == "auto") {
-        margins[prop] = "auto";
-      }
-    }
-
-    return margins;
-  },
-}
diff --git a/browser/devtools/layoutview/view.xhtml b/browser/devtools/layoutview/view.xhtml
index c4a20c0e7bfa..d6f6db6ee2c6 100644
--- a/browser/devtools/layoutview/view.xhtml
+++ b/browser/devtools/layoutview/view.xhtml
@@ -10,9 +10,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
-    <title>&title;</title>
+    <title>Layout View</title>
 
-    <script type="application/javascript;version=1.8" src="view.js"></script>
     <script type="application/javascript;version=1.8">
     <![CDATA[
       let elts;
@@ -21,8 +20,7 @@
       const Ci = Components.interfaces;
       const Cc = Components.classes;
 
-      window.setPanel = function(panel) {
-        this.layoutview = new LayoutView(panel, window);
+      window.onload = function() {
 
         // Tooltip mechanism
         elts = document.querySelectorAll("*[tooltip]");
@@ -43,7 +41,6 @@
       }
 
       window.onunload = function() {
-        this.layoutview.destroy();
         if (elts) {
           for (let i = 0; i < elts.length; i++) {
             let elt = elts[i];
@@ -60,6 +57,10 @@
       function onmouseout(e) {
         tooltip.textContent = "";
       }
+
+      function toggleView() {
+        window.parent.postMessage("layoutview-toggle-view", "*");
+      }
     ]]>
     </script>
 
@@ -69,10 +70,13 @@
   </head>
   <body>
 
-    <p id="header">
+    <!-- Header: always visible, even when the view is closed. -->
+    <a onclick="toggleView()" href="#" id="header">
         <span id="element-size"></span>
-    </p>
+        <span id="togglebutton"></span>
+    </a>
 
+    <!-- Boxes: hidden when the view is closed. -->
     <div id="main">
 
       <div id="margins" tooltip="&margins.tooltip;">
diff --git a/browser/devtools/markupview/MarkupView.jsm b/browser/devtools/markupview/MarkupView.jsm
index a0ab2eeb6ccb..55967b0d3cae 100644
--- a/browser/devtools/markupview/MarkupView.jsm
+++ b/browser/devtools/markupview/MarkupView.jsm
@@ -39,7 +39,7 @@ Cu.import("resource://gre/modules/Services.jsm");
  * @param iframe aFrame
  *        An iframe in which the caller has kindly loaded markup-view.xhtml.
  */
-this.MarkupView = function MarkupView(aInspector, aFrame, aControllerWindow)
+this.MarkupView = function MarkupView(aInspector, aFrame)
 {
   this._inspector = aInspector;
   this._frame = aFrame;
@@ -47,15 +47,15 @@ this.MarkupView = function MarkupView(aInspector, aFrame, aControllerWindow)
   this._elt = this.doc.querySelector("#root");
 
   this.undo = new UndoStack();
-  this.undo.installController(aControllerWindow);
+  this.undo.installController(this._frame.ownerDocument.defaultView);
 
   this._containers = new WeakMap();
 
   this._observer = new this.doc.defaultView.MutationObserver(this._mutationObserver.bind(this));
 
-  this._boundOnNewSelection = this._onNewSelection.bind(this);
-  this._inspector.selection.on("new-node", this._boundOnNewSelection);
-  this._onNewSelection();
+  this._boundSelect = this._onSelect.bind(this);
+  this._inspector.on("select", this._boundSelect);
+  this._onSelect();
 
   this._boundKeyDown = this._onKeyDown.bind(this);
   this._frame.addEventListener("keydown", this._boundKeyDown, false);
@@ -69,6 +69,13 @@ this.MarkupView = function MarkupView(aInspector, aFrame, aControllerWindow)
 MarkupView.prototype = {
   _selectedContainer: null,
 
+  /**
+   * Return the selected node.
+   */
+  get selected() {
+    return this._selectedContainer ? this._selectedContainer.node : null;
+  },
+
   template: function MT_template(aName, aDest, aOptions)
   {
     let node = this.doc.getElementById("template-" + aName).cloneNode(true);
@@ -87,16 +94,14 @@ MarkupView.prototype = {
   },
 
   /**
-   * Highlight the inspector selected node.
+   * Highlight the given element in the markup panel.
    */
-  _onNewSelection: function MT__onNewSelection()
+  _onSelect: function MT__onSelect()
   {
-    if (this._inspector.selection.isNode()) {
-      this.showNode(this._inspector.selection.node, true);
-      this.markNodeAsSelected(this._inspector.selection.node);
-    } else {
-      this.unmarkSelectedNode();
+    if (this._inspector.selection) {
+      this.showNode(this._inspector.selection, true);
     }
+    this.selectNode(this._inspector.selection);
   },
 
   /**
@@ -250,11 +255,12 @@ MarkupView.prototype = {
 
     let node = aContainer.node;
     this.showNode(node, false);
+    this.selectNode(node);
 
-    this._inspector.selection.setNode(node, "treepanel");
-    // This event won't be fired if the node is the same. But the highlighter
-    // need to lock the node if it wasn't.
-    this._inspector.selection.emit("new-node");
+    if (this._inspector._IUI.highlighter.isNodeHighlightable(node)) {
+      this._inspector._IUI.select(node, true, false, "treepanel");
+      this._inspector._IUI.highlighter.highlight(node);
+    }
 
     if (!aIgnoreFocus) {
       aContainer.focus();
@@ -407,7 +413,7 @@ MarkupView.prototype = {
   /**
    * Mark the given node selected.
    */
-  markNodeAsSelected: function MT_markNodeAsSelected(aNode)
+  selectNode: function MT_selectNode(aNode)
   {
     let container = this._containers.get(aNode);
     if (this._selectedContainer === container) {
@@ -421,18 +427,9 @@ MarkupView.prototype = {
       this._selectedContainer.selected = true;
     }
 
-    return true;
-  },
+    this._selectedContainer.focus();
 
-  /**
-   * Unmark selected node (no node selected).
-   */
-  unmarkSelectedNode: function MT_unmarkSelectedNode()
-  {
-    if (this._selectedContainer) {
-      this._selectedContainer.selected = false;
-      this._selectedContainer = null;
-    }
+    return true;
   },
 
   /**
@@ -493,8 +490,8 @@ MarkupView.prototype = {
     this._frame.removeEventListener("keydown", this._boundKeyDown, true);
     delete this._boundKeyDown;
 
-    this._inspector.selection.off("new-node", this._boundOnNewSelection);
-    delete this._boundOnNewSelection;
+    this._inspector.off("select", this._boundSelect);
+    delete this._boundSelect;
 
     delete this._elt;
 
@@ -950,9 +947,9 @@ ElementEditor.prototype = {
         start: function EE_editAttribute_start(aEditor, aEvent) {
           // If the editing was started inside the name or value areas,
           // select accordingly.
-          if (aEvent && aEvent.target === name) {
+          if (aEvent.target === name) {
             aEditor.input.setSelectionRange(0, name.textContent.length);
-          } else if (aEvent && aEvent.target === val) {
+          } else if (aEvent.target === val) {
             let length = val.textContent.length;
             let editorLength = aEditor.input.value.length;
             let start = editorLength - (length + 1);
diff --git a/browser/devtools/markupview/test/browser_inspector_markup_edit.js b/browser/devtools/markupview/test/browser_inspector_markup_edit.js
index dfe1ed6d734b..280f025dce5a 100644
--- a/browser/devtools/markupview/test/browser_inspector_markup_edit.js
+++ b/browser/devtools/markupview/test/browser_inspector_markup_edit.js
@@ -17,10 +17,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
  */
 
 function test() {
-  let inspector;
   let tempScope = {}
   Cu.import("resource:///modules/devtools/CssRuleView.jsm", tempScope);
-
   let inplaceEditor = tempScope._getInplaceEditorForSpan;
 
   waitForExplicitFinish();
@@ -54,8 +52,8 @@ function test() {
 
   // All the mutation types we want to test.
   let edits = [
+    // Change an attribute
     {
-      desc: "Change an attribute",
       before: function() {
         assertAttributes(doc.querySelector("#node1"), {
           id: "node1",
@@ -75,8 +73,8 @@ function test() {
       }
     },
 
+    // Try change an attribute to a badly formed string
     {
-      desc: "Try change an attribute to a badly formed string",
       before: function() {
         assertAttributes(doc.querySelector("#node22"), {
           id: "node22",
@@ -96,8 +94,9 @@ function test() {
       }
     },
 
+
+    // Remove an attribute
     {
-      desc: "Remove an attribute",
       before: function() {
         assertAttributes(doc.querySelector("#node4"), {
           id: "node4",
@@ -116,8 +115,8 @@ function test() {
       }
     },
 
+    // Add an attribute by clicking the empty space after a node
     {
-      desc: "Add an attribute by clicking the empty space after a node",
       before: function() {
         assertAttributes(doc.querySelector("#node14"), {
           id: "node14",
@@ -137,8 +136,8 @@ function test() {
       }
     },
 
+    // Try add a badly formed attribute by clicking the empty space after a node
     {
-      desc: "Try add a badly formed attribute by clicking the empty space after a node",
       before: function() {
         assertAttributes(doc.querySelector("#node23"), {
           id: "node23",
@@ -156,8 +155,34 @@ function test() {
       }
     },
 
+    // Add attributes by adding to an existing attribute's entry
+    {
+      setup: function() {
+        InspectorUI.select(doc.querySelector("#node18"), true, true, true);
+      },
+      before: function() {
+        assertAttributes(doc.querySelector("#node18"), {
+          id: "node18",
+        });
+        is(InspectorUI.highlighter.nodeInfo.classesBox.textContent, "", "No classes in the infobar before edit.");
+      },
+      execute: function() {
+        let editor = markup.getContainer(doc.querySelector("#node18")).editor;
+        let attr = editor.attrs["id"].querySelector(".editable");
+        editField(attr, attr.textContent + ' class="newclass" style="color:green"');
+      },
+      after: function() {
+        assertAttributes(doc.querySelector("#node18"), {
+          id: "node18",
+          class: "newclass",
+          style: "color:green"
+        });
+        is(InspectorUI.highlighter.nodeInfo.classesBox.textContent, ".newclass", "Correct classes in the infobar after edit.");
+      }
+    },
+
+    // Try add attributes by adding to an existing attribute's entry
     {
-      desc: "Try add attributes by adding to an existing attribute's entry",
       before: function() {
         assertAttributes(doc.querySelector("#node24"), {
           id: "node24",
@@ -175,8 +200,22 @@ function test() {
       }
     },
 
+    // Remove an element with the delete key
+    {
+      before: function() {
+        ok(!!doc.querySelector("#node18"), "Node 18 should exist.");
+      },
+      execute: function() {
+        markup.selectNode(doc.querySelector("#node18"));
+        EventUtils.sendKey("delete");
+      },
+      after: function() {
+        ok(!doc.querySelector("#node18"), "Node 18 should not exist.")
+      }
+    },
+
+    // Edit text
     {
-      desc: "Edit text",
       before: function() {
         let node = doc.querySelector('.node6').firstChild;
         is(node.nodeValue, "line6", "Text should be unchanged");
@@ -192,103 +231,19 @@ function test() {
         is(node.nodeValue, "New text", "Text should be changed.");
       },
     },
-  ];
 
-  // Create the helper tab for parsing...
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onload() {
-    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
-    doc = content.document;
-    waitForFocus(setupTest, content);
-  }, true);
-  content.location = "http://mochi.test:8888/browser/browser/devtools/markupview/test/browser_inspector_markup_edit.html";
-
-  function setupTest() {
-    var target = TargetFactory.forTab(gBrowser.selectedTab);
-    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
-    toolbox.once("inspector-selected", function SE_selected(id, aInspector) {
-      inspector = aInspector;
-      runTests();
-    });
-  }
-
-  function runTests() {
-    inspector.selection.once("new-node", startTests);
-    executeSoon(function() {
-      inspector.selection.setNode(doc.body);
-    });
-  }
-
-  function startTests() {
-    let startNode = doc.documentElement.cloneNode();
-    markup = inspector.markup;
-    markup.expandAll();
-    for (let step of edits) {
-      info("START " + step.desc);
-      if (step.setup) {
-        step.setup();
-      }
-      step.before();
-      step.execute();
-      step.after();
-      ok(markup.undo.canUndo(), "Should be able to undo.");
-      markup.undo.undo();
-      step.before();
-      ok(markup.undo.canRedo(), "Should be able to redo.");
-      markup.undo.redo();
-      step.after();
-      info("END " + step.desc);
-    }
-    addAttributes();
-  }
-
-  function addAttributes() {
-    let test = {
-      desc: "Add attributes by adding to an existing attribute's entry",
+    // Edit the tag name
+    {
       setup: function() {
-        inspector.selection.setNode(doc.querySelector("#node18"));
-      },
-      before: function() {
-        assertAttributes(doc.querySelector("#node18"), {
-          id: "node18",
-        });
-
-        is(inspector.highlighter.nodeInfo.classesBox.textContent, "",
-          "No classes in the infobar before edit.");
-      },
-      execute: function() {
-        let editor = markup.getContainer(doc.querySelector("#node18")).editor;
-        let attr = editor.attrs["id"].querySelector(".editable");
-        editField(attr, attr.textContent + ' class="newclass" style="color:green"');
-      },
-      after: function() {
-        assertAttributes(doc.querySelector("#node18"), {
-          id: "node18",
-          class: "newclass",
-          style: "color:green"
-        });
-        is(inspector.highlighter.nodeInfo.classesBox.textContent, ".newclass",
-          "Correct classes in the infobar after edit.");
-      }
-    };
-    testAsyncSetup(test, editTagName);
-  }
-
-  function editTagName() {
-    let test =  {
-      desc: "Edit the tag name",
-      setup: function() {
-        inspector.selection.setNode(doc.querySelector("#retag-me"));
+        markup.selectNode(doc.querySelector("#retag-me"));
       },
       before: function() {
         let node = doc.querySelector("#retag-me");
         let container = markup.getContainer(node);
-
         is(node.tagName, "DIV", "retag-me should be a div.");
         ok(container.selected, "retag-me should be selected.");
         ok(container.expanded, "retag-me should be expanded.");
-        is(doc.querySelector("#retag-me-2").parentNode, node,
-          "retag-me-2 should be a child of the old element.");
+        is(doc.querySelector("#retag-me-2").parentNode, node, "retag-me-2 should be a child of the old element.");
       },
       execute: function() {
         let node = doc.querySelector("#retag-me");
@@ -302,80 +257,65 @@ function test() {
         is(node.tagName, "P", "retag-me should be a p.");
         ok(container.selected, "retag-me should be selected.");
         ok(container.expanded, "retag-me should be expanded.");
-        is(doc.querySelector("#retag-me-2").parentNode, node,
-          "retag-me-2 should be a child of the new element.");
+        is(doc.querySelector("#retag-me-2").parentNode, node, "retag-me-2 should be a child of the new element.");
       }
-    };
-    testAsyncSetup(test, removeElementWithDelete);
+    },
+  ];
+
+  // Create the helper tab for parsing...
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onload() {
+    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
+    doc = content.document;
+    waitForFocus(setupTest, content);
+  }, true);
+  content.location = "http://mochi.test:8888/browser/browser/devtools/markupview/test/browser_inspector_markup_edit.html";
+
+  function setupTest() {
+    Services.obs.addObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.toggleInspectorUI();
   }
 
-  function removeElementWithDelete() {
-    let test =  {
-      desc: "Remove an element with the delete key",
-      before: function() {
-        ok(!!doc.querySelector("#node18"), "Node 18 should exist.");
-      },
-      execute: function() {
-        inspector.selection.setNode(doc.querySelector("#node18"));
-      },
-      executeCont: function() {
-        EventUtils.sendKey("delete");
-      },
-      after: function() {
-        ok(!doc.querySelector("#node18"), "Node 18 should not exist.")
+  function runTests() {
+    Services.obs.removeObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+    InspectorUI.currentInspector.once("markuploaded", startTests);
+    InspectorUI.select(doc.body, true, true, true);
+    InspectorUI.stopInspecting();
+    InspectorUI.toggleHTMLPanel();
+  }
+
+  function startTests() {
+    let startNode = doc.documentElement.cloneNode();
+    markup = InspectorUI.currentInspector.markup;
+    markup.expandAll();
+    for (let step of edits) {
+      if (step.setup) {
+        step.setup();
       }
-    };
-    testAsyncExecute(test, finishUp);
-  }
-
-  function testAsyncExecute(test, callback) {
-    info("START " + test.desc);
-
-    test.before();
-    inspector.selection.once("new-node", function BIMET_testAsyncExecNewNode() {
-      test.executeCont();
-      test.after();
-      undoRedo(test, callback);
-    });
-    executeSoon(function BIMET_setNode1() {
-      test.execute();
-    });
-  }
-
-  function testAsyncSetup(test, callback) {
-    info("START " + test.desc);
-
-    inspector.selection.once("new-node", function BIMET_testAsyncSetupNewNode() {
-      test.before();
-      test.execute();
-      test.after();
-      undoRedo(test, callback);
-    });
-    executeSoon(function BIMET_setNode2() {
-      test.setup();
-    });
-  }
-
-  function undoRedo(test, callback) {
-    ok(markup.undo.canUndo(), "Should be able to undo.");
-    markup.undo.undo();
-    executeSoon(function() {
-      test.before();
+      step.before();
+      step.execute();
+      step.after();
+      ok(markup.undo.canUndo(), "Should be able to undo.");
+      markup.undo.undo();
+      step.before();
       ok(markup.undo.canRedo(), "Should be able to redo.");
       markup.undo.redo();
-      executeSoon(function() {
-        test.after();
-        info("END " + test.desc);
-        callback();
-      });
-    });
-  }
+      step.after();
+    }
 
-  function finishUp() {
     while (markup.undo.canUndo()) {
       markup.undo.undo();
     }
-    doc = inspector = null;
+    // By now we should have a healthy undo stack, clear it out and we should be back where
+    // we started.
+    ok(doc.documentElement.isEqualNode(startNode), "Clearing the undo stack should leave us where we started.");
+    Services.obs.addObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+    InspectorUI.closeInspectorUI();
+  }
+
+  function finishUp() {
+    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+    doc = null;
     gBrowser.removeCurrentTab();
     finish();
   }
diff --git a/browser/devtools/markupview/test/browser_inspector_markup_mutation.js b/browser/devtools/markupview/test/browser_inspector_markup_mutation.js
index 463fc8e48804..a34d86fd65a0 100644
--- a/browser/devtools/markupview/test/browser_inspector_markup_mutation.js
+++ b/browser/devtools/markupview/test/browser_inspector_markup_mutation.js
@@ -24,8 +24,6 @@ function test() {
   let parseTab;
   let parseDoc;
 
-  let inspector;
-
   // Strip whitespace from a node and its children.
   function stripWhitespace(node)
   {
@@ -145,27 +143,32 @@ function test() {
   content.location = "data:text/html,<html></html>";
 
   function setupTest() {
-    var target = TargetFactory.forTab(gBrowser.selectedTab);
-    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
-    toolbox.once("inspector-selected", function BIMMT_selected(id, aInspector) {
-      inspector = aInspector;
-      startTests();
-    });
+    Services.obs.addObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.toggleInspectorUI();
+  }
+
+  function runTests() {
+    Services.obs.removeObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+    InspectorUI.currentInspector.once("markuploaded", startTests);
+    InspectorUI.select(doc.body, true, true, true);
+    InspectorUI.stopInspecting();
+    InspectorUI.toggleHTMLPanel();
   }
 
   function startTests() {
-    markup = inspector.markup;
+    markup = InspectorUI.currentInspector.markup;
     checkMarkup();
     nextStep(0);
   }
 
   function nextStep(cursor) {
     if (cursor >= mutations.length) {
-      finishUp();
+      Services.obs.addObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+      InspectorUI.closeInspectorUI();
       return;
     }
     mutations[cursor]();
-    inspector.once("markupmutation", function() {
+    InspectorUI.currentInspector.once("markupmutation", function() {
       executeSoon(function() {
         checkMarkup();
         nextStep(cursor + 1);
@@ -174,7 +177,8 @@ function test() {
   }
 
   function finishUp() {
-    doc = inspector = null;
+    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+    doc = null;
     gBrowser.removeTab(contentTab);
     gBrowser.removeTab(parseTab);
     finish();
diff --git a/browser/devtools/markupview/test/browser_inspector_markup_navigation.html b/browser/devtools/markupview/test/browser_inspector_markup_navigation.html
index 9633052e17f9..fe5561181b14 100644
--- a/browser/devtools/markupview/test/browser_inspector_markup_navigation.html
+++ b/browser/devtools/markupview/test/browser_inspector_markup_navigation.html
@@ -1,9 +1,7 @@
 <!DOCTYPE html>
 
 <html class="html">
-  <head class="head">
-    <meta charset=utf-8 />
-  </head>
+  <meta charset=utf-8 />
 
   <body class="body">
     <div class="node0">
diff --git a/browser/devtools/markupview/test/browser_inspector_markup_navigation.js b/browser/devtools/markupview/test/browser_inspector_markup_navigation.js
index 3cc3a18c5050..4540c1e5c606 100644
--- a/browser/devtools/markupview/test/browser_inspector_markup_navigation.js
+++ b/browser/devtools/markupview/test/browser_inspector_markup_navigation.js
@@ -3,16 +3,12 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 
 
 function test() {
-  let inspector;
 
   waitForExplicitFinish();
 
   let doc;
 
   let keySequences = [
-    ["right", "html"],
-    ["down", "head"],
-    ["down", "body"],
     ["right", "body"],
     ["down", "node0"],
     ["right", "node0"],
@@ -72,28 +68,34 @@ function test() {
 
   content.location = "http://mochi.test:8888/browser/browser/devtools/markupview/test/browser_inspector_markup_navigation.html";
 
+  let markup = null;
+
   function setupTest() {
-    var target = TargetFactory.forTab(gBrowser.selectedTab);
-    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
-    toolbox.once("inspector-selected", function BIMNT_selected(id, aInspector) {
-      inspector = aInspector;
-      startNavigation();
-    });
+    Services.obs.addObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.toggleInspectorUI();
+  }
+
+  function runTests() {
+    Services.obs.removeObserver(runTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+    InspectorUI.currentInspector.once("markuploaded", startNavigation);
+    InspectorUI.select(doc.body, true, true, true);
+    InspectorUI.toggleHTMLPanel();
   }
 
   function startNavigation() {
+    markup = InspectorUI.currentInspector.markup;
     nextStep(0);
   }
 
   function nextStep(cursor) {
     if (cursor >= keySequences.length) {
-      finishUp();
+      Services.obs.addObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+      InspectorUI.closeInspectorUI();
       return;
     }
 
     let key = keySequences[cursor][0];
     let className = keySequences[cursor][1];
-    inspector.markup._frame.focus();
 
     switch(key) {
       case "right":
@@ -119,9 +121,8 @@ function test() {
         break;
     }
 
-    executeSoon(function BIMNT_newNode() {
-      let node = inspector.selection.node;
-
+    executeSoon(function() {
+      let node = markup.selected;
       if (className == "*comment*") {
         is(node.nodeType, Node.COMMENT_NODE, "[" + cursor + "] should be a comment after moving " + key);
       } else if (className == "*text*") {
@@ -131,13 +132,13 @@ function test() {
       } else {
         is(node.className, className, "[" + cursor + "] right node selected: " + className + " after moving " + key);
       }
-
       nextStep(cursor + 1);
     });
   }
 
   function finishUp() {
-    doc = inspector = null;
+    Services.obs.removeObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+    doc = null;
     gBrowser.removeCurrentTab();
     finish();
   }
diff --git a/browser/devtools/markupview/test/head.js b/browser/devtools/markupview/test/head.js
index 61cc04274100..3907fad4fbd0 100644
--- a/browser/devtools/markupview/test/head.js
+++ b/browser/devtools/markupview/test/head.js
@@ -4,12 +4,6 @@
 
 const Cu = Components.utils;
 
-let TargetFactory = (function() {
-  let tempScope = {};
-  Components.utils.import("resource:///modules/devtools/Target.jsm", tempScope);
-  return tempScope.TargetFactory;
-})();
-
 // Clear preferences that may be set during the course of tests.
 function clearUserPrefs()
 {
diff --git a/browser/devtools/responsivedesign/CmdResize.jsm b/browser/devtools/responsivedesign/CmdResize.jsm
index d35fdf33ed70..1303136c296f 100644
--- a/browser/devtools/responsivedesign/CmdResize.jsm
+++ b/browser/devtools/responsivedesign/CmdResize.jsm
@@ -30,8 +30,6 @@ gcli.addCommand({
 
 gcli.addCommand({
   name: 'resize toggle',
-  buttonId: "command-button-responsive",
-  buttonClass: "command-button",
   description: gcli.lookup('resizeModeToggleDesc'),
   manual: gcli.lookup('resizeModeManual'),
   exec: gcli_cmd_resize
diff --git a/browser/devtools/responsivedesign/responsivedesign.jsm b/browser/devtools/responsivedesign/responsivedesign.jsm
index 8f45f9eecf57..a74df04f9da1 100644
--- a/browser/devtools/responsivedesign/responsivedesign.jsm
+++ b/browser/devtools/responsivedesign/responsivedesign.jsm
@@ -9,10 +9,8 @@ const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/devtools/gDevTools.jsm");
 Cu.import("resource:///modules/devtools/FloatingScrollbars.jsm");
 Cu.import("resource:///modules/devtools/EventEmitter.jsm");
-Cu.import("resource:///modules/devtools/Target.jsm");
 
 this.EXPORTED_SYMBOLS = ["ResponsiveUIManager"];
 
@@ -163,8 +161,7 @@ function ResponsiveUI(aWindow, aTab)
   this.buildUI();
   this.checkMenus();
 
-  let target = TargetFactory.forTab(this.tab);
-  this.toolboxWasOpen = !!gDevTools.getToolboxForTarget(target);
+  this.inspectorWasOpen = this.mainWindow.InspectorUI.isInspectorOpen;
 
   try {
     if (Services.prefs.getBoolPref("devtools.responsiveUI.rotate")) {
@@ -244,13 +241,12 @@ ResponsiveUI.prototype = {
     if (aEvent.keyCode == this.mainWindow.KeyEvent.DOM_VK_ESCAPE &&
         this.mainWindow.gBrowser.selectedBrowser == this.browser) {
 
-      // If the toolbox wasn't open at first but is open now,
+      // If the inspector wasn't open at first but is open now,
       // we don't want to close the Responsive Mode on Escape.
-      // We let the toolbox close first.
+      // We let the inspector close first.
 
-      let target = TargetFactory.forTab(this.tab);
-      let isToolboxOpen =  !!gDevTools.getToolboxForTarget(target);
-      if (this.toolboxWasOpen || !isToolboxOpen) {
+      let isInspectorOpen = this.mainWindow.InspectorUI.isInspectorOpen;
+      if (this.inspectorWasOpen || !isInspectorOpen) {
         aEvent.preventDefault();
         aEvent.stopPropagation();
         this.close();
diff --git a/browser/devtools/responsivedesign/test/browser_responsivecomputedview.js b/browser/devtools/responsivedesign/test/browser_responsivecomputedview.js
index 540e918f5966..bfdcb11d6008 100644
--- a/browser/devtools/responsivedesign/test/browser_responsivecomputedview.js
+++ b/browser/devtools/responsivedesign/test/browser_responsivecomputedview.js
@@ -5,7 +5,6 @@ function test() {
   let instance;
 
   let computedView;
-  let inspector;
 
   waitForExplicitFinish();
 
@@ -53,27 +52,29 @@ function test() {
 
     instance.setSize(500, 500);
 
-    openInspector(onInspectorUIOpen);
+    Services.obs.addObserver(onInspectorUIOpen,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.openInspectorUI();
   }
 
-  function onInspectorUIOpen(aInspector) {
-    inspector = aInspector;
-    ok(inspector, "Got inspector instance");
-    inspector.sidebar.select("computedview");
+  function onInspectorUIOpen() {
+    Services.obs.removeObserver(onInspectorUIOpen,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
 
     let div = content.document.getElementsByTagName("div")[0];
+    InspectorUI.inspectNode(div);
+    InspectorUI.stopInspecting();
 
-    inspector.sidebar.once("computedview-ready", function() {
-      Services.obs.addObserver(testShrink, "StyleInspector-populated", false);
-      inspector.selection.setNode(div);
-    });
+    Services.obs.addObserver(testShrink, "StyleInspector-populated", false);
+
+    InspectorUI.sidebar.show();
+    InspectorUI.sidebar.activatePanel("computedview");
   }
 
   function testShrink() {
     Services.obs.removeObserver(testShrink, "StyleInspector-populated", false);
 
-    computedView = inspector.sidebar.getWindowForTab("computedview").computedview.view;
-    ok(computedView, "We have access to the Computed View object");
+    computedView = InspectorUI.sidebar._toolContext("computedview").view;
 
     is(computedWidth(), "500px", "Should show 500px initially.");
 
@@ -102,6 +103,8 @@ function test() {
     // Menus are correctly updated?
     is(document.getElementById("Tools:ResponsiveUI").getAttribute("checked"), "false", "menu unchecked");
 
+    InspectorUI.closeInspectorUI();
+
     gBrowser.removeCurrentTab();
     finish();
   }
diff --git a/browser/devtools/responsivedesign/test/browser_responsiveruleview.js b/browser/devtools/responsivedesign/test/browser_responsiveruleview.js
index 9aeb3147a303..8161e8dc0d2d 100644
--- a/browser/devtools/responsivedesign/test/browser_responsiveruleview.js
+++ b/browser/devtools/responsivedesign/test/browser_responsiveruleview.js
@@ -5,7 +5,6 @@ function test() {
   let instance;
 
   let ruleView;
-  let inspector;
 
   waitForExplicitFinish();
 
@@ -48,26 +47,27 @@ function test() {
 
     instance.setSize(500, 500);
 
-    openInspector(onInspectorUIOpen);
+    Services.obs.addObserver(onInspectorUIOpen,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    InspectorUI.openInspectorUI();
   }
 
-  function onInspectorUIOpen(aInspector) {
-    inspector = aInspector;
-    ok(inspector, "Got inspector instance");
-    inspector.sidebar.select("ruleview");
+  function onInspectorUIOpen() {
+    Services.obs.removeObserver(onInspectorUIOpen,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
 
     let div = content.document.getElementsByTagName("div")[0];
+    InspectorUI.inspectNode(div);
+    InspectorUI.stopInspecting();
 
-    inspector.sidebar.once("ruleview-ready", function() {
-      Services.obs.addObserver(testShrink, "StyleInspector-populated", false);
-      inspector.selection.setNode(div);
-    });
+    InspectorUI.currentInspector.once("sidebaractivated-ruleview", testShrink);
+
+    InspectorUI.sidebar.show();
+    InspectorUI.sidebar.activatePanel("ruleview");
   }
 
   function testShrink() {
-    Services.obs.removeObserver(testShrink, "StyleInspector-populated");
-
-    ruleView = inspector.sidebar.getWindowForTab("ruleview").ruleview.view;
+    ruleView = InspectorUI.sidebar._toolContext("ruleview").view;
 
     is(numberOfRules(), 2, "Should have two rules initially.");
 
@@ -96,6 +96,7 @@ function test() {
     // Menus are correctly updated?
     is(document.getElementById("Tools:ResponsiveUI").getAttribute("checked"), "false", "menu unchecked");
 
+    InspectorUI.closeInspectorUI();
     gBrowser.removeCurrentTab();
     finish();
   }
diff --git a/browser/devtools/responsivedesign/test/head.js b/browser/devtools/responsivedesign/test/head.js
index cc6b0832a7e5..d4dc324c4383 100644
--- a/browser/devtools/responsivedesign/test/head.js
+++ b/browser/devtools/responsivedesign/test/head.js
@@ -3,27 +3,6 @@
 
 "use strict";
 
-let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
 // Import the GCLI test helper
 let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
 Services.scriptloader.loadSubScript(testDir + "/helpers.js", this);
-
-function openInspector(callback)
-{
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-
-  let inspector = gDevTools.getPanelForTarget("inspector", target);
-  if (inspector && inspector.isReady) {
-    callback(inspector);
-  } else {
-    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
-    toolbox.once("inspector-ready", function(event, panel) {
-      let inspector = gDevTools.getPanelForTarget("inspector", target);
-      callback(inspector);
-    });
-  }
-}
-
diff --git a/browser/devtools/scratchpad/CmdScratchpad.jsm b/browser/devtools/scratchpad/CmdScratchpad.jsm
deleted file mode 100644
index 859b287f1fa5..000000000000
--- a/browser/devtools/scratchpad/CmdScratchpad.jsm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-this.EXPORTED_SYMBOLS = [ ];
-
-Components.utils.import("resource:///modules/devtools/gcli.jsm");
-
-/**
- * 'scratchpad' command
- */
-gcli.addCommand({
-  name: "scratchpad",
-  buttonId: "command-button-scratchpad",
-  buttonClass: "command-button",
-  hidden: true,
-  exec: function(args, context) {
-    let chromeWindow = context.environment.chromeDocument.defaultView;
-    chromeWindow.Scratchpad.ScratchpadManager.openScratchpad();
-  }
-});
diff --git a/browser/devtools/scratchpad/scratchpad.js b/browser/devtools/scratchpad/scratchpad.js
index a8dde0114dc2..f69743bab46e 100644
--- a/browser/devtools/scratchpad/scratchpad.js
+++ b/browser/devtools/scratchpad/scratchpad.js
@@ -26,8 +26,6 @@ Cu.import("resource:///modules/source-editor.jsm");
 Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
 Cu.import("resource:///modules/devtools/scratchpad-manager.jsm");
 Cu.import("resource://gre/modules/jsdebugger.jsm");
-Cu.import("resource:///modules/devtools/gDevTools.jsm");
-Cu.import("resource:///modules/devtools/Target.jsm");
 
 const SCRATCHPAD_CONTEXT_CONTENT = 1;
 const SCRATCHPAD_CONTEXT_BROWSER = 2;
@@ -1055,8 +1053,9 @@ var Scratchpad = {
    */
   openWebConsole: function SP_openWebConsole()
   {
-    let target = TargetFactory.forTab(this.gBrowser.selectedTab);
-    gDevTools.openToolboxForTab(target, "webconsole");
+    if (!this.browserWindow.HUDConsoleUI.getOpenHUD()) {
+      this.browserWindow.HUDConsoleUI.toggleHUD();
+    }
     this.browserWindow.focus();
   },
 
diff --git a/browser/devtools/scratchpad/scratchpad.xul b/browser/devtools/scratchpad/scratchpad.xul
index dd6edd351c4d..8dfcfa7c372a 100644
--- a/browser/devtools/scratchpad/scratchpad.xul
+++ b/browser/devtools/scratchpad/scratchpad.xul
@@ -100,6 +100,10 @@
        key="&errorConsoleCmd.commandkey;"
        command="sp-cmd-errorConsole"
        modifiers="accel,shift"/>
+  <key id="sp-key-webConsole"
+       key="&webConsoleCmd.commandkey;"
+       command="sp-cmd-webConsole"
+       modifiers="accel,shift"/>
   <key id="key_openHelp"
        keycode="VK_F1"
        command="sp-cmd-documentationLink"/>
diff --git a/browser/devtools/shared/DeveloperToolbar.jsm b/browser/devtools/shared/DeveloperToolbar.jsm
index ecf9095cb583..8a921e65c85d 100644
--- a/browser/devtools/shared/DeveloperToolbar.jsm
+++ b/browser/devtools/shared/DeveloperToolbar.jsm
@@ -4,7 +4,7 @@
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = [ "DeveloperToolbar", "CommandUtils" ];
+this.EXPORTED_SYMBOLS = [ "DeveloperToolbar" ];
 
 const NS_XHTML = "http://www.w3.org/1999/xhtml";
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
@@ -27,92 +27,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "CmdCommands",
 XPCOMUtils.defineLazyModuleGetter(this, "PageErrorListener",
                                   "resource://gre/modules/devtools/WebConsoleUtils.jsm");
 
-XPCOMUtils.defineLazyGetter(this, "prefBranch", function() {
-  var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-          .getService(Components.interfaces.nsIPrefService);
-  return prefService.getBranch(null)
-          .QueryInterface(Components.interfaces.nsIPrefBranch2);
-});
-
-/**
- * A collection of utilities to help working with commands
- */
-this.CommandUtils = {
-  /**
-   * Read a toolbarSpec from preferences
-   * @param aPref The name of the preference to read
-   */
-  getCommandbarSpec: function CU_getCommandbarSpec(aPref) {
-    let value = prefBranch.getComplexValue(aPref,
-                               Components.interfaces.nsISupportsString).data;
-    return JSON.parse(value);
-  },
-
-  /**
-   * A toolbarSpec is an array of buttonSpecs. A buttonSpec is an array of
-   * strings each of which is a GCLI command (including args if needed).
-   */
-  createButtons: function CU_createButtons(toolbarSpec, document, requisition) {
-    var reply = [];
-
-    toolbarSpec.forEach(function(buttonSpec) {
-      var button = document.createElement("toolbarbutton");
-      reply.push(button);
-
-      if (typeof buttonSpec == "string") {
-        buttonSpec = { typed: buttonSpec };
-      }
-      // Ask GCLI to parse the typed string (doesn't execute it)
-      requisition.update(buttonSpec.typed);
-
-      // Ignore invalid commands
-      var command = requisition.commandAssignment.value;
-      if (command == null) {
-        // TODO: Have a broken icon
-        // button.icon = 'Broken';
-        button.setAttribute("label", "X");
-        button.setAttribute("tooltip", "Unknown command: " + buttonSpec.typed);
-        button.setAttribute("disabled", "true");
-      }
-      else {
-        if (command.buttonId != null) {
-          button.id = command.buttonId;
-        }
-        if (command.buttonClass != null) {
-          button.className = command.buttonClass;
-        }
-
-        button.addEventListener("click", function() {
-          requisition.update(buttonSpec.typed);
-          //if (requisition.getStatus() == Status.VALID) {
-            requisition.exec();
-          /*
-          }
-          else {
-            console.error('incomplete commands not yet supported');
-          }
-          */
-        }, false);
-
-        // Allow the command button to be toggleable
-        /*
-        if (command.checkedState) {
-          button.setAttribute("type", "checkbox");
-          button.setAttribute("checked", command.checkedState.get() ? "true" : "false");
-          command.checkedState.on("change", function() {
-            button.checked = command.checkedState.get();
-          });
-        }
-        */
-      }
-    });
-
-    requisition.update('');
-
-    return reply;
-  }
-};
-
 /**
  * Due to a number of panel bugs we need a way to check if we are running on
  * Linux. See the comments for TooltipPanel and OutputPanel for further details.
@@ -143,10 +57,10 @@ this.DeveloperToolbar = function DeveloperToolbar(aChromeWindow, aToolbarElement
   this._lastState = NOTIFICATIONS.HIDE;
   this._pendingShowCallback = undefined;
   this._pendingHide = false;
-  this._errorsCount = {};
-  this._errorListeners = {};
-  this._errorCounterButton = this._doc
-                             .getElementById("developer-toolbar-toolbox-button");
+  this._errorsCount = Object.create(null);
+  this._errorListeners = Object.create(null);
+  this._webConsoleButton = this._doc
+                           .getElementById("developer-toolbar-webconsole");
 
   try {
     CmdCommands.refreshAutoCommands(aChromeWindow);
@@ -583,9 +497,9 @@ function DT__updateErrorsCount(aChangedTabId)
   let errors = this._errorsCount[tabId];
 
   if (errors) {
-    this._errorCounterButton.setAttribute("error-count", errors);
+    this._webConsoleButton.setAttribute("error-count", errors);
   } else {
-    this._errorCounterButton.removeAttribute("error-count");
+    this._webConsoleButton.removeAttribute("error-count");
   }
 };
 
diff --git a/browser/devtools/shared/EventEmitter.jsm b/browser/devtools/shared/EventEmitter.jsm
index fdeda4074597..d70324fc5700 100644
--- a/browser/devtools/shared/EventEmitter.jsm
+++ b/browser/devtools/shared/EventEmitter.jsm
@@ -1,23 +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/. */
+// XXXkhuey this should have a license header.
 
 this.EXPORTED_SYMBOLS = ["EventEmitter"];
 
-/**
- * EventEmitter.
- *
- * @param Object aObjectToExtend
- *        If aObjectToExtend is not null, the public methods of EventEmitter
- *        are bound to the object.
- */
-this.EventEmitter = function EventEmitter(aObjectToExtend) {
-  if (aObjectToExtend) {
-    aObjectToExtend.on = this.on.bind(this);
-    aObjectToExtend.off = this.off.bind(this);
-    aObjectToExtend.once = this.once.bind(this);
-    aObjectToExtend.emit = this.emit.bind(this);
-  }
+this.EventEmitter = function EventEmitter() {
 }
 
 EventEmitter.prototype = {
@@ -49,7 +34,7 @@ EventEmitter.prototype = {
   once: function EventEmitter_once(aEvent, aListener) {
     let handler = function() {
       this.off(aEvent, handler);
-      aListener.apply(null, arguments);
+      aListener();
     }.bind(this);
     this.on(aEvent, handler);
   },
@@ -67,9 +52,7 @@ EventEmitter.prototype = {
     if (!this._eventEmitterListeners)
       return;
     let listeners = this._eventEmitterListeners.get(aEvent);
-    if (listeners) {
-      this._eventEmitterListeners.set(aEvent, listeners.filter(function(l) aListener != l));
-    }
+    this._eventEmitterListeners.set(aEvent, listeners.filter(function(l) aListener != l));
   },
 
   /**
diff --git a/browser/devtools/shared/test/browser_eventemitter_basic.js b/browser/devtools/shared/test/browser_eventemitter_basic.js
index e15adbe72e2d..c54ce5420eef 100644
--- a/browser/devtools/shared/test/browser_eventemitter_basic.js
+++ b/browser/devtools/shared/test/browser_eventemitter_basic.js
@@ -1,24 +1,10 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+
 function test() {
-  testEmitter();
-  testEmitter({});
-}
-
-
-function testEmitter(aObject) {
   Cu.import("resource:///modules/devtools/EventEmitter.jsm", this);
-
-  let emitter;
-
-  if (aObject) {
-    emitter = aObject;
-    new EventEmitter(emitter);
-  } else {
-    emitter = new EventEmitter();
-  }
-
+  let emitter = new EventEmitter();
   ok(emitter, "We have an event emitter");
 
   emitter.on("next", next);
diff --git a/browser/devtools/shared/test/browser_toolbar_basic.js b/browser/devtools/shared/test/browser_toolbar_basic.js
index 10734464cf84..31d3ae19a0d6 100644
--- a/browser/devtools/shared/test/browser_toolbar_basic.js
+++ b/browser/devtools/shared/test/browser_toolbar_basic.js
@@ -31,34 +31,102 @@ function isChecked(b) {
 
 function checkOpen() {
   ok(DeveloperToolbar.visible, "DeveloperToolbar is visible in checkOpen");
+
   let close = document.getElementById("developer-toolbar-closebutton");
+  let webconsole = document.getElementById("developer-toolbar-webconsole");
+  let inspector = document.getElementById("developer-toolbar-inspector");
+  let styleeditor = document.getElementById("developer-toolbar-styleeditor");
+  let debuggr = document.getElementById("developer-toolbar-debugger");
+
   ok(close, "Close button exists");
 
-  let toggleToolbox =
-    document.getElementById("devtoolsMenuBroadcaster_DevToolbox");
-  ok(!isChecked(toggleToolbox), "toggle toolbox button is not checked");
+  ok(!isChecked(webconsole), "web console button state 1");
+  ok(!isChecked(inspector), "inspector button state 1");
+  ok(!isChecked(debuggr), "debugger button state 1");
+  ok(!isChecked(styleeditor), "styleeditor button state 1");
 
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  let toolbox = gDevTools.openToolboxForTab(target, "webconsole");
-  toolbox.once("webconsole-selected", function BTBT_selected(id, aInspector) {
-    ok(isChecked(toggleToolbox), "toggle toolbox button is checked");
+  document.getElementById("Tools:WebConsole").doCommand();
 
-    addTab("about:blank", function(browser, tab) {
-      info("Opened a new tab");
+  ok(isChecked(webconsole), "web console button state 2");
+  ok(!isChecked(inspector), "inspector button state 2");
+  ok(!isChecked(debuggr), "debugger button state 2");
+  ok(!isChecked(styleeditor), "styleeditor button state 2");
 
-      ok(!isChecked(toggleToolbox), "toggle toolbox button is not checked");
+  document.getElementById("Tools:Inspect").doCommand();
 
-      gBrowser.removeCurrentTab();
+  ok(isChecked(webconsole), "web console button state 3");
+  ok(isChecked(inspector), "inspector button state 3");
+  ok(!isChecked(debuggr), "debugger button state 3");
+  ok(!isChecked(styleeditor), "styleeditor button state 3");
 
-      oneTimeObserve(DeveloperToolbar.NOTIFICATIONS.HIDE, catchFail(checkClosed));
-      document.getElementById("Tools:DevToolbar").doCommand();
-    });
+  // Christmas tree!
+
+  // The web console opens synchronously, but closes asynchronously.
+  let hud = imported.HUDService.getHudByWindow(content);
+  imported.HUDService.disableAnimation(hud.hudId);
+
+  document.getElementById("Tools:WebConsole").doCommand();
+
+  ok(!isChecked(webconsole), "web console button state 6");
+  ok(isChecked(inspector), "inspector button state 6");
+  ok(!isChecked(debuggr), "debugger button state 6");
+  ok(!isChecked(styleeditor), "styleeditor button state 6");
+
+  document.getElementById("Tools:Inspect").doCommand();
+
+  ok(!isChecked(webconsole), "web console button state 7");
+  ok(!isChecked(inspector), "inspector button state 7");
+  ok(!isChecked(debuggr), "debugger button state 7");
+  ok(!isChecked(styleeditor), "styleeditor button state 7");
+
+  // All closed
+
+  // Check we can open and close and retain button state
+  document.getElementById("Tools:Inspect").doCommand();
+
+  ok(!isChecked(webconsole), "web console button state 8");
+  ok(isChecked(inspector), "inspector button state 8");
+  ok(!isChecked(debuggr), "debugger button state 8");
+  ok(!isChecked(styleeditor), "styleeditor button state 8");
+
+
+  // Test Style Editor
+  document.getElementById("Tools:StyleEditor").doCommand();
+
+  ok(!isChecked(webconsole), "web console button state 9");
+  ok(isChecked(inspector), "inspector button state 9");
+  ok(!isChecked(debuggr), "debugger button state 9");
+  ok(isChecked(styleeditor), "styleeditor button state 9");
+
+  // Test Debugger
+  document.getElementById("Tools:Debugger").doCommand();
+
+  ok(!isChecked(webconsole), "web console button state 9");
+  ok(isChecked(inspector), "inspector button state 9");
+  ok(isChecked(debuggr), "debugger button state 9");
+  ok(isChecked(styleeditor), "styleeditor button state 9");
+
+  addTab("about:blank", function(browser, tab) {
+    info("Opening a new tab");
+
+    ok(!isChecked(webconsole), "web console button state 10");
+    ok(!isChecked(inspector), "inspector button state 10");
+    ok(!isChecked(debuggr), "debugger button state 10");
+    ok(!isChecked(styleeditor), "styleeditor button state 10");
+
+    gBrowser.removeCurrentTab();
+
+    oneTimeObserve(DeveloperToolbar.NOTIFICATIONS.HIDE, catchFail(checkClosed));
+    document.getElementById("Tools:DevToolbar").doCommand();
   });
 }
 
 function checkClosed() {
   ok(!DeveloperToolbar.visible, "DeveloperToolbar is not visible in checkClosed");
 
+  // Check we grok state even when closed
+  document.getElementById("Tools:WebConsole").doCommand();
+
   oneTimeObserve(DeveloperToolbar.NOTIFICATIONS.SHOW, catchFail(checkReOpen));
   document.getElementById("Tools:DevToolbar").doCommand();
 }
@@ -66,9 +134,18 @@ function checkClosed() {
 function checkReOpen() {
   ok(DeveloperToolbar.visible, "DeveloperToolbar is visible in checkReOpen");
 
-  let toggleToolbox =
-    document.getElementById("devtoolsMenuBroadcaster_DevToolbox");
-  ok(isChecked(toggleToolbox), "toggle toolbox button is checked");
+  let webconsole = document.getElementById("developer-toolbar-webconsole");
+  let inspector = document.getElementById("developer-toolbar-inspector");
+  let debuggr = document.getElementById("developer-toolbar-debugger");
+  let styleeditor = document.getElementById("developer-toolbar-styleeditor");
+
+  ok(isChecked(webconsole), "web console button state 99");
+  ok(isChecked(inspector), "inspector button state 99");
+  ok(isChecked(debuggr), "debugger button state 99");
+  ok(isChecked(styleeditor), "styleeditor button state 99");
+
+  // We close the style editor (not automatically closed)
+  document.getElementById("Tools:StyleEditor").doCommand();
 
   oneTimeObserve(DeveloperToolbar.NOTIFICATIONS.HIDE, catchFail(checkReClosed));
   document.getElementById("developer-toolbar-closebutton").doCommand();
diff --git a/browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.js b/browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.js
index ee5e36c5747e..9dfbdc12c00b 100644
--- a/browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.js
+++ b/browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.js
@@ -4,20 +4,13 @@
 // Tests that the developer toolbar errors count works properly.
 
 function test() {
-  const TEST_URI = "http://example.com/browser/browser/devtools/shared/test/" +
-                   "browser_toolbar_webconsole_errors_count.html";
+  const TEST_URI = "http://example.com/browser/browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.html";
 
   let imported = {};
   Components.utils.import("resource:///modules/HUDService.jsm", imported);
   let HUDService = imported.HUDService;
 
-  Components.utils.import("resource:///modules/devtools/gDevTools.jsm", imported);
-  let gDevTools = imported.gDevTools;
-
-  Components.utils.import("resource:///modules/devtools/Target.jsm", imported);
-  let TargetFactory = imported.TargetFactory;
-
-  let webconsole = document.getElementById("developer-toolbar-toolbox-button");
+  let webconsole = document.getElementById("developer-toolbar-webconsole");
   let toolbar = document.getElementById("Tools:DevToolbar");
   let tab1, tab2;
 
@@ -111,8 +104,7 @@ function test() {
 
     oneTimeObserve("web-console-created", _onWebConsoleOpen);
 
-    let target = TargetFactory.forTab(tab);
-    gDevTools.openToolboxForTab(target, "webconsole");
+    HUDService.activateHUDForContext(tab);
   }
 
   function onWebConsoleOpen(hud) {
@@ -214,8 +206,7 @@ function test() {
 
   function testEnd() {
     document.getElementById("developer-toolbar-closebutton").doCommand();
-    let target1 = TargetFactory.forTab(tab1);
-    gDevTools.closeToolbox(target1);
+    HUDService.deactivateHUDForContext(tab1);
     gBrowser.removeTab(tab1);
     gBrowser.removeTab(tab2);
     finish();
diff --git a/browser/devtools/shared/test/head.js b/browser/devtools/shared/test/head.js
index 6c2999659802..abb1dc76f147 100644
--- a/browser/devtools/shared/test/head.js
+++ b/browser/devtools/shared/test/head.js
@@ -8,12 +8,6 @@ let console = (function() {
   return tempScope.console;
 })();
 
-let TargetFactory = (function() {
-  let tempScope = {};
-  Components.utils.import("resource:///modules/devtools/Target.jsm", tempScope);
-  return tempScope.TargetFactory;
-})();
-
 // Import the GCLI test helper
 let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
 Services.scriptloader.loadSubScript(testDir + "/helpers.js", this);
diff --git a/browser/devtools/shared/test/leakhunt.js b/browser/devtools/shared/test/leakhunt.js
index 66d067a3c851..c5b956981313 100644
--- a/browser/devtools/shared/test/leakhunt.js
+++ b/browser/devtools/shared/test/leakhunt.js
@@ -10,12 +10,22 @@
  *   otherthing: otherthing
  * });
  */
-function leakHunt(root) {
-  var path = [];
-  var seen = [];
+
+var noRecurse = [
+  /^string$/, /^number$/, /^boolean$/, /^null/, /^undefined/,
+  /^Window$/, /^Document$/,
+  /^XULDocument$/, /^XULElement$/,
+  /^DOMWindow$/, /^HTMLDocument$/, /^HTML.*Element$/
+];
+
+var hide = [ /^string$/, /^number$/, /^boolean$/, /^null/, /^undefined/ ];
+
+function leakHunt(root, path, seen) {
+  path = path || [];
+  seen = seen || [];
 
   try {
-    var output = leakHunt.inner(root, path, seen);
+    var output = leakHuntInner(root, path, seen);
     output.forEach(function(line) {
       dump(line + '\n');
     });
@@ -25,7 +35,7 @@ function leakHunt(root) {
   }
 }
 
-leakHunt.inner = function LH_inner(root, path, seen) {
+function leakHuntInner(root, path, seen) {
   var prefix = new Array(path.length).join('  ');
 
   var reply = [];
@@ -42,93 +52,70 @@ leakHunt.inner = function LH_inner(root, path, seen) {
     return reply;
   }
 
-  try {
-    var index = 0;
-    for (var data of root) {
-      var prop = '' + index;
-      leakHunt.digProperty(prop, data, path, seen, direct, log);
-      index++;
-    }
-  }
-  catch (ex) { /* Ignore things that are not enumerable */ }
-
   for (var prop in root) {
+    var newPath = path.slice();
+    newPath.push(prop);
+    prefix = new Array(newPath.length).join('  ');
+
     var data;
     try {
       data = root[prop];
     }
     catch (ex) {
-      log(prefix + '  ' + prop + ' = Error: ' + ex.toString().substring(0, 30));
+      log(prefix + prop + '  Error reading: ' + ex);
       continue;
     }
 
-    leakHunt.digProperty(prop, data, path, seen, direct, log);
+    var recurse = true;
+    var message = getType(data);
+
+    if (matchesAnyPattern(message, hide)) {
+      continue;
+    }
+
+    if (message === 'function' && direct.indexOf(prop) == -1) {
+      continue;
+    }
+
+    if (message === 'string') {
+      var extra = data.length > 10 ? data.substring(0, 9) + '_' : data;
+      message += ' "' + extra.replace(/\n/g, "|") + '"';
+      recurse = false;
+    }
+    else if (matchesAnyPattern(message, noRecurse)) {
+      message += ' (no recurse)'
+      recurse = false;
+    }
+    else if (seen.indexOf(data) !== -1) {
+      message += ' (already seen)';
+      recurse = false;
+    }
+
+    if (recurse) {
+      seen.push(data);
+      var lines = leakHuntInner(data, newPath, seen);
+      if (lines.length == 0) {
+        if (message !== 'function') {
+          log(prefix + prop + ' = ' + message + ' { }');
+        }
+      }
+      else {
+        log(prefix + prop + ' = ' + message + ' {');
+        lines.forEach(function(line) {
+          reply.push(line);
+        });
+        log(prefix + '}');
+      }
+    }
+    else {
+      log(prefix + prop + ' = ' + message);
+    }
   }
 
   return reply;
 }
 
-leakHunt.hide = [ /^string$/, /^number$/, /^boolean$/, /^null/, /^undefined/ ];
-
-leakHunt.noRecurse = [
-  /^string$/, /^number$/, /^boolean$/, /^null/, /^undefined/,
-  /^Window$/, /^Document$/,
-  /^XULDocument$/, /^XULElement$/,
-  /^DOMWindow$/, /^HTMLDocument$/, /^HTML.*Element$/, /^ChromeWindow$/
-];
-
-leakHunt.digProperty = function LH_digProperty(prop, data, path, seen, direct, log) {
-  var newPath = path.slice();
-  newPath.push(prop);
-  var prefix = new Array(newPath.length).join('  ');
-
-  var recurse = true;
-  var message = leakHunt.getType(data);
-
-  if (leakHunt.matchesAnyPattern(message, leakHunt.hide)) {
-    return;
-  }
-
-  if (message === 'function' && direct.indexOf(prop) == -1) {
-    return;
-  }
-
-  if (message === 'string') {
-    var extra = data.length > 10 ? data.substring(0, 9) + '_' : data;
-    message += ' "' + extra.replace(/\n/g, "|") + '"';
-    recurse = false;
-  }
-  else if (leakHunt.matchesAnyPattern(message, leakHunt.noRecurse)) {
-    message += ' (no recurse)'
-    recurse = false;
-  }
-  else if (seen.indexOf(data) !== -1) {
-    message += ' (already seen)';
-    recurse = false;
-  }
-
-  if (recurse) {
-    seen.push(data);
-    var lines = leakHunt.inner(data, newPath, seen);
-    if (lines.length == 0) {
-      if (message !== 'function') {
-        log(prefix + prop + ' = ' + message + ' { }');
-      }
-    }
-    else {
-      log(prefix + prop + ' = ' + message + ' {');
-      lines.forEach(function(line) {
-        log(line);
-      });
-      log(prefix + '}');
-    }
-  }
-  else {
-    log(prefix + prop + ' = ' + message);
-  }
-};
-
-leakHunt.matchesAnyPattern = function LH_matchesAnyPattern(str, patterns) {
+function matchesAnyPattern(str, patterns) {
   var match = false;
   patterns.forEach(function(pattern) {
     if (str.match(pattern)) {
@@ -136,9 +123,9 @@ leakHunt.matchesAnyPattern = function LH_matchesAnyPattern(str, patterns) {
     }
   });
   return match;
-};
+}
 
-leakHunt.getType = function LH_getType(data) {
+function getType(data) {
   if (data === null) {
     return 'null';
   }
@@ -148,13 +135,13 @@ leakHunt.getType = function LH_getType(data) {
 
   var type = typeof data;
   if (type === 'object' || type === 'Object') {
-    type = leakHunt.getCtorName(data);
+    type = getCtorName(data);
   }
 
   return type;
-};
+}
 
-leakHunt.getCtorName = function LH_getCtorName(aObj) {
+function getCtorName(aObj) {
   try {
     if (aObj.constructor && aObj.constructor.name) {
       return aObj.constructor.name;
@@ -167,4 +154,4 @@ leakHunt.getCtorName = function LH_getCtorName(aObj) {
   // If that fails, use Objects toString which sometimes gives something
   // better than 'Object', and at least defaults to Object if nothing better
   return Object.prototype.toString.call(aObj).slice(8, -1);
-};
+}
diff --git a/browser/devtools/styleeditor/StyleEditor.jsm b/browser/devtools/styleeditor/StyleEditor.jsm
index c7464162268c..685d039d2a05 100644
--- a/browser/devtools/styleeditor/StyleEditor.jsm
+++ b/browser/devtools/styleeditor/StyleEditor.jsm
@@ -5,7 +5,7 @@
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = ["StyleEditor", "StyleEditorFlags"];
+this.EXPORTED_SYMBOLS = ["StyleEditor", "StyleEditorFlags", "StyleEditorManager"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
@@ -298,7 +298,7 @@ StyleEditor.prototype = {
           }
           let source = NetUtil.readInputStreamToString(aStream, aStream.available());
           aStream.close();
-
+    
           this._appendNewStyleSheet(source);
           this.clearFlag(StyleEditorFlags.ERROR);
         }.bind(this));
@@ -1120,7 +1120,6 @@ StyleEditor.prototype = {
       accel: true,
       callback: function save() {
         this.saveToFile(this._savedFile);
-        return true;
       }.bind(this)
     });
 
@@ -1131,7 +1130,6 @@ StyleEditor.prototype = {
       shift: true,
       callback: function saveAs() {
         this.saveToFile();
-        return true;
       }.bind(this)
     });
 
@@ -1279,3 +1277,134 @@ function setupBracketCompletion(aSourceEditor)
     aSourceEditor.setCaretOffset(aSourceEditor.getCaretOffset() - 1);
   }, false);
 }
+
+/**
+  * Manage the different editors instances.
+  */
+
+this.StyleEditorManager = function StyleEditorManager(aWindow) {
+  this.chromeWindow = aWindow;
+  this.listenToTabs();
+  this.editors = new WeakMap();
+}
+
+StyleEditorManager.prototype = {
+
+  /**
+   * Get the editor for a specific content window.
+   */
+  getEditorForWindow: function SEM_getEditorForWindow(aContentWindow) {
+    return this.editors.get(aContentWindow);
+  },
+
+  /**
+   * Focus the editor and select a stylesheet.
+   *
+   * @param {CSSStyleSheet} [aSelectedStyleSheet] default Stylesheet.
+   * @param {Number} [aLine] Line to which the caret should be moved (one-indexed).
+   * @param {Number} [aCol] Column to which the caret should be moved (one-indexed).
+   */
+  selectEditor: function SEM_selectEditor(aWindow, aSelectedStyleSheet, aLine, aCol) {
+    if (aSelectedStyleSheet) {
+      aWindow.styleEditorChrome.selectStyleSheet(aSelectedStyleSheet, aLine, aCol);
+    }
+    aWindow.focus();
+  },
+
+  /**
+   * Open a new editor.
+   *
+   * @param {Window} content window.
+   * @param {Window} chrome window.
+   * @param {CSSStyleSheet} [aSelectedStyleSheet] default Stylesheet.
+   * @param {Number} [aLine] Line to which the caret should be moved (one-indexed).
+   * @param {Number} [aCol] Column to which the caret should be moved (one-indexed).
+   */
+  newEditor: function SEM_newEditor(aContentWindow, aChromeWindow, aSelectedStyleSheet, aLine, aCol) {
+    const CHROME_URL = "chrome://browser/content/styleeditor.xul";
+    const CHROME_WINDOW_FLAGS = "chrome,centerscreen,resizable,dialog=no";
+
+    let args = {
+      contentWindow: aContentWindow,
+      selectedStyleSheet: aSelectedStyleSheet,
+      line: aLine,
+      col: aCol
+    };
+    args.wrappedJSObject = args;
+    let chromeWindow = Services.ww.openWindow(aChromeWindow, CHROME_URL, "_blank",
+                                              CHROME_WINDOW_FLAGS, args);
+
+    chromeWindow.onunload = function() {
+      if (chromeWindow.location == CHROME_URL) {
+        // not about:blank being unloaded
+        this.unregisterEditor(aContentWindow);
+      }
+    }.bind(this);
+    chromeWindow.focus();
+
+    this.editors.set(aContentWindow, chromeWindow);
+
+    this.refreshCommand();
+
+    return chromeWindow;
+  },
+
+  /**
+   * Toggle an editor.
+   *
+   * @param {Window} associated content window.
+   */
+  toggleEditor: function SEM_toggleEditor(aContentWindow, aChromeWindow) {
+    let editor = this.getEditorForWindow(aContentWindow);
+    if (editor) {
+      editor.close();
+    } else {
+      this.newEditor(aContentWindow, aChromeWindow);
+    }
+  },
+
+  /**
+   * Close an editor.
+   *
+   * @param {Window} associated content window.
+   */
+  unregisterEditor: function SEM_unregisterEditor(aContentWindow) {
+    let chromeWindow = this.editors.get(aContentWindow);
+    if (chromeWindow) {
+      chromeWindow.close();
+    }
+    this.editors.delete(aContentWindow);
+    this.refreshCommand();
+  },
+
+  /**
+   * Update the status of tool's menuitems and buttons.
+   */
+  refreshCommand: function SEM_refreshCommand() {
+    let contentWindow = this.chromeWindow.gBrowser.contentWindow;
+    let command = this.chromeWindow.document.getElementById("Tools:StyleEditor");
+
+    let win = this.getEditorForWindow(contentWindow);
+    if (win) {
+      command.setAttribute("checked", "true");
+    } else {
+      command.setAttribute("checked", "false");
+    }
+  },
+
+  /**
+   * Trigger refreshCommand when needed.
+   */
+  listenToTabs: function SEM_listenToTabs() {
+    let win = this.chromeWindow;
+    let tabs = win.gBrowser.tabContainer;
+
+    let bound_refreshCommand = this.refreshCommand.bind(this);
+    tabs.addEventListener("TabSelect", bound_refreshCommand, true);
+
+    win.addEventListener("unload", function onClose(aEvent) {
+      tabs.removeEventListener("TabSelect", bound_refreshCommand, true);
+      win.removeEventListener("unload", onClose, false);
+    }, false);
+  },
+}
diff --git a/browser/devtools/styleeditor/StyleEditorChrome.jsm b/browser/devtools/styleeditor/StyleEditorChrome.jsm
index 7c2aeb6099e5..ca9dccd9e2fe 100644
--- a/browser/devtools/styleeditor/StyleEditorChrome.jsm
+++ b/browser/devtools/styleeditor/StyleEditorChrome.jsm
@@ -69,8 +69,6 @@ this.StyleEditorChrome = function StyleEditorChrome(aRoot, aContentWindow)
 }
 
 StyleEditorChrome.prototype = {
-  _styleSheetToSelect: null,
-
   /**
    * Retrieve the content window attached to this chrome.
    *
@@ -276,7 +274,7 @@ StyleEditorChrome.prototype = {
   /**
    * Reset the chrome UI to an empty and ready state.
    */
-  resetChrome: function SEC__resetChrome()
+  _resetChrome: function SEC__resetChrome()
   {
     this._editors.forEach(function (aEditor) {
       aEditor.removeActionListener(this);
@@ -299,7 +297,7 @@ StyleEditorChrome.prototype = {
    */
   _populateChrome: function SEC__populateChrome()
   {
-    this.resetChrome();
+    this._resetChrome();
 
     let document = this.contentDocument;
     this._document.title = _("chromeWindowTitle",
@@ -339,60 +337,49 @@ StyleEditorChrome.prototype = {
    */
   selectStyleSheet: function SEC_selectSheet(aSheet, aLine, aCol)
   {
-    let alreadyCalled = !!this._styleSheetToSelect;
-
-    this._styleSheetToSelect = {
-      sheet: aSheet,
-      line: aLine,
-      col: aCol,
-    };
-
-    if (alreadyCalled) {
-      return;
-    }
-
     let select = function DEC_select(aEditor) {
-      let sheet = this._styleSheetToSelect.sheet;
-      let line = this._styleSheetToSelect.line;
-      let col = this._styleSheetToSelect.col;
-      let summary = sheet ? this.getSummaryElementForEditor(aEditor)
-                          : this._view.getSummaryElementByOrdinal(0);
+      let summary = aSheet ? this.getSummaryElementForEditor(aEditor)
+                           : this._view.getSummaryElementByOrdinal(0);
+      let setCaret = false;
 
-      if (line) {
-        col = col || 1;
-
-        if (!aEditor.sourceEditor) {
-          // If a line or column was specified we move the caret appropriately.
+      if (aLine || aCol) {
+        aLine = aLine || 1;
+        aCol = aCol || 1;
+        setCaret = true;
+      }
+      if (!aEditor.sourceEditor) {
+        // If a line or column was specified we move the caret appropriately.
+        if (setCaret) {
           let self = this;
           aEditor.addActionListener({
             onAttach: function SEC_selectSheet_onAttach()
             {
               aEditor.removeActionListener(this);
               self.selectedStyleSheetIndex = aEditor.styleSheetIndex;
-              aEditor.sourceEditor.setCaretPosition(line - 1, col - 1);
+              aEditor.sourceEditor.setCaretPosition(aLine - 1, aCol - 1);
             }
           });
-        } else {
-          // If a line or column was specified we move the caret appropriately.
-          aEditor.sourceEditor.setCaretPosition(line - 1, col - 1);
+        }
+        this._view.activeSummary = summary;
+      } else {
+        this._view.activeSummary = summary;
+
+        // If a line or column was specified we move the caret appropriately.
+        if (setCaret) {
+          aEditor.sourceEditor.setCaretPosition(aLine - 1, aCol - 1);
         }
       }
-
-      this._view.activeSummary = summary;
       this.selectedStyleSheetIndex = aEditor.styleSheetIndex;
-      this._styleSheetToSelect = null;
     }.bind(this);
 
     if (!this.editors.length) {
       // We are in the main initialization phase so we wait for the editor
       // containing the target stylesheet to be added and select the target
       // stylesheet, optionally moving the cursor to a selected line.
-      let self = this;
       this.addChromeListener({
         onEditorAdded: function SEC_selectSheet_onEditorAdded(aChrome, aEditor) {
-          let sheet = self._styleSheetToSelect.sheet;
-          if ((sheet && aEditor.styleSheet == sheet) ||
-              aEditor.styleSheetIndex == 0) {
+          if ((!aSheet && aEditor.styleSheetIndex == 0) ||
+              aEditor.styleSheet == aSheet) {
             aChrome.removeChromeListener(this);
             select(aEditor);
           }
diff --git a/browser/devtools/styleeditor/StyleEditorDefinition.jsm b/browser/devtools/styleeditor/StyleEditorDefinition.jsm
deleted file mode 100644
index 654e304d4206..000000000000
--- a/browser/devtools/styleeditor/StyleEditorDefinition.jsm
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-this.EXPORTED_SYMBOLS = [ "StyleEditorDefinition" ];
-
-const Cu = Components.utils;
-const STRINGS_URI = "chrome://browser/locale/devtools/styleeditor.properties";
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/devtools/StyleEditorChrome.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-XPCOMUtils.defineLazyGetter(this, "_strings",
-  function() Services.strings.createBundle(STRINGS_URI));
-
-XPCOMUtils.defineLazyModuleGetter(this, "StyleEditorPanel",
-  "resource:///modules/devtools/StyleEditorPanel.jsm");
-
-/**
- * The external API allowing us to be registered with DevTools.jsm
- */
-this.StyleEditorDefinition = {
-  id: "styleeditor",
-  key: l10n("open.commandkey"),
-  ordinal: 3,
-  accesskey: l10n("open.accesskey"),
-  modifiers: "shift",
-  label: l10n("ToolboxStyleEditor.label"),
-  url: "chrome://browser/content/styleeditor.xul",
-
-  isTargetSupported: function(target) {
-    return !target.isRemote && !target.isChrome;
-  },
-
-  build: function(iframeWindow, toolbox) {
-    return new StyleEditorPanel(iframeWindow, toolbox);
-  }
-};
-
-/**
- * Lookup l10n string from a string bundle.
- * @param {string} aName The key to lookup.
- * @returns A localized version of the given key.
- */
-function l10n(aName)
-{
-  try {
-    return _strings.GetStringFromName(aName);
-  } catch (ex) {
-    Services.console.logStringMessage("Error reading '" + aName + "'");
-    throw new Error("l10n error with " + aName);
-  }
-}
diff --git a/browser/devtools/styleeditor/StyleEditorPanel.jsm b/browser/devtools/styleeditor/StyleEditorPanel.jsm
deleted file mode 100644
index ff0d3c18e162..000000000000
--- a/browser/devtools/styleeditor/StyleEditorPanel.jsm
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const Cu = Components.utils;
-const Ci = Components.interfaces;
-
-this.EXPORTED_SYMBOLS = ["StyleEditorPanel"];
-
-Cu.import("resource:///modules/devtools/EventEmitter.jsm");
-Cu.import("resource:///modules/devtools/StyleEditorChrome.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-this.StyleEditorPanel = function StyleEditorPanel(panelWin, toolbox) {
-  new EventEmitter(this);
-
-  this._toolbox = toolbox;
-  this._target = toolbox.target;
-
-  this.reset = this.reset.bind(this);
-  this.newPage = this.newPage.bind(this);
-  this.destroy = this.destroy.bind(this);
-
-  this._target.on("will-navigate", this.reset);
-  this._target.on("navigate", this.newPage);
-  this._target.on("close", this.destroy);
-
-  this._panelWin = panelWin;
-  this._panelDoc = panelWin.document;
-
-  let contentWin = toolbox.target.tab.linkedBrowser.contentWindow;
-  this.setPage(contentWin);
-
-  this.isReady = true;
-}
-
-StyleEditorPanel.prototype = {
-  /**
-   * Target getter.
-   */
-  get target() {
-    return this._target;
-  },
-
-  /**
-   * Panel window getter.
-   */
-  get panelWindow() this._panelWin,
-
-  /**
-   * StyleEditorChrome instance getter.
-   */
-  get styleEditorChrome() this._panelWin.styleEditorChrome,
-
-  /**
-   * Set the page to target.
-   */
-  setPage: function StyleEditor_setPage(contentWindow) {
-    if (this._panelWin.styleEditorChrome) {
-      this._panelWin.styleEditorChrome.contentWindow = contentWindow;
-    } else {
-      let chromeRoot = this._panelDoc.getElementById("style-editor-chrome");
-      let chrome = new StyleEditorChrome(chromeRoot, contentWindow);
-      this._panelWin.styleEditorChrome = chrome;
-    }
-    this.selectStyleSheet(null, null, null);
-  },
-
-  /**
-   * Navigated to a new page.
-   */
-  newPage: function StyleEditor_newPage(event, window) {
-    this.setPage(window);
-  },
-
-  /**
-   * No window available anymore.
-   */
-  reset: function StyleEditor_reset() {
-    this._panelWin.styleEditorChrome.resetChrome();
-  },
-
-  /**
-   * Select a stylesheet.
-   */
-  selectStyleSheet: function StyleEditor_selectStyleSheet(stylesheet, line, col) {
-    this._panelWin.styleEditorChrome.selectStyleSheet(stylesheet, line, col);
-  },
-
-  /**
-   * Destroy StyleEditor
-   */
-  destroy: function StyleEditor_destroy() {
-    if (this._destroyed) {
-      return;
-    }
-    this._destroyed = true;
-
-    this._target.off("will-navigate", this.reset);
-    this._target.off("navigate", this.newPage);
-    this._target.off("close", this.destroy);
-    this._target = null;
-    this._toolbox = null;
-    this._panelWin = null;
-    this._panelDoc = null;
-  },
-}
diff --git a/browser/devtools/styleeditor/styleeditor.xul b/browser/devtools/styleeditor/styleeditor.xul
index 6a3cff7c5f63..93887d1e125d 100644
--- a/browser/devtools/styleeditor/styleeditor.xul
+++ b/browser/devtools/styleeditor/styleeditor.xul
@@ -16,95 +16,117 @@
 <?xul-overlay href="chrome://browser/content/source-editor-overlay.xul"?>
 <xul:window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns="http://www.w3.org/1999/xhtml"
-        id="style-editor-chrome-window">
+        id="style-editor-chrome-window"
+        title="&window.title;"
+        windowtype="Tools:StyleEditor"
+        width="800" height="280"
+        persist="screenX screenY width height sizemode">
+<xul:script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
-  <xul:script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+<xul:popupset id="style-editor-popups">
+  <xul:menupopup id="sourceEditorContextMenu"
+                 onpopupshowing="goUpdateSourceEditorMenuItems()">
+    <xul:menuitem id="se-cMenu-undo"/>
+    <xul:menuseparator/>
+    <xul:menuitem id="se-cMenu-cut"/>
+    <xul:menuitem id="se-cMenu-copy"/>
+    <xul:menuitem id="se-cMenu-paste"/>
+    <xul:menuitem id="se-cMenu-delete"/>
+    <xul:menuseparator/>
+    <xul:menuitem id="se-cMenu-selectAll"/>
+    <xul:menuseparator/>
+    <xul:menuitem id="se-cMenu-find"/>
+    <xul:menuitem id="se-cMenu-findAgain"/>
+    <xul:menuseparator/>
+    <xul:menuitem id="se-cMenu-gotoLine"/>
+  </xul:menupopup>
+</xul:popupset>
 
-  <xul:popupset id="style-editor-popups">
-    <xul:menupopup id="sourceEditorContextMenu"
-                  onpopupshowing="goUpdateSourceEditorMenuItems()">
-      <xul:menuitem id="se-cMenu-undo"/>
-      <xul:menuseparator/>
-      <xul:menuitem id="se-cMenu-cut"/>
-      <xul:menuitem id="se-cMenu-copy"/>
-      <xul:menuitem id="se-cMenu-paste"/>
-      <xul:menuitem id="se-cMenu-delete"/>
-      <xul:menuseparator/>
-      <xul:menuitem id="se-cMenu-selectAll"/>
-      <xul:menuseparator/>
-      <xul:menuitem id="se-cMenu-find"/>
-      <xul:menuitem id="se-cMenu-findAgain"/>
-      <xul:menuseparator/>
-      <xul:menuitem id="se-cMenu-gotoLine"/>
-    </xul:menupopup>
-  </xul:popupset>
+<xul:commandset id="editMenuCommands"/>
+<xul:commandset id="sourceEditorCommands"/>
+<xul:commandset id="style-editor-commandset">
+  <xul:command id="style-editor-cmd-close" oncommand="window.close();"/>
+</xul:commandset>
 
-  <xul:commandset id="editMenuCommands"/>
-  <xul:commandset id="sourceEditorCommands"/>
+<xul:keyset id="sourceEditorKeys"/>
+<xul:keyset id="style-editor-keyset">
+  <xul:key id="style-editor-key-close"
+           key="&closeCmd.key;"
+           command="style-editor-cmd-close"
+           modifiers="accel"/>
+</xul:keyset>
 
-  <xul:keyset id="sourceEditorKeys"/>
+<xul:box id="style-editor-chrome" class="splitview-root loading">
+  <xul:box class="splitview-controller">
+    <xul:box class="splitview-main">
+      <xul:toolbar class="devtools-toolbar">
+        <xul:toolbarbutton class="style-editor-newButton devtools-toolbarbutton"
+                    accesskey="&newButton.accesskey;"
+                    tooltiptext="&newButton.tooltip;"
+                    label="&newButton.label;"
+                    disabled="true"/>
+        <xul:toolbarbutton class="style-editor-importButton devtools-toolbarbutton"
+                    accesskey="&importButton.accesskey;"
+                    tooltiptext="&importButton.tooltip;"
+                    label="&importButton.label;"
+                    disabled="true"/>
+      </xul:toolbar>
+    </xul:box>
+    <xul:box id="splitview-resizer-target" class="splitview-nav-container"
+             persist="width height">
+      <ol class="splitview-nav" tabindex="0"></ol>
+      <div class="splitview-nav placeholder empty">
+        <p><strong>&noStyleSheet.label;</strong></p>
+        <p>&noStyleSheet-tip-start.label;
+          <a href="#"
+             class="style-editor-newButton">&noStyleSheet-tip-action.label;</a>
+          &noStyleSheet-tip-end.label;</p>
+      </div>
+    </xul:box> <!-- .splitview-nav-container -->
+  </xul:box>   <!-- .splitview-controller -->
+  <xul:box class="splitview-side-details"/>
 
-  <xul:box id="style-editor-chrome" class="splitview-root loading">
-    <xul:box class="splitview-controller">
-      <xul:box class="splitview-main">
-        <xul:toolbar class="devtools-toolbar">
-          <xul:toolbarbutton class="style-editor-newButton devtools-toolbarbutton"
-                      accesskey="&newButton.accesskey;"
-                      tooltiptext="&newButton.tooltip;"
-                      label="&newButton.label;"
-                      disabled="true"/>
-          <xul:toolbarbutton class="style-editor-importButton devtools-toolbarbutton"
-                      accesskey="&importButton.accesskey;"
-                      tooltiptext="&importButton.tooltip;"
-                      label="&importButton.label;"
-                      disabled="true"/>
-        </xul:toolbar>
-      </xul:box>
-      <xul:box id="splitview-resizer-target" class="splitview-nav-container"
-              persist="width height">
-        <ol class="splitview-nav" tabindex="0"></ol>
-        <div class="splitview-nav placeholder empty">
-          <p><strong>&noStyleSheet.label;</strong></p>
-          <p>&noStyleSheet-tip-start.label;
-            <a href="#"
-              class="style-editor-newButton">&noStyleSheet-tip-action.label;</a>
-            &noStyleSheet-tip-end.label;</p>
+  <div id="splitview-templates" hidden="true">
+    <li id="splitview-tpl-summary-stylesheet" tabindex="0">
+      <a class="stylesheet-enabled" tabindex="0" href="#"
+         title="&visibilityToggle.tooltip;"
+         accesskey="&saveButton.accesskey;"></a>
+      <hgroup class="stylesheet-info">
+        <h1><a class="stylesheet-name" href="#"><xul:label crop="start"/></a></h1>
+        <div class="stylesheet-more">
+          <h3 class="stylesheet-title"></h3>
+          <h3 class="stylesheet-rule-count"></h3>
+          <h3 class="stylesheet-error-message"></h3>
+          <xul:spacer/>
+          <h3><a class="stylesheet-saveButton" href="#"
+                 title="&saveButton.tooltip;"
+                 accesskey="&saveButton.accesskey;">&saveButton.label;</a></h3>
         </div>
-      </xul:box> <!-- .splitview-nav-container -->
-    </xul:box>   <!-- .splitview-controller -->
-    <xul:box class="splitview-side-details"/>
+      </hgroup>
+    </li>
 
-    <div id="splitview-templates" hidden="true">
-      <li id="splitview-tpl-summary-stylesheet" tabindex="0">
-        <a class="stylesheet-enabled" tabindex="0" href="#"
-          title="&visibilityToggle.tooltip;"
-          accesskey="&saveButton.accesskey;"></a>
-        <hgroup class="stylesheet-info">
-          <h1><a class="stylesheet-name" href="#"><xul:label crop="start"/></a></h1>
-          <div class="stylesheet-more">
-            <h3 class="stylesheet-title"></h3>
-            <h3 class="stylesheet-rule-count"></h3>
-            <h3 class="stylesheet-error-message"></h3>
-            <xul:spacer/>
-            <h3><a class="stylesheet-saveButton" href="#"
-                  title="&saveButton.tooltip;"
-                  accesskey="&saveButton.accesskey;">&saveButton.label;</a></h3>
-          </div>
-        </hgroup>
-      </li>
+    <xul:box id="splitview-tpl-details-stylesheet" class="splitview-details">
+      <xul:resizer class="splitview-portrait-resizer"
+                   dir="bottom"
+                   element="splitview-resizer-target"/>
+      <xul:toolbar id="splitview-details-toolbar" class="devtools-toolbar">
+        <xul:resizer class="splitview-landscape-resizer"
+                     dir="bottomend"
+                     element="splitview-resizer-target"/>
+      </xul:toolbar>
+      <xul:box class="stylesheet-editor-input textbox"
+               data-placeholder="&editorTextbox.placeholder;"/>
+    </xul:box>
+  </div> <!-- #splitview-templates -->
+</xul:box>   <!-- .splitview-root -->
 
-      <xul:box id="splitview-tpl-details-stylesheet" class="splitview-details">
-        <xul:resizer class="splitview-portrait-resizer"
-                    dir="bottom"
-                    element="splitview-resizer-target"/>
-        <xul:toolbar id="splitview-details-toolbar" class="devtools-toolbar">
-          <xul:resizer class="splitview-landscape-resizer"
-                      dir="bottomend"
-                      element="splitview-resizer-target"/>
-        </xul:toolbar>
-        <xul:box class="stylesheet-editor-input textbox"
-                data-placeholder="&editorTextbox.placeholder;"/>
-      </xul:box>
-    </div> <!-- #splitview-templates -->
-  </xul:box>   <!-- .splitview-root -->
+<xul:script type="application/javascript"><![CDATA[
+Components.utils.import("resource:///modules/devtools/StyleEditorChrome.jsm");
+let chromeRoot = document.getElementById("style-editor-chrome");
+let args = window.arguments[0].wrappedJSObject;
+let contentWindow = args.contentWindow;
+let chrome = new StyleEditorChrome(chromeRoot, contentWindow);
+chrome.selectStyleSheet(args.selectedStyleSheet, args.line, args.col);
+window.styleEditorChrome = chrome;
+]]></xul:script>
 </xul:window>
diff --git a/browser/devtools/styleeditor/test/Makefile.in b/browser/devtools/styleeditor/test/Makefile.in
index 95ef1121f73d..4ca04ee26bae 100644
--- a/browser/devtools/styleeditor/test/Makefile.in
+++ b/browser/devtools/styleeditor/test/Makefile.in
@@ -23,11 +23,9 @@ _BROWSER_TEST_FILES = \
                  browser_styleeditor_passedinsheet.js \
                  browser_styleeditor_pretty.js \
                  browser_styleeditor_readonly.js \
-                 $(filter disabled-for-intermittent-failures--bug-707891, browser_styleeditor_reopen.js) \
+		 $(filter disabled-for-intermittent-failures--bug-707891, browser_styleeditor_reopen.js) \
                  browser_styleeditor_sv_keynav.js \
                  browser_styleeditor_sv_resize.js \
-                 head.js \
-                 helpers.js \
                  four.html \
                  head.js \
                  helpers.js \
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_init.js b/browser/devtools/styleeditor/test/browser_styleeditor_init.js
index 7835c7c15ba2..51f8663aee93 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_init.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_init.js
@@ -32,11 +32,19 @@ function run(aChrome)
   let SEC = gChromeWindow.styleEditorChrome;
   is(SEC, aChrome, "StyleEditorChrome object exists as new window property");
 
+  ok(gChromeWindow.document.title.indexOf("simple testcase") >= 0,
+     "the Style Editor window title contains the document's title");
+
   // check editors are instantiated
   is(SEC.editors.length, 2,
      "there is two StyleEditor instances managed");
   ok(SEC.editors[0].styleSheetIndex < SEC.editors[1].styleSheetIndex,
      "editors are ordered by styleSheetIndex");
+
+  // check StyleEditorChrome is a singleton wrt to the same DOMWindow
+  let chromeWindow = StyleEditor.openChrome();
+  is(chromeWindow, gChromeWindow,
+     "attempt to edit the same document returns the same Style Editor window");
 }
 
 let gEditorAddedCount = 0;
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_loading.js b/browser/devtools/styleeditor/test/browser_styleeditor_loading.js
index 07331c6e092c..9b5e86e4d838 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_loading.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_loading.js
@@ -15,32 +15,31 @@ function test()
   // this checks that the Style Editor still launches correctly when it is opened
   // *while* the page is still loading
   launchStyleEditorChrome(function (aChrome) {
-    content.location = TESTCASE_URI;
-    executeSoon(function() {
-      isnot(gBrowser.selectedBrowser.contentWindow.document.readyState, "complete",
-            "content document is still loading");
+    isnot(gBrowser.selectedBrowser.contentWindow.document.readyState, "complete",
+          "content document is still loading");
 
-      let root = gChromeWindow.document.querySelector(".splitview-root");
-      ok(root.classList.contains("loading"),
-        "style editor root element has 'loading' class name");
+    let root = gChromeWindow.document.querySelector(".splitview-root");
+    ok(root.classList.contains("loading"),
+       "style editor root element has 'loading' class name");
 
-      let button = gChromeWindow.document.querySelector(".style-editor-newButton");
-      ok(button.hasAttribute("disabled"),
-        "new style sheet button is disabled");
+    let button = gChromeWindow.document.querySelector(".style-editor-newButton");
+    ok(button.hasAttribute("disabled"),
+       "new style sheet button is disabled");
 
-      button = gChromeWindow.document.querySelector(".style-editor-importButton");
-      ok(button.hasAttribute("disabled"),
-        "import button is disabled");
+    button = gChromeWindow.document.querySelector(".style-editor-importButton");
+    ok(button.hasAttribute("disabled"),
+       "import button is disabled");
 
-      if (!aChrome.isContentAttached) {
-        aChrome.addChromeListener({
-          onContentAttach: run
-        });
-      } else {
-        run(aChrome);
-      }
-    });
+    if (!aChrome.isContentAttached) {
+      aChrome.addChromeListener({
+        onContentAttach: run
+      });
+    } else {
+      run(aChrome);
+    }
   });
+
+  content.location = TESTCASE_URI;
 }
 
 function run(aChrome)
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_passedinsheet.js b/browser/devtools/styleeditor/test/browser_styleeditor_passedinsheet.js
index d095d1a48c6e..05b37019e49f 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_passedinsheet.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_passedinsheet.js
@@ -6,53 +6,56 @@ const TESTCASE_URI = TEST_BASE + "simple.html";
 const LINE = 6;
 const COL = 2;
 
+let editor = null;
+let sheet = null;
+
 function test()
 {
-  let editor = null;
-  let sheet = null;
-
   waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
-    gBrowser.selectedBrowser.removeEventListener("load", onLoad, true);
+  gBrowser.selectedBrowser.addEventListener("load", function () {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
     run();
   }, true);
   content.location = TESTCASE_URI;
+}
 
-  function run()
-  {
-    sheet = content.document.styleSheets[1];
-    launchStyleEditorChrome(function attachListeners(aChrome) {
-      aChrome.addChromeListener({
-        onEditorAdded: checkSourceEditor
-      });
-    }, sheet, LINE, COL);
-  }
+function run()
+{
+  sheet = content.document.styleSheets[1];
+  launchStyleEditorChrome(function attachListeners(aChrome) {
+    aChrome.addChromeListener({
+      onEditorAdded: checkSourceEditor
+    });
+  }, sheet, LINE, COL);
+}
 
-  function checkSourceEditor(aChrome, aEditor)
-  {
-    aChrome.removeChromeListener(this);
-    if (!aEditor.sourceEditor) {
-      aEditor.addActionListener({
-        onAttach: function (aEditor) {
-          aEditor.removeActionListener(this);
-          validate(aEditor);
-        }
-      });
-    } else {
-      validate(aEditor);
-    }
-  }
-
-  function validate(aEditor)
-  {
-    info("validating style editor");
-    let sourceEditor = aEditor.sourceEditor;
-    let caretPosition = sourceEditor.getCaretPosition();
-    is(caretPosition.line, LINE - 1, "caret row is correct"); // index based
-    is(caretPosition.col, COL - 1, "caret column is correct");
-    is(aEditor.styleSheet, sheet, "loaded stylesheet matches document stylesheet");
-    finish();
+function checkSourceEditor(aChrome, aEditor)
+{
+  if (!aEditor.sourceEditor) {
+    aEditor.addActionListener({
+      onAttach: function (aEditor) {
+        aEditor.removeActionListener(this);
+        validate(aEditor);
+      }
+    });
+  } else {
+    validate(aEditor);
   }
 }
+
+function validate(aEditor)
+{
+  info("validating style editor");
+  let sourceEditor = aEditor.sourceEditor;
+  let caretPosition = sourceEditor.getCaretPosition();
+  is(caretPosition.line, LINE - 1, "caret row is correct"); // index based
+  is(caretPosition.col, COL - 1, "caret column is correct");
+  is(aEditor.styleSheet, sheet, "loaded stylesheet matches document stylesheet");
+  finishUp();
+}
+
+function finishUp()
+{
+  editor = sheet = null;
+  finish();
+}
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_private.js b/browser/devtools/styleeditor/test/browser_styleeditor_private.js
index e3677e7c5d5b..4172caf5e4ca 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_private.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_private.js
@@ -19,33 +19,23 @@ function test() {
     finish();
   }
 
-  gBrowser.selectedTab = gBrowser.addTab();
-
   gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
     gBrowser.selectedBrowser.removeEventListener("load", onLoad, true);
     cache.evictEntries(Ci.nsICache.STORE_ANYWHERE);
     launchStyleEditorChrome(function(aChrome) {
-      if (aChrome.isContentAttached) {
-        onEditorAdded(aChrome, aChrome.editors[0]);
-      } else {
-        aChrome.addChromeListener({
-          onEditorAdded: onEditorAdded
-        });
-      }
+      aChrome.addChromeListener({
+        onEditorAdded: function(aChrome, aEditor) {
+          if (aEditor.isLoaded) {
+            checkCache();
+          } else {
+            aEditor.addActionListener({
+              onLoad: checkCache
+            });
+          }
+        }
+      });
     });
   }, true);
 
-  function onEditorAdded(aChrome, aEditor) {
-    aChrome.removeChromeListener(this);
-
-    if (aEditor.isLoaded) {
-      checkCache();
-    } else {
-      aEditor.addActionListener({
-        onLoad: checkCache
-      });
-    }
-  }
-
   content.location = 'http://' + TEST_HOST + '/browser/browser/devtools/styleeditor/test/test_private.html';
 }
diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_reopen.js b/browser/devtools/styleeditor/test/browser_styleeditor_reopen.js
index d27431617227..bf3045a83225 100644
--- a/browser/devtools/styleeditor/test/browser_styleeditor_reopen.js
+++ b/browser/devtools/styleeditor/test/browser_styleeditor_reopen.js
@@ -2,30 +2,22 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+// http rather than chrome to improve coverage
+const TESTCASE_URI = TEST_BASE_HTTP + "simple.gz.html";
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
 let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
-function test() {
-
-  // http rather than chrome to improve coverage
-  const TESTCASE_URI = TEST_BASE_HTTP + "simple.gz.html";
-
-  const Cc = Components.classes;
-  const Ci = Components.interfaces;
-
-  let toolbox;
-  let tempScope = {};
-  Components.utils.import("resource://gre/modules/FileUtils.jsm", tempScope);
-  let FileUtils = tempScope.FileUtils;
+Components.utils.import("resource://gre/modules/FileUtils.jsm", tempScope);
+let FileUtils = tempScope.FileUtils;
 
 
+function test()
+{
   waitForExplicitFinish();
 
   addTabAndLaunchStyleEditorChromeWhenLoaded(function (aChrome) {
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    toolbox = gDevTools.getToolboxForTarget(target);
-
     aChrome.addChromeListener({
       onEditorAdded: function (aChrome, aEditor) {
         if (aEditor.styleSheetIndex != 0) {
@@ -42,7 +34,8 @@ function test() {
       }
     });
 
-    toolbox.once("destroyed", function onClose() {
+    gChromeWindow.addEventListener("unload", function onClose() {
+      gChromeWindow.removeEventListener("unload", onClose, true);
       gChromeWindow = null;
       executeSoon(function () {
         waitForFocus(function () {
@@ -50,8 +43,8 @@ function test() {
           // open StyleEditorChrome again (a new one since we closed the previous one)
           launchStyleEditorChrome(function (aChrome) {
             is(gChromeWindow.document.documentElement.hasAttribute("data-marker"),
-              false,
-              "opened a completely new StyleEditorChrome window");
+               false,
+               "opened a completely new StyleEditorChrome window");
 
             aChrome.addChromeListener({
               onEditorAdded: function (aChrome, aEditor) {
@@ -75,91 +68,91 @@ function test() {
   });
 
   content.location = TESTCASE_URI;
+}
 
-  let gFilename;
+let gFilename;
 
-  function run(aEditor)
-  {
-    gFilename = FileUtils.getFile("ProfD", ["styleeditor-test.css"])
+function run(aEditor)
+{
+  gFilename = FileUtils.getFile("ProfD", ["styleeditor-test.css"])
 
-    aEditor.saveToFile(gFilename, function (aFile) {
-      ok(aFile, "file got saved successfully");
+  aEditor.saveToFile(gFilename, function (aFile) {
+    ok(aFile, "file got saved successfully");
 
-      aEditor.addActionListener({
-        onFlagChange: function (aEditor, aFlag) {
-          if (aFlag != "unsaved") {
-            return;
-          }
-
-          ok(aEditor.hasFlag("unsaved"),
-            "first stylesheet has UNSAVED flag after making a change");
-
-          // marker used to check it does not exist when we reopen
-          // ie. the window we opened is indeed a new one
-          gChromeWindow.document.documentElement.setAttribute("data-marker", "true");
-          toolbox.destroy();
+    aEditor.addActionListener({
+      onFlagChange: function (aEditor, aFlag) {
+        if (aFlag != "unsaved") {
+          return;
         }
-      });
 
-      waitForFocus(function () {
-        // insert char so that this stylesheet has the UNSAVED flag
-        EventUtils.synthesizeKey("x", {}, gChromeWindow);
-      }, gChromeWindow);
+        ok(aEditor.hasFlag("unsaved"),
+           "first stylesheet has UNSAVED flag after making a change");
+
+        // marker used to check it does not exist when we reopen
+        // ie. the window we opened is indeed a new one
+        gChromeWindow.document.documentElement.setAttribute("data-marker", "true");
+        gChromeWindow.close();
+      }
+    });
+
+    waitForFocus(function () {
+      // insert char so that this stylesheet has the UNSAVED flag
+      EventUtils.synthesizeKey("x", {}, gChromeWindow);
+    }, gChromeWindow);
+  });
+}
+
+function testNewChrome(aEditor)
+{
+  ok(aEditor.savedFile,
+     "first stylesheet editor will save directly into the same file");
+
+  is(aEditor.getFriendlyName(), gFilename.leafName,
+     "first stylesheet still has the filename as it was saved");
+  gFilename = null;
+
+  ok(aEditor.hasFlag("unsaved"),
+     "first stylesheet still has UNSAVED flag at reopening");
+
+  ok(!aEditor.hasFlag("inline"),
+     "first stylesheet does not have INLINE flag");
+
+  ok(!aEditor.hasFlag("error"),
+     "editor does not have error flag initially");
+  let hadError = false;
+
+  let onSaveCallback = function (aFile) {
+    aEditor.addActionListener({
+      onFlagChange: function (aEditor, aFlag) {
+        if (!hadError && aFlag == "error") {
+          ok(aEditor.hasFlag("error"),
+             "editor has ERROR flag after attempting to save with invalid path");
+          hadError = true;
+
+          // save using source editor key binding (previous successful path)
+          waitForFocus(function () {
+            EventUtils.synthesizeKey("S", {accelKey: true}, gChromeWindow);
+          }, gChromeWindow);
+          return;
+        }
+
+        if (hadError && aFlag == "unsaved") {
+          executeSoon(function () {
+            ok(!aEditor.hasFlag("unsaved"),
+               "first stylesheet has no UNSAVED flag after successful save");
+            ok(!aEditor.hasFlag("error"),
+               "ERROR flag has been removed since last operation succeeded");
+            finish();
+          });
+        }
+      }
     });
   }
 
-  function testNewChrome(aEditor)
-  {
-    ok(aEditor.savedFile,
-      "first stylesheet editor will save directly into the same file");
-
-    is(aEditor.getFriendlyName(), gFilename.leafName,
-      "first stylesheet still has the filename as it was saved");
-    gFilename = null;
-
-    ok(aEditor.hasFlag("unsaved"),
-      "first stylesheet still has UNSAVED flag at reopening");
-
-    ok(!aEditor.hasFlag("inline"),
-      "first stylesheet does not have INLINE flag");
-
-    ok(!aEditor.hasFlag("error"),
-      "editor does not have error flag initially");
-    let hadError = false;
-
-    let onSaveCallback = function (aFile) {
-      aEditor.addActionListener({
-        onFlagChange: function (aEditor, aFlag) {
-          if (!hadError && aFlag == "error") {
-            ok(aEditor.hasFlag("error"),
-              "editor has ERROR flag after attempting to save with invalid path");
-            hadError = true;
-
-            // save using source editor key binding (previous successful path)
-            waitForFocus(function () {
-              EventUtils.synthesizeKey("S", {accelKey: true}, gChromeWindow);
-            }, gChromeWindow);
-            return;
-          }
-
-          if (hadError && aFlag == "unsaved") {
-            executeSoon(function () {
-              ok(!aEditor.hasFlag("unsaved"),
-                "first stylesheet has no UNSAVED flag after successful save");
-              ok(!aEditor.hasFlag("error"),
-                "ERROR flag has been removed since last operation succeeded");
-              finish();
-            });
-          }
-        }
-      });
-    }
-
-    let os = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
-    if (os == "WINNT") {
-      aEditor.saveToFile("C:\\I_DO_NOT_EXIST_42\\bogus.css", onSaveCallback);
-    } else {
-      aEditor.saveToFile("/I_DO_NOT_EXIST_42/bogos.css", onSaveCallback);
-    }
+  let os = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
+  if (os == "WINNT") {
+    aEditor.saveToFile("C:\\I_DO_NOT_EXIST_42\\bogus.css", onSaveCallback);
+  } else {
+    aEditor.saveToFile("/I_DO_NOT_EXIST_42/bogos.css", onSaveCallback);
   }
 }
diff --git a/browser/devtools/styleeditor/test/head.js b/browser/devtools/styleeditor/test/head.js
index d08249dca059..f2e646a47063 100644
--- a/browser/devtools/styleeditor/test/head.js
+++ b/browser/devtools/styleeditor/test/head.js
@@ -6,10 +6,6 @@ const TEST_BASE_HTTP = "http://example.com/browser/browser/devtools/styleeditor/
 const TEST_BASE_HTTPS = "https://example.com/browser/browser/devtools/styleeditor/test/";
 const TEST_HOST = 'mochi.test:8888';
 
-let tempScope = {};
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
 let gChromeWindow;               //StyleEditorChrome window
 let cache = Cc["@mozilla.org/network/cache-service;1"]
               .getService(Ci.nsICacheService);
@@ -21,7 +17,10 @@ Services.scriptloader.loadSubScript(testDir + "/helpers.js", this);
 
 function cleanup()
 {
-  gChromeWindow = null;
+  if (gChromeWindow) {
+    gChromeWindow.close();
+    gChromeWindow = null;
+  }
   while (gBrowser.tabs.length > 1) {
     gBrowser.removeCurrentTab();
   }
@@ -29,26 +28,16 @@ function cleanup()
 
 function launchStyleEditorChrome(aCallback, aSheet, aLine, aCol)
 {
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-
-  let panel = gDevTools.getPanelForTarget("styleeditor", target);
-  if (panel && panel.isReady) {
-    gChromeWindow = panel._panelWin;
-    gChromeWindow.styleEditorChrome._alwaysDisableAnimations = true;
-    if (aSheet) {
-      panel.selectStyleSheet(aSheet, aLine, aCol);
-    }
-    aCallback(gChromeWindow.styleEditorChrome);
-  } else {
-    let toolbox = gDevTools.openToolboxForTab(target, "styleeditor");
-    toolbox.once("styleeditor-ready", function(event, panel) {
-      gChromeWindow = panel._panelWin;
+  gChromeWindow = StyleEditor.openChrome(aSheet, aLine, aCol);
+  if (gChromeWindow.document.readyState != "complete") {
+    gChromeWindow.addEventListener("load", function onChromeLoad() {
+      gChromeWindow.removeEventListener("load", onChromeLoad, true);
       gChromeWindow.styleEditorChrome._alwaysDisableAnimations = true;
-      if (aSheet) {
-        panel.selectStyleSheet(aSheet, aLine, aCol);
-      }
       aCallback(gChromeWindow.styleEditorChrome);
-    });
+    }, true);
+  } else {
+    gChromeWindow.styleEditorChrome._alwaysDisableAnimations = true;
+    aCallback(gChromeWindow.styleEditorChrome);
   }
 }
 
diff --git a/browser/devtools/styleinspector/CssHtmlTree.jsm b/browser/devtools/styleinspector/CssHtmlTree.jsm
index 35f3bcbfceca..0e1ddb30da13 100644
--- a/browser/devtools/styleinspector/CssHtmlTree.jsm
+++ b/browser/devtools/styleinspector/CssHtmlTree.jsm
@@ -17,10 +17,6 @@ Cu.import("resource://gre/modules/PluralForm.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/devtools/CssLogic.jsm");
 Cu.import("resource:///modules/devtools/Templater.jsm");
-Cu.import("resource:///modules/devtools/StyleEditorDefinition.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource:///modules/devtools/gDevTools.jsm");
 
 this.EXPORTED_SYMBOLS = ["CssHtmlTree", "PropertyView"];
 
@@ -122,16 +118,14 @@ UpdateProcess.prototype = {
  */
 this.CssHtmlTree = function CssHtmlTree(aStyleInspector)
 {
-  this.styleWindow = aStyleInspector.window;
-  this.styleDocument = aStyleInspector.window.document;
+  this.styleWin = aStyleInspector.iframe;
   this.styleInspector = aStyleInspector;
   this.cssLogic = aStyleInspector.cssLogic;
+  this.doc = aStyleInspector.document;
+  this.win = aStyleInspector.window;
+  this.getRTLAttr = this.win.getComputedStyle(this.win.gBrowser).direction;
   this.propertyViews = [];
 
-  let chromeReg = Cc["@mozilla.org/chrome/chrome-registry;1"].
-    getService(Ci.nsIXULChromeRegistry);
-  this.getRTLAttr = chromeReg.isLocaleRTL("global") ? "rtl" : "ltr";
-
   // Create bound methods.
   this.siBoundMenuUpdate = this.computedViewMenuUpdate.bind(this);
   this.siBoundCopy = this.computedViewCopy.bind(this);
@@ -139,6 +133,9 @@ this.CssHtmlTree = function CssHtmlTree(aStyleInspector)
   this.siBoundCopyProperty = this.computedViewCopyProperty.bind(this);
   this.siBoundCopyPropertyValue = this.computedViewCopyPropertyValue.bind(this);
 
+  // The document in which we display the results (csshtmltree.xul).
+  this.styleDocument = this.styleWin.contentWindow.document;
+
   this.styleDocument.addEventListener("copy", this.siBoundCopy);
 
   // Nodes used in templating
@@ -269,8 +266,8 @@ CssHtmlTree.prototype = {
       // processed.
       this.refreshSourceFilter();
       this.numVisibleProperties = 0;
-      let fragment = this.styleDocument.createDocumentFragment();
-      this._refreshProcess = new UpdateProcess(this.styleWindow, CssHtmlTree.propertyNames, {
+      let fragment = this.doc.createDocumentFragment();
+      this._refreshProcess = new UpdateProcess(this.win, CssHtmlTree.propertyNames, {
         onItem: function(aPropertyName) {
           // Per-item callback.
           let propView = new PropertyView(this, aPropertyName);
@@ -330,7 +327,7 @@ CssHtmlTree.prototype = {
     this._darkStripe = true;
 
     let display = this.propertyContainer.style.display;
-    this._refreshProcess = new UpdateProcess(this.styleWindow, this.propertyViews, {
+    this._refreshProcess = new UpdateProcess(this.win, this.propertyViews, {
       onItem: function(aPropView) {
         aPropView.refresh();
       }.bind(this),
@@ -350,7 +347,7 @@ CssHtmlTree.prototype = {
    */
   filterChanged: function CssHtmlTree_filterChanged(aEvent)
   {
-    let win = this.styleWindow;
+    let win = this.styleWin.contentWindow;
 
     if (this._filterChangedTimeout) {
       win.clearTimeout(this._filterChangedTimeout);
@@ -400,7 +397,7 @@ CssHtmlTree.prototype = {
 
     // Here we build and cache a list of css properties supported by the browser
     // We could use any element but let's use the main document's root element
-    let styles = this.styleWindow.getComputedStyle(this.styleDocument.documentElement);
+    let styles = this.styleWin.contentWindow.getComputedStyle(this.styleDocument.documentElement);
     let mozProps = [];
     for (let i = 0, numStyles = styles.length; i < numStyles; i++) {
       let prop = styles.item(i);
@@ -471,12 +468,9 @@ CssHtmlTree.prototype = {
    */
   createContextMenu: function SI_createContextMenu()
   {
-    let iframe = this.styleInspector.outerIFrame;
-    let outerDoc = iframe.ownerDocument;
+    let popupSet = this.doc.getElementById("mainPopupSet");
 
-    let popupSet = outerDoc.getElementById("inspectorPopupSet");
-
-    let menu = outerDoc.createElement("menupopup");
+    let menu = this.doc.createElement("menupopup");
     menu.addEventListener("popupshowing", this.siBoundMenuUpdate);
     menu.id = "computed-view-context-menu";
     popupSet.appendChild(menu);
@@ -484,7 +478,7 @@ CssHtmlTree.prototype = {
     // Copy selection
     let label = CssHtmlTree.l10n("style.contextmenu.copyselection");
     let accessKey = CssHtmlTree.l10n("style.contextmenu.copyselection.accesskey");
-    let item = outerDoc.createElement("menuitem");
+    let item = this.doc.createElement("menuitem");
     item.id = "computed-view-copy";
     item.setAttribute("label", label);
     item.setAttribute("accesskey", accessKey);
@@ -494,7 +488,7 @@ CssHtmlTree.prototype = {
     // Copy declaration
     label = CssHtmlTree.l10n("style.contextmenu.copydeclaration");
     accessKey = CssHtmlTree.l10n("style.contextmenu.copydeclaration.accesskey");
-    item = outerDoc.createElement("menuitem");
+    item = this.doc.createElement("menuitem");
     item.id = "computed-view-copy-declaration";
     item.setAttribute("label", label);
     item.setAttribute("accesskey", accessKey);
@@ -504,7 +498,7 @@ CssHtmlTree.prototype = {
     // Copy property name
     label = CssHtmlTree.l10n("style.contextmenu.copyproperty");
     accessKey = CssHtmlTree.l10n("style.contextmenu.copyproperty.accesskey");
-    item = outerDoc.createElement("menuitem");
+    item = this.doc.createElement("menuitem");
     item.id = "computed-view-copy-property";
     item.setAttribute("label", label);
     item.setAttribute("accesskey", accessKey);
@@ -514,14 +508,14 @@ CssHtmlTree.prototype = {
     // Copy property value
     label = CssHtmlTree.l10n("style.contextmenu.copypropertyvalue");
     accessKey = CssHtmlTree.l10n("style.contextmenu.copypropertyvalue.accesskey");
-    item = outerDoc.createElement("menuitem");
+    item = this.doc.createElement("menuitem");
     item.id = "computed-view-copy-property-value";
     item.setAttribute("label", label);
     item.setAttribute("accesskey", accessKey);
     item.addEventListener("command", this.siBoundCopyPropertyValue);
     menu.appendChild(item);
 
-    iframe.setAttribute("context", menu.id);
+    this.styleWin.setAttribute("context", menu.id);
   },
 
   /**
@@ -530,13 +524,12 @@ CssHtmlTree.prototype = {
    */
   computedViewMenuUpdate: function si_computedViewMenuUpdate()
   {
-    let disable = this.styleWindow.getSelection().isCollapsed;
-
-    let outerDoc = this.styleInspector.outerIFrame.ownerDocument;
-    let menuitem = outerDoc.querySelector("#computed-view-copy");
+    let win = this.styleDocument.defaultView;
+    let disable = win.getSelection().isCollapsed;
+    let menuitem = this.doc.querySelector("#computed-view-copy");
     menuitem.disabled = disable;
 
-    let node = outerDoc.popupNode;
+    let node = this.doc.popupNode;
     if (!node) {
       return;
     }
@@ -549,11 +542,11 @@ CssHtmlTree.prototype = {
       }
     }
     let disablePropertyItems = !node;
-    menuitem = outerDoc.querySelector("#computed-view-copy-declaration");
+    menuitem = this.doc.querySelector("#computed-view-copy-declaration");
     menuitem.disabled = disablePropertyItems;
-    menuitem = outerDoc.querySelector("#computed-view-copy-property");
+    menuitem = this.doc.querySelector("#computed-view-copy-property");
     menuitem.disabled = disablePropertyItems;
-    menuitem = outerDoc.querySelector("#computed-view-copy-property-value");
+    menuitem = this.doc.querySelector("#computed-view-copy-property-value");
     menuitem.disabled = disablePropertyItems;
   },
 
@@ -573,8 +566,7 @@ CssHtmlTree.prototype = {
 
     // Remove any MDN link titles
     text = text.replace(CssHtmlTree.HELP_LINK_TITLE, "");
-    let outerDoc = this.styleInspector.outerIFrame.ownerDocument;
-    clipboardHelper.copyString(text, outerDoc);
+    clipboardHelper.copyString(text, this.doc);
 
     if (aEvent) {
       aEvent.preventDefault();
@@ -588,8 +580,7 @@ CssHtmlTree.prototype = {
    */
   computedViewCopyDeclaration: function si_computedViewCopyDeclaration(aEvent)
   {
-    let outerDoc = this.styleInspector.outerIFrame.ownerDocument;
-    let node = outerDoc.popupNode;
+    let node = this.doc.popupNode;
     if (!node) {
       return;
     }
@@ -605,7 +596,7 @@ CssHtmlTree.prototype = {
       let name = node.querySelector(".property-name").textContent;
       let value = node.querySelector(".property-value").textContent;
 
-      clipboardHelper.copyString(name + ": " + value + ";", outerDoc);
+      clipboardHelper.copyString(name + ": " + value + ";", this.doc);
     }
   },
 
@@ -616,8 +607,7 @@ CssHtmlTree.prototype = {
    */
   computedViewCopyProperty: function si_computedViewCopyProperty(aEvent)
   {
-    let outerDoc = this.styleInspector.outerIFrame.ownerDocument;
-    let node = outerDoc.popupNode;
+    let node = this.doc.popupNode;
     if (!node) {
       return;
     }
@@ -631,7 +621,7 @@ CssHtmlTree.prototype = {
     }
     if (node) {
       node = node.querySelector(".property-name");
-      clipboardHelper.copyString(node.textContent, outerDoc);
+      clipboardHelper.copyString(node.textContent, this.doc);
     }
   },
 
@@ -642,8 +632,7 @@ CssHtmlTree.prototype = {
    */
   computedViewCopyPropertyValue: function si_computedViewCopyPropertyValue(aEvent)
   {
-    let outerDoc = this.styleInspector.outerIFrame.ownerDocument;
-    let node = outerDoc.popupNode;
+    let node = this.doc.popupNode;
     if (!node) {
       return;
     }
@@ -657,7 +646,7 @@ CssHtmlTree.prototype = {
     }
     if (node) {
       node = node.querySelector(".property-value");
-      clipboardHelper.copyString(node.textContent, outerDoc);
+      clipboardHelper.copyString(node.textContent, this.doc);
     }
   },
 
@@ -679,23 +668,22 @@ CssHtmlTree.prototype = {
     }
 
     // Remove context menu
-    let outerDoc = this.styleInspector.outerIFrame.ownerDocument;
-    let menu = outerDoc.querySelector("#computed-view-context-menu");
+    let menu = this.doc.querySelector("#computed-view-context-menu");
     if (menu) {
       // Copy selected
-      let menuitem = outerDoc.querySelector("#computed-view-copy");
+      let menuitem = this.doc.querySelector("#computed-view-copy");
       menuitem.removeEventListener("command", this.siBoundCopy);
 
       // Copy property
-      menuitem = outerDoc.querySelector("#computed-view-copy-declaration");
+      menuitem = this.doc.querySelector("#computed-view-copy-declaration");
       menuitem.removeEventListener("command", this.siBoundCopyDeclaration);
 
       // Copy property name
-      menuitem = outerDoc.querySelector("#computed-view-copy-property");
+      menuitem = this.doc.querySelector("#computed-view-copy-property");
       menuitem.removeEventListener("command", this.siBoundCopyProperty);
 
       // Copy property value
-      menuitem = outerDoc.querySelector("#computed-view-copy-property-value");
+      menuitem = this.doc.querySelector("#computed-view-copy-property-value");
       menuitem.removeEventListener("command", this.siBoundCopyPropertyValue);
 
       menu.removeEventListener("popupshowing", this.siBoundMenuUpdate);
@@ -715,9 +703,10 @@ CssHtmlTree.prototype = {
 
     // The element that we're inspecting, and the document that it comes from.
     delete this.propertyViews;
-    delete this.styleWindow;
-    delete this.styleDocument;
+    delete this.styleWin;
     delete this.cssLogic;
+    delete this.doc;
+    delete this.win;
     delete this.styleInspector;
   },
 };
@@ -873,7 +862,7 @@ PropertyView.prototype = {
 
   buildMain: function PropertyView_buildMain()
   {
-    let doc = this.tree.styleDocument;
+    let doc = this.tree.doc;
     this.element = doc.createElementNS(HTML_NS, "tr");
     this.element.setAttribute("class", this.propertyHeaderClassName);
 
@@ -928,7 +917,7 @@ PropertyView.prototype = {
 
   buildSelectorContainer: function PropertyView_buildSelectorContainer()
   {
-    let doc = this.tree.styleDocument;
+    let doc = this.tree.doc;
     let element = doc.createElementNS(HTML_NS, "tr");
     element.setAttribute("class", this.propertyContentClassName);
     this.matchedSelectorsContainer = doc.createElementNS(HTML_NS, "td");
@@ -1097,12 +1086,7 @@ PropertyView.prototype = {
    */
   mdnLinkClick: function PropertyView_mdnLinkClick(aEvent)
   {
-    let inspector = this.tree.styleInspector.inspector;
-
-    if (inspector.target.tab) {
-      let browserWin = inspector.target.tab.ownerDocument.defaultView;
-      browserWin.openUILinkIn(this.link, "tab");
-    }
+    this.tree.win.openUILinkIn(this.link, "tab");
     aEvent.preventDefault();
   },
 };
@@ -1213,35 +1197,27 @@ SelectorView.prototype = {
 
   /**
    * When a css link is clicked this method is called in order to either:
-   *   1. Open the link in view source (for chrome stylesheets).
+   *   1. Open the link in view source (for element style attributes).
    *   2. Open the link in the style editor.
    *
-   *   We can only view stylesheets contained in document.styleSheets inside the
-   *   style editor.
+   *   Like the style editor, we only view stylesheets contained in
+   *   document.styleSheets inside the style editor.
    *
    * @param aEvent The click event
    */
   openStyleEditor: function(aEvent)
   {
-    let inspector = this.tree.styleInspector.inspector;
-    let contentDoc = inspector.selection.document;
-    let cssSheet = this.selectorInfo.selector._cssRule._cssSheet;
+    let rule = this.selectorInfo.selector._cssRule;
+    let doc = this.tree.win.content.document;
     let line = this.selectorInfo.ruleLine || 0;
+    let cssSheet = rule._cssSheet;
     let contentSheet = false;
     let styleSheet;
     let styleSheets;
 
-    // The style editor can only display stylesheets coming from content because
-    // chrome stylesheets are not listed in the editor's stylesheet selector.
-    //
-    // If the stylesheet is a content stylesheet we send it to the style
-    // editor else we display it in the view source window.
-    //
-    // We check if cssSheet exists in case of inline styles (which contain no
-    // sheet)
     if (cssSheet) {
       styleSheet = cssSheet.domSheet;
-      styleSheets = contentDoc.styleSheets;
+      styleSheets = doc.styleSheets;
 
       // Array.prototype.indexOf always returns -1 here so we loop through
       // the styleSheets array instead.
@@ -1254,24 +1230,15 @@ SelectorView.prototype = {
     }
 
     if (contentSheet) {
-      let target = inspector.target;
-
-      if (StyleEditorDefinition.isTargetSupported(target)) {
-        let toolbox = gDevTools.getToolboxForTarget(target);
-
-        toolbox.once("styleeditor-selected", function SE_selected(id, styleEditor) {
-          styleEditor.selectStyleSheet(styleSheet, line);
-        });
-        toolbox.selectTool("styleeditor");
-      }
+      this.tree.win.StyleEditor.openChrome(styleSheet, line);
     } else {
       let href = styleSheet ? styleSheet.href : "";
-      let viewSourceUtils = inspector.viewSourceUtils;
+      let viewSourceUtils = this.tree.win.gViewSourceUtils;
 
       if (this.selectorInfo.sourceElement) {
         href = this.selectorInfo.sourceElement.ownerDocument.location.href;
       }
-      viewSourceUtils.viewSource(href, null, contentDoc, line);
+      viewSourceUtils.viewSource(href, null, doc, line);
     }
   },
 };
diff --git a/browser/devtools/styleinspector/StyleInspector.jsm b/browser/devtools/styleinspector/StyleInspector.jsm
index d724a8214094..0496c381de48 100644
--- a/browser/devtools/styleinspector/StyleInspector.jsm
+++ b/browser/devtools/styleinspector/StyleInspector.jsm
@@ -11,44 +11,83 @@ const Ci = Components.interfaces;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/devtools/CssRuleView.jsm");
-Cu.import("resource:///modules/devtools/StyleEditorDefinition.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource:///modules/devtools/gDevTools.jsm");
+Cu.import("resource:///modules/inspector.jsm");
 
 // This module doesn't currently export any symbols directly, it only
 // registers inspector tools.
-this.EXPORTED_SYMBOLS = ["RuleViewTool", "ComputedViewTool"];
+this.EXPORTED_SYMBOLS = [];
 
-this.RuleViewTool = function RVT_RuleViewTool(aInspector, aWindow, aIFrame)
+/**
+ * Lookup l10n string from a string bundle.
+ * @param {string} aName The key to lookup.
+ * @returns A localized version of the given key.
+ */
+function l10n(aName)
+{
+  try {
+    return _strings.GetStringFromName(aName);
+  } catch (ex) {
+    Services.console.logStringMessage("Error reading '" + aName + "'");
+    throw new Error("l10n error with " + aName);
+  }
+}
+
+function RegisterStyleTools()
+{
+  // Register the rules view
+  if (Services.prefs.getBoolPref("devtools.ruleview.enabled")) {
+    InspectorUI.registerSidebar({
+      id: "ruleview",
+      label: l10n("ruleView.label"),
+      tooltiptext: l10n("ruleView.tooltiptext"),
+      accesskey: l10n("ruleView.accesskey"),
+      contentURL: "chrome://browser/content/devtools/cssruleview.xul",
+      load: function(aInspector, aFrame) new RuleViewTool(aInspector, aFrame),
+      destroy: function(aContext) aContext.destroy()
+    });
+  }
+
+  // Register the computed styles view
+  if (Services.prefs.getBoolPref("devtools.styleinspector.enabled")) {
+    InspectorUI.registerSidebar({
+      id: "computedview",
+      label: this.l10n("style.highlighter.button.label2"),
+      tooltiptext: this.l10n("style.highlighter.button.tooltip2"),
+      accesskey: this.l10n("style.highlighter.accesskey2"),
+      contentURL: "chrome://browser/content/devtools/csshtmltree.xul",
+      load: function(aInspector, aFrame) new ComputedViewTool(aInspector, aFrame),
+      destroy: function(aContext) aContext.destroy()
+    });
+  }
+}
+
+function RuleViewTool(aInspector, aFrame)
 {
   this.inspector = aInspector;
-  this.doc = aWindow.document;
-  this.outerIFrame = aIFrame;
+  this.chromeWindow = this.inspector.chromeWindow;
+  this.doc = aFrame.contentDocument;
 
-  this.view = new CssRuleView(this.doc);
+  if (!this.inspector._ruleViewStore) {
+   this.inspector._ruleViewStore = {};
+  }
+  this.view = new CssRuleView(this.doc, this.inspector._ruleViewStore);
   this.doc.documentElement.appendChild(this.view.element);
 
   this._changeHandler = function() {
     this.inspector.markDirty();
+    this.inspector.change("ruleview");
   }.bind(this);
 
   this.view.element.addEventListener("CssRuleViewChanged", this._changeHandler)
 
   this._cssLinkHandler = function(aEvent) {
-    let contentDoc = this.inspector.selection.document;
     let rule = aEvent.detail.rule;
-    let line = rule.ruleLine || 0;
     let styleSheet = rule.sheet;
-    let styleSheets = contentDoc.styleSheets;
+    let doc = this.chromeWindow.content.document;
+    let styleSheets = doc.styleSheets;
     let contentSheet = false;
+    let line = rule.ruleLine || 0;
 
-    // The style editor can only display stylesheets coming from content because
-    // chrome stylesheets are not listed in the editor's stylesheet selector.
-    //
-    // If the stylesheet is a content stylesheet we send it to the style
-    // editor else we display it in the view source window.
-    //
     // Array.prototype.indexOf always returns -1 here so we loop through
     // the styleSheets object instead.
     for each (let sheet in styleSheets) {
@@ -59,23 +98,14 @@ this.RuleViewTool = function RVT_RuleViewTool(aInspector, aWindow, aIFrame)
     }
 
     if (contentSheet)  {
-      let target = this.inspector.target;
-
-      if (StyleEditorDefinition.isTargetSupported(target)) {
-        let toolbox = gDevTools.getToolboxForTarget(target);
-
-        toolbox.once("styleeditor-selected", function SE_selected(id, styleEditor) {
-          styleEditor.selectStyleSheet(styleSheet, line);
-        });
-        toolbox.selectTool("styleeditor");
-      }
+      this.chromeWindow.StyleEditor.openChrome(styleSheet, line);
     } else {
       let href = styleSheet ? styleSheet.href : "";
       if (rule.elementStyle.element) {
         href = rule.elementStyle.element.ownerDocument.location.href;
       }
-      let viewSourceUtils = this.inspector.viewSourceUtils;
-      viewSourceUtils.viewSource(href, null, contentDoc, line);
+      let viewSourceUtils = this.chromeWindow.gViewSourceUtils;
+      viewSourceUtils.viewSource(href, null, doc, line);
     }
   }.bind(this);
 
@@ -83,93 +113,75 @@ this.RuleViewTool = function RVT_RuleViewTool(aInspector, aWindow, aIFrame)
                                      this._cssLinkHandler);
 
   this._onSelect = this.onSelect.bind(this);
-  this.inspector.selection.on("new-node", this._onSelect);
-  this.refresh = this.refresh.bind(this);
-  this.inspector.on("layout-change", this.refresh);
-  this.inspector.sidebar.on("ruleview-selected", this.refresh);
-  this.inspector.selection.on("pseudoclass", this.refresh);
-  if (this.inspector.highlighter) {
-    this.inspector.highlighter.on("locked", this._onSelect);
-  }
+  this.inspector.on("select", this._onSelect);
+
+  this._onChange = this.onChange.bind(this);
+  this.inspector.on("change", this._onChange);
+  this.inspector.on("sidebaractivated-ruleview", this._onChange);
 
   this.onSelect();
 }
 
 RuleViewTool.prototype = {
-  onSelect: function RVT_onSelect(aEvent) {
-    if (!this.inspector.selection.isConnected() ||
-        !this.inspector.selection.isElementNode()) {
+  onSelect: function RVT_onSelect(aEvent, aFrom) {
+    let node = this.inspector.selection;
+    if (!node) {
       this.view.highlight(null);
       return;
     }
 
-    if (!aEvent || aEvent == "new-node") {
-      if (this.inspector.selection.reason == "highlighter") {
-        this.view.highlight(null);
-      } else {
-        this.view.highlight(this.inspector.selection.node);
-      }
-    }
-
-    if (aEvent == "locked") {
-      this.view.highlight(this.inspector.selection.node);
+    if (this.inspector.locked) {
+      this.view.highlight(node);
     }
   },
 
-  isActive: function RVT_isActive() {
-    return this.inspector.sidebar.getCurrentTabID() == "ruleview";
-  },
+  onChange: function RVT_onChange(aEvent, aFrom) {
+    if (aFrom == "ruleview" || aFrom == "createpanel") {
+      return;
+    }
 
-  refresh: function RVT_refresh() {
-    if (this.isActive()) {
+    if (this.inspector.locked && this.inspector.isPanelVisible("ruleview")) {
       this.view.nodeChanged();
     }
   },
 
   destroy: function RVT_destroy() {
-    this.inspector.off("layout-change", this.refresh);
-    this.inspector.sidebar.off("ruleview-selected", this.refresh);
-    this.inspector.selection.off("pseudoclass", this.refresh);
-    this.inspector.selection.off("new-node", this._onSelect);
-    if (this.inspector.highlighter) {
-      this.inspector.highlighter.off("locked", this._onSelect);
-    }
-
-    this.view.element.removeEventListener("CssRuleViewCSSLinkClicked",
-      this._cssLinkHandler);
-
+    this.inspector.off("select", this._onSelect);
+    this.inspector.off("change", this._onChange);
+    this.inspector.off("sidebaractivated-ruleview", this._onChange);
     this.view.element.removeEventListener("CssRuleViewChanged",
-      this._changeHandler);
-
+                                          this._changeHandler);
+    this.view.element.removeEventListener("CssRuleViewCSSLinkClicked",
+                                          this._cssLinkHandler);
     this.doc.documentElement.removeChild(this.view.element);
 
     this.view.destroy();
 
-    delete this.outerIFrame;
+    delete this._changeHandler;
     delete this.view;
     delete this.doc;
     delete this.inspector;
   }
 }
 
-this.ComputedViewTool = function CVT_ComputedViewTool(aInspector, aWindow, aIFrame)
+function ComputedViewTool(aInspector, aFrame)
 {
   this.inspector = aInspector;
-  this.window = aWindow;
-  this.document = aWindow.document;
-  this.outerIFrame = aIFrame;
+  this.iframe = aFrame;
+  this.window = aInspector.chromeWindow;
+  this.document = this.window.document;
   this.cssLogic = new CssLogic();
   this.view = new CssHtmlTree(this);
 
   this._onSelect = this.onSelect.bind(this);
-  this.inspector.selection.on("new-node", this._onSelect);
-  if (this.inspector.highlighter) {
-    this.inspector.highlighter.on("locked", this._onSelect);
-  }
-  this.refresh = this.refresh.bind(this);
-  this.inspector.on("layout-change", this.refresh);
-  this.inspector.sidebar.on("computedview-selected", this.refresh);
-  this.inspector.selection.on("pseudoclass", this.refresh);
+  this.inspector.on("select", this._onSelect);
+  this._onChange = this.onChange.bind(this);
+  this.inspector.on("change", this._onChange);
+
+  // Since refreshes of the computed view are non-destructive,
+  // refresh when the tab is changed so we can notice script-driven
+  // changes.
+  this.inspector.on("sidebaractivated-computedview", this._onChange);
 
   this.cssLogic.highlight(null);
   this.view.highlight(null);
@@ -180,57 +192,39 @@ this.ComputedViewTool = function CVT_ComputedViewTool(aInspector, aWindow, aIFra
 ComputedViewTool.prototype = {
   onSelect: function CVT_onSelect(aEvent)
   {
-    if (!this.inspector.selection.isConnected() ||
-        !this.inspector.selection.isElementNode()) {
-      // FIXME: We should hide view's content
+    if (this.inspector.locked) {
+      this.cssLogic.highlight(this.inspector.selection);
+      this.view.highlight(this.inspector.selection);
+    }
+  },
+
+  onChange: function CVT_change(aEvent, aFrom)
+  {
+    if (aFrom == "computedview" ||
+        aFrom == "createpanel" ||
+        this.inspector.selection != this.cssLogic.viewedElement) {
       return;
     }
 
-    if (!aEvent || aEvent == "new-node") {
-      if (this.inspector.selection.reason == "highlighter") {
-        // FIXME: We should hide view's content
-      } else {
-        this.cssLogic.highlight(this.inspector.selection.node);
-        this.view.highlight(this.inspector.selection.node);
-      }
-    }
-
-    if (aEvent == "locked") {
-      this.cssLogic.highlight(this.inspector.selection.node);
-      this.view.highlight(this.inspector.selection.node);
-    }
-  },
-
-  isActive: function CVT_isActive() {
-    return this.inspector.sidebar.getCurrentTabID() == "computedview";
-  },
-
-  refresh: function CVT_refresh() {
-    if (this.isActive()) {
-      this.cssLogic.highlight(this.inspector.selection.node);
+    if (this.inspector.locked && this.inspector.isPanelVisible("computedview")) {
+      this.cssLogic.highlight(this.inspector.selection);
       this.view.refreshPanel();
     }
   },
 
   destroy: function CVT_destroy(aContext)
   {
-    this.inspector.off("layout-change", this.refresh);
-    this.inspector.sidebar.off("computedview-selected", this.refresh);
-    this.inspector.selection.off("pseudoclass", this.refresh);
-    this.inspector.selection.off("new-node", this._onSelect);
-    if (this.inspector.highlighter) {
-      this.inspector.highlighter.off("locked", this._onSelect);
-    }
-
+    this.inspector.off("select", this._onSelect);
+    this.inspector.off("change", this._onChange);
+    this.inspector.off("sidebaractivated-computedview", this._onChange);
     this.view.destroy();
     delete this.view;
 
-    delete this.outerIFrame;
     delete this.cssLogic;
     delete this.cssHtmlTree;
+    delete this.iframe;
     delete this.window;
     delete this.document;
-    delete this.inspector;
   }
 }
 
@@ -248,3 +242,5 @@ XPCOMUtils.defineLazyGetter(this, "CssHtmlTree", function() {
   Cu.import("resource:///modules/devtools/CssHtmlTree.jsm", tmp);
   return tmp.CssHtmlTree;
 });
+
+RegisterStyleTools();
diff --git a/browser/devtools/styleinspector/csshtmltree.xul b/browser/devtools/styleinspector/csshtmltree.xul
index dfac610dd95d..216ffa30b7a2 100644
--- a/browser/devtools/styleinspector/csshtmltree.xul
+++ b/browser/devtools/styleinspector/csshtmltree.xul
@@ -24,20 +24,7 @@
 ]>
 
 <xul:window xmlns="http://www.w3.org/1999/xhtml"
-            xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-            title="&computedViewTitle;">
-
-<script type="application/javascript;version=1.8">
-  window.setPanel = function(panel, iframe) {
-    Components.utils.import("resource:///modules/devtools/StyleInspector.jsm");
-    this.computedview = new ComputedViewTool(panel, window, iframe);
-  }
-  window.onunload = function() {
-    if (this.computedview) {
-      this.computedview.destroy();
-    }
-  }
-</script>
+            xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <!-- The output from #templateRoot (below) is inserted here. -->
 <div id="root"></div>
diff --git a/browser/devtools/styleinspector/cssruleview.xul b/browser/devtools/styleinspector/cssruleview.xul
index 058f478257f9..6ba8220ad0a7 100644
--- a/browser/devtools/styleinspector/cssruleview.xul
+++ b/browser/devtools/styleinspector/cssruleview.xul
@@ -9,16 +9,4 @@
   <!ENTITY % inspectorDTD SYSTEM "chrome://browser/locale/devtools/styleinspector.dtd">
   %inspectorDTD;
 ]>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" title="&ruleViewTitle;">
-  <script type="application/javascript;version=1.8">
-    window.setPanel = function(panel, iframe) {
-      Components.utils.import("resource:///modules/devtools/StyleInspector.jsm");
-      this.ruleview = new RuleViewTool(panel, window, iframe);
-    }
-    window.onunload = function() {
-      if (this.ruleview) {
-        this.ruleview.destroy();
-      }
-    }
-  </script>
-</window>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>
diff --git a/browser/devtools/styleinspector/test/Makefile.in b/browser/devtools/styleinspector/test/Makefile.in
index b923418b636f..ee9180408e4a 100644
--- a/browser/devtools/styleinspector/test/Makefile.in
+++ b/browser/devtools/styleinspector/test/Makefile.in
@@ -16,27 +16,27 @@ MOCHITEST_BROWSER_FILES = \
   browser_bug683672.js \
   browser_styleinspector_bug_672746_default_styles.js \
   browser_styleinspector_bug_672744_search_filter.js \
-  $(filter awaiting-promise-based-init, browser_bug589375_keybindings.js) \
+  browser_bug589375_keybindings.js \
   browser_styleinspector_bug_689759_no_results_placeholder.js \
   browser_bug_692400_element_style.js \
   browser_csslogic_inherited.js \
-  browser_ruleview_734259_style_editor_link.js \
   browser_ruleview_editor.js \
   browser_ruleview_editor_changedvalues.js \
-  browser_ruleview_bug_703643_context_menu_copy.js \
-  browser_ruleview_focus.js \
   browser_ruleview_inherit.js \
   browser_ruleview_manipulation.js \
   browser_ruleview_override.js \
   browser_ruleview_ui.js \
   browser_ruleview_update.js \
+  browser_ruleview_focus.js \
   browser_bug705707_is_content_stylesheet.js \
   browser_bug722196_property_view_media_queries.js \
   browser_bug722196_rule_view_media_queries.js \
   browser_bug_592743_specificity.js \
-  browser_bug722691_rule_view_increment.js \
+  browser_ruleview_bug_703643_context_menu_copy.js \
+  browser_computedview_bug_703643_context_menu_copy.js \
+  browser_ruleview_734259_style_editor_link.js \
   browser_computedview_734259_style_editor_link.js \
-  browser_computedview_bug_703643_context_menu_copy.js\
+  browser_bug722691_rule_view_increment.js \
   head.js \
   $(NULL)
 
diff --git a/browser/devtools/styleinspector/test/browser_bug589375_keybindings.js b/browser/devtools/styleinspector/test/browser_bug589375_keybindings.js
index ecbd05aaa402..0e8bacbfbd0f 100644
--- a/browser/devtools/styleinspector/test/browser_bug589375_keybindings.js
+++ b/browser/devtools/styleinspector/test/browser_bug589375_keybindings.js
@@ -5,9 +5,7 @@
 // Tests that the key bindings work properly.
 
 let doc;
-let inspector;
-let computedView;
-let iframe;
+let stylePanel;
 
 function createDocument()
 {
@@ -16,38 +14,38 @@ function createDocument()
     '<span class="matches">Some styled text</span>' +
     '</div>';
   doc.title = "Style Inspector key binding test";
-
-  openInspector(openComputedView);
+  stylePanel = new ComputedViewPanel(window);
+  stylePanel.createPanel(doc.body, runStyleInspectorTests);
 }
 
-function openComputedView(aInspector)
+function runStyleInspectorTests()
 {
-  inspector = aInspector;
-  iframe = inspector._toolbox.frame;
-
-  Services.obs.addObserver(runTests, "StyleInspector-populated", false);
-
-  inspector.sidebar.select("computedview");
+  Services.obs.addObserver(SI_test, "StyleInspector-populated", false);
+  SI_inspectNode();
 }
 
-function runTests()
+function SI_inspectNode()
 {
-  Services.obs.removeObserver(runTests, "StyleInspector-populated");
-  computedView = getComputedView(inspector);
-
   var span = doc.querySelector(".matches");
   ok(span, "captain, we have the matches span");
 
-  inspector.selection.setNode(span);
+  let htmlTree = stylePanel.cssHtmlTree;
+  stylePanel.selectNode(span);
 
-  is(span, computedView.viewedElement,
+  is(span, htmlTree.viewedElement,
     "style inspector node matches the selected node");
-  is(computedView.viewedElement, computedView.cssLogic.viewedElement,
+  is(htmlTree.viewedElement, stylePanel.cssLogic.viewedElement,
      "cssLogic node matches the cssHtmlTree node");
+}
+
+function SI_test()
+{
+  Services.obs.removeObserver(SI_test, "StyleInspector-populated", false);
 
   info("checking keybindings");
 
-  let searchbar = computedView.searchField;
+  let iframe = stylePanel.iframe;
+  let searchbar = stylePanel.cssHtmlTree.searchField;
   let propView = getFirstVisiblePropertyView();
   let rulesTable = propView.matchedSelectorsContainer;
   let matchedExpander = propView.matchedExpander;
@@ -61,7 +59,7 @@ function runTests()
     testKey(iframe.contentWindow, "VK_RETURN", rulesTable);
 
     checkHelpLinkKeybinding();
-    computedView.destroy();
+    stylePanel.destroy();
     finishUp();
   });
 
@@ -78,13 +76,13 @@ function runTests()
     info("window is focused");
     info("focusing search filter");
     searchbar.focus();
-  }, iframe.contentWindow);
+  }, stylePanel.iframe.contentWindow);
 }
 
 function getFirstVisiblePropertyView()
 {
   let propView = null;
-  computedView.propertyViews.some(function(aPropView) {
+  stylePanel.cssHtmlTree.propertyViews.some(function(aPropView) {
     if (aPropView.visible) {
       propView = aPropView;
       return true;
@@ -109,6 +107,7 @@ function testKey(aContext, aVirtKey, aRulesTable)
 function checkHelpLinkKeybinding()
 {
   info("checking help link keybinding");
+  let iframe = stylePanel.iframe;
   let propView = getFirstVisiblePropertyView();
 
   info("check that MDN link is opened on \"F1\"");
@@ -122,7 +121,7 @@ function checkHelpLinkKeybinding()
 
 function finishUp()
 {
-  doc = inspector = iframe = computedView = null;
+  doc = stylePanel = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_bug683672.js b/browser/devtools/styleinspector/test/browser_bug683672.js
index bd9064df0deb..fc0388cce2d1 100644
--- a/browser/devtools/styleinspector/test/browser_bug683672.js
+++ b/browser/devtools/styleinspector/test/browser_bug683672.js
@@ -5,9 +5,7 @@
 // Tests that the style inspector works properly
 
 let doc;
-let inspector;
-let div;
-let computedView;
+let stylePanel;
 
 const TEST_URI = "http://example.com/browser/browser/devtools/styleinspector/test/browser_bug683672.html";
 
@@ -27,24 +25,9 @@ function tabLoaded()
 {
   browser.removeEventListener("load", tabLoaded, true);
   doc = content.document;
-  openInspector(selectNode);
-}
-
-function selectNode(aInspector)
-{
-  inspector = aInspector;
-
-  div = content.document.getElementById("test");
-  ok(div, "captain, we have the div");
-
-  inspector.selection.setNode(div);
-
-  inspector.sidebar.once("computedview-ready", function() {
-    computedView = getComputedView(inspector);
-
-    inspector.sidebar.select("computedview");
-    runTests();
-  });
+  // ok(StyleInspector.isEnabled, "style inspector preference is enabled");
+  stylePanel = new ComputedViewPanel(window);
+  stylePanel.createPanel(doc.body, runTests);
 }
 
 function runTests()
@@ -53,17 +36,25 @@ function runTests()
   //testUnmatchedSelectors();
 
   info("finishing up");
+  stylePanel.destroy();
   finishUp();
 }
 
 function testMatchedSelectors()
 {
   info("checking selector counts, matched rules and titles");
+  let div = content.document.getElementById("test");
+  ok(div, "captain, we have the div");
 
-  is(div, computedView.viewedElement,
+  info("selecting the div");
+  stylePanel.selectNode(div);
+
+  let htmlTree = stylePanel.cssHtmlTree;
+
+  is(div, htmlTree.viewedElement,
       "style inspector node matches the selected node");
 
-  let propertyView = new PropertyView(computedView, "color");
+  let propertyView = new PropertyView(htmlTree, "color");
   let numMatchedSelectors = propertyView.propertyInfo.matchedSelectors.length;
 
   is(numMatchedSelectors, 6,
@@ -80,12 +71,14 @@ function testUnmatchedSelectors()
   ok(body, "captain, we have a body");
 
   info("selecting content.document.body");
-  inspector.selection.setNode(body);
+  stylePanel.selectNode(body);
 
-  is(body, computedView.viewedElement,
+  let htmlTree = stylePanel.cssHtmlTree;
+
+  is(body, htmlTree.viewedElement,
       "style inspector node matches the selected node");
 
-  let propertyView = new PropertyView(computedView, "color");
+  let propertyView = new PropertyView(htmlTree, "color");
   let numUnmatchedSelectors = propertyView.propertyInfo.unmatchedSelectors.length;
 
   is(numUnmatchedSelectors, 13,
@@ -97,7 +90,7 @@ function testUnmatchedSelectors()
 
 function finishUp()
 {
-  doc = inspector = div = computedView = null;
+  doc = stylePanel = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js b/browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js
index 9fe1b464a514..c2f94a24c69d 100644
--- a/browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js
+++ b/browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js
@@ -6,7 +6,7 @@
 // property view.
 
 let doc;
-let computedView;
+let stylePanel;
 
 const TEST_URI = "http://example.com/browser/browser/devtools/styleinspector/" +
   "test/browser_bug722196_identify_media_queries.html";
@@ -22,27 +22,18 @@ function docLoaded()
 {
   browser.removeEventListener("load", docLoaded, true);
   doc = content.document;
-
-  openInspector(selectNode);
-}
-
-function selectNode(aInspector)
-{
-  var div = doc.querySelector("div");
-  ok(div, "captain, we have the div");
-
-  aInspector.selection.setNode(div);
-
-  aInspector.sidebar.once("computedview-ready", function() {
-    aInspector.sidebar.select("computedview");
-    computedView = getComputedView(aInspector);
-    checkSheets();
-  });
+  stylePanel = new ComputedViewPanel(window);
+  stylePanel.createPanel(doc.body, checkSheets);
 }
 
 function checkSheets()
 {
-  let cssLogic = computedView.cssLogic;
+  var div = doc.querySelector("div");
+  ok(div, "captain, we have the div");
+
+  stylePanel.selectNode(div);
+
+  let cssLogic = stylePanel.cssLogic;
   cssLogic.processMatchedSelectors();
 
   let _strings = Services.strings
@@ -57,12 +48,13 @@ function checkSheets()
   is(cssLogic._matchedRules[1][0].source, source2,
     "rule.source gives correct output for rule 2");
 
+  stylePanel.destroy();
   finishUp();
 }
 
 function finishUp()
 {
-  doc = computedView = null;
+  doc = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_bug_692400_element_style.js b/browser/devtools/styleinspector/test/browser_bug_692400_element_style.js
index 8a5653989a4e..56175d968d14 100644
--- a/browser/devtools/styleinspector/test/browser_bug_692400_element_style.js
+++ b/browser/devtools/styleinspector/test/browser_bug_692400_element_style.js
@@ -5,31 +5,21 @@
 // Tests for selector text errors.
 
 let doc;
-let computedView;
+let stylePanel;
 
 function createDocument()
 {
   doc.body.innerHTML = "<div style='color:blue;'></div>";
 
   doc.title = "Style Inspector Selector Text Test";
+  stylePanel = new ComputedViewPanel(window);
 
-  openInspector(openComputedView);
-}
+  Services.obs.addObserver(SI_checkText, "StyleInspector-populated", false);
 
+  let span = doc.querySelector("div");
+  ok(span, "captain, we have the test div");
 
-function openComputedView(aInspector)
-{
-  let div = doc.querySelector("div");
-  ok(div, "captain, we have the test div");
-
-  aInspector.selection.setNode(div);
-
-  aInspector.sidebar.once("computedview-ready", function() {
-    aInspector.sidebar.select("computedview");
-    computedView = getComputedView(aInspector);
-
-    Services.obs.addObserver(SI_checkText, "StyleInspector-populated", false);
-  });
+  stylePanel.createPanel(span);
 }
 
 function SI_checkText()
@@ -37,7 +27,7 @@ function SI_checkText()
   Services.obs.removeObserver(SI_checkText, "StyleInspector-populated", false);
 
   let propertyView = null;
-  computedView.propertyViews.some(function(aView) {
+  stylePanel.cssHtmlTree.propertyViews.some(function(aView) {
     if (aView.name == "color") {
       propertyView = aView;
       return true;
@@ -66,12 +56,13 @@ function SI_checkText()
     ok(false, "getting the selector text should not raise an exception");
   }
 
+  stylePanel.destroy();
   finishUp();
 }
 
 function finishUp()
 {
-  doc = computedView = null;
+  doc = stylePanel = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_computedview_734259_style_editor_link.js b/browser/devtools/styleinspector/test/browser_computedview_734259_style_editor_link.js
index 0fcdfdf99336..3e6c40fbb6ec 100644
--- a/browser/devtools/styleinspector/test/browser_computedview_734259_style_editor_link.js
+++ b/browser/devtools/styleinspector/test/browser_computedview_734259_style_editor_link.js
@@ -3,8 +3,8 @@
  http://creativecommons.org/publicdomain/zero/1.0/ */
 
 let doc;
-let inspector;
-let computedView;
+let win;
+let stylePanel;
 
 function createDocument()
 {
@@ -27,26 +27,12 @@ function createDocument()
     '</div>';
   doc.title = "Rule view style editor link test";
 
-  openInspector(selectNode);
-}
-
-
-function selectNode(aInspector)
-{
-  inspector = aInspector;
-
   let span = doc.querySelector("span");
   ok(span, "captain, we have the span");
 
-  aInspector.selection.setNode(span);
-
-  aInspector.sidebar.once("computedview-ready", function() {
-    aInspector.sidebar.select("computedview");
-
-    computedView = getComputedView(aInspector);
-
-    Services.obs.addObserver(testInlineStyle, "StyleInspector-populated", false);
-  });
+  Services.obs.addObserver(testInlineStyle, "StyleInspector-populated", false);
+  stylePanel = new ComputedViewPanel(window);
+  stylePanel.createPanel(span);
 }
 
 function testInlineStyle()
@@ -60,7 +46,7 @@ function testInlineStyle()
         return;
       }
       info("window opened");
-      let win = aSubject.QueryInterface(Ci.nsIDOMWindow);
+      win = aSubject.QueryInterface(Ci.nsIDOMWindow);
       win.addEventListener("load", function windowLoad() {
         win.removeEventListener("load", windowLoad);
         info("window load completed");
@@ -81,28 +67,35 @@ function testInlineStyleSheet()
 {
   info("clicking an inline stylesheet");
 
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  let toolbox = gDevTools.openToolboxForTab(target, "styleeditor");
+  Services.ww.registerNotification(function onWindow(aSubject, aTopic) {
+    if (aTopic != "domwindowopened") {
+      return;
+    }
+    info("window opened");
+    win = aSubject.QueryInterface(Ci.nsIDOMWindow);
+    win.addEventListener("load", function windowLoad() {
+      win.removeEventListener("load", windowLoad);
+      info("window load completed");
+      let windowType = win.document.documentElement.getAttribute("windowtype");
+      is(windowType, "Tools:StyleEditor", "style editor window is open");
 
-  toolbox.once("styleeditor-ready", function(event, panel) {
-    let win = panel._panelWin;
-
-    win.styleEditorChrome.addChromeListener({
-      onEditorAdded: function checkEditor(aChrome, aEditor) {
-        if (!aEditor.sourceEditor) {
-          aEditor.addActionListener({
-            onAttach: function (aEditor) {
-              aEditor.removeActionListener(this);
-              validateStyleEditorSheet(aEditor);
-            }
-          });
-        } else {
-          validateStyleEditorSheet(aEditor);
+      win.styleEditorChrome.addChromeListener({
+        onEditorAdded: function checkEditor(aChrome, aEditor) {
+          if (!aEditor.sourceEditor) {
+            aEditor.addActionListener({
+              onAttach: function (aEditor) {
+                aEditor.removeActionListener(this);
+                validateStyleEditorSheet(aEditor);
+              }
+            });
+          } else {
+            validateStyleEditorSheet(aEditor);
+          }
         }
-      }
+      });
+      Services.ww.unregisterNotification(onWindow);
     });
   });
-
   let link = getLinkByIndex(1);
   link.click();
 }
@@ -113,13 +106,18 @@ function validateStyleEditorSheet(aEditor)
 
   let sheet = doc.styleSheets[0];
   is(aEditor.styleSheet, sheet, "loaded stylesheet matches document stylesheet");
+  info("closing window");
+  win.close();
 
+  stylePanel.destroy();
   finishUp();
 }
 
 function expandProperty(aIndex, aCallback)
 {
-  let contentDoc = computedView.styleDocument;
+  let iframe = stylePanel.iframe;
+  let contentDoc = iframe.contentDocument;
+  let contentWindow = iframe.contentWindow;
   let expando = contentDoc.querySelectorAll(".expandable")[aIndex];
   expando.click();
 
@@ -129,14 +127,14 @@ function expandProperty(aIndex, aCallback)
 
 function getLinkByIndex(aIndex)
 {
-  let contentDoc = computedView.styleDocument;
+  let contentDoc = stylePanel.iframe.contentDocument;
   let links = contentDoc.querySelectorAll(".rule-link .link");
   return links[aIndex];
 }
 
 function finishUp()
 {
-  doc = inspector = computedView = null;
+  doc = win = stylePanel = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_computedview_bug_703643_context_menu_copy.js b/browser/devtools/styleinspector/test/browser_computedview_bug_703643_context_menu_copy.js
index 4b1046446c3a..4f7bad0a2410 100644
--- a/browser/devtools/styleinspector/test/browser_computedview_bug_703643_context_menu_copy.js
+++ b/browser/devtools/styleinspector/test/browser_computedview_bug_703643_context_menu_copy.js
@@ -5,8 +5,8 @@
 // Tests that the style inspector works properly
 
 let doc;
-let win;
-let computedView;
+let stylePanel;
+let cssHtmlTree;
 
 XPCOMUtils.defineLazyGetter(this, "osString", function() {
   return Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
@@ -32,42 +32,30 @@ function createDocument()
     '</div>';
   doc.title = "Computed view context menu test";
 
-  openInspector(selectNode)
-}
-
-function selectNode(aInspector)
-{
   let span = doc.querySelector("span");
   ok(span, "captain, we have the span");
 
-  aInspector.selection.setNode(span);
-
-  aInspector.sidebar.once("computedview-ready", function() {
-    aInspector.sidebar.select("computedview");
-
-    computedView = getComputedView(aInspector);
-    win = aInspector.sidebar.getWindowForTab("computedview");
-
-    Services.obs.addObserver(runStyleInspectorTests,
-      "StyleInspector-populated", false);
-  });
+  stylePanel = new ComputedViewPanel(window);
+  Services.obs.addObserver(runStyleInspectorTests, "StyleInspector-populated", false);
+  stylePanel.createPanel(span);
 }
 
-
 function runStyleInspectorTests()
 {
-  Services.obs.removeObserver(runStyleInspectorTests,
-    "StyleInspector-populated", false);
+  Services.obs.removeObserver(runStyleInspectorTests, "StyleInspector-populated", false);
 
-  let contentDocument = computedView.styleDocument;
+  cssHtmlTree = stylePanel.cssHtmlTree;
+
+  let contentDocument = stylePanel.iframe.contentDocument;
   let prop = contentDocument.querySelector(".property-view");
   ok(prop, "captain, we have the property-view node");
 
   // We need the context menu to open in the correct place in order for
   // popupNode to be propertly set.
-  contextMenuClick(prop);
+  EventUtils.synthesizeMouse(prop, 1, 1, { type: "contextmenu", button: 2 },
+    stylePanel.iframe.contentWindow);
 
-  checkCopyProperty();
+  checkCopyProperty()
 }
 
 function checkCopyProperty()
@@ -79,7 +67,7 @@ function checkCopyProperty()
   SimpleTest.waitForClipboard(function CS_boundCopyPropCheck() {
       return checkClipboardData(expectedPattern);
     },
-    computedView.siBoundCopyDeclaration,
+    cssHtmlTree.siBoundCopyDeclaration,
     checkCopyPropertyName, function() {
       failedClipboard(expectedPattern, checkCopyPropertyName);
     });
@@ -94,7 +82,7 @@ function checkCopyPropertyName()
   SimpleTest.waitForClipboard(function CS_boundCopyPropNameCheck() {
       return checkClipboardData(expectedPattern);
     },
-    computedView.siBoundCopyProperty,
+    cssHtmlTree.siBoundCopyProperty,
     checkCopyPropertyValue, function() {
       failedClipboard(expectedPattern, checkCopyPropertyValue);
     });
@@ -109,7 +97,7 @@ function checkCopyPropertyValue()
   SimpleTest.waitForClipboard(function CS_boundCopyPropValueCheck() {
       return checkClipboardData(expectedPattern);
     },
-    computedView.siBoundCopyPropertyValue,
+    cssHtmlTree.siBoundCopyPropertyValue,
     checkCopySelection, function() {
       failedClipboard(expectedPattern, checkCopySelection);
     });
@@ -117,14 +105,15 @@ function checkCopyPropertyValue()
 
 function checkCopySelection()
 {
-  let contentDocument = computedView.styleDocument;
+  let contentDocument = stylePanel.iframe.contentDocument;
+  let contentWindow = stylePanel.iframe.contentWindow;
   let props = contentDocument.querySelectorAll(".property-view");
   ok(props, "captain, we have the property-view nodes");
 
   let range = document.createRange();
   range.setStart(props[0], 0);
   range.setEnd(props[3], 4);
-  win.getSelection().addRange(range);
+  contentWindow.getSelection().addRange(range);
 
   info("Checking that cssHtmlTree.siBoundCopy() " +
        " returns the correct clipboard value");
@@ -137,7 +126,7 @@ function checkCopySelection()
   SimpleTest.waitForClipboard(function CS_boundCopyCheck() {
       return checkClipboardData(expectedPattern);
     },
-    computedView.siBoundCopy, closeStyleInspector, function() {
+    cssHtmlTree.siBoundCopy, closeStyleInspector, function() {
       failedClipboard(expectedPattern, closeStyleInspector);
     });
 }
@@ -173,12 +162,13 @@ function failedClipboard(aExpectedPattern, aCallback)
 
 function closeStyleInspector()
 {
+  stylePanel.destroy();
   finishUp();
 }
 
 function finishUp()
 {
-  computedView = doc = win = null;
+  doc = stylePanel = cssHtmlTree = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.js b/browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.js
index 86e36378bc38..0d933c700e0f 100644
--- a/browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.js
+++ b/browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.js
@@ -5,8 +5,6 @@
 let win;
 let doc;
 let contentWindow;
-let inspector;
-let toolbox;
 
 let tempScope = {};
 Cu.import("resource://gre/modules/Services.jsm", tempScope);
@@ -33,27 +31,41 @@ function createDocument()
     '</div>';
   doc.title = "Rule view style editor link test";
 
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  toolbox = gDevTools.openToolboxForTab(target, "inspector");
-  toolbox.once("inspector-selected", function SE_selected(id, aInspector) {
-    inspector = aInspector;
-    inspector.sidebar.select("ruleview");
-    highlightNode();
-  });
+  openInspector();
 }
 
-function highlightNode()
+function openInspector()
 {
+  ok(window.InspectorUI, "InspectorUI variable exists");
+  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
+  ok(InspectorUI.store.isEmpty(), "Inspector.store is empty");
+
+  Services.obs.addObserver(inspectorUIOpen,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.openInspectorUI();
+}
+
+function inspectorUIOpen()
+{
+  Services.obs.removeObserver(inspectorUIOpen,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  // Make sure the inspector is open.
+  ok(InspectorUI.inspecting, "Inspector is highlighting");
+  ok(!InspectorUI.isSidebarOpen, "Inspector Sidebar is not open");
+  ok(!InspectorUI.store.isEmpty(), "InspectorUI.store is not empty");
+  is(InspectorUI.store.length, 1, "Inspector.store.length = 1");
+
   // Highlight a node.
   let div = content.document.getElementsByTagName("div")[0];
+  InspectorUI.inspectNode(div);
+  InspectorUI.stopInspecting();
+  is(InspectorUI.selection, div, "selection matches the div element");
 
-  inspector.selection.once("new-node", function() {
-    is(inspector.selection.node, div, "selection matches the div element");
-    testInlineStyle();
-  });
-  executeSoon(function() {
-    inspector.selection.setNode(div);
-  });
+  InspectorUI.currentInspector.once("sidebaractivated-ruleview", testInlineStyle);
+
+  InspectorUI.sidebar.show();
+  InspectorUI.sidebar.activatePanel("ruleview");
 }
 
 function testInlineStyle()
@@ -76,10 +88,7 @@ function testInlineStyle()
         testInlineStyleSheet();
       });
     });
-
-    let link = getLinkByIndex(0);
-    link.scrollIntoView();
-    link.click();
+    EventUtils.synthesizeMouseAtCenter(getLinkByIndex(0), { }, contentWindow);
   });
 }
 
@@ -87,18 +96,41 @@ function testInlineStyleSheet()
 {
   info("clicking an inline stylesheet");
 
-  toolbox.once("styleeditor-ready", function(id, aToolbox) {
-    aToolbox.panelWindow.styleEditorChrome.addChromeListener({
-      onEditorAdded: validateStyleEditorSheet
+  Services.ww.registerNotification(function onWindow(aSubject, aTopic) {
+    if (aTopic != "domwindowopened") {
+      return;
+    }
+
+    win = aSubject.QueryInterface(Ci.nsIDOMWindow);
+    win.addEventListener("load", function windowLoad() {
+      win.removeEventListener("load", windowLoad);
+
+      let windowType = win.document.documentElement.getAttribute("windowtype");
+      is(windowType, "Tools:StyleEditor", "style editor window is open");
+
+      win.styleEditorChrome.addChromeListener({
+        onEditorAdded: function checkEditor(aChrome, aEditor) {
+          if (!aEditor.sourceEditor) {
+            aEditor.addActionListener({
+              onAttach: function (aEditor) {
+                aEditor.removeActionListener(this);
+                validateStyleEditorSheet(aEditor);
+              }
+            });
+          } else {
+            validateStyleEditorSheet(aEditor);
+          }
+        }
+      });
+
+      Services.ww.unregisterNotification(onWindow);
     });
   });
 
-  let link = getLinkByIndex(1);
-  link.scrollIntoView();
-  link.click();
+  EventUtils.synthesizeMouse(getLinkByIndex(1), 5, 5, { }, contentWindow);
 }
 
-function validateStyleEditorSheet(aChrome, aEditor)
+function validateStyleEditorSheet(aEditor)
 {
   info("validating style editor stylesheet");
 
@@ -120,8 +152,10 @@ function getLinkByIndex(aIndex)
 
 function finishup()
 {
+  InspectorUI.sidebar.hide();
+  InspectorUI.closeInspectorUI();
   gBrowser.removeCurrentTab();
-  contentWindow = doc = inspector = toolbox = win = null;
+  doc = contentWindow = win = null;
   finish();
 }
 
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_bug_703643_context_menu_copy.js b/browser/devtools/styleinspector/test/browser_ruleview_bug_703643_context_menu_copy.js
index 62060b704a0a..0183314d1db2 100644
--- a/browser/devtools/styleinspector/test/browser_ruleview_bug_703643_context_menu_copy.js
+++ b/browser/devtools/styleinspector/test/browser_ruleview_bug_703643_context_menu_copy.js
@@ -6,13 +6,16 @@ let doc;
 let tempScope = {};
 Cu.import("resource:///modules/devtools/CssRuleView.jsm", tempScope);
 let inplaceEditor = tempScope._getInplaceEditorForSpan;
-let inspector;
-let win;
 
 XPCOMUtils.defineLazyGetter(this, "osString", function() {
   return Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
 });
 
+function ruleViewFrame()
+{
+  return InspectorUI.sidebar._tools["ruleview"].frame;
+}
+
 function createDocument()
 {
   doc.body.innerHTML = '<style type="text/css"> ' +
@@ -34,28 +37,40 @@ function createDocument()
     '</div>';
   doc.title = "Rule view context menu test";
 
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  let toolbox = gDevTools.openToolboxForTab(target, "inspector");
-  toolbox.once("inspector-selected", function SE_selected(id, aInspector) {
-    inspector = aInspector;
-    inspector.sidebar.select("ruleview");
-    win = inspector.sidebar.getWindowForTab("ruleview");
-    highlightNode();
-  });
+  openInspector();
 }
 
-function highlightNode()
+function openInspector()
 {
+  ok(window.InspectorUI, "InspectorUI variable exists");
+  ok(!InspectorUI.inspecting, "Inspector is not highlighting");
+  ok(InspectorUI.store.isEmpty(), "Inspector.store is empty");
+
+  Services.obs.addObserver(inspectorUIOpen,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.openInspectorUI();
+}
+
+function inspectorUIOpen()
+{
+  Services.obs.removeObserver(inspectorUIOpen,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+
+  // Make sure the inspector is open.
+  ok(InspectorUI.inspecting, "Inspector is highlighting");
+  ok(!InspectorUI.isSidebarOpen, "Inspector Sidebar is not open");
+  ok(!InspectorUI.store.isEmpty(), "InspectorUI.store is not empty");
+  is(InspectorUI.store.length, 1, "Inspector.store.length = 1");
+
   // Highlight a node.
   let div = content.document.getElementsByTagName("div")[0];
+  InspectorUI.inspectNode(div);
+  InspectorUI.stopInspecting();
+  is(InspectorUI.selection, div, "selection matches the div element");
 
-  inspector.selection.once("new-node", function() {
-    is(inspector.selection.node, div, "selection matches the div element");
-    testClip();
-  });
-  executeSoon(function() {
-    inspector.selection.setNode(div);
-  });
+  InspectorUI.currentInspector.once("sidebaractivated-ruleview", testClip)
+  InspectorUI.sidebar.show();
+  InspectorUI.sidebar.activatePanel("ruleview");
 }
 
 function testClip()
@@ -80,7 +95,7 @@ function testClip()
 }
 
 function checkCopyRule() {
-  let contentDoc = win.document;
+  let contentDoc = ruleViewFrame().contentDocument;
   let props = contentDoc.querySelectorAll(".ruleview-property");
 
   is(props.length, 5, "checking property length");
@@ -94,7 +109,8 @@ function checkCopyRule() {
 
   // We need the context menu to open in the correct place in order for
   // popupNode to be propertly set.
-  contextMenuClick(prop);
+  EventUtils.synthesizeMouse(prop, 1, 1, { type: "contextmenu", button: 2 },
+    ruleViewFrame().contentWindow);
 
   ruleView()._boundCopyRule();
   let menu = contentDoc.querySelector("#rule-view-context-menu");
@@ -104,7 +120,7 @@ function checkCopyRule() {
 
 function checkCopyProperty()
 {
-  let contentDoc = win.document;
+  let contentDoc = ruleViewFrame().contentDocument;
   let props = contentDoc.querySelectorAll(".ruleview-property");
   let prop = props[2];
 
@@ -114,7 +130,8 @@ function checkCopyProperty()
 
   // We need the context menu to open in the correct place in order for
   // popupNode to be propertly set.
-  contextMenuClick(prop);
+  EventUtils.synthesizeMouse(prop, 1, 1, { type: "contextmenu", button: 2 },
+    ruleViewFrame().contentWindow);
 
   SimpleTest.waitForClipboard(function IUI_boundCopyPropCheck() {
     return checkClipboardData(expectedPattern);
@@ -157,7 +174,7 @@ function checkCopyPropertyValue()
 
 function checkCopySelection()
 {
-  let contentDoc = win.document;
+  let contentDoc = ruleViewFrame().contentDocument;
   let props = contentDoc.querySelectorAll(".ruleview-property");
   let values = contentDoc.querySelectorAll(".ruleview-propertycontainer");
 
@@ -165,7 +182,7 @@ function checkCopySelection()
   range.setStart(props[0], 0);
   range.setEnd(values[4], 2);
 
-  let selection = win.getSelection();
+  let selection = ruleViewFrame().contentWindow.getSelection();
   selection.addRange(range);
 
   info("Checking that _boundCopy() returns the correct " +
@@ -206,7 +223,7 @@ function testSimpleCopy()
 }
 
 function checkSimpleCopy() {
-  let contentDoc = win.document;
+  let contentDoc = ruleViewFrame().contentDocument;
   let props = contentDoc.querySelectorAll(".ruleview-code");
 
   is(props.length, 2, "checking property length");
@@ -217,7 +234,8 @@ function checkSimpleCopy() {
 
   // We need the context menu to open in the correct place in order for
   // popupNode to be propertly set.
-  contextMenuClick(prop);
+  EventUtils.synthesizeMouse(prop, 1, 1, { type: "contextmenu", button: 2 },
+    ruleViewFrame().contentWindow);
 
   ruleView()._boundCopy();
   let menu = contentDoc.querySelector("#rule-view-context-menu");
@@ -265,8 +283,10 @@ function failedClipboard(aExpectedPattern, aCallback)
 
 function finishup()
 {
+  InspectorUI.sidebar.hide();
+  InspectorUI.closeInspectorUI();
   gBrowser.removeCurrentTab();
-  doc = inspector = null;
+  doc = null;
   finish();
 }
 
diff --git a/browser/devtools/styleinspector/test/browser_ruleview_focus.js b/browser/devtools/styleinspector/test/browser_ruleview_focus.js
index d9f49f57c2cc..10f38c31bf43 100644
--- a/browser/devtools/styleinspector/test/browser_ruleview_focus.js
+++ b/browser/devtools/styleinspector/test/browser_ruleview_focus.js
@@ -9,31 +9,39 @@ let tempScope = {};
 Cu.import("resource:///modules/devtools/CssRuleView.jsm", tempScope);
 let inplaceEditor = tempScope._getInplaceEditorForSpan;
 let doc;
-let inspector;
 let stylePanel;
 
+function waitForRuleView(aCallback)
+{
+  InspectorUI.currentInspector.once("sidebaractivated-ruleview", aCallback);
+}
+
 function openRuleView()
 {
-  var target = TargetFactory.forTab(gBrowser.selectedTab);
-  let toolbox = gDevTools.openToolboxForTab(target, "inspector");
-  toolbox.once("inspector-selected", function SE_selected(id, aInspector) {
-    inspector = aInspector;
-    inspector.sidebar.select("ruleview");
+  Services.obs.addObserver(function onOpened() {
+    Services.obs.removeObserver(onOpened,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
 
     // Highlight a node.
     let node = content.document.getElementsByTagName("h1")[0];
-    inspector.selection.once("new-node", testFocus);
-    executeSoon(function() {
-      inspector.selection.setNode(doc.body);
-    });
-  });
+    InspectorUI.inspectNode(node);
+    InspectorUI.stopInspecting();
+
+    // Open the rule view sidebar.
+    waitForRuleView(testFocus);
+
+    InspectorUI.sidebar.show();
+    InspectorUI.sidebar.activatePanel("ruleview");
+
+    testFocus();
+  }, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.openInspectorUI();
 }
 
 function testFocus()
 {
-  let win = inspector.sidebar.getWindowForTab("ruleview");
-  let brace = win.document.querySelectorAll(".ruleview-ruleclose")[0];
-
+  let ruleViewFrame = InspectorUI.sidebar._tools["ruleview"].frame;
+  let brace = ruleViewFrame.contentDocument.querySelectorAll(".ruleview-ruleclose")[0];
   waitForEditorFocus(brace.parentNode, function onNewElement(aEditor) {
     aEditor.input.value = "color";
     waitForEditorFocus(brace.parentNode, function onEditingValue(aEditor) {
@@ -57,7 +65,9 @@ function testFocus()
 
 function finishUp()
 {
-  doc = inspector = stylePanel = null;
+  InspectorUI.sidebar.hide();
+  InspectorUI.closeInspectorUI();
+  doc = stylePanel = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector.js b/browser/devtools/styleinspector/test/browser_styleinspector.js
index ea8e01203ee4..c397b2f20978 100644
--- a/browser/devtools/styleinspector/test/browser_styleinspector.js
+++ b/browser/devtools/styleinspector/test/browser_styleinspector.js
@@ -5,8 +5,7 @@
 // Tests that the style inspector works properly
 
 let doc;
-let inspector;
-let computedView;
+let stylePanel;
 
 function createDocument()
 {
@@ -27,20 +26,8 @@ function createDocument()
     '<p>Inspect using inspectstyle(document.querySelectorAll("span")[0])</p>' +
     '</div>';
   doc.title = "Style Inspector Test";
-
-  openInspector(openComputedView);
-}
-
-function openComputedView(aInspector)
-{
-  inspector = aInspector;
-
-  inspector.sidebar.once("computedview-ready", function() {
-    computedView = getComputedView(inspector);
-
-    inspector.sidebar.select("computedview");
-    runStyleInspectorTests();
-  });
+  stylePanel = new ComputedViewPanel(window);
+  stylePanel.createPanel(doc.body, runStyleInspectorTests);
 }
 
 function runStyleInspectorTests()
@@ -48,22 +35,25 @@ function runStyleInspectorTests()
   var spans = doc.querySelectorAll("span");
   ok(spans, "captain, we have the spans");
 
-  for (var i = 0, numSpans = spans.length; i < numSpans; i++) {
-    inspector.selection.setNode(spans[i]);
+  let htmlTree = stylePanel.cssHtmlTree;
 
-    is(spans[i], computedView.viewedElement,
+  for (var i = 0, numSpans = spans.length; i < numSpans; i++) {
+    stylePanel.selectNode(spans[i]);
+
+    is(spans[i], htmlTree.viewedElement,
       "style inspector node matches the selected node");
-    is(computedView.viewedElement, computedView.cssLogic.viewedElement,
+    is(htmlTree.viewedElement, stylePanel.cssLogic.viewedElement,
        "cssLogic node matches the cssHtmlTree node");
   }
 
   SI_CheckProperty();
+  stylePanel.destroy();
   finishUp();
 }
 
 function SI_CheckProperty()
 {
-  let cssLogic = computedView.cssLogic;
+  let cssLogic = stylePanel.cssLogic;
   let propertyInfo = cssLogic.getPropertyInfo("color");
   ok(propertyInfo.matchedRuleCount > 0, "color property has matching rules");
   //ok(propertyInfo.unmatchedRuleCount > 0, "color property has unmatched rules");
@@ -71,7 +61,7 @@ function SI_CheckProperty()
 
 function finishUp()
 {
-  doc = computedView = null;
+  doc = stylePanel = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js b/browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js
index a7c48a0befa6..b73769233378 100644
--- a/browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js
+++ b/browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js
@@ -5,8 +5,7 @@
 // Tests that the search filter works properly.
 
 let doc;
-let inspector;
-let computedView;
+let stylePanel;
 
 function createDocument()
 {
@@ -15,20 +14,9 @@ function createDocument()
     '<span id="matches" class="matches">Some styled text</span>' +
     '</div>';
   doc.title = "Style Inspector Search Filter Test";
-
-  openInspector(openComputedView);
-}
-
-function openComputedView(aInspector)
-{
-  inspector = aInspector;
-
-  inspector.sidebar.once("computedview-ready", function() {
-    inspector.sidebar.select("computedview");
-    computedView = getComputedView(inspector);
-
-    runStyleInspectorTests();
-  });
+  // ok(StyleInspector.isEnabled, "style inspector preference is enabled");
+  stylePanel = new ComputedViewPanel(window);
+  stylePanel.createPanel(doc.body, runStyleInspectorTests);
 }
 
 function runStyleInspectorTests()
@@ -42,11 +30,12 @@ function SI_inspectNode()
   var span = doc.querySelector("#matches");
   ok(span, "captain, we have the matches span");
 
-  inspector.selection.setNode(span);
+  let htmlTree = stylePanel.cssHtmlTree;
+  stylePanel.selectNode(span);
 
-  is(span, computedView.viewedElement,
+  is(span, htmlTree.viewedElement,
     "style inspector node matches the selected node");
-  is(computedView.viewedElement, computedView.cssLogic.viewedElement,
+  is(htmlTree.viewedElement, stylePanel.cssLogic.viewedElement,
      "cssLogic node matches the cssHtmlTree node");
 }
 
@@ -56,34 +45,32 @@ function SI_toggleDefaultStyles()
 
   info("clearing \"only user styles\" checkbox");
 
-  let doc = computedView.styleDocument;
-  let checkbox = doc.querySelector(".onlyuserstyles");
+  let iframe = stylePanel.iframe;
+  let checkbox = iframe.contentDocument.querySelector(".onlyuserstyles");
   Services.obs.addObserver(SI_AddFilterText, "StyleInspector-populated", false);
-  checkbox.click();
+  EventUtils.synthesizeMouse(checkbox, 5, 5, {}, iframe.contentWindow);
 }
 
 function SI_AddFilterText()
 {
   Services.obs.removeObserver(SI_AddFilterText, "StyleInspector-populated", false);
 
-  let doc = computedView.styleDocument;
-  let searchbar = doc.querySelector(".searchfield");
+  let iframe = stylePanel.iframe;
+  let searchbar = iframe.contentDocument.querySelector(".searchfield");
   Services.obs.addObserver(SI_checkFilter, "StyleInspector-populated", false);
   info("setting filter text to \"color\"");
   searchbar.focus();
-
-  let win =computedView.styleWindow;
-  EventUtils.synthesizeKey("c", {}, win);
-  EventUtils.synthesizeKey("o", {}, win);
-  EventUtils.synthesizeKey("l", {}, win);
-  EventUtils.synthesizeKey("o", {}, win);
-  EventUtils.synthesizeKey("r", {}, win);
+  EventUtils.synthesizeKey("c", {}, iframe.contentWindow);
+  EventUtils.synthesizeKey("o", {}, iframe.contentWindow);
+  EventUtils.synthesizeKey("l", {}, iframe.contentWindow);
+  EventUtils.synthesizeKey("o", {}, iframe.contentWindow);
+  EventUtils.synthesizeKey("r", {}, iframe.contentWindow);
 }
 
 function SI_checkFilter()
 {
   Services.obs.removeObserver(SI_checkFilter, "StyleInspector-populated", false);
-  let propertyViews = computedView.propertyViews;
+  let propertyViews = stylePanel.cssHtmlTree.propertyViews;
 
   info("check that the correct properties are visible");
   propertyViews.forEach(function(propView) {
@@ -92,12 +79,13 @@ function SI_checkFilter()
       "span " + name + " property visibility check");
   });
 
+  stylePanel.destroy();
   finishUp();
 }
 
 function finishUp()
 {
-  doc = inspector = computedView = null;
+  doc = stylePanel = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js b/browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js
index 059134f19f07..c9a9913f3943 100644
--- a/browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js
+++ b/browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js
@@ -5,8 +5,7 @@
 // Tests that the checkbox to show only user styles works properly.
 
 let doc;
-let inspector;
-let computedView;
+let stylePanel;
 
 function createDocument()
 {
@@ -15,20 +14,9 @@ function createDocument()
     '<span id="matches" class="matches">Some styled text</span>' +
     '</div>';
   doc.title = "Style Inspector Default Styles Test";
-
-  openInspector(openComputedView);
-}
-
-function openComputedView(aInspector)
-{
-  inspector = aInspector;
-
-  inspector.sidebar.once("computedview-ready", function() {
-    inspector.sidebar.select("computedview");
-    computedView = getComputedView(inspector);
-
-    runStyleInspectorTests();
-  });
+  // ok(StyleInspector.isEnabled, "style inspector preference is enabled");
+  stylePanel = new ComputedViewPanel(window);
+  stylePanel.createPanel(doc.body, runStyleInspectorTests);
 }
 
 function runStyleInspectorTests()
@@ -42,11 +30,12 @@ function SI_inspectNode()
   let span = doc.querySelector("#matches");
   ok(span, "captain, we have the matches span");
 
-  inspector.selection.setNode(span);
+  let htmlTree = stylePanel.cssHtmlTree;
+  stylePanel.selectNode(span);
 
-  is(span, computedView.viewedElement,
+  is(span, htmlTree.viewedElement,
     "style inspector node matches the selected node");
-  is(computedView.viewedElement, computedView.cssLogic.viewedElement,
+  is(htmlTree.viewedElement, stylePanel.cssLogic.viewedElement,
      "cssLogic node matches the cssHtmlTree node");
 }
 
@@ -64,11 +53,10 @@ function SI_check()
 function SI_toggleDefaultStyles()
 {
   // Click on the checkbox.
-  let doc = computedView.styleDocument;
-  let checkbox = doc.querySelector(".onlyuserstyles");
+  let iframe = stylePanel.iframe;
+  let checkbox = iframe.contentDocument.querySelector(".onlyuserstyles");
   Services.obs.addObserver(SI_checkDefaultStyles, "StyleInspector-populated", false);
-
-  checkbox.click();
+  EventUtils.synthesizeMouse(checkbox, 5, 5, {}, iframe.contentWindow);
 }
 
 function SI_checkDefaultStyles()
@@ -80,13 +68,14 @@ function SI_checkDefaultStyles()
   is(propertyVisible("background-color"), true,
       "span background-color property is visible");
 
+  stylePanel.destroy();
   finishUp();
 }
 
 function propertyVisible(aName)
 {
   info("Checking property visibility for " + aName);
-  let propertyViews = computedView.propertyViews;
+  let propertyViews = stylePanel.cssHtmlTree.propertyViews;
   for each (let propView in propertyViews) {
     if (propView.name == aName) {
       return propView.visible;
@@ -97,7 +86,7 @@ function propertyVisible(aName)
 
 function finishUp()
 {
-  doc = inspector = computedView = null;
+  doc = stylePanel = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js b/browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js
index 047bebf8f8e9..b16871fa4f76 100644
--- a/browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js
+++ b/browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js
@@ -5,8 +5,7 @@
 // Tests that the no results placeholder works properly.
 
 let doc;
-let inspector;
-let computedView;
+let stylePanel;
 
 function createDocument()
 {
@@ -14,23 +13,10 @@ function createDocument()
     '.matches {color: #F00;}</style>' +
     '<span id="matches" class="matches">Some styled text</span>';
   doc.title = "Tests that the no results placeholder works properly";
-
-  openInspector(openComputedView);
+  stylePanel = new ComputedViewPanel(window);
+  stylePanel.createPanel(doc.body, runStyleInspectorTests);
 }
 
-function openComputedView(aInspector)
-{
-  inspector = aInspector;
-
-  inspector.sidebar.once("computedview-ready", function() {
-    inspector.sidebar.select("computedview");
-    computedView = getComputedView(inspector);
-
-    runStyleInspectorTests();
-  });
-}
-
-
 function runStyleInspectorTests()
 {
   Services.obs.addObserver(SI_AddFilterText, "StyleInspector-populated", false);
@@ -38,11 +24,12 @@ function runStyleInspectorTests()
   let span = doc.querySelector("#matches");
   ok(span, "captain, we have the matches span");
 
-  inspector.selection.setNode(span);
+  let htmlTree = stylePanel.cssHtmlTree;
+  stylePanel.selectNode(span);
 
-  is(span, computedView.viewedElement,
+  is(span, htmlTree.viewedElement,
     "style inspector node matches the selected node");
-  is(computedView.viewedElement, computedView.cssLogic.viewedElement,
+  is(htmlTree.viewedElement, stylePanel.cssLogic.viewedElement,
      "cssLogic node matches the cssHtmlTree node");
 }
 
@@ -50,14 +37,15 @@ function SI_AddFilterText()
 {
   Services.obs.removeObserver(SI_AddFilterText, "StyleInspector-populated", false);
 
-  let searchbar = computedView.searchField;
+  let iframe = stylePanel.iframe;
+  let searchbar = stylePanel.cssHtmlTree.searchField;
   let searchTerm = "xxxxx";
 
   Services.obs.addObserver(SI_checkPlaceholderVisible, "StyleInspector-populated", false);
   info("setting filter text to \"" + searchTerm + "\"");
   searchbar.focus();
   for each (let c in searchTerm) {
-    EventUtils.synthesizeKey(c, {}, computedView.styleWindow);
+    EventUtils.synthesizeKey(c, {}, iframe.contentWindow);
   }
 }
 
@@ -65,9 +53,9 @@ function SI_checkPlaceholderVisible()
 {
   Services.obs.removeObserver(SI_checkPlaceholderVisible, "StyleInspector-populated", false);
   info("SI_checkPlaceholderVisible called");
-  let placeholder = computedView.noResults;
-  let win = computedView.styleWindow;
-  let display = win.getComputedStyle(placeholder).display;
+  let placeholder = stylePanel.cssHtmlTree.noResults;
+  let iframe = stylePanel.iframe;
+  let display = iframe.contentWindow.getComputedStyle(placeholder).display;
 
   is(display, "block", "placeholder is visible");
 
@@ -76,30 +64,32 @@ function SI_checkPlaceholderVisible()
 
 function SI_ClearFilterText()
 {
-  let searchbar = computedView.searchField;
+  let iframe = stylePanel.iframe;
+  let searchbar = stylePanel.cssHtmlTree.searchField;
 
   Services.obs.addObserver(SI_checkPlaceholderHidden, "StyleInspector-populated", false);
   info("clearing filter text");
   searchbar.focus();
   searchbar.value = "";
-  EventUtils.synthesizeKey("c", {}, computedView.styleWindow);
+  EventUtils.synthesizeKey("c", {}, iframe.contentWindow);
 }
 
 function SI_checkPlaceholderHidden()
 {
   Services.obs.removeObserver(SI_checkPlaceholderHidden, "StyleInspector-populated", false);
-  let placeholder = computedView.noResults;
-  let win = computedView.styleWindow;
-  let display = win.getComputedStyle(placeholder).display;
+  let placeholder = stylePanel.cssHtmlTree.noResults;
+  let iframe = stylePanel.iframe;
+  let display = iframe.contentWindow.getComputedStyle(placeholder).display;
 
   is(display, "none", "placeholder is hidden");
 
+  stylePanel.destroy();
   finishUp();
 }
 
 function finishUp()
 {
-  doc = inspector = computedView = null;
+  doc = stylePanel = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/devtools/styleinspector/test/head.js b/browser/devtools/styleinspector/test/head.js
index 7c2ee991d621..cf2827811be8 100644
--- a/browser/devtools/styleinspector/test/head.js
+++ b/browser/devtools/styleinspector/test/head.js
@@ -6,36 +6,122 @@
 let tempScope = {};
 Cu.import("resource:///modules/devtools/CssLogic.jsm", tempScope);
 Cu.import("resource:///modules/devtools/CssHtmlTree.jsm", tempScope);
-Cu.import("resource:///modules/devtools/gDevTools.jsm", tempScope);
+Cu.import("resource:///modules/HUDService.jsm", tempScope);
+let HUDService = tempScope.HUDService;
 let ConsoleUtils = tempScope.ConsoleUtils;
 let CssLogic = tempScope.CssLogic;
 let CssHtmlTree = tempScope.CssHtmlTree;
-let gDevTools = tempScope.gDevTools;
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
 
-let browser, hudId, hud, hudBox, filterBox, outputNode, cs;
+function log(aMsg)
+{
+  dump("*** WebConsoleTest: " + aMsg + "\n");
+}
+
+function pprint(aObj)
+{
+  for (let prop in aObj) {
+    if (typeof aObj[prop] == "function") {
+      log("function " + prop);
+    }
+    else {
+      log(prop + ": " + aObj[prop]);
+    }
+  }
+}
+
+let tab, browser, hudId, hud, hudBox, filterBox, outputNode, cs;
 
 function addTab(aURL)
 {
   gBrowser.selectedTab = gBrowser.addTab();
   content.location = aURL;
-  browser = gBrowser.getBrowserForTab(gBrowser.selectedTab);
+  tab = gBrowser.selectedTab;
+  browser = gBrowser.getBrowserForTab(tab);
 }
 
-function openInspector(callback)
-{
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  let inspector = gDevTools.getPanelForTarget("inspector", target);
-  if (inspector && inspector.isReady) {
-    callback(inspector);
-  } else {
-    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
-    toolbox.once("inspector-ready", function(event, panel) {
-      let inspector = gDevTools.getPanelForTarget("inspector", target);
-      callback(inspector);
-    });
+function afterAllTabsLoaded(callback, win) {
+  win = win || window;
+
+  let stillToLoad = 0;
+
+  function onLoad() {
+    this.removeEventListener("load", onLoad, true);
+    stillToLoad--;
+    if (!stillToLoad)
+      callback();
   }
+
+  for (let a = 0; a < win.gBrowser.tabs.length; a++) {
+    let browser = win.gBrowser.tabs[a].linkedBrowser;
+    if (browser.contentDocument.readyState != "complete") {
+      stillToLoad++;
+      browser.addEventListener("load", onLoad, true);
+    }
+  }
+
+  if (!stillToLoad)
+    callback();
+}
+
+/**
+ * Check if a log entry exists in the HUD output node.
+ *
+ * @param {Element} aOutputNode
+ *        the HUD output node.
+ * @param {string} aMatchString
+ *        the string you want to check if it exists in the output node.
+ * @param {string} aMsg
+ *        the message describing the test
+ * @param {boolean} [aOnlyVisible=false]
+ *        find only messages that are visible, not hidden by the filter.
+ * @param {boolean} [aFailIfFound=false]
+ *        fail the test if the string is found in the output node.
+ * @param {string} aClass [optional]
+ *        find only messages with the given CSS class.
+ */
+function testLogEntry(aOutputNode, aMatchString, aMsg, aOnlyVisible,
+                      aFailIfFound, aClass)
+{
+  let selector = ".hud-msg-node";
+  // Skip entries that are hidden by the filter.
+  if (aOnlyVisible) {
+    selector += ":not(.hud-filtered-by-type)";
+  }
+  if (aClass) {
+    selector += "." + aClass;
+  }
+
+  let msgs = aOutputNode.querySelectorAll(selector);
+  let found = false;
+  for (let i = 0, n = msgs.length; i < n; i++) {
+    let message = msgs[i].textContent.indexOf(aMatchString);
+    if (message > -1) {
+      found = true;
+      break;
+    }
+
+    // Search the labels too.
+    let labels = msgs[i].querySelectorAll("label");
+    for (let j = 0; j < labels.length; j++) {
+      if (labels[j].getAttribute("value").indexOf(aMatchString) > -1) {
+        found = true;
+        break;
+      }
+    }
+  }
+
+  is(found, !aFailIfFound, aMsg);
+}
+
+/**
+ * A convenience method to call testLogEntry().
+ *
+ * @param string aString
+ *        The string to find.
+ */
+function findLogEntry(aString)
+{
+  testLogEntry(outputNode, aString, "found " + aString);
 }
 
 function addStyle(aDocument, aString)
@@ -47,6 +133,16 @@ function addStyle(aDocument, aString)
   return node;
 }
 
+function openConsole()
+{
+  HUDService.activateHUDForContext(tab);
+}
+
+function closeConsole()
+{
+  HUDService.deactivateHUDForContext(tab);
+}
+
 function finishTest()
 {
   finish();
@@ -55,25 +151,158 @@ function finishTest()
 function tearDown()
 {
   try {
-    let target = TargetFactory.forTab(gBrowser.selectedTab);
-    gDevTools.closeToolbox(target);
+    HUDService.deactivateHUDForContext(gBrowser.selectedTab);
   }
   catch (ex) {
-    dump(ex);
+    log(ex);
   }
   while (gBrowser.tabs.length > 1) {
     gBrowser.removeCurrentTab();
   }
-  browser = hudId = hud = filterBox = outputNode = cs = null;
+  tab = browser = hudId = hud = filterBox = outputNode = cs = null;
 }
 
-function getComputedView(inspector) {
-  return inspector.sidebar.getWindowForTab("computedview").computedview.view;
+/**
+ * Shows the computed view in its own panel.
+ */
+function ComputedViewPanel(aContext)
+{
+  this._init(aContext);
 }
 
+ComputedViewPanel.prototype = {
+  _init: function CVP_init(aContext)
+  {
+    this.window = aContext;
+    this.document = this.window.document;
+    this.cssLogic = new CssLogic();
+    this.panelReady = false;
+    this.iframeReady = false;
+  },
+
+  /**
+   * Factory method to create the actual style panel
+   * @param {function} aCallback (optional) callback to fire when ready.
+   */
+  createPanel: function SI_createPanel(aSelection, aCallback)
+  {
+    let popupSet = this.document.getElementById("mainPopupSet");
+    let panel = this.document.createElement("panel");
+
+    panel.setAttribute("class", "styleInspector");
+    panel.setAttribute("orient", "vertical");
+    panel.setAttribute("ignorekeys", "true");
+    panel.setAttribute("noautofocus", "true");
+    panel.setAttribute("noautohide", "true");
+    panel.setAttribute("titlebar", "normal");
+    panel.setAttribute("close", "true");
+    panel.setAttribute("label", "Computed View");
+    panel.setAttribute("width", 350);
+    panel.setAttribute("height", this.window.screen.height / 2);
+
+    this._openCallback = aCallback;
+    this.selectedNode = aSelection;
+
+    let iframe = this.document.createElement("iframe");
+    let boundIframeOnLoad = function loadedInitializeIframe()
+    {
+      this.iframeReady = true;
+      this.iframe.removeEventListener("load", boundIframeOnLoad, true);
+      this.panel.openPopup(this.window.gBrowser.selectedBrowser, "end_before", 0, 0, false, false);
+    }.bind(this);
+
+    iframe.flex = 1;
+    iframe.setAttribute("tooltip", "aHTMLTooltip");
+    iframe.addEventListener("load", boundIframeOnLoad, true);
+    iframe.setAttribute("src", "chrome://browser/content/devtools/csshtmltree.xul");
+
+    panel.appendChild(iframe);
+    popupSet.appendChild(panel);
+
+    this._boundPopupShown = this.popupShown.bind(this);
+    panel.addEventListener("popupshown", this._boundPopupShown, false);
+
+    this.panel = panel;
+    this.iframe = iframe;
+
+    return panel;
+  },
+
+  /**
+   * Event handler for the popupshown event.
+   */
+  popupShown: function SI_popupShown()
+  {
+    this.panelReady = true;
+    this.cssHtmlTree = new CssHtmlTree(this);
+    let selectedNode = this.selectedNode || null;
+    this.cssLogic.highlight(selectedNode);
+    this.cssHtmlTree.highlight(selectedNode);
+    if (this._openCallback) {
+      this._openCallback();
+      delete this._openCallback;
+    }
+  },
+
+  isLoaded: function SI_isLoaded()
+  {
+    return this.iframeReady && this.panelReady;
+  },
+
+  /**
+   * Select from Path (via CssHtmlTree_pathClick)
+   * @param aNode The node to inspect.
+   */
+  selectFromPath: function SI_selectFromPath(aNode)
+  {
+    this.selectNode(aNode);
+  },
+
+  /**
+   * Select a node to inspect in the Style Inspector panel
+   * @param aNode The node to inspect.
+   */
+  selectNode: function SI_selectNode(aNode)
+  {
+    this.selectedNode = aNode;
+
+    if (this.isLoaded()) {
+      this.cssLogic.highlight(aNode);
+      this.cssHtmlTree.highlight(aNode);
+    }
+  },
+
+  /**
+   * Destroy the style panel, remove listeners etc.
+   */
+  destroy: function SI_destroy()
+  {
+    this.panel.hidePopup();
+
+    if (this.cssHtmlTree) {
+      this.cssHtmlTree.destroy();
+      delete this.cssHtmlTree;
+    }
+
+    if (this.iframe) {
+      this.iframe.parentNode.removeChild(this.iframe);
+      delete this.iframe;
+    }
+
+    delete this.cssLogic;
+    this.panel.removeEventListener("popupshown", this._boundPopupShown, false);
+    delete this._boundPopupShown;
+    this.panel.parentNode.removeChild(this.panel);
+    delete this.panel;
+    delete this.doc;
+    delete this.win;
+    delete CssHtmlTree.win;
+  },
+};
+
 function ruleView()
 {
-  return inspector.sidebar.getWindowForTab("ruleview").ruleview.view;
+  return InspectorUI.sidebar._toolContext("ruleview").view;
 }
 
 function waitForEditorFocus(aParent, aCallback)
@@ -100,18 +329,6 @@ function waitForEditorBlur(aEditor, aCallback)
   }, false);
 }
 
-function contextMenuClick(element) {
-  var evt = element.ownerDocument.createEvent('MouseEvents');
-
-  var button = 2;  // right click
-
-  evt.initMouseEvent('contextmenu', true, true,
-       element.ownerDocument.defaultView, 1, 0, 0, 0, 0, false,
-       false, false, false, button, null);
-
-  element.dispatchEvent(evt);
-}
-
 registerCleanupFunction(tearDown);
 
 waitForExplicitFinish();
diff --git a/browser/devtools/tilt/CmdTilt.jsm b/browser/devtools/tilt/CmdTilt.jsm
index 3c09b3772c13..ff6d84de1453 100644
--- a/browser/devtools/tilt/CmdTilt.jsm
+++ b/browser/devtools/tilt/CmdTilt.jsm
@@ -7,7 +7,6 @@ this.EXPORTED_SYMBOLS = [ ];
 
 Components.utils.import("resource:///modules/devtools/gcli.jsm");
 Components.utils.import("resource:///modules/HUDService.jsm");
-Components.utils.import("resource:///modules/devtools/Tilt.jsm");
 
 
 /**
@@ -27,32 +26,31 @@ gcli.addCommand({
   name: 'tilt open',
   description: gcli.lookup("tiltOpenDesc"),
   manual: gcli.lookup("tiltOpenManual"),
-  exec: function(args, context) {
-    let chromeWindow = context.environment.chromeDocument.defaultView;
-    let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
-    Tilt.initializeForCurrentTab();
-  }
-});
-
-
-/**
- * 'tilt toggle' command
- */
-gcli.addCommand({
-  name: "tilt toggle",
-  buttonId: "command-button-tilt",
-  buttonClass: "command-button",
-  hidden: true,
-  exec: function(args, context) {
-    let chromeWindow = context.environment.chromeDocument.defaultView;
-
-    if (TiltManager._instances.has(chromeWindow)) {
-      let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
-      Tilt.destroy(Tilt.currentWindowId);
+  params: [
+    {
+      name: "node",
+      type: "node",
+      defaultValue: null,
+      description: gcli.lookup("inspectNodeDesc"),
+      manual: gcli.lookup("inspectNodeManual")
     }
-    else {
-      let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
-      Tilt.initializeForCurrentTab();
+  ],
+  exec: function(args, context) {
+    let chromeWindow = context.environment.chromeDocument.defaultView;
+    let InspectorUI = chromeWindow.InspectorUI;
+    let Tilt = chromeWindow.Tilt;
+
+    if (Tilt.currentInstance) {
+      Tilt.update(args.node);
+    } else {
+      let hudId = chromeWindow.HUDConsoleUI.getOpenHUD();
+      let hud = HUDService.getHudReferenceById(hudId);
+
+      if (hud && !hud.consolePanel) {
+        HUDService.deactivateHUDForContext(chromeWindow.gBrowser.selectedTab);
+      }
+      InspectorUI.openInspectorUI(args.node);
+      Tilt.initialize();
     }
   }
 });
@@ -83,7 +81,8 @@ gcli.addCommand({
   ],
   exec: function(args, context) {
     let chromeWindow = context.environment.chromeDocument.defaultView;
-    let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
+    let Tilt = chromeWindow.Tilt;
+
     if (Tilt.currentInstance) {
       Tilt.currentInstance.controller.arcball.translate([args.x, args.y]);
     }
@@ -123,7 +122,8 @@ gcli.addCommand({
   ],
   exec: function(args, context) {
     let chromeWindow = context.environment.chromeDocument.defaultView;
-    let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
+    let Tilt = chromeWindow.Tilt;
+
     if (Tilt.currentInstance) {
       Tilt.currentInstance.controller.arcball.rotate([args.x, args.y, args.z]);
     }
@@ -148,7 +148,7 @@ gcli.addCommand({
   ],
   exec: function(args, context) {
     let chromeWindow = context.environment.chromeDocument.defaultView;
-    let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
+    let Tilt = chromeWindow.Tilt;
 
     if (Tilt.currentInstance) {
       Tilt.currentInstance.controller.arcball.zoom(-args.zoom);
@@ -166,7 +166,7 @@ gcli.addCommand({
   manual: gcli.lookup("tiltResetManual"),
   exec: function(args, context) {
     let chromeWindow = context.environment.chromeDocument.defaultView;
-    let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
+    let Tilt = chromeWindow.Tilt;
 
     if (Tilt.currentInstance) {
       Tilt.currentInstance.controller.arcball.reset();
@@ -184,7 +184,7 @@ gcli.addCommand({
   manual: gcli.lookup("tiltCloseManual"),
   exec: function(args, context) {
     let chromeWindow = context.environment.chromeDocument.defaultView;
-    let Tilt = TiltManager.getTiltForBrowser(chromeWindow);
+    let Tilt = chromeWindow.Tilt;
 
     Tilt.destroy(Tilt.currentWindowId);
   }
diff --git a/browser/devtools/tilt/Tilt.jsm b/browser/devtools/tilt/Tilt.jsm
index debbe626a91c..a32e80a39f38 100644
--- a/browser/devtools/tilt/Tilt.jsm
+++ b/browser/devtools/tilt/Tilt.jsm
@@ -48,21 +48,7 @@ Cu.import("resource:///modules/devtools/TiltGL.jsm");
 Cu.import("resource:///modules/devtools/TiltUtils.jsm");
 Cu.import("resource:///modules/devtools/TiltVisualizer.jsm");
 
-this.EXPORTED_SYMBOLS = ["TiltManager"];
-
-this.TiltManager = {
-  _instances: new WeakMap(),
-  getTiltForBrowser: function(aChromeWindow)
-  {
-    if (this._instances.has(aChromeWindow)) {
-      return this._instances.get(aChromeWindow);
-    } else {
-      let tilt = new Tilt(aChromeWindow);
-      this._instances.set(aChromeWindow, tilt);
-      return tilt;
-    }
-  },
-}
+this.EXPORTED_SYMBOLS = ["Tilt"];
 
 /**
  * Object managing instances of the visualizer.
@@ -86,8 +72,6 @@ this.Tilt = function Tilt(aWindow)
    * Shortcut for accessing notifications strings.
    */
   this.NOTIFICATIONS = TILT_NOTIFICATIONS;
-
-  this.setup();
 }
 
 Tilt.prototype = {
@@ -95,16 +79,9 @@ Tilt.prototype = {
   /**
    * Initializes a visualizer for the current tab.
    */
-  initializeForCurrentTab: function T_initializeForCurrentTab()
+  initialize: function T_initialize()
   {
-    let contentWindow = this.chromeWindow.gBrowser.selectedBrowser.contentWindow;
     let id = this.currentWindowId;
-    let self = this;
-
-    contentWindow.addEventListener("beforeunload", function onUnload() {
-      contentWindow.removeEventListener("beforeunload", onUnload, false);
-      self.destroy(id, true);
-    }, false);
 
     // if the visualizer for the current tab is already open, destroy it now
     if (this.visualizers[id]) {
@@ -117,8 +94,7 @@ Tilt.prototype = {
       chromeWindow: this.chromeWindow,
       contentWindow: this.chromeWindow.gBrowser.selectedBrowser.contentWindow,
       parentNode: this.chromeWindow.gBrowser.selectedBrowser.parentNode,
-      notifications: this.NOTIFICATIONS,
-      tab: this.chromeWindow.gBrowser.selectedTab
+      notifications: this.NOTIFICATIONS
     });
 
     // make sure the visualizer object was initialized properly
@@ -186,6 +162,42 @@ Tilt.prototype = {
     Services.obs.notifyObservers(null, TILT_NOTIFICATIONS.DESTROYED, null);
   },
 
+  /**
+   * Handles any supplementary post-initialization work, done immediately
+   * after a TILT_NOTIFICATIONS.INITIALIZING notification.
+   */
+  _whenInitializing: function T__whenInitializing()
+  {
+    this._whenShown();
+  },
+
+  /**
+   * Handles any supplementary post-destruction work, done immediately
+   * after a TILT_NOTIFICATIONS.DESTROYED notification.
+   */
+  _whenDestroyed: function T__whenDestroyed()
+  {
+    this._whenHidden();
+  },
+
+  /**
+   * Handles any necessary changes done when the Tilt surface is shown,
+   * after a TILT_NOTIFICATIONS.SHOWN notification.
+   */
+  _whenShown: function T__whenShown()
+  {
+    this.tiltButton.checked = true;
+  },
+
+  /**
+   * Handles any necessary changes done when the Tilt surface is hidden,
+   * after a TILT_NOTIFICATIONS.HIDDEN notification.
+   */
+  _whenHidden: function T__whenHidden()
+  {
+    this.tiltButton.checked = false;
+  },
+
   /**
    * Handles the event fired when a tab is selected.
    */
@@ -198,16 +210,80 @@ Tilt.prototype = {
     }
   },
 
+  /**
+   * A node was selected in the Inspector.
+   * Called from InspectorUI.
+   *
+   * @param {Element} aNode
+   *                  the newly selected node
+   */
+  update: function T_update(aNode) {
+    if (this.currentInstance) {
+      this.currentInstance.presenter.highlightNode(aNode, "moveIntoView");
+    }
+  },
+
   /**
    * Add the browser event listeners to handle state changes.
+   * Called from InspectorUI.
    */
   setup: function T_setup()
   {
+    if (this._setupFinished) {
+      return;
+    }
+
     // load the preferences from the devtools.tilt branch
     TiltVisualizer.Prefs.load();
 
-    this.chromeWindow.gBrowser.tabContainer.addEventListener(
-      "TabSelect", this._onTabSelect.bind(this), false);
+    // hide the button in the Inspector toolbar if Tilt is not enabled
+    this.tiltButton.hidden = !this.enabled;
+
+    // add the necessary observers to handle specific notifications
+    Services.obs.addObserver(
+      this._whenInitializing.bind(this), TILT_NOTIFICATIONS.INITIALIZING, false);
+    Services.obs.addObserver(
+      this._whenDestroyed.bind(this), TILT_NOTIFICATIONS.DESTROYED, false);
+    Services.obs.addObserver(
+      this._whenShown.bind(this), TILT_NOTIFICATIONS.SHOWN, false);
+    Services.obs.addObserver(
+      this._whenHidden.bind(this), TILT_NOTIFICATIONS.HIDDEN, false);
+
+    Services.obs.addObserver(function(aSubject, aTopic, aWinId) {
+      this.destroy(aWinId); }.bind(this),
+      this.chromeWindow.InspectorUI.INSPECTOR_NOTIFICATIONS.DESTROYED, false);
+
+    this.chromeWindow.gBrowser.tabContainer.addEventListener("TabSelect",
+      this._onTabSelect.bind(this), false);
+
+
+    // FIXME: this shouldn't be done here, see bug #705131
+    let onOpened = function() {
+      if (this.inspector && this.highlighter && this.currentInstance) {
+        this.inspector.stopInspecting();
+        this.inspectButton.disabled = true;
+        this.highlighter.hide();
+      }
+    }.bind(this);
+
+    let onClosed = function() {
+      if (this.inspector && this.highlighter) {
+        this.inspectButton.disabled = false;
+        this.highlighter.show();
+      }
+    }.bind(this);
+
+    Services.obs.addObserver(onOpened,
+      this.chromeWindow.InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+    Services.obs.addObserver(onClosed,
+      this.chromeWindow.InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+    Services.obs.addObserver(onOpened,
+      TILT_NOTIFICATIONS.INITIALIZING, false);
+    Services.obs.addObserver(onClosed,
+      TILT_NOTIFICATIONS.DESTROYED, false);
+
+
+    this._setupFinished = true;
   },
 
   /**
@@ -235,4 +311,35 @@ Tilt.prototype = {
   {
     return this.visualizers[this.currentWindowId];
   },
+
+  /**
+   * Gets the current InspectorUI instance.
+   */
+  get inspector()
+  {
+    return this.chromeWindow.InspectorUI;
+  },
+
+  /**
+   * Gets the current Highlighter instance from the InspectorUI.
+   */
+  get highlighter()
+  {
+    return this.inspector.highlighter;
+  },
+
+  /**
+   * Gets the Tilt button in the Inspector toolbar.
+   */
+  get tiltButton()
+  {
+    return this.chromeWindow.document.getElementById("inspector-3D-button");
+  },
+
+  /**
+   * Gets the Inspect button in the Inspector toolbar.
+   */
+  get inspectButton() {
+    return this.chromeWindow.document.getElementById("inspector-inspect-toolbutton");
+  }
 };
diff --git a/browser/devtools/tilt/TiltVisualizer.jsm b/browser/devtools/tilt/TiltVisualizer.jsm
index e577b8dfb0c0..05d678ad8545 100644
--- a/browser/devtools/tilt/TiltVisualizer.jsm
+++ b/browser/devtools/tilt/TiltVisualizer.jsm
@@ -51,8 +51,6 @@ const TILT_CRAFTER = "resource:///modules/devtools/TiltWorkerCrafter.js";
 const TILT_PICKER = "resource:///modules/devtools/TiltWorkerPicker.js";
 
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/devtools/gDevTools.jsm");
-Cu.import("resource:///modules/devtools/Target.jsm");
 Cu.import("resource:///modules/devtools/TiltGL.jsm");
 Cu.import("resource:///modules/devtools/TiltMath.jsm");
 Cu.import("resource:///modules/devtools/TiltUtils.jsm");
@@ -100,8 +98,6 @@ this.TiltVisualizer = function TiltVisualizer(aProperties)
     aProperties.onError || null,
     aProperties.onLoad || null);
 
-  this.bindToInspector(aProperties.tab);
-
   /**
    * Visualization mouse and keyboard controller.
    */
@@ -136,8 +132,6 @@ TiltVisualizer.prototype = {
    */
   cleanup: function TV_cleanup()
   {
-    this.unbindInspector();
-
     if (this.controller) {
       TiltUtils.destroyObject(this.controller);
     }
@@ -150,124 +144,7 @@ TiltVisualizer.prototype = {
     TiltUtils.destroyObject(this);
     TiltUtils.clearCache();
     TiltUtils.gc(chromeWindow);
-  },
-
-  /**
-   * Listen to the inspector activity.
-   */
-  bindToInspector: function TV_bindToInspector(aTab)
-  {
-    this._browserTab = aTab;
-
-    this.onNewNodeFromInspector = this.onNewNodeFromInspector.bind(this);
-    this.onNewNodeFromTilt = this.onNewNodeFromTilt.bind(this);
-    this.onInspectorReady = this.onInspectorReady.bind(this);
-    this.onToolboxDestroyed = this.onToolboxDestroyed.bind(this);
-
-    gDevTools.on("inspector-ready", this.onInspectorReady);
-    gDevTools.on("toolbox-destroyed", this.onToolboxDestroyed);
-
-    Services.obs.addObserver(this.onNewNodeFromTilt,
-                             this.presenter.NOTIFICATIONS.HIGHLIGHTING,
-                             false);
-    Services.obs.addObserver(this.onNewNodeFromTilt,
-                             this.presenter.NOTIFICATIONS.UNHIGHLIGHTING,
-                             false);
-
-    let target = TargetFactory.forTab(aTab);
-    let inspector = gDevTools.getPanelForTarget("inspector", target);
-    if (inspector) {
-      this.inspector = inspector;
-      this.inspector.selection.on("new-node", this.onNewNodeFromInspector);
-      this.inspector.selection.on("detached", this.onNewNodeFromInspector);
-      this.onNewNodeFromInspector();
-    }
-  },
-
-  /**
-   * Unregister inspector event listeners.
-   */
-  unbindInspector: function TV_unbindInspector()
-  {
-    this._browserTab = null;
-
-    if (this.inspector) {
-      this.inspector.selection.off("new-node", this.onNewNodeFromInspector);
-      this.inspector.selection.off("detached", this.onNewNodeFromInspector);
-      this.inspector = null;
-    }
-
-    gDevTools.off("inspector-ready", this.onInspectorReady);
-    gDevTools.off("toolbox-destroyed", this.onToolboxDestroyed);
-
-    Services.obs.removeObserver(this.onNewNodeFromTilt,
-                                this.presenter.NOTIFICATIONS.HIGHLIGHTING);
-    Services.obs.removeObserver(this.onNewNodeFromTilt,
-                                this.presenter.NOTIFICATIONS.UNHIGHLIGHTING);
-  },
-
-  /**
-   * When a new inspector is started.
-   */
-  onInspectorReady: function TV_onInspectorReady(event, toolbox, panel)
-  {
-    if (toolbox.target.tab === this._browserTab) {
-      this.inspector = panel;
-      this.inspector.selection.on("new-node", this.onNewNodeFromInspector);
-      this.inspector.selection.on("detached", this.onNewNodeFromInspector);
-      this.onNewNodeFromTilt();
-    }
-  },
-
-  /**
-   * When the toolbox, therefor the inspector, is closed.
-   */
-  onToolboxDestroyed: function TV_onToolboxDestroyed(event, tab)
-  {
-    if (tab === this._browserTab &&
-        this.inspector) {
-      if (this.inspector.selection) {
-        this.inspector.selection.off("new-node", this.onNewNodeFromInspector);
-        this.inspector.selection.off("detached", this.onNewNodeFromInspector);
-      }
-      this.inspector = null;
-    }
-  },
-
-  /**
-   * When a new node is selected in the inspector.
-   */
-  onNewNodeFromInspector: function TV_onNewNodeFromInspector()
-  {
-    if (this.inspector &&
-        this.inspector.selection.reason != "tilt") {
-      let selection = this.inspector.selection;
-      let canHighlightNode = selection.isNode() &&
-                              selection.isConnected() &&
-                              selection.isElementNode();
-      if (canHighlightNode) {
-        this.presenter.highlightNode(selection.node);
-      } else {
-        this.presenter.highlightNodeFor(-1);
-      }
-    }
-  },
-
-  /**
-   * When a new node is selected in Tilt.
-   */
-  onNewNodeFromTilt: function TV_onNewNodeFromTilt()
-  {
-    if (!this.inspector) {
-      return;
-    }
-    let nodeIndex = this.presenter._currentSelection;
-    if (nodeIndex < 0) {
-      this.inspector.selection.setNode(null, "tilt");
-    }
-    let node = this.presenter._traverseData.nodes[nodeIndex];
-    this.inspector.selection.setNode(node, "tilt");
-  },
+  }
 };
 
 /**
@@ -295,7 +172,7 @@ TiltVisualizer.Presenter = function TV_Presenter(
   this.canvas = aCanvas;
 
   /**
-   * Save a reference to the top-level window, to access Tilt.
+   * Save a reference to the top-level window, to access InspectorUI or Tilt.
    */
   this.chromeWindow = aChromeWindow;
 
@@ -354,6 +231,7 @@ TiltVisualizer.Presenter = function TV_Presenter(
    * Variables holding information about the initial and current node selected.
    */
   this._currentSelection = -1; // the selected node index
+  this._initialSelection = false; // true if an initial selection was made
   this._initialMeshConfiguration = false; // true if the 3D mesh was configured
 
   /**
@@ -389,6 +267,7 @@ TiltVisualizer.Presenter.prototype = {
   _setup: function TVP__setup()
   {
     let renderer = this._renderer;
+    let inspector = this.chromeWindow.InspectorUI;
 
     // if the renderer was destroyed, don't continue setup
     if (!renderer || !renderer.context) {
@@ -404,7 +283,9 @@ TiltVisualizer.Presenter.prototype = {
     });
 
     // get the document zoom to properly scale the visualization
-    this.transforms.zoom = this._getPageZoom();
+    if (inspector.highlighter) {
+      this.transforms.zoom = inspector.highlighter.zoom;
+    }
 
     // bind the owner object to the necessary functions
     TiltUtils.bindObjectFunc(this, "^_on");
@@ -416,17 +297,6 @@ TiltVisualizer.Presenter.prototype = {
     this.canvas.focus();
   },
 
-  /**
-   * Get page zoom factor.
-   * @return {Number}
-   */
-  _getPageZoom: function TVP__getPageZoom() {
-    return this.contentWindow
-      .QueryInterface(Ci.nsIInterfaceRequestor)
-      .getInterface(Ci.nsIDOMWindowUtils)
-      .fullZoom;
-  },
-
   /**
    * The animation logic.
    */
@@ -683,6 +553,16 @@ TiltVisualizer.Presenter.prototype = {
       });
     }
 
+    // if there's no initial selection made, highlight the required node
+    if (!this._initialSelection) {
+      this._initialSelection = true;
+      this.highlightNode(this.chromeWindow.InspectorUI.selection);
+
+      if (this._currentSelection === 0) { // if the "html" node is selected
+        this._highlight.disabled = true;
+      }
+    }
+
     // configure the required mesh transformations and background only once
     if (!this._initialMeshConfiguration) {
       this._initialMeshConfiguration = true;
@@ -755,7 +635,7 @@ TiltVisualizer.Presenter.prototype = {
    */
   _onResize: function TVP_onResize(e)
   {
-    let zoom = this._getPageZoom();
+    let zoom = this.chromeWindow.InspectorUI.highlighter.zoom;
     let width = e.target.innerWidth * zoom;
     let height = e.target.innerHeight * zoom;
 
@@ -858,6 +738,7 @@ TiltVisualizer.Presenter.prototype = {
 
     let highlight = this._highlight;
     let info = this._traverseData.info[aNodeIndex];
+    let node = this._traverseData.nodes[aNodeIndex];
     let style = TiltVisualizerStyle.nodes;
 
     highlight.disabled = false;
@@ -878,6 +759,10 @@ TiltVisualizer.Presenter.prototype = {
 
     this._currentSelection = aNodeIndex;
 
+    this.chromeWindow.InspectorUI.inspectNode(node,
+      this.contentWindow.innerHeight < y ||
+      this.contentWindow.pageYOffset > 0);
+
     // if something is highlighted, make sure it's inside the current viewport;
     // the point which should be moved into view is considered the center [x, y]
     // position along the top edge of the currently selected node
@@ -961,7 +846,7 @@ TiltVisualizer.Presenter.prototype = {
       }
     }, false);
 
-    let zoom = this._getPageZoom();
+    let zoom = this.chromeWindow.InspectorUI.highlighter.zoom;
     let width = this._renderer.width * zoom;
     let height = this._renderer.height * zoom;
     x *= zoom;
@@ -1398,11 +1283,9 @@ TiltVisualizer.Controller.prototype = {
    */
   _onKeyPress: function TVC__onKeyPress(e)
   {
+    let tilt = this.presenter.chromeWindow.Tilt;
+
     if (e.keyCode === e.DOM_VK_ESCAPE) {
-      let mod = {};
-      Cu.import("resource:///modules/devtools/Tilt.jsm", mod);
-      let tilt =
-        mod.TiltManager.getTiltForBrowser(this.presenter.chromeWindow);
       e.preventDefault();
       e.stopPropagation();
       tilt.destroy(tilt.currentWindowId, true);
@@ -1421,7 +1304,7 @@ TiltVisualizer.Controller.prototype = {
    */
   _onResize: function TVC__onResize(e)
   {
-    let zoom = this.presenter._getPageZoom();
+    let zoom = this.presenter.chromeWindow.InspectorUI.highlighter.zoom;
     let width = e.target.innerWidth * zoom;
     let height = e.target.innerHeight * zoom;
 
diff --git a/browser/devtools/tilt/test/Makefile.in b/browser/devtools/tilt/test/Makefile.in
index 83794742fb46..0083aa512956 100644
--- a/browser/devtools/tilt/test/Makefile.in
+++ b/browser/devtools/tilt/test/Makefile.in
@@ -16,6 +16,7 @@ MOCHITEST_BROWSER_FILES = \
 	browser_tilt_02_notifications-seq.js \
 	browser_tilt_02_notifications.js \
 	browser_tilt_03_tab_switch.js \
+	browser_tilt_04_initialization-key.js \
 	browser_tilt_04_initialization.js \
 	browser_tilt_05_destruction-esc.js \
 	browser_tilt_05_destruction-url.js \
diff --git a/browser/devtools/tilt/test/browser_tilt_03_tab_switch.js b/browser/devtools/tilt/test/browser_tilt_03_tab_switch.js
index 0ea5c886f4ec..62b599328b93 100644
--- a/browser/devtools/tilt/test/browser_tilt_03_tab_switch.js
+++ b/browser/devtools/tilt/test/browser_tilt_03_tab_switch.js
@@ -26,8 +26,22 @@ function createTab1() {
 
   tab1 = createTab(function() {
     createTilt({
+      onInspectorOpen: function()
+      {
+        ok(Tilt.tiltButton.checked === false,
+          "The toolbar tilt button shouldn't be pressed before Tilt is open.");
+        ok(InspectorUI.inspecting,
+          "The Inspector should be inspecting for tab1.");
+        ok(InspectorUI.highlighter.hidden === false,
+          "The Highlighter should be visible for tab1.");
+      },
       onTiltOpen: function()
       {
+        ok(InspectorUI.inspecting === false,
+          "The Inspector should not be inspecting for tab1 after Tilt is open.");
+        ok(InspectorUI.highlighter.hidden,
+          "The Highlighter should not be visible for tab1 after Tilt is open.");
+
         createTab2();
       }
     }, false, function suddenDeath()
@@ -42,8 +56,22 @@ function createTab2() {
   tab2 = createTab(function() {
 
     createTilt({
+      onInspectorOpen: function()
+      {
+        ok(Tilt.tiltButton.checked === false,
+          "The toolbar tilt button shouldn't be pressed before Tilt is open.");
+        ok(InspectorUI.inspecting,
+          "The Inspector should be inspecting for tab2.");
+        ok(InspectorUI.highlighter.hidden === false,
+          "The Highlighter should be visible for tab2.");
+      },
       onTiltOpen: function()
       {
+        ok(InspectorUI.inspecting === false,
+          "The Inspector should not be inspecting for tab2 after Tilt is open.");
+        ok(InspectorUI.highlighter.hidden,
+          "The Highlighter should be visible for tab2 after Tilt is open.");
+
         testStep = 0;
         tabSelect();
       }
@@ -57,28 +85,77 @@ function createTab2() {
 
 let testSteps = [
   function step0() {
+    ok(Tilt.tiltButton.checked === true,
+      "The toolbar tilt button should have been pressed at step0 (tab 2).");
+    ok(InspectorUI.inspecting === false,
+      "The Inspector should not be inspecting at step0.");
+    ok(InspectorUI.highlighter.hidden,
+      "The Highlighter should be hidden at step0.");
+
     gBrowser.selectedTab = tab1;
   },
   function step1() {
+    ok(Tilt.tiltButton.checked === true,
+      "The toolbar tilt button should have been pressed at step1 (tab 1).");
+    ok(InspectorUI.inspecting === false,
+      "The Inspector should not be inspecting at step1.");
+    ok(InspectorUI.highlighter.hidden,
+      "The Highlighter should be hidden at step1.");
+
     gBrowser.selectedTab = tab0;
   },
   function step2() {
+    ok(Tilt.tiltButton.checked === false,
+      "The toolbar tilt button shouldn't have been pressed at step2 (tab 0).");
+    ok(InspectorUI.inspecting === false,
+      "The Inspector should not be inspecting at step2.");
+    is(InspectorUI.highlighter, null,
+      "The Highlighter should be dead while in step2.");
+
     gBrowser.selectedTab = tab1;
   },
   function step3() {
+    ok(Tilt.tiltButton.checked === true,
+      "The toolbar tilt button should have been pressed at step3 (tab 1).");
+    ok(InspectorUI.inspecting === false,
+      "The Inspector should not be inspecting at step3.");
+    ok(InspectorUI.highlighter.hidden,
+      "The Highlighter should be hidden at step3.");
+
     gBrowser.selectedTab = tab2;
   },
   function step4() {
+    ok(Tilt.tiltButton.checked === true,
+      "The toolbar tilt button should have been pressed at step4 (tab 2).");
+    ok(InspectorUI.inspecting === false,
+      "The Inspector should not be inspecting at step4.");
+    ok(InspectorUI.highlighter.hidden,
+      "The Highlighter should be hidden at step4.");
+
     Tilt.destroy(Tilt.currentWindowId);
     gBrowser.removeCurrentTab();
     tab2 = null;
   },
   function step5() {
+    ok(Tilt.tiltButton.checked === true,
+      "The toolbar tilt button should have been pressed at step5 (tab 1).");
+    ok(InspectorUI.inspecting === false,
+      "The Inspector should not be inspecting at step5.");
+    ok(InspectorUI.highlighter.hidden,
+      "The Highlighter should be hidden at step5.");
+
     Tilt.destroy(Tilt.currentWindowId);
     gBrowser.removeCurrentTab();
     tab1 = null;
   },
   function step6_cleanup() {
+    ok(Tilt.tiltButton.checked === false,
+      "The toolbar tilt button shouldn't have been pressed at step6 (tab 0).");
+    ok(InspectorUI.inspecting === false,
+      "The Inspector should not be inspecting at step6.");
+    is(InspectorUI.highlighter, null,
+      "The Highlighter should be dead while in step6.");
+
     cleanup();
   }
 ];
diff --git a/browser/devtools/tilt/test/browser_tilt_04_initialization-key.js b/browser/devtools/tilt/test/browser_tilt_04_initialization-key.js
new file mode 100644
index 000000000000..0acd791dfd31
--- /dev/null
+++ b/browser/devtools/tilt/test/browser_tilt_04_initialization-key.js
@@ -0,0 +1,82 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+let id;
+let tiltKey;
+let eventType;
+
+function test() {
+  if (!isTiltEnabled()) {
+    info("Skipping initialization key test because Tilt isn't enabled.");
+    return;
+  }
+  if (!isWebGLSupported()) {
+    info("Skipping initialization key test because WebGL isn't supported.");
+    return;
+  }
+
+  waitForExplicitFinish();
+
+  id = TiltUtils.getWindowId(gBrowser.selectedBrowser.contentWindow);
+  tiltKey = Tilt.tiltButton.getAttribute("accesskey");
+
+  if ("nsILocalFileMac" in Ci) {
+    eventType = { type: "keypress", ctrlKey: true };
+  } else {
+    eventType = { type: "keypress", altKey: true };
+  }
+
+  Services.obs.addObserver(onInspectorOpen, INSPECTOR_OPENED, false);
+  InspectorUI.toggleInspectorUI();
+}
+
+function suddenDeath() {
+  Services.obs.removeObserver(onTiltOpen, INITIALIZING);
+  cleanup();
+}
+
+function onInspectorOpen() {
+  Services.obs.removeObserver(onInspectorOpen, INSPECTOR_OPENED);
+
+  executeSoon(function() {
+    is(Tilt.visualizers[id], null,
+      "A instance of the visualizer shouldn't be initialized yet.");
+
+    info("Pressing the accesskey should open Tilt.");
+
+    Tilt.failureCallback = suddenDeath;
+
+    Services.obs.addObserver(onTiltOpen, INITIALIZING, false);
+    EventUtils.synthesizeKey(tiltKey, eventType);
+  });
+}
+
+function onTiltOpen() {
+  Services.obs.removeObserver(onTiltOpen, INITIALIZING);
+
+  executeSoon(function() {
+    ok(Tilt.visualizers[id] instanceof TiltVisualizer,
+      "A new instance of the visualizer wasn't created properly.");
+    ok(Tilt.visualizers[id].isInitialized(),
+      "The new instance of the visualizer wasn't initialized properly.");
+
+    info("Pressing the accesskey again should close Tilt.");
+
+    Services.obs.addObserver(onTiltClose, DESTROYED, false);
+    EventUtils.synthesizeKey(tiltKey, eventType);
+  });
+}
+
+function onTiltClose() {
+  is(Tilt.visualizers[id], null,
+    "The current instance of the visualizer wasn't destroyed properly.");
+
+  cleanup();
+}
+
+function cleanup() {
+  Tilt.failureCallback = null;
+  InspectorUI.closeInspectorUI();
+  finish();
+}
diff --git a/browser/devtools/tilt/test/browser_tilt_04_initialization.js b/browser/devtools/tilt/test/browser_tilt_04_initialization.js
index 314fb22e6645..b4f34869c3da 100644
--- a/browser/devtools/tilt/test/browser_tilt_04_initialization.js
+++ b/browser/devtools/tilt/test/browser_tilt_04_initialization.js
@@ -21,6 +21,10 @@ function test() {
       "The unique window identifiers should match for the same window.");
 
     createTilt({
+      onInspectorOpen: function() {
+        is(Tilt.visualizers[id], null,
+          "A instance of the visualizer shouldn't be initialized yet.");
+      },
       onTiltOpen: function(instance)
       {
         is(document.activeElement, instance.presenter.canvas,
diff --git a/browser/devtools/tilt/test/browser_tilt_05_destruction-esc.js b/browser/devtools/tilt/test/browser_tilt_05_destruction-esc.js
index 503f7925451a..c3e1fbfb563a 100644
--- a/browser/devtools/tilt/test/browser_tilt_05_destruction-esc.js
+++ b/browser/devtools/tilt/test/browser_tilt_05_destruction-esc.js
@@ -39,6 +39,9 @@ function finalize() {
   is(Tilt.visualizers[id], null,
     "The current instance of the visualizer wasn't destroyed properly.");
 
+  ok(InspectorUI.highlighter && InspectorUI.breadcrumbs,
+    "The Inspector should not close while Tilt is opened.");
+
   cleanup();
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_05_destruction.js b/browser/devtools/tilt/test/browser_tilt_05_destruction.js
index a083fa1bcbc1..0f78eb3aaa0e 100644
--- a/browser/devtools/tilt/test/browser_tilt_05_destruction.js
+++ b/browser/devtools/tilt/test/browser_tilt_05_destruction.js
@@ -23,7 +23,7 @@ function test() {
         tiltOpened = true;
 
         Services.obs.addObserver(finalize, DESTROYED, false);
-        Tilt.destroy(Tilt.currentWindowId);
+        InspectorUI.closeInspectorUI();
       }
     }, false, function suddenDeath()
     {
diff --git a/browser/devtools/tilt/test/browser_tilt_arcball-reset-typeahead.js b/browser/devtools/tilt/test/browser_tilt_arcball-reset-typeahead.js
index 366bfa323180..f70223be9395 100644
--- a/browser/devtools/tilt/test/browser_tilt_arcball-reset-typeahead.js
+++ b/browser/devtools/tilt/test/browser_tilt_arcball-reset-typeahead.js
@@ -31,7 +31,7 @@ function test() {
 
           Services.prefs.setBoolPref("accessibility.typeaheadfind", false);
           Services.obs.addObserver(cleanup, DESTROYED, false);
-          Tilt.destroy(Tilt.currentWindowId);
+          InspectorUI.closeInspectorUI();
         });
       }
     }, false, function suddenDeath()
diff --git a/browser/devtools/tilt/test/browser_tilt_arcball-reset.js b/browser/devtools/tilt/test/browser_tilt_arcball-reset.js
index 72e11236e679..4d64d9be8de6 100644
--- a/browser/devtools/tilt/test/browser_tilt_arcball-reset.js
+++ b/browser/devtools/tilt/test/browser_tilt_arcball-reset.js
@@ -29,7 +29,7 @@ function test() {
           info("Killing arcball reset test.");
 
           Services.obs.addObserver(cleanup, DESTROYED, false);
-          Tilt.destroy(Tilt.currentWindowId);
+          InspectorUI.closeInspectorUI();
         });
       }
     }, false, function suddenDeath()
diff --git a/browser/devtools/tilt/test/browser_tilt_picking.js b/browser/devtools/tilt/test/browser_tilt_picking.js
index c79056a3b4cf..ba7a0b968e7a 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking.js
@@ -34,7 +34,7 @@ function test() {
 
               pickDone = true;
               Services.obs.addObserver(cleanup, DESTROYED, false);
-              Tilt.destroy(Tilt.currentWindowId);
+              InspectorUI.closeInspectorUI();
             }
           });
         };
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_delete.js b/browser/devtools/tilt/test/browser_tilt_picking_delete.js
index c45d44b03446..95e6b7c69339 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking_delete.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking_delete.js
@@ -65,7 +65,7 @@ function whenNodeRemoved() {
 
   executeSoon(function() {
     Services.obs.addObserver(cleanup, DESTROYED, false);
-    Tilt.destroy(Tilt.currentWindowId);
+    InspectorUI.closeInspectorUI();
   });
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight01-offs.js b/browser/devtools/tilt/test/browser_tilt_picking_highlight01-offs.js
index abfd4f586ffd..4c3624d90a1d 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking_highlight01-offs.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking_highlight01-offs.js
@@ -64,7 +64,7 @@ function whenUnhighlighting() {
   executeSoon(function() {
     Services.obs.removeObserver(whenUnhighlighting, UNHIGHLIGHTING);
     Services.obs.addObserver(cleanup, DESTROYED, false);
-    Tilt.destroy(Tilt.currentWindowId);
+    InspectorUI.closeInspectorUI();
   });
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight01.js b/browser/devtools/tilt/test/browser_tilt_picking_highlight01.js
index 82871270ef33..b498d2ac07c6 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking_highlight01.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking_highlight01.js
@@ -64,7 +64,7 @@ function whenUnhighlighting() {
   executeSoon(function() {
     Services.obs.removeObserver(whenUnhighlighting, UNHIGHLIGHTING);
     Services.obs.addObserver(cleanup, DESTROYED, false);
-    Tilt.destroy(Tilt.currentWindowId);
+    InspectorUI.closeInspectorUI();
   });
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js b/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js
index fc8d0fc51577..9d873d1ea181 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js
@@ -59,7 +59,7 @@ function whenUnhighlighting() {
   executeSoon(function() {
     Services.obs.removeObserver(whenUnhighlighting, UNHIGHLIGHTING);
     Services.obs.addObserver(cleanup, DESTROYED, false);
-    Tilt.destroy(Tilt.currentWindowId);
+    InspectorUI.closeInspectorUI();
   });
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight03.js b/browser/devtools/tilt/test/browser_tilt_picking_highlight03.js
index 721189f65c37..0412b76b586e 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking_highlight03.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking_highlight03.js
@@ -59,7 +59,7 @@ function whenUnhighlighting() {
   executeSoon(function() {
     Services.obs.removeObserver(whenUnhighlighting, UNHIGHLIGHTING);
     Services.obs.addObserver(cleanup, DESTROYED, false);
-    Tilt.destroy(Tilt.currentWindowId);
+    InspectorUI.closeInspectorUI();
   });
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_picking_miv.js b/browser/devtools/tilt/test/browser_tilt_picking_miv.js
index 64b911a0020a..ebac1272174d 100644
--- a/browser/devtools/tilt/test/browser_tilt_picking_miv.js
+++ b/browser/devtools/tilt/test/browser_tilt_picking_miv.js
@@ -65,7 +65,7 @@ function whenBringingIntoView() {
   executeSoon(function() {
     Services.obs.removeObserver(whenHighlighting, HIGHLIGHTING);
     Services.obs.addObserver(cleanup, DESTROYED, false);
-    Tilt.destroy(Tilt.currentWindowId);
+    InspectorUI.closeInspectorUI();
   });
 }
 
diff --git a/browser/devtools/tilt/test/browser_tilt_visualizer.js b/browser/devtools/tilt/test/browser_tilt_visualizer.js
index 0f25a04fd84e..fbbcb737317e 100644
--- a/browser/devtools/tilt/test/browser_tilt_visualizer.js
+++ b/browser/devtools/tilt/test/browser_tilt_visualizer.js
@@ -19,8 +19,7 @@ function test() {
     chromeWindow: window,
     contentWindow: gBrowser.selectedBrowser.contentWindow,
     parentNode: gBrowser.selectedBrowser.parentNode,
-    notifications: Tilt.NOTIFICATIONS,
-    tab: gBrowser.selectedTab,
+    inspectorUI: window.InspectorUI,
 
     onError: function onWebGLError()
     {
diff --git a/browser/devtools/tilt/test/browser_tilt_zoom.js b/browser/devtools/tilt/test/browser_tilt_zoom.js
index af6ac2c91414..104bd113a05a 100644
--- a/browser/devtools/tilt/test/browser_tilt_zoom.js
+++ b/browser/devtools/tilt/test/browser_tilt_zoom.js
@@ -19,14 +19,16 @@ function test() {
   waitForExplicitFinish();
 
   createTab(function() {
-    TiltUtils.setDocumentZoom(window, ZOOM);
-
     createTilt({
+      onInspectorOpen: function()
+      {
+        TiltUtils.setDocumentZoom(window, ZOOM);
+      },
       onTiltOpen: function(instance)
       {
         tiltOpened = true;
 
-        ok(isApprox(instance.presenter._getPageZoom(), ZOOM),
+        ok(isApprox(InspectorUI.highlighter.zoom, ZOOM),
           "The Highlighter zoom doesn't have the expected results.");
 
         ok(isApprox(instance.presenter.transforms.zoom, ZOOM),
@@ -73,7 +75,7 @@ function test() {
 
 
           Services.obs.addObserver(cleanup, DESTROYED, false);
-          Tilt.destroy(Tilt.currentWindowId);
+          InspectorUI.closeInspectorUI();
         });
       }
     }, false, function suddenDeath()
diff --git a/browser/devtools/tilt/test/head.js b/browser/devtools/tilt/test/head.js
index 349cf6f6dc1f..83fe62c1a6c1 100644
--- a/browser/devtools/tilt/test/head.js
+++ b/browser/devtools/tilt/test/head.js
@@ -3,13 +3,11 @@
 "use strict";
 
 let tempScope = {};
-Components.utils.import("resource:///modules/devtools/Tilt.jsm", tempScope);
 Components.utils.import("resource:///modules/devtools/TiltGL.jsm", tempScope);
 Components.utils.import("resource:///modules/devtools/TiltMath.jsm", tempScope);
 Components.utils.import("resource:///modules/devtools/TiltUtils.jsm", tempScope);
 Components.utils.import("resource:///modules/devtools/TiltVisualizer.jsm", tempScope);
 Components.utils.import("resource:///modules/devtools/LayoutHelpers.jsm", tempScope);
-let TiltManager = tempScope.TiltManager;
 let TiltGL = tempScope.TiltGL;
 let EPSILON = tempScope.EPSILON;
 let TiltMath = tempScope.TiltMath;
@@ -48,7 +46,8 @@ const DEFAULT_HTML = "data:text/html," +
     "<body>" +
   "</html>";
 
-let Tilt = TiltManager.getTiltForBrowser(window);
+const INSPECTOR_OPENED = InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED;
+const INSPECTOR_CLOSED = InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED;
 
 const INITIALIZING = Tilt.NOTIFICATIONS.INITIALIZING;
 const INITIALIZED = Tilt.NOTIFICATIONS.INITIALIZED;
@@ -144,14 +143,30 @@ function createTilt(callbacks, close, suddenDeath) {
                    ", autoclose param " + close +
           ", and sudden death handler " + typeof suddenDeath + ".");
 
-  handleFailure(suddenDeath);
-
   Services.prefs.setBoolPref("webgl.verbose", true);
   TiltUtils.Output.suppressAlerts = true;
 
-  info("Attempting to start Tilt.");
-  Services.obs.addObserver(onTiltOpen, INITIALIZING, false);
-  Tilt.initializeForCurrentTab();
+  info("Attempting to start the inspector.");
+  Services.obs.addObserver(onInspectorOpen, INSPECTOR_OPENED, false);
+  InspectorUI.toggleInspectorUI();
+
+  function onInspectorOpen() {
+    info("Inspector was opened.");
+    Services.obs.removeObserver(onInspectorOpen, INSPECTOR_OPENED);
+
+    executeSoon(function() {
+      if ("function" === typeof callbacks.onInspectorOpen) {
+        info("Calling 'onInspectorOpen'.");
+        callbacks.onInspectorOpen();
+      }
+      executeSoon(function() {
+        info("Attempting to start Tilt.");
+        Services.obs.addObserver(onTiltOpen, INITIALIZING, false);
+        handleFailure(suddenDeath);
+        Tilt.initialize();
+      });
+    });
+  }
 
   function onTiltOpen() {
     info("Tilt was opened.");
@@ -181,6 +196,25 @@ function createTilt(callbacks, close, suddenDeath) {
         info("Calling 'onTiltClose'.");
         callbacks.onTiltClose();
       }
+      if (close) {
+        executeSoon(function() {
+          info("Attempting to close the Inspector.");
+          Services.obs.addObserver(onInspectorClose, INSPECTOR_CLOSED, false);
+          InspectorUI.closeInspectorUI();
+        });
+      }
+    });
+  }
+
+  function onInspectorClose() {
+    info("Inspector was closed.");
+    Services.obs.removeObserver(onInspectorClose, INSPECTOR_CLOSED);
+
+    executeSoon(function() {
+      if ("function" === typeof callbacks.onInspectorClose) {
+        info("Calling 'onInspectorClose'.");
+        callbacks.onInspectorClose();
+      }
       if ("function" === typeof callbacks.onEnd) {
         info("Calling 'onEnd'.");
         callbacks.onEnd();
diff --git a/browser/devtools/webconsole/HUDService.jsm b/browser/devtools/webconsole/HUDService.jsm
index e19212512444..5f901d74a713 100644
--- a/browser/devtools/webconsole/HUDService.jsm
+++ b/browser/devtools/webconsole/HUDService.jsm
@@ -13,10 +13,6 @@ const Cu = Components.utils;
 const CONSOLEAPI_CLASS_ID = "{b49c18f8-3379-4fc0-8c90-d7772c1a9ff3}";
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/devtools/gDevTools.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
-                                  "resource:///modules/devtools/Target.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
                                   "resource://gre/modules/Services.jsm");
@@ -46,6 +42,24 @@ const HTML_NS = "http://www.w3.org/1999/xhtml";
 // The XUL namespace.
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+
+// Possible directions that can be passed to HUDService.animate().
+const ANIMATE_OUT = 0;
+const ANIMATE_IN = 1;
+
+// Minimum console height, in pixels.
+const MINIMUM_CONSOLE_HEIGHT = 150;
+
+// Minimum page height, in pixels. This prevents the Web Console from
+// remembering a height that covers the whole page.
+const MINIMUM_PAGE_HEIGHT = 50;
+
+// The default console height, as a ratio from the content window inner height.
+const DEFAULT_CONSOLE_HEIGHT = 0.33;
+
+// points to the file to load in the Web Console iframe.
+const UI_IFRAME_URL = "chrome://browser/content/devtools/webconsole.xul";
+
 ///////////////////////////////////////////////////////////////////////////
 //// The HUD service
 
@@ -53,8 +67,13 @@ function HUD_SERVICE()
 {
   // These methods access the "this" object, but they're registered as
   // event listeners. So we hammer in the "this" binding.
+  this.onTabClose = this.onTabClose.bind(this);
+  this.onTabSelect = this.onTabSelect.bind(this);
   this.onWindowUnload = this.onWindowUnload.bind(this);
 
+  // Remembers the last console height, in pixels.
+  this.lastConsoleHeight = Services.prefs.getIntPref("devtools.hud.height");
+
   /**
    * Keeps a reference for each HeadsUpDisplay that is created
    */
@@ -92,15 +111,19 @@ HUD_SERVICE.prototype =
    *
    * @param nsIDOMElement aTab
    *        The xul:tab element.
-   * @param nsIDOMElement aIframe
-   *        The iframe element into which to place the web console.
-   * @param RemoteTarget aTarget
-   *        The target that the web console will connect to.
+   * @param boolean aAnimated
+   *        True if you want to animate the opening of the Web console.
+   * @param object aOptions
+   *        Options for the Web Console:
+   *        - host
+   *          Server to connect to.
+   *        - port
+   *          Port to connect to.
    * @return object
    *         The new HeadsUpDisplay instance.
    */
-  activateHUDForContext: function HS_activateHUDForContext(aTab, aIframe,
-                                                           aTarget)
+  activateHUDForContext:
+  function HS_activateHUDForContext(aTab, aAnimated, aOptions)
   {
     let hudId = "hud_" + aTab.linkedPanel;
     if (hudId in this.hudReferences) {
@@ -112,11 +135,19 @@ HUD_SERVICE.prototype =
     let window = aTab.ownerDocument.defaultView;
     let gBrowser = window.gBrowser;
 
+    gBrowser.tabContainer.addEventListener("TabClose", this.onTabClose, false);
+    gBrowser.tabContainer.addEventListener("TabSelect", this.onTabSelect, false);
     window.addEventListener("unload", this.onWindowUnload, false);
 
-    let hud = new WebConsole(aTab, aIframe, aTarget);
+    let hud = new WebConsole(aTab, aOptions);
     this.hudReferences[hudId] = hud;
 
+    if (!aAnimated || hud.consolePanel) {
+      this.disableAnimation(hudId);
+    }
+
+    HeadsUpDisplayUICommands.refreshCommand();
+
     return hud;
   },
 
@@ -125,15 +156,21 @@ HUD_SERVICE.prototype =
    *
    * @param nsIDOMElement aTab
    *        The xul:tab element you want to enable the Web Console for.
+   * @param boolean aAnimated
+   *        True if you want to animate the closing of the Web console.
    * @return void
    */
-  deactivateHUDForContext: function HS_deactivateHUDForContext(aTab)
+  deactivateHUDForContext: function HS_deactivateHUDForContext(aTab, aAnimated)
   {
     let hudId = "hud_" + aTab.linkedPanel;
     if (!(hudId in this.hudReferences)) {
       return;
     }
 
+    if (!aAnimated) {
+      this.storeHeight(hudId);
+    }
+
     let hud = this.getHudReferenceById(hudId);
     let document = hud.chromeDocument;
 
@@ -157,12 +194,16 @@ HUD_SERVICE.prototype =
 
       let gBrowser = window.gBrowser;
       let tabContainer = gBrowser.tabContainer;
+      tabContainer.removeEventListener("TabClose", this.onTabClose, false);
+      tabContainer.removeEventListener("TabSelect", this.onTabSelect, false);
 
       this.suspend();
     }
 
     let contentWindow = aTab.linkedBrowser.contentWindow;
     contentWindow.focus();
+
+    HeadsUpDisplayUICommands.refreshCommand();
   },
 
   /**
@@ -214,7 +255,7 @@ HUD_SERVICE.prototype =
   shutdown: function HS_shutdown()
   {
     for (let hud of this.hudReferences) {
-      this.deactivateHUDForContext(hud.tab);
+      this.deactivateHUDForContext(hud.tab, false);
     }
   },
 
@@ -289,6 +330,28 @@ HUD_SERVICE.prototype =
     return sequencer(aInt);
   },
 
+  /**
+   * onTabClose event handler function
+   *
+   * @param aEvent
+   * @returns void
+   */
+  onTabClose: function HS_onTabClose(aEvent)
+  {
+    this.deactivateHUDForContext(aEvent.target, false);
+  },
+
+  /**
+   * onTabSelect event handler function
+   *
+   * @param aEvent
+   * @returns void
+   */
+  onTabSelect: function HS_onTabSelect(aEvent)
+  {
+    HeadsUpDisplayUICommands.refreshCommand();
+  },
+
   /**
    * Called whenever a browser window closes. Cleans up any consoles still
    * around.
@@ -306,12 +369,125 @@ HUD_SERVICE.prototype =
     let gBrowser = window.gBrowser;
     let tabContainer = gBrowser.tabContainer;
 
+    tabContainer.removeEventListener("TabClose", this.onTabClose, false);
+    tabContainer.removeEventListener("TabSelect", this.onTabSelect, false);
+
     let tab = tabContainer.firstChild;
     while (tab != null) {
-      this.deactivateHUDForContext(tab);
+      this.deactivateHUDForContext(tab, false);
       tab = tab.nextSibling;
     }
   },
+
+  /**
+   * Animates the Console appropriately.
+   *
+   * @param string aHUDId The ID of the console.
+   * @param string aDirection Whether to animate the console appearing
+   *        (ANIMATE_IN) or disappearing (ANIMATE_OUT).
+   * @param function aCallback An optional callback, which will be called with
+   *        the "transitionend" event passed as a parameter once the animation
+   *        finishes.
+   */
+  animate: function HS_animate(aHUDId, aDirection, aCallback)
+  {
+    let hudBox = this.getHudReferenceById(aHUDId).iframe;
+    if (!hudBox.hasAttribute("animated")) {
+      if (aCallback) {
+        aCallback();
+      }
+      return;
+    }
+
+    switch (aDirection) {
+      case ANIMATE_OUT:
+        hudBox.style.height = 0;
+        break;
+      case ANIMATE_IN:
+        this.resetHeight(aHUDId);
+        break;
+    }
+
+    if (aCallback) {
+      hudBox.addEventListener("transitionend", aCallback, false);
+    }
+  },
+
+  /**
+   * Disables all animation for a console, for unit testing. After this call,
+   * the console will instantly take on a reasonable height, and the close
+   * animation will not occur.
+   *
+   * @param string aHUDId The ID of the console.
+   */
+  disableAnimation: function HS_disableAnimation(aHUDId)
+  {
+    let hudBox = HUDService.hudReferences[aHUDId].iframe;
+    if (hudBox.hasAttribute("animated")) {
+      hudBox.removeAttribute("animated");
+      this.resetHeight(aHUDId);
+    }
+  },
+
+  /**
+   * Reset the height of the Web Console.
+   *
+   * @param string aHUDId The ID of the Web Console.
+   */
+  resetHeight: function HS_resetHeight(aHUDId)
+  {
+    let HUD = this.hudReferences[aHUDId];
+    let innerHeight = HUD.tab.linkedBrowser.clientHeight;
+    let chromeWindow = HUD.chromeWindow;
+    if (!HUD.consolePanel) {
+      let splitterStyle = chromeWindow.getComputedStyle(HUD.splitter, null);
+      innerHeight += parseInt(splitterStyle.height) +
+                     parseInt(splitterStyle.borderTopWidth) +
+                     parseInt(splitterStyle.borderBottomWidth) +
+                     parseInt(splitterStyle.marginTop) +
+                     parseInt(splitterStyle.marginBottom);
+    }
+
+    let boxStyle = chromeWindow.getComputedStyle(HUD.iframe, null);
+    innerHeight += parseInt(boxStyle.height) +
+                   parseInt(boxStyle.borderTopWidth) +
+                   parseInt(boxStyle.borderBottomWidth);
+
+    let height = this.lastConsoleHeight > 0 ? this.lastConsoleHeight :
+      Math.ceil(innerHeight * DEFAULT_CONSOLE_HEIGHT);
+
+    if ((innerHeight - height) < MINIMUM_PAGE_HEIGHT) {
+      height = innerHeight - MINIMUM_PAGE_HEIGHT;
+    }
+
+    if (isNaN(height) || height < MINIMUM_CONSOLE_HEIGHT) {
+      height = MINIMUM_CONSOLE_HEIGHT;
+    }
+
+    HUD.iframe.style.height = height + "px";
+  },
+
+  /**
+   * Remember the height of the given Web Console, such that it can later be
+   * reused when other Web Consoles are open.
+   *
+   * @param string aHUDId The ID of the Web Console.
+   */
+  storeHeight: function HS_storeHeight(aHUDId)
+  {
+    let hudBox = this.hudReferences[aHUDId].iframe;
+    let window = hudBox.ownerDocument.defaultView;
+    let style = window.getComputedStyle(hudBox, null);
+    let height = parseInt(style.height);
+    height += parseInt(style.borderTopWidth);
+    height += parseInt(style.borderBottomWidth);
+    this.lastConsoleHeight = height;
+
+    let pref = Services.prefs.getIntPref("devtools.hud.height");
+    if (pref > -1) {
+      Services.prefs.setIntPref("devtools.hud.height", height);
+    }
+  },
 };
 
 
@@ -324,36 +500,21 @@ HUD_SERVICE.prototype =
  *
  * @param nsIDOMElement aTab
  *        The xul:tab for which you want the WebConsole object.
- * @param nsIDOMElement aIframe
- *        iframe into which we should create the WebConsole UI.
- * @param RemoteTarget aTarget
- *        The target that the web console will connect to.
+ * @param object aOptions
+ *        Web Console options: host and port, for the remote Web console.
  */
-function WebConsole(aTab, aIframe, aTarget)
+function WebConsole(aTab, aOptions = {})
 {
   this.tab = aTab;
-  if (this.tab == null) {
-    throw new Error('Missing tab');
-  }
-
-  this.iframe = aIframe;
-  if (this.iframe == null) {
-    console.trace();
-    throw new Error('Missing iframe');
-  }
-
   this.chromeDocument = this.tab.ownerDocument;
   this.chromeWindow = this.chromeDocument.defaultView;
   this.hudId = "hud_" + this.tab.linkedPanel;
 
-  this.target = aTarget;
+  this.remoteHost = aOptions.host;
+  this.remotePort = aOptions.port;
 
   this._onIframeLoad = this._onIframeLoad.bind(this);
-
-  this.iframe.className = "web-console-frame";
-  this.iframe.addEventListener("load", this._onIframeLoad, true);
-
-  this.positionConsole();
+  this._initUI();
 }
 
 WebConsole.prototype = {
@@ -374,6 +535,12 @@ WebConsole.prototype = {
    */
   get lastFinishedRequestCallback() HUDService.lastFinishedRequestCallback,
 
+  /**
+   * The xul:panel that holds the Web Console when it is positioned as a window.
+   * @type nsIDOMElement
+   */
+  consolePanel: null,
+
   /**
    * Getter for the xul:popupset that holds any popups we open.
    * @type nsIDOMElement
@@ -394,6 +561,28 @@ WebConsole.prototype = {
 
   get gViewSourceUtils() this.chromeWindow.gViewSourceUtils,
 
+  /**
+   * Initialize the Web Console UI. This method sets up the iframe.
+   * @private
+   */
+  _initUI: function WC__initUI()
+  {
+    this.splitter = this.chromeDocument.createElement("splitter");
+    this.splitter.className = "devtools-horizontal-splitter";
+
+    this.iframe = this.chromeDocument.createElement("iframe");
+    this.iframe.setAttribute("id", this.hudId);
+    this.iframe.className = "web-console-frame";
+    this.iframe.setAttribute("animated", "true");
+    this.iframe.setAttribute("tooltip", "aHTMLTooltip");
+    this.iframe.style.height = 0;
+    this.iframe.addEventListener("load", this._onIframeLoad, true);
+    this.iframe.setAttribute("src", UI_IFRAME_URL);
+
+    let position = Services.prefs.getCharPref("devtools.webconsole.position");
+    this.positionConsole(position);
+  },
+
   /**
    * The "load" event handler for the Web Console iframe.
    * @private
@@ -402,8 +591,144 @@ WebConsole.prototype = {
   {
     this.iframe.removeEventListener("load", this._onIframeLoad, true);
 
+    let position = Services.prefs.getCharPref("devtools.webconsole.position");
+
     this.iframeWindow = this.iframe.contentWindow.wrappedJSObject;
-    this.ui = new this.iframeWindow.WebConsoleFrame(this);
+    this.ui = new this.iframeWindow.WebConsoleFrame(this, position);
+  },
+
+  /**
+   * Create a panel to open the web console if it should float above
+   * the content in its own window.
+   * @private
+   */
+  _createOwnWindowPanel: function WC__createOwnWindowPanel()
+  {
+    if (this.consolePanel) {
+      return;
+    }
+
+    let width = 0;
+    try {
+      width = Services.prefs.getIntPref("devtools.webconsole.width");
+    }
+    catch (ex) {}
+
+    if (width < 1) {
+      width = this.iframe.clientWidth || this.chromeWindow.innerWidth;
+    }
+
+    let height = this.iframe.clientHeight;
+
+    let top = 0;
+    try {
+      top = Services.prefs.getIntPref("devtools.webconsole.top");
+    }
+    catch (ex) {}
+
+    let left = 0;
+    try {
+      left = Services.prefs.getIntPref("devtools.webconsole.left");
+    }
+    catch (ex) {}
+
+    let panel = this.chromeDocument.createElementNS(XUL_NS, "panel");
+
+    let config = { id: "console_window_" + this.hudId,
+                   label: this.getPanelTitle(),
+                   titlebar: "normal",
+                   noautohide: "true",
+                   norestorefocus: "true",
+                   close: "true",
+                   flex: "1",
+                   hudId: this.hudId,
+                   width: width,
+                   position: "overlap",
+                   top: top,
+                   left: left,
+                 };
+
+    for (let attr in config) {
+      panel.setAttribute(attr, config[attr]);
+    }
+
+    panel.classList.add("web-console-panel");
+
+    let onPopupShown = (function HUD_onPopupShown() {
+      panel.removeEventListener("popupshown", onPopupShown, false);
+
+      // Make sure that the HUDBox size updates when the panel is resized.
+
+      let height = panel.clientHeight;
+
+      this.iframe.style.height = "auto";
+      this.iframe.flex = 1;
+
+      panel.setAttribute("height", height);
+    }).bind(this);
+
+    panel.addEventListener("popupshown", onPopupShown,false);
+
+    let onPopupHidden = (function HUD_onPopupHidden(aEvent) {
+      if (aEvent.target != panel) {
+        return;
+      }
+
+      panel.removeEventListener("popuphidden", onPopupHidden, false);
+
+      let width = 0;
+      try {
+        width = Services.prefs.getIntPref("devtools.webconsole.width");
+      }
+      catch (ex) { }
+
+      if (width > 0) {
+        Services.prefs.setIntPref("devtools.webconsole.width", panel.clientWidth);
+      }
+
+      // Are we destroying the HUD or repositioning it?
+      if (this.consoleWindowUnregisterOnHide) {
+        HUDService.deactivateHUDForContext(this.tab, false);
+      }
+    }).bind(this);
+
+    panel.addEventListener("popuphidden", onPopupHidden, false);
+
+    let lastIndex = -1;
+
+    if (this.outputNode && this.outputNode.getIndexOfFirstVisibleRow) {
+      lastIndex = this.outputNode.getIndexOfFirstVisibleRow() +
+                  this.outputNode.getNumberOfVisibleRows() - 1;
+    }
+
+    if (this.splitter.parentNode) {
+      this.splitter.parentNode.removeChild(this.splitter);
+    }
+
+    this._beforePositionConsole("window", lastIndex);
+
+    panel.appendChild(this.iframe);
+
+    let space = this.chromeDocument.createElement("spacer");
+    space.flex = 1;
+
+    let bottomBox = this.chromeDocument.createElement("hbox");
+
+    let resizer = this.chromeDocument.createElement("resizer");
+    resizer.setAttribute("dir", "bottomend");
+    resizer.setAttribute("element", config.id);
+
+    bottomBox.appendChild(space);
+    bottomBox.appendChild(resizer);
+
+    panel.appendChild(bottomBox);
+
+    this.mainPopupSet.appendChild(panel);
+
+    panel.openPopup(null, "overlay", left, top, false, false);
+
+    this.consolePanel = panel;
+    this.consoleWindowUnregisterOnHide = true;
   },
 
   /**
@@ -418,13 +743,44 @@ WebConsole.prototype = {
     return l10n.getFormatStr("webConsoleWindowTitleAndURL", [url]);
   },
 
+  positions: {
+    above: 0, // the childNode index
+    below: 2,
+    window: null
+  },
+
   consoleWindowUnregisterOnHide: true,
 
   /**
    * Position the Web Console UI.
+   *
+   * @param string aPosition
+   *        The desired Web Console UI location: above, below or window.
    */
-  positionConsole: function WC_positionConsole()
+  positionConsole: function WC_positionConsole(aPosition)
   {
+    if (!(aPosition in this.positions)) {
+      throw new Error("Incorrect argument: " + aPosition +
+        ". Cannot position Web Console");
+    }
+
+    if (aPosition == "window") {
+      this._createOwnWindowPanel();
+      return;
+    }
+
+    let height = this.iframe.clientHeight;
+
+    // get the node position index
+    let nodeIdx = this.positions[aPosition];
+    let nBox = this.chromeDocument.getElementById(this.tab.linkedPanel);
+    let node = nBox.childNodes[nodeIdx];
+
+    // check to see if console is already positioned in aPosition
+    if (node == this.iframe) {
+      return;
+    }
+
     let lastIndex = -1;
 
     if (this.outputNode && this.outputNode.getIndexOfFirstVisibleRow) {
@@ -432,18 +788,45 @@ WebConsole.prototype = {
                   this.outputNode.getNumberOfVisibleRows() - 1;
     }
 
-    this._beforePositionConsole(lastIndex);
+    // remove the console and splitter and reposition
+    if (this.splitter.parentNode) {
+      this.splitter.parentNode.removeChild(this.splitter);
+    }
+
+    this._beforePositionConsole(aPosition, lastIndex);
+
+    if (aPosition == "below") {
+      nBox.appendChild(this.splitter);
+      nBox.appendChild(this.iframe);
+    }
+    else {
+      nBox.insertBefore(this.splitter, node);
+      nBox.insertBefore(this.iframe, this.splitter);
+    }
+
+    if (this.consolePanel) {
+      // must destroy the consolePanel
+      this.consoleWindowUnregisterOnHide = false;
+      this.consolePanel.hidePopup();
+      this.consolePanel.parentNode.removeChild(this.consolePanel);
+      this.consolePanel = null;   // remove this as we're not in panel anymore
+      this.iframe.removeAttribute("flex");
+      this.iframe.removeAttribute("height");
+      this.iframe.style.height = height + "px";
+    }
   },
 
   /**
    * Common code that needs to execute before the Web Console is repositioned.
    * @private
+   * @param string aPosition
+   *        The new position: "above", "below" or "window".
    * @param number aLastIndex
    *        The last visible message in the console output before repositioning
    *        occurred.
    */
   _beforePositionConsole:
-  function WC__beforePositionConsole(aLastIndex)
+  function WC__beforePositionConsole(aPosition, aLastIndex)
   {
     if (!this.ui) {
       return;
@@ -452,11 +835,14 @@ WebConsole.prototype = {
     let onLoad = function() {
       this.iframe.removeEventListener("load", onLoad, true);
       this.iframeWindow = this.iframe.contentWindow.wrappedJSObject;
-      this.ui.positionConsole(this.iframeWindow);
+      this.ui.positionConsole(aPosition, this.iframeWindow);
 
       if (aLastIndex > -1 && aLastIndex < this.outputNode.getRowCount()) {
         this.outputNode.ensureIndexIsVisible(aLastIndex);
       }
+
+      this._currentUIPosition = aPosition;
+      Services.prefs.setCharPref("devtools.webconsole.position", aPosition);
     }.bind(this);
 
     this.iframe.addEventListener("load", onLoad, true);
@@ -472,6 +858,16 @@ WebConsole.prototype = {
     return this.ui ? this.ui.jsterm : null;
   },
 
+  /**
+   * The close button handler.
+   */
+  onCloseButton: function WC_onCloseButton()
+  {
+    HUDService.animate(this.hudId, ANIMATE_OUT, function() {
+      HUDService.deactivateHUDForContext(this.tab, true);
+    }.bind(this));
+  },
+
   /**
    * The clear output button handler.
    * @private
@@ -481,6 +877,22 @@ WebConsole.prototype = {
     this.chromeWindow.DeveloperToolbar.resetErrorsCount(this.tab);
   },
 
+  /**
+   * Handler for page location changes. If the Web Console is
+   * opened in a panel the panel title is updated.
+   *
+   * @param string aURI
+   *        New page location.
+   * @param string aTitle
+   *        New page title.
+   */
+  onLocationChange: function WC_onLocationChange(aURI, aTitle)
+  {
+    if (this.consolePanel) {
+      this.consolePanel.label = this.getPanelTitle();
+    }
+  },
+
   /**
    * Alias for the WebConsoleFrame.setFilterState() method.
    * @see webconsole.js::WebConsoleFrame.setFilterState()
@@ -533,14 +945,14 @@ WebConsole.prototype = {
     let styleSheets = this.tab.linkedBrowser.contentWindow.document.styleSheets;
     for each (let style in styleSheets) {
       if (style.href == aSourceURL) {
-        let target = TargetFactory.forTab(this.tab);
-        let gDevTools = this.chromeWindow.gDevTools;
-        let toolbox = gDevTools.getToolboxForTarget(target);
-        toolbox.once("styleeditor-selected",
-          function _onStyleEditorReady(aEvent, aPanel) {
-            aPanel.selectStyleSheet(style, aSourceLine);
-          });
-        toolbox.selectTool("styleeditor");
+        let SEM = this.chromeWindow.StyleEditor.StyleEditorManager;
+        let win = SEM.getEditorForWindow(this.chromeWindow.content.window);
+        if (win) {
+          SEM.selectEditor(win, style, aSourceLine);
+        }
+        else {
+          this.chromeWindow.StyleEditor.openChrome(style, aSourceLine);
+        }
         return;
       }
     }
@@ -565,7 +977,9 @@ WebConsole.prototype = {
     let popupset = this.mainPopupSet;
     let panels = popupset.querySelectorAll("panel[hudId=" + this.hudId + "]");
     for (let panel of panels) {
-      panel.hidePopup();
+      if (panel != this.consolePanel) {
+        panel.hidePopup();
+      }
     }
 
     let onDestroy = function WC_onDestroyUI() {
@@ -581,6 +995,10 @@ WebConsole.prototype = {
         this.iframe.parentNode.removeChild(this.iframe);
       }
 
+      if (this.splitter.parentNode) {
+        this.splitter.parentNode.removeChild(this.splitter);
+      }
+
       aOnDestroy && aOnDestroy();
     }.bind(this);
 
@@ -598,11 +1016,53 @@ WebConsole.prototype = {
 //////////////////////////////////////////////////////////////////////////
 
 var HeadsUpDisplayUICommands = {
+  refreshCommand: function UIC_refreshCommand() {
+    var window = HUDService.currentContext();
+    if (!window) {
+      return;
+    }
+
+    let command = window.document.getElementById("Tools:WebConsole");
+    if (this.getOpenHUD() != null) {
+      command.setAttribute("checked", true);
+    } else {
+      command.setAttribute("checked", false);
+    }
+  },
+
   toggleHUD: function UIC_toggleHUD(aOptions)
   {
     var window = HUDService.currentContext();
-    let target = TargetFactory.forTab(window.gBrowser.selectedTab);
-    gDevTools.toggleToolboxForTarget(target, "webconsole");
+    var gBrowser = window.gBrowser;
+    var linkedBrowser = gBrowser.selectedTab.linkedBrowser;
+    var tabId = gBrowser.getNotificationBox(linkedBrowser).getAttribute("id");
+    var hudId = "hud_" + tabId;
+    var ownerDocument = gBrowser.selectedTab.ownerDocument;
+    var hud = ownerDocument.getElementById(hudId);
+    var hudRef = HUDService.hudReferences[hudId];
+
+    if (hudRef && hud) {
+      if (hudRef.consolePanel) {
+        hudRef.consolePanel.hidePopup();
+      }
+      else {
+        HUDService.storeHeight(hudId);
+
+        HUDService.animate(hudId, ANIMATE_OUT, function() {
+          // If the user closes the console while the console is animating away,
+          // then these callbacks will queue up, but all the callbacks after the
+          // first will have no console to operate on. This test handles this
+          // case gracefully.
+          if (ownerDocument.getElementById(hudId)) {
+            HUDService.deactivateHUDForContext(gBrowser.selectedTab, true);
+          }
+        });
+      }
+    }
+    else {
+      HUDService.activateHUDForContext(gBrowser.selectedTab, true, aOptions);
+      HUDService.animate(hudId, ANIMATE_IN);
+    }
   },
 
   toggleRemoteHUD: function UIC_toggleRemoteHUD()
@@ -684,5 +1144,8 @@ var WebConsoleObserver = {
   },
 };
 
-const HUDService = new HUD_SERVICE();
+
+XPCOMUtils.defineLazyGetter(this, "HUDService", function () {
+  return new HUD_SERVICE();
+});
 
diff --git a/browser/devtools/webconsole/Makefile.in b/browser/devtools/webconsole/Makefile.in
index 4e820ee84038..ed66e5a9fb71 100644
--- a/browser/devtools/webconsole/Makefile.in
+++ b/browser/devtools/webconsole/Makefile.in
@@ -15,7 +15,6 @@ EXTRA_JS_MODULES = \
 		PropertyPanel.jsm \
 		NetworkPanel.jsm \
 		AutocompletePopup.jsm \
-		WebConsolePanel.jsm \
 		$(NULL)
 
 TEST_DIRS = test
diff --git a/browser/devtools/webconsole/WebConsolePanel.jsm b/browser/devtools/webconsole/WebConsolePanel.jsm
deleted file mode 100644
index feec3d7a4ae3..000000000000
--- a/browser/devtools/webconsole/WebConsolePanel.jsm
+++ /dev/null
@@ -1,102 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-this.EXPORTED_SYMBOLS = [ "WebConsoleDefinition" ];
-
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "Services",
-                                  "resource://gre/modules/Services.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils",
-                                  "resource://gre/modules/devtools/WebConsoleUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "HUDService",
-                                  "resource:///modules/HUDService.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "EventEmitter",
-                                  "resource:///modules/devtools/EventEmitter.jsm");
-
-const STRINGS_URI = "chrome://browser/locale/devtools/webconsole.properties";
-let l10n = new WebConsoleUtils.l10n(STRINGS_URI);
-
-/**
- * The external API allowing us to be registered with DevTools.jsm
- */
-this.WebConsoleDefinition = {
-  id: "webconsole",
-  key: l10n.getStr("cmd.commandkey"),
-  accesskey: l10n.getStr("webConsoleCmd.accesskey"),
-  modifiers: Services.appinfo.OS == "Darwin" ? "accel,alt" : "accel,shift",
-  ordinal: 0,
-  icon: "chrome://browser/skin/devtools/webconsole-tool-icon.png",
-  url: "chrome://browser/content/devtools/webconsole.xul",
-  label: l10n.getStr("ToolboxWebconsole.label"),
-  isTargetSupported: function(target) {
-    return true;
-  },
-  build: function(iframeWindow, toolbox) {
-    return new WebConsolePanel(iframeWindow, toolbox);
-  }
-};
-
-/**
- * A DevToolPanel that controls the Web Console.
- */
-function WebConsolePanel(iframeWindow, toolbox) {
-  this._frameWindow = iframeWindow;
-  this._toolbox = toolbox;
-  new EventEmitter(this);
-
-  let tab = this._toolbox._getHostTab();
-  let parentDoc = iframeWindow.document.defaultView.parent.document;
-  let iframe = parentDoc.getElementById("toolbox-panel-iframe-webconsole");
-  this.hud = HUDService.activateHUDForContext(tab, iframe, toolbox.target);
-
-  let hudId = this.hud.hudId;
-  let onOpen = function _onWebConsoleOpen(aSubject)
-  {
-    aSubject.QueryInterface(Ci.nsISupportsString);
-    if (hudId == aSubject.data) {
-      Services.obs.removeObserver(onOpen, "web-console-created");
-      this.setReady();
-    }
-  }.bind(this);
-
-  Services.obs.addObserver(onOpen, "web-console-created", false);
-}
-
-WebConsolePanel.prototype = {
-  get target() this._toolbox.target,
-
-  _isReady: false,
-  get isReady() this._isReady,
-
-  destroy: function WCP_destroy()
-  {
-    let hudId = this.hud.hudId;
-
-    let onClose = function _onWebConsoleClose(aSubject)
-    {
-      aSubject.QueryInterface(Ci.nsISupportsString);
-      if (hudId == aSubject.data) {
-        Services.obs.removeObserver(onClose, "web-console-destroyed");
-        this.emit("destroyed");
-      }
-    }.bind(this);
-
-    Services.obs.addObserver(onClose, "web-console-destroyed", false);
-    HUDService.deactivateHUDForContext(this.hud.tab, false);
-  },
-
-  setReady: function WCP_setReady()
-  {
-    this._isReady = true;
-    this.emit("ready");
-  },
-}
diff --git a/browser/devtools/webconsole/test/Makefile.in b/browser/devtools/webconsole/test/Makefile.in
index 859962aa4c68..28e16c392af6 100644
--- a/browser/devtools/webconsole/test/Makefile.in
+++ b/browser/devtools/webconsole/test/Makefile.in
@@ -46,6 +46,7 @@ MOCHITEST_BROWSER_FILES = \
 	browser_webconsole_property_provider.js \
 	browser_webconsole_bug_587617_output_copy.js \
 	browser_webconsole_bug_585237_line_limit.js \
+	browser_webconsole_bug_581231_close_button.js \
 	browser_webconsole_bug_582201_duplicate_errors.js \
 	browser_webconsole_bug_580454_timestamp_l10n.js \
 	browser_webconsole_netlogging.js \
@@ -60,6 +61,7 @@ MOCHITEST_BROWSER_FILES = \
 	browser_webconsole_bug_601352_scroll.js \
 	browser_webconsole_bug_592442_closing_brackets.js \
 	browser_webconsole_bug_593003_iframe_wrong_hud.js \
+	browser_webconsole_bug_601909_remember_height.js \
 	browser_webconsole_bug_613013_console_api_iframe.js \
 	browser_webconsole_bug_597756_reopen_closed_tab.js \
 	browser_webconsole_bug_600183_charset.js \
@@ -90,9 +92,11 @@ MOCHITEST_BROWSER_FILES = \
 	browser_webconsole_bug_632275_getters_document_width.js \
 	browser_webconsole_bug_644419_log_limits.js \
 	browser_webconsole_bug_646025_console_file_location.js \
+	browser_webconsole_position_ui.js \
 	browser_webconsole_bug_642615_autocomplete.js \
 	browser_webconsole_bug_585991_autocomplete_popup.js \
 	browser_webconsole_bug_585991_autocomplete_keys.js \
+	browser_webconsole_bug_663443_panel_title.js \
 	browser_webconsole_bug_660806_history_nav.js \
 	browser_webconsole_bug_651501_document_body_autocomplete.js \
 	browser_webconsole_bug_653531_highlighter_console_helper.js \
@@ -102,11 +106,13 @@ MOCHITEST_BROWSER_FILES = \
 	browser_webconsole_bug_658368_time_methods.js \
 	browser_webconsole_bug_764572_output_open_url.js \
 	browser_webconsole_bug_622303_persistent_filters.js \
-	browser_webconsole_bug_770099_bad_policyuri.js \
-	browser_webconsole_bug_770099_violation.js \
+        browser_webconsole_bug_770099_bad_policyuri.js \
+        browser_webconsole_bug_770099_violation.js \
 	browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js \
+	browser_webconsole_window_zombie.js \
 	browser_cached_messages.js \
 	browser_bug664688_sandbox_update_after_navigation.js \
+	browser_webconsole_menustatus.js \
 	browser_result_format_as_string.js \
 	browser_webconsole_bug_737873_mixedcontent.js \
 	browser_output_breaks_after_console_dir_uninspectable.js \
@@ -196,10 +202,10 @@ MOCHITEST_BROWSER_FILES += \
 	test-bug-658368-time-methods.html \
 	test-webconsole-error-observer.html \
 	test-for-of.html \
-	test_bug_770099_violation.html \
-	test_bug_770099_violation.html^headers^ \
-	test_bug_770099_bad_policy_uri.html \
-	test_bug_770099_bad_policy_uri.html^headers^ \
+        test_bug_770099_violation.html \
+        test_bug_770099_violation.html^headers^ \
+        test_bug_770099_bad_policy_uri.html \
+        test_bug_770099_bad_policy_uri.html^headers^ \
 	test-result-format-as-string.html \
 	test-bug-737873-mixedcontent.html \
 	$(NULL)
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_581231_close_button.js b/browser/devtools/webconsole/test/browser_webconsole_bug_581231_close_button.js
new file mode 100644
index 000000000000..afe62c8a21f1
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_581231_close_button.js
@@ -0,0 +1,37 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * Contributor(s):
+ *  Patrick Walton <pcwalton@mozilla.com>
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// Tests that the Web Console close button functions.
+
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
+
+function test() {
+  addTab(TEST_URI);
+  browser.addEventListener("load", function onLoad() {
+    browser.removeEventListener("load", onLoad, true);
+    openConsole(null, testCloseButton);
+  }, true);
+}
+
+function testCloseButton(hud) {
+  let hudId = hud.hudId;
+  HUDService.disableAnimation(hudId);
+  waitForFocus(function() {
+    let closeButton = hud.ui.closeButton;
+    ok(closeButton != null, "we have the close button");
+
+    EventUtils.synthesizeMouse(closeButton, 2, 2, {}, hud.iframeWindow);
+
+    ok(!(hudId in HUDService.hudReferences), "the console is closed when " +
+       "the close button is pressed");
+
+    finishTest();
+  }, hud.iframeWindow);
+}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js b/browser/devtools/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
index c5fe4505af0d..f1e40dfaa3cc 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
@@ -44,20 +44,18 @@ function tab2Loaded(aEvent) {
 
   function openConsoles() {
     try {
-      let target1 = TargetFactory.forTab(tab1);
-      gDevTools.openToolboxForTab(target1, "webconsole");
+      HUDService.activateHUDForContext(tab1);
     }
     catch (ex) {
-      ok(false, "gDevTools.openToolboxForTab(target1) exception: " + ex);
+      ok(false, "HUDService.activateHUDForContext(tab1) exception: " + ex);
       noErrors = false;
     }
 
     try {
-      let target2 = TargetFactory.forTab(tab2);
-      gDevTools.openToolboxForTab(target2, "webconsole");
+      HUDService.activateHUDForContext(tab2);
     }
     catch (ex) {
-      ok(false, "gDevTools.openToolboxForTab(target2) exception: " + ex);
+      ok(false, "HUDService.activateHUDForContext(tab2) exception: " + ex);
       noErrors = false;
     }
   }
@@ -76,20 +74,18 @@ function tab2Loaded(aEvent) {
     Services.obs.addObserver(onWebConsoleClose, "web-console-destroyed", false);
 
     try {
-      let target1 = TargetFactory.forTab(tab1);
-      gDevTools.closeToolbox(target1);
+      HUDService.deactivateHUDForContext(tab1);
     }
     catch (ex) {
-      ok(false, "gDevTools.closeToolbox(target1) exception: " + ex);
+      ok(false, "HUDService.deactivateHUDForContext(tab1) exception: " + ex);
       noErrors = false;
     }
 
     try {
-      let target2 = TargetFactory.forTab(tab2);
-      gDevTools.closeToolbox(target2);
+      HUDService.deactivateHUDForContext(tab2);
     }
     catch (ex) {
-      ok(false, "gDevTools.closeToolbox(target2) exception: " + ex);
+      ok(false, "HUDService.deactivateHUDForContext(tab2) exception: " + ex);
       noErrors = false;
     }
   }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_601909_remember_height.js b/browser/devtools/webconsole/test/browser_webconsole_bug_601909_remember_height.js
new file mode 100644
index 000000000000..de8649179159
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_601909_remember_height.js
@@ -0,0 +1,107 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * Contributor(s):
+ *  Mihai Șucan <mihai.sucan@gmail.com>
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// Minimum console height, in pixels.
+const MINIMUM_CONSOLE_HEIGHT = 150;
+
+// Minimum page height, in pixels. This prevents the Web Console from
+// remembering a height that covers the whole page.
+const MINIMUM_PAGE_HEIGHT = 50;
+const HEIGHT_PREF = "devtools.hud.height";
+
+let hud, newHeight, height, innerHeight, testDriver;
+
+function testGen()
+{
+  height = parseInt(hud.style.height);
+
+  toggleConsole();
+  yield;
+
+  is(newHeight, height, "same height after reopening the console");
+  is(Services.prefs.getIntPref(HEIGHT_PREF), HUDService.lastConsoleHeight,
+    "pref is correct");
+
+  setHeight(Math.ceil(innerHeight * 0.5));
+  toggleConsole();
+  yield;
+
+  is(newHeight, height, "same height after reopening the console");
+  is(Services.prefs.getIntPref(HEIGHT_PREF), HUDService.lastConsoleHeight,
+    "pref is correct");
+
+  setHeight(MINIMUM_CONSOLE_HEIGHT - 1);
+  toggleConsole();
+  yield;
+
+  is(newHeight, MINIMUM_CONSOLE_HEIGHT, "minimum console height is respected");
+  is(Services.prefs.getIntPref(HEIGHT_PREF), HUDService.lastConsoleHeight,
+    "pref is correct");
+
+  setHeight(innerHeight - MINIMUM_PAGE_HEIGHT + 1);
+  toggleConsole();
+  yield;
+
+  is(newHeight, innerHeight - MINIMUM_PAGE_HEIGHT,
+    "minimum page height is respected");
+  is(Services.prefs.getIntPref(HEIGHT_PREF), HUDService.lastConsoleHeight,
+    "pref is correct");
+
+  setHeight(Math.ceil(innerHeight * 0.6));
+  Services.prefs.setIntPref(HEIGHT_PREF, -1);
+  toggleConsole();
+  yield;
+
+  is(newHeight, height, "same height after reopening the console");
+  is(Services.prefs.getIntPref(HEIGHT_PREF), -1, "pref is not updated");
+
+  closeConsole();
+  HUDService.lastConsoleHeight = 0;
+  Services.prefs.setIntPref(HEIGHT_PREF, 0);
+
+  hud = testDriver = null;
+  executeSoon(finishTest);
+
+  yield;
+}
+
+function toggleConsole()
+{
+  closeConsole(null, function() {
+    openConsole(null, function() {
+      let hudId = HUDService.getHudIdByWindow(content);
+      hud = HUDService.hudReferences[hudId].iframe;
+      newHeight = parseInt(hud.style.height);
+
+      testDriver.next();
+    });
+  });
+}
+
+function setHeight(aHeight)
+{
+  height = aHeight;
+  hud.style.height = height + "px";
+}
+
+function test()
+{
+  addTab("data:text/html;charset=utf-8,Web Console test for bug 601909");
+  browser.addEventListener("load", function onLoad() {
+    browser.removeEventListener("load", onLoad, true);
+    innerHeight = content.innerHeight;
+    openConsole(null, function(aHud) {
+      hud = aHud.iframe;
+      testDriver = testGen();
+      testDriver.next();
+    });
+  }, true);
+}
+
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js b/browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js
index d22a50c9b3ec..5623f52b2cb2 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js
@@ -46,6 +46,7 @@ function startTest()
   let win2 = tabs[runCount*2 + 1].linkedBrowser.contentWindow;
   let hudId2 = HUDService.getHudIdByWindow(win2);
   huds[1] = HUDService.hudReferences[hudId2];
+  HUDService.disableAnimation(hudId2);
 
   if (runCount == 0) {
     menuitems[1] = huds[1].ui.rootElement.querySelector("#saveBodies");
@@ -114,6 +115,7 @@ function onpopupshown2b(aEvent)
       let win1 = tabs[runCount*2].linkedBrowser.contentWindow;
       let hudId1 = HUDService.getHudIdByWindow(win1);
       huds[0] = HUDService.hudReferences[hudId1];
+      HUDService.disableAnimation(hudId1);
 
       info("iframe1 height " + huds[0].iframe.clientHeight);
       info("iframe1 root height " + huds[0].ui.rootElement.clientHeight);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js b/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
index 1fd615fb9556..9e451d0ca175 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+let prefService = Services.prefs;
+
 let prefs = {
   "net": [
     "network",
@@ -26,7 +28,7 @@ function test() {
   // Set all prefs to true
   for (let category in prefs) {
     prefs[category].forEach(function(pref) {
-      Services.prefs.setBoolPref("devtools.webconsole.filter." + pref, true);
+      prefService.setBoolPref("devtools.webconsole.filter." + pref, true);
     });
   }
 
@@ -105,11 +107,12 @@ function onConsoleReopen2(hud) {
   // Clear prefs
   for (let category in prefs) {
     prefs[category].forEach(function(pref) {
-      Services.prefs.clearUserPref("devtools.webconsole.filter." + pref);
+      prefService.clearUserPref("devtools.webconsole.filter." + pref);
     });
   }
 
-  prefs = null;
+  prefs = prefService = null;
+  gBrowser.removeCurrentTab();
   finishTest();
 }
 
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js b/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
index 22eba17a0454..4eeaec88a687 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
@@ -44,17 +44,18 @@ function setupHighlighterTests()
 {
   let h1 = content.document.querySelector("h1");
   ok(h1, "we have the header node");
-
-  openInspector(runSelectionTests);
+  Services.obs.addObserver(runSelectionTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.toggleInspectorUI();
 }
 
-function runSelectionTests(aInspector)
+function runSelectionTests()
 {
-  aInspector.highlighter.unlock();
-  aInspector.highlighter.outline.setAttribute("disable-transitions", "true");
+  Services.obs.removeObserver(runSelectionTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
 
   executeSoon(function() {
-    aInspector.selection.once("new-node", performTestComparisons);
+    InspectorUI.highlighter.addListener("nodeselected", performTestComparisons);
     let h1 = content.document.querySelector("h1");
     EventUtils.synthesizeMouse(h1, 2, 2, {type: "mousemove"}, content);
   });
@@ -62,24 +63,19 @@ function runSelectionTests(aInspector)
 
 function performTestComparisons()
 {
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  let inspector = gDevTools.getPanelForTarget("inspector", target);
-  inspector.highlighter.lock();
+  InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons);
 
-  let isHighlighting =
-    !(inspector.highlighter.outline.getAttribute("hidden") == "true");
-
-  ok(isHighlighting, "inspector is highlighting");
+  InspectorUI.stopInspecting();
 
   let h1 = content.document.querySelector("h1");
-  is(inspector.selection.node, h1, "selection matches node");
+  is(InspectorUI.highlighter.node, h1, "node selected");
+  is(InspectorUI.selection, h1, "selection matches node");
 
   openConsole(gBrowser.selectedTab, performWebConsoleTests);
 }
 
 function performWebConsoleTests(hud)
 {
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
   let jsterm = hud.jsterm;
   outputNode = hud.outputNode;
 
@@ -116,8 +112,7 @@ function performWebConsoleTests(hud)
       let node = outputNode.querySelector(".webconsole-msg-output");
       isnot(node.textContent.indexOf("bug653531"), -1,
             "correct output for $0.textContent");
-      let inspector = gDevTools.getPanelForTarget("inspector", target);
-      is(inspector.selection.node.textContent, "bug653531",
+      is(InspectorUI.selection.textContent, "bug653531",
          "node successfully updated");
 
       executeSoon(finishUp);
@@ -127,6 +122,7 @@ function performWebConsoleTests(hud)
 }
 
 function finishUp() {
+  InspectorUI.closeInspectorUI();
   finishTest();
 }
 
@@ -134,8 +130,8 @@ function test()
 {
   waitForExplicitFinish();
   gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
-    gBrowser.selectedBrowser.removeEventListener("load", onLoad, true);
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
     waitForFocus(createDocument, content);
   }, true);
 
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js b/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
index ade0c09363ae..0f685f88e672 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
@@ -21,11 +21,10 @@ function consoleOpened(HUD)
 
   let jsterm = HUD.jsterm;
   let popup = jsterm.autocompletePopup;
-  let onShown = function() {
+  popup._panel.addEventListener("popupshown", function() {
+    popup._panel.removeEventListener("popupshown", arguments.callee, false);
     ok(false, "popup shown");
-  };
-
-  popup._panel.addEventListener("popupshown", onShown, false);
+  }, false);
 
   ok(!popup.isOpen, "popup is not open");
 
@@ -42,7 +41,6 @@ function consoleOpened(HUD)
 
   executeSoon(function() {
     ok(!popup.isOpen, "popup is not open");
-    popup._panel.removeEventListener("popupshown", onShown, false);
     executeSoon(finishTest);
   });
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_663443_panel_title.js b/browser/devtools/webconsole/test/browser_webconsole_bug_663443_panel_title.js
new file mode 100644
index 000000000000..b485165d7069
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_663443_panel_title.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/ */
+
+const TEST_URI = "data:text/html;charset=utf-8,<p>test for bug 663443. test1";
+
+const POSITION_PREF = "devtools.webconsole.position";
+const POSITION_WINDOW = "window";
+
+function consoleOpened() {
+  document.removeEventListener("popupshown", consoleOpened, false);
+
+  let HUD = HUDService.getHudByWindow(content);
+  ok(HUD.consolePanel, "Web Console opened in a panel");
+
+  let waitForTitleChange = {
+    name: "panel title change",
+    validatorFn: function() {
+      return HUD.consolePanel.label.indexOf("test2") > -1;
+    },
+    successFn: testEnd,
+    failureFn: testEnd,
+  };
+
+  waitForSuccess({
+    name: "initial panel title",
+    validatorFn: function() {
+      return HUD.consolePanel.label.indexOf("test1") > -1;
+    },
+    successFn: function() {
+      content.location = "data:text/html;charset=utf-8,<p>test2 for bug 663443";
+      waitForSuccess(waitForTitleChange);
+    },
+    failureFn: testEnd,
+  });
+}
+
+function testEnd() {
+  closeConsole(null, finishTest);
+}
+
+function test() {
+  addTab(TEST_URI);
+  browser.addEventListener("load", function onLoad() {
+    browser.removeEventListener("load", onLoad, true);
+
+    Services.prefs.setCharPref(POSITION_PREF, POSITION_WINDOW);
+
+    registerCleanupFunction(function() {
+      Services.prefs.clearUserPref(POSITION_PREF);
+    });
+  
+    document.addEventListener("popupshown", consoleOpened, false);
+
+    openConsole();
+  }, true);
+}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js b/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
index e3d214aa5282..48614c9cc024 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
@@ -39,9 +39,7 @@ function testViewSource(aHud)
       nodes = hud.outputNode.querySelectorAll(selector);
       is(nodes.length, 2, "correct number of css messages");
 
-      let target = TargetFactory.forTab(gBrowser.selectedTab);
-      let toolbox = gDevTools.getToolboxForTarget(target);
-      toolbox.once("styleeditor-selected", onStyleEditorReady);
+      Services.ww.registerNotification(observer);
 
       EventUtils.sendMouseEvent({ type: "click" }, nodes[0]);
     },
@@ -49,75 +47,88 @@ function testViewSource(aHud)
   });
 }
 
-function onStyleEditorReady(aEvent, aPanel)
-{
-  info(aEvent + " event fired");
-
-  SEC = aPanel.styleEditorChrome;
-  let win = aPanel.panelWindow;
-  ok(win, "Style Editor Window is defined");
-  ok(SEC, "Style Editor Chrome is defined");
-
-  function sheetForNode(aNode)
+let observer = {
+  observe: function(aSubject, aTopic, aData)
   {
-    let href = aNode.getAttribute("title");
-    let sheet, i = 0;
-    while((sheet = content.document.styleSheets[i++])) {
-      if (sheet.href == href) {
-        return sheet;
+    if (aTopic != "domwindowopened") {
+      return;
+    }
+    Services.ww.unregisterNotification(observer);
+    info("Style Editor window was opened in response to clicking " +
+         "the location node");
+
+    function sheetForNode(aNode)
+    {
+      let href = aNode.getAttribute("title");
+      let sheet, i = 0;
+      while((sheet = content.document.styleSheets[i++])) {
+        if (sheet.href == href) {
+          return sheet;
+        }
       }
     }
-  }
 
-  waitForFocus(function() {
-    info("style editor window focused");
+    executeSoon(function() {
+      let styleEditorWin = window.StyleEditor.StyleEditorManager
+                          .getEditorForWindow(content.window);
+      ok(styleEditorWin, "Style Editor window is defined");
 
-    let sheet = sheetForNode(nodes[0]);
-    ok(sheet, "sheet found");
-    let line = nodes[0].sourceLine;
-    ok(line, "found source line");
+      waitForFocus(function() {
+        SEC = styleEditorWin.styleEditorChrome;
+        ok(SEC, "Style Editor Chrome is defined");
 
-    checkStyleEditorForSheetAndLine(sheet, line - 1, function() {
-      info("first check done");
+        let sheet = sheetForNode(nodes[0]);
+        ok(sheet, "sheet found");
+        let line = nodes[0].sourceLine;
+        ok(line, "found source line");
 
-      let target = TargetFactory.forTab(gBrowser.selectedTab);
-      let toolbox = gDevTools.getToolboxForTarget(target);
+        checkStyleEditorForSheetAndLine(sheet, line - 1, function() {
+          let sheet = sheetForNode(nodes[1]);
+          ok(sheet, "sheet found");
+          let line = nodes[1].sourceLine;
+          ok(line, "found source line");
 
-      let sheet = sheetForNode(nodes[1]);
-      ok(sheet, "sheet found");
-      let line = nodes[1].sourceLine;
-      ok(line, "found source line");
-
-      toolbox.once("webconsole-selected", function(aEvent) {
-        info(aEvent + " event fired");
-
-        toolbox.once("styleeditor-selected", function() {
-          info(aEvent + " event fired");
+          EventUtils.sendMouseEvent({ type: "click" }, nodes[1]);
 
           checkStyleEditorForSheetAndLine(sheet, line - 1, function() {
-            info("second check done");
+            window.StyleEditor.toggle();
             finishTest();
           });
         });
-
-        EventUtils.sendMouseEvent({ type: "click" }, nodes[1]);
-      });
-
-      toolbox.selectTool("webconsole");
+      }, styleEditorWin);
     });
-  }, win);
-}
+  }
+};
 
 function checkStyleEditorForSheetAndLine(aStyleSheet, aLine, aCallback)
 {
-  let foundEditor = null;
-  waitForSuccess({
-    name: "style editor for stylesheet",
+  let editor = null;
+
+  let performLineCheck = {
+    name: "source editor load",
     validatorFn: function()
     {
-      for (let editor of SEC.editors) {
-        if (editor.styleSheet == aStyleSheet) {
-          foundEditor = editor;
+      return editor.sourceEditor;
+    },
+    successFn: function()
+    {
+      is(editor.sourceEditor.getCaretPosition().line, aLine,
+         "correct line is selected");
+      is(SEC.selectedStyleSheetIndex, editor.styleSheetIndex,
+         "correct stylesheet is selected in the editor");
+
+      executeSoon(aCallback);
+    },
+    failureFn: aCallback,
+  };
+
+  waitForSuccess({
+    name: "editor for stylesheet",
+    validatorFn: function()
+    {
+      for (let item of SEC.editors) {
+        if (item.styleSheet == aStyleSheet) {
+          editor = item;
           return true;
         }
       }
@@ -125,31 +136,8 @@ function checkStyleEditorForSheetAndLine(aStyleSheet, aLine, aCallback)
     },
     successFn: function()
     {
-      performLineCheck(foundEditor, aLine, aCallback);
+      waitForSuccess(performLineCheck);
     },
     failureFn: finishTest,
   });
 }
-
-function performLineCheck(aEditor, aLine, aCallback)
-{
-  function checkForCorrectState()
-  {
-    is(aEditor.sourceEditor.getCaretPosition().line, aLine,
-       "correct line is selected");
-    is(SEC.selectedStyleSheetIndex, aEditor.styleSheetIndex,
-       "correct stylesheet is selected in the editor");
-
-    aCallback && executeSoon(aCallback);
-  }
-
-  waitForSuccess({
-    name: "source editor load",
-    validatorFn: function()
-    {
-      return aEditor.sourceEditor;
-    },
-    successFn: checkForCorrectState,
-    failureFn: finishTest,
-  });
-}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_menustatus.js b/browser/devtools/webconsole/test/browser_webconsole_menustatus.js
new file mode 100644
index 000000000000..794122beefce
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_webconsole_menustatus.js
@@ -0,0 +1,33 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+function test() {
+  var tab1 = gBrowser.addTab();
+  var tab2 = gBrowser.addTab();
+  gBrowser.selectedTab = tab2;
+
+  openConsole(tab2, function() {
+    let cmd = document.getElementById("Tools:WebConsole");
+    is(cmd.getAttribute("checked"), "true", "<command Tools:WebConsole> is checked.");
+
+    gBrowser.selectedTab = tab1;
+
+    is(cmd.getAttribute("checked"), "false", "<command Tools:WebConsole> is unchecked after tab switch.");
+
+    gBrowser.selectedTab = tab2;
+
+    is(cmd.getAttribute("checked"), "true", "<command Tools:WebConsole> is checked.");
+
+    closeConsole(tab2, function() {
+      is(cmd.getAttribute("checked"), "false", "<command Tools:WebConsole> is checked once closed.");
+
+      gBrowser.removeTab(tab1);
+      gBrowser.removeTab(tab2);
+
+      finish();
+    });
+  });
+}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_position_ui.js b/browser/devtools/webconsole/test/browser_webconsole_position_ui.js
new file mode 100644
index 000000000000..3639b9a86ae3
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_webconsole_position_ui.js
@@ -0,0 +1,207 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "data:text/html;charset=utf-8,<p>test for bug 577721";
+
+const POSITION_PREF = "devtools.webconsole.position";
+const TOP_PREF = "devtools.webconsole.top";
+const LEFT_PREF = "devtools.webconsole.left";
+const WIDTH_PREF = "devtools.webconsole.width";
+const HEIGHT_PREF = "devtools.hud.height";
+
+let hudRef, boxHeight, panelWidth;
+
+function test() {
+  addTab(TEST_URI);
+  browser.addEventListener("load", function onLoad() {
+    browser.removeEventListener("load", onLoad, true);
+    openConsole(null, consoleOpened);
+  }, true);
+  registerCleanupFunction(testEnd);
+}
+
+function testEnd() {
+  hudRef = null;
+  Services.prefs.clearUserPref(POSITION_PREF);
+  Services.prefs.clearUserPref(WIDTH_PREF);
+  Services.prefs.clearUserPref(HEIGHT_PREF);
+  Services.prefs.clearUserPref(TOP_PREF);
+  Services.prefs.clearUserPref(LEFT_PREF);
+}
+
+function waitForPosition(aPosition, aCallback) {
+  waitForSuccess({
+    name: "web console position changed to '" + aPosition + "'",
+    validatorFn: function()
+    {
+      return hudRef._currentUIPosition == aPosition;
+    },
+    successFn: executeSoon.bind(null, aCallback),
+    failureFn: finishTest,
+  });
+}
+
+function consoleOpened(aHudRef) {
+  hudRef = aHudRef;
+  testMenuitems();
+
+  let hudBox = hudRef.iframe;
+
+  is(hudBox.parentNode.childNodes[2].getAttribute("id"), hudRef.hudId,
+     "initial console position is correct");
+
+  is(hudRef.ui.positionMenuitems.below.getAttribute("checked"), "true",
+     "position menu checkbox is below");
+  is(Services.prefs.getCharPref(POSITION_PREF), "below", "pref is below");
+
+  executeSoon(function() {
+    hudRef.positionConsole("above");
+    waitForPosition("above", onPositionAbove);
+  });
+}
+
+function onPositionAbove() {
+  let hudBox = hudRef.iframe;
+
+  let id = hudBox.parentNode.childNodes[0].getAttribute("id");
+  is(id, hudRef.hudId, "above position is correct");
+
+  is(hudRef.ui.positionMenuitems.above.getAttribute("checked"), "true",
+     "position menu checkbox is above");
+  is(Services.prefs.getCharPref(POSITION_PREF), "above", "pref is above");
+
+  boxHeight = content.innerHeight * 0.5;
+  panelWidth = content.innerWidth * 0.5;
+
+  hudBox.style.height = boxHeight + "px";
+
+  boxHeight = hudBox.clientHeight;
+
+  Services.prefs.setIntPref(WIDTH_PREF, panelWidth);
+  Services.prefs.setIntPref(TOP_PREF, 50);
+  Services.prefs.setIntPref(LEFT_PREF, 51);
+
+  executeSoon(function() {
+    hudRef.positionConsole("window");
+    waitForPosition("window", onPositionWindow);
+  });
+}
+
+function onPositionWindow() {
+  let hudBox = hudRef.iframe;
+
+  let id = hudBox.parentNode.getAttribute("id");
+  is(id, "console_window_" + hudRef.hudId, "window position is correct");
+  is(Services.prefs.getCharPref(POSITION_PREF), "window", "pref is window");
+
+  let diffHeight = Math.abs(hudBox.clientHeight - boxHeight);
+  ok(diffHeight < 8, "hudBox height is correct");
+
+  let consolePanel = hudRef.consolePanel;
+
+  is(consolePanel.getAttribute("width"), panelWidth, "panel width is correct");
+  is(consolePanel.getAttribute("top"), 50, "panel top position is correct");
+  is(consolePanel.getAttribute("left"), 51, "panel left position is correct");
+
+  let panelHeight = parseInt(consolePanel.getAttribute("height"));
+  let boxWidth = hudBox.clientWidth;
+  boxHeight = hudBox.clientHeight;
+
+  hudRef.consolePanel.sizeTo(panelWidth - 15, panelHeight - 13);
+
+  let popupBoxObject = consolePanel.popupBoxObject;
+  let screenX = popupBoxObject.screenX;
+  let screenY = popupBoxObject.screenY;
+  consolePanel.moveTo(screenX - 11, screenY - 13);
+
+  isnot(hudBox.clientWidth, boxWidth, "hudBox width was updated");
+  isnot(hudBox.clientHeight, boxHeight, "hudBox height was updated");
+
+  isnot(popupBoxObject.screenX, screenX, "panel screenX was updated");
+  isnot(popupBoxObject.screenY, screenY, "panel screenY was updated");
+
+  panelWidth = consolePanel.clientWidth;
+  boxHeight = hudBox.clientHeight;
+
+  executeSoon(function() {
+    hudRef.positionConsole("below");
+    waitForPosition("below", onPositionBelow);
+  });
+}
+
+function onPositionBelow() {
+  let hudBox = hudRef.iframe;
+
+  let id = hudBox.parentNode.childNodes[2].getAttribute("id");
+  is(id, hudRef.hudId, "below position is correct after reopen");
+
+  let diffHeight = Math.abs(hudBox.clientHeight - boxHeight);
+  // dump("Diffheight: " + diffHeight + " clientHeight: " + hudBox.clientHeight + " boxHeight: " + boxHeight + "\n");
+  // XXX TODO bug 702707
+  ok(diffHeight < 8, "hudBox height is still correct");
+
+  is(Services.prefs.getCharPref(POSITION_PREF), "below", "pref is below");
+
+  // following three disabled due to bug 674562
+  // is(Services.prefs.getIntPref(WIDTH_PREF), panelWidth, "width pref updated - bug 674562");
+  // isnot(Services.prefs.getIntPref(TOP_PREF), 50, "top location pref updated - bug 674562");
+  // isnot(Services.prefs.getIntPref(LEFT_PREF), 51, "left location pref updated - bug 674562");
+
+  Services.obs.addObserver(onConsoleClose, "web-console-destroyed", false);
+
+  // Close the window console via the toolbar button
+  let btn = hudRef.ui.closeButton;
+  executeSoon(function() {
+    EventUtils.synthesizeMouse(btn, 2, 2, {}, hudRef.iframeWindow);
+  });
+}
+
+function onConsoleClose()
+{
+  Services.obs.removeObserver(onConsoleClose, "web-console-destroyed");
+
+  executeSoon(function() {
+    hudRef = null;
+    openConsole(null, onConsoleReopen);
+  });
+}
+
+function onConsoleReopen(aHudRef) {
+  let hudBox = aHudRef.iframe;
+
+  let id = hudBox.parentNode.childNodes[2].getAttribute("id");
+  is(id, aHudRef.hudId, "below position is correct after another reopen");
+
+  is(aHudRef.ui.positionMenuitems.below.getAttribute("checked"), "true",
+     "position menu checkbox is below");
+
+  executeSoon(finishTest);
+}
+
+function testMenuitems() {
+  let positionConsole = hudRef.positionConsole;
+  is(typeof positionConsole, "function", "positionConsole() is available");
+
+  let param = null;
+  hudRef.positionConsole = function(aPosition) {
+    param = aPosition;
+  };
+
+  // Make sure the menuitems call the correct method.
+
+  hudRef.ui.positionMenuitems.above.doCommand();
+
+  is(param, "above", "menuitem for above positioning calls positionConsole() correctly");
+
+  hudRef.ui.positionMenuitems.below.doCommand();
+
+  is(param, "below", "menuitem for below positioning calls positionConsole() correctly");
+
+  hudRef.ui.positionMenuitems.window.doCommand();
+
+  is(param, "window", "menuitem for window positioning calls positionConsole() correctly");
+
+  hudRef.positionConsole = positionConsole;
+}
+
diff --git a/browser/devtools/webconsole/test/browser_webconsole_window_zombie.js b/browser/devtools/webconsole/test/browser_webconsole_window_zombie.js
new file mode 100644
index 000000000000..d4ce62aa41fd
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_webconsole_window_zombie.js
@@ -0,0 +1,42 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "data:text/html;charset=utf-8,<p>test for bug 577721";
+
+const POSITION_PREF = "devtools.webconsole.position";
+
+function test() {
+  addTab(TEST_URI);
+  browser.addEventListener("load", function onLoad() {
+    browser.removeEventListener("load", onLoad, true);
+    openConsole(null, consoleOpened);
+  }, true);
+  registerCleanupFunction(testEnd);
+}
+
+function testEnd() {
+  Services.prefs.clearUserPref(POSITION_PREF);
+}
+
+function consoleOpened(hudRef) {
+  let hudBox = hudRef.HUDBox;
+
+  // listen for the panel popupshown event.
+  document.addEventListener("popupshown", function popupShown() {
+    document.removeEventListener("popupshown", popupShown, false);
+
+    ok(hudRef.consolePanel, "console is in a panel");
+
+    Services.obs.addObserver(function onWebConsoleClose() {
+      Services.obs.removeObserver(onWebConsoleClose, "web-console-destroyed");
+      executeSoon(finishTest);
+    }, "web-console-destroyed", false);
+
+    // Close the window console via the menu item
+    let menu = document.getElementById("webConsole");
+    menu.click();
+  }, false);
+
+  hudRef.positionConsole("window");
+}
diff --git a/browser/devtools/webconsole/test/head.js b/browser/devtools/webconsole/test/head.js
index c556de529a68..4e285568d715 100644
--- a/browser/devtools/webconsole/test/head.js
+++ b/browser/devtools/webconsole/test/head.js
@@ -8,11 +8,6 @@ Cu.import("resource:///modules/HUDService.jsm", tempScope);
 let HUDService = tempScope.HUDService;
 Cu.import("resource://gre/modules/devtools/WebConsoleUtils.jsm", tempScope);
 let WebConsoleUtils = tempScope.WebConsoleUtils;
-Cu.import("resource:///modules/devtools/gDevTools.jsm", tempScope);
-let gDevTools = tempScope.gDevTools;
-Cu.import("resource:///modules/devtools/Target.jsm", tempScope);
-let TargetFactory = tempScope.TargetFactory;
-
 const WEBCONSOLE_STRINGS_URI = "chrome://browser/locale/devtools/webconsole.properties";
 let WCU_l10n = new WebConsoleUtils.l10n(WEBCONSOLE_STRINGS_URI);
 
@@ -37,7 +32,8 @@ let tab, browser, hudId, hud, hudBox, filterBox, outputNode, cs;
 
 function addTab(aURL)
 {
-  gBrowser.selectedTab = gBrowser.addTab(aURL);
+  gBrowser.selectedTab = gBrowser.addTab();
+  content.location.assign(aURL);
   tab = gBrowser.selectedTab;
   browser = gBrowser.getBrowserForTab(tab);
 }
@@ -137,24 +133,23 @@ function findLogEntry(aString)
  *        Optional function to invoke after the Web Console completes
  *        initialization (web-console-created).
  */
-function openConsole(aTab, aCallback = function() { })
+function openConsole(aTab, aCallback)
 {
-  function onWebConsoleOpen(aEvent, aPanel)
+  function onWebConsoleOpen(aSubject, aTopic)
   {
-    executeSoon(aCallback.bind(null, aPanel.hud));
+    if (aTopic == "web-console-created") {
+      Services.obs.removeObserver(onWebConsoleOpen, "web-console-created");
+      aSubject.QueryInterface(Ci.nsISupportsString);
+      let hud = HUDService.getHudReferenceById(aSubject.data);
+      executeSoon(aCallback.bind(null, hud));
+    }
   }
 
-  let target = TargetFactory.forTab(aTab || tab);
-  let toolbox = gDevTools.getToolboxForTarget(target);
-  if (toolbox) {
-    toolbox.once("webconsole-selected", onWebConsoleOpen);
-    toolbox.selectTool("webconsole");
-  }
-  else {
-    let target = TargetFactory.forTab(aTab || tab);
-    toolbox = gDevTools.openToolboxForTab(target, "webconsole");
-    toolbox.once("webconsole-selected", onWebConsoleOpen);
+  if (aCallback) {
+    Services.obs.addObserver(onWebConsoleOpen, "web-console-created", false);
   }
+
+  HUDService.activateHUDForContext(aTab || tab);
 }
 
 /**
@@ -167,27 +162,23 @@ function openConsole(aTab, aCallback = function() { })
  *        Optional function to invoke after the Web Console completes
  *        closing (web-console-destroyed).
  */
-function closeConsole(aTab, aCallback = function() { })
+function closeConsole(aTab, aCallback)
 {
-  let target = TargetFactory.forTab(aTab || tab);
-  let toolbox = gDevTools.getToolboxForTarget(target);
-  if (toolbox) {
-    let panel = gDevTools.getPanelForTarget("webconsole", target);
-    if (panel) {
-      let hudId = panel.hud.hudId;
-      panel.once("destroyed", function() {
-        executeSoon(aCallback.bind(null, hudId));
-      });
-    }
-    else {
-      toolbox.once("destroyed", aCallback.bind(null, null));
+  function onWebConsoleClose(aSubject, aTopic)
+  {
+    if (aTopic == "web-console-destroyed") {
+      Services.obs.removeObserver(onWebConsoleClose, "web-console-destroyed");
+      aSubject.QueryInterface(Ci.nsISupportsString);
+      let hudId = aSubject.data;
+      executeSoon(aCallback.bind(null, hudId));
     }
+  }
 
-    toolbox.destroy();
-  }
-  else {
-    aCallback();
+  if (aCallback) {
+    Services.obs.addObserver(onWebConsoleClose, "web-console-destroyed", false);
   }
+
+  HUDService.deactivateHUDForContext(aTab || tab);
 }
 
 /**
@@ -259,8 +250,7 @@ function finishTest()
 
 function tearDown()
 {
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  gDevTools.closeToolbox(target);
+  HUDService.deactivateHUDForContext(gBrowser.selectedTab);
   while (gBrowser.tabs.length > 1) {
     gBrowser.removeCurrentTab();
   }
@@ -317,17 +307,3 @@ function waitForSuccess(aOptions)
 
   wait(aOptions.validatorFn, aOptions.successFn, aOptions.failureFn);
 }
-
-function openInspector(aCallback, aTab = gBrowser.selectedTab)
-{
-  let target = TargetFactory.forTab(aTab);
-  let inspector = gDevTools.getPanelForTarget("inspector", target);
-  if (inspector && inspector.isReady) {
-    aCallback(inspector);
-  } else {
-    let toolbox = gDevTools.openToolboxForTab(target, "inspector");
-    toolbox.once("inspector-ready", function _onSelect(aEvent, aPanel) {
-      aCallback(aPanel);
-    });
-  }
-}
diff --git a/browser/devtools/webconsole/webconsole.js b/browser/devtools/webconsole/webconsole.js
index 973c06a27d5b..4116fa3f2e07 100644
--- a/browser/devtools/webconsole/webconsole.js
+++ b/browser/devtools/webconsole/webconsole.js
@@ -177,8 +177,10 @@ const PREF_CONNECTION_TIMEOUT = "devtools.debugger.remote-timeout";
  *
  * @param object aWebConsoleOwner
  *        The WebConsole owner object.
+ * @param string aPosition
+ *        Tells the UI location for the Web Console.
  */
-function WebConsoleFrame(aWebConsoleOwner)
+function WebConsoleFrame(aWebConsoleOwner, aPosition)
 {
   this.owner = aWebConsoleOwner;
   this.hudId = this.owner.hudId;
@@ -189,6 +191,7 @@ function WebConsoleFrame(aWebConsoleOwner)
   this._networkRequests = {};
 
   this._toggleFilter = this._toggleFilter.bind(this);
+  this._onPositionConsoleCommand = this._onPositionConsoleCommand.bind(this);
   this._flushMessageQueue = this._flushMessageQueue.bind(this);
   this._connectionTimeout = this._connectionTimeout.bind(this);
 
@@ -197,7 +200,7 @@ function WebConsoleFrame(aWebConsoleOwner)
 
   this._initDefaultFilterPrefs();
   this._commandController = new CommandController(this);
-  this.positionConsole(window);
+  this.positionConsole(aPosition, window);
 
   this.jsterm = new JSTerm(this);
   this.jsterm.inputNode.focus();
@@ -370,7 +373,10 @@ WebConsoleFrame.prototype = {
    */
   _initConnection: function WCF__initConnection()
   {
-    this.proxy = new WebConsoleConnectionProxy(this, this.owner.target);
+    this.proxy = new WebConsoleConnectionProxy(this, {
+      host: this.owner.remoteHost,
+      port: this.owner.remotePort,
+    });
 
     let timeout = Services.prefs.getIntPref(PREF_CONNECTION_TIMEOUT);
     this._connectTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
@@ -433,6 +439,7 @@ WebConsoleFrame.prototype = {
     this.inputNode = doc.querySelector(".jsterm-input-node");
 
     this._setFilterTextBoxEvents();
+    this._initPositionUI();
     this._initFilterButtons();
 
     let fontSize = Services.prefs.getIntPref("devtools.webconsole.fontSize");
@@ -476,6 +483,10 @@ WebConsoleFrame.prototype = {
                                        !this.getFilterState("network");
     }.bind(this));
 
+    this.closeButton = doc.getElementById("webconsole-close-button");
+    this.closeButton.addEventListener("command",
+                                      this.owner.onCloseButton.bind(this.owner));
+
     let clearButton = doc.getElementsByClassName("webconsole-clear-console-button")[0];
     clearButton.addEventListener("command", function WCF__onClearButton() {
       this.owner._onClearButton();
@@ -533,6 +544,31 @@ WebConsoleFrame.prototype = {
     this.filterBox.addEventListener("input", onChange, false);
   },
 
+  /**
+   * Initialize the UI for re-positioning the console
+   * @private
+   */
+  _initPositionUI: function WCF__initPositionUI()
+  {
+    let doc = this.document;
+
+    let itemAbove = doc.querySelector("menuitem[consolePosition='above']");
+    itemAbove.addEventListener("command", this._onPositionConsoleCommand, false);
+
+    let itemBelow = doc.querySelector("menuitem[consolePosition='below']");
+    itemBelow.addEventListener("command", this._onPositionConsoleCommand, false);
+
+    let itemWindow = doc.querySelector("menuitem[consolePosition='window']");
+    itemWindow.addEventListener("command", this._onPositionConsoleCommand, false);
+
+    this.positionMenuitems = {
+      last: null,
+      above: itemAbove,
+      below: itemBelow,
+      window: itemWindow,
+    };
+  },
+
   /**
    * Creates one of the filter buttons on the toolbar.
    *
@@ -579,6 +615,19 @@ WebConsoleFrame.prototype = {
     Services.obs.notifyObservers(id, "web-console-created", null);
   },
 
+  /**
+   * Handle the "command" event for the buttons that allow the user to
+   * reposition the Web Console UI.
+   *
+   * @private
+   * @param nsIDOMEvent aEvent
+   */
+  _onPositionConsoleCommand: function WCF__onPositionConsoleCommand(aEvent)
+  {
+    let position = aEvent.target.getAttribute("consolePosition");
+    this.owner.positionConsole(position);
+  },
+
   /**
    * Position the console in a different location.
    *
@@ -586,12 +635,15 @@ WebConsoleFrame.prototype = {
    * instance that owns this iframe. You need to call this if you write
    * a different owner or you manually reposition the iframe.
    *
+   * @param string aPosition
+   *        The new Web Console iframe location: "above" (the page), "below" or
+   *        "window".
    * @param object aNewWindow
    *        Repositioning causes the iframe to reload - bug 254144. You need to
    *        provide the new window object so we can reinitialize the UI as
    *        needed.
    */
-  positionConsole: function WCF_positionConsole(aNewWindow)
+  positionConsole: function WCF_positionConsole(aPosition, aNewWindow)
   {
     this.window = aNewWindow;
     this.document = this.window.document;
@@ -605,6 +657,14 @@ WebConsoleFrame.prototype = {
     this._initUI();
     this.jsterm && this.jsterm._initUI();
 
+    this.closeButton.hidden = aPosition == "window";
+
+    this.positionMenuitems[aPosition].setAttribute("checked", true);
+    if (this.positionMenuitems.last) {
+      this.positionMenuitems.last.setAttribute("checked", false);
+    }
+    this.positionMenuitems.last = this.positionMenuitems[aPosition];
+
     if (oldOutputNode && oldOutputNode.childNodes.length) {
       let parentNode = this.outputNode.parentNode;
       parentNode.replaceChild(oldOutputNode, this.outputNode);
@@ -1731,9 +1791,7 @@ WebConsoleFrame.prototype = {
   onLocationChange: function WCF_onLocationChange(aURI, aTitle)
   {
     this.contentLocation = aURI;
-    if (this.owner.onLocationChange) {
-      this.owner.onLocationChange(aURI, aTitle);
-    }
+    this.owner.onLocationChange(aURI, aTitle);
   },
 
   /**
@@ -3970,13 +4028,14 @@ CommandController.prototype = {
  * @constructor
  * @param object aWebConsole
  *        The Web Console instance that owns this connection proxy.
- * @param RemoteTarget aTarget
- *        The target that the console will connect to.
+ * @param object aOptions
+ *        Connection options: host and port.
  */
-function WebConsoleConnectionProxy(aWebConsole, aTarget)
+function WebConsoleConnectionProxy(aWebConsole, aOptions = {})
 {
   this.owner = aWebConsole;
-  this.target = aTarget;
+  this.remoteHost = aOptions.host;
+  this.remotePort = aOptions.port;
 
   this._onPageError = this._onPageError.bind(this);
   this._onConsoleAPICall = this._onConsoleAPICall.bind(this);
@@ -4052,18 +4111,17 @@ WebConsoleConnectionProxy.prototype = {
    */
   connect: function WCCP_connect(aCallback)
   {
-    // TODO: convert the non-remote path to use the target API as well.
-    let transport, client;
-    if (this.target.isRemote) {
-      client = this.client = this.target.client;
+    let transport;
+    if (this.remoteHost) {
+      transport = debuggerSocketConnect(this.remoteHost, this.remotePort);
     }
     else {
       this.initServer();
       transport = DebuggerServer.connectPipe();
-
-      client = this.client = new DebuggerClient(transport);
     }
 
+    let client = this.client = new DebuggerClient(transport);
+
     client.addListener("pageError", this._onPageError);
     client.addListener("consoleAPICall", this._onConsoleAPICall);
     client.addListener("networkEvent", this._onNetworkEvent);
@@ -4071,18 +4129,6 @@ WebConsoleConnectionProxy.prototype = {
     client.addListener("fileActivity", this._onFileActivity);
     client.addListener("locationChange", this._onLocationChange);
 
-    if (this.target.isRemote) {
-      this._consoleActor = this.target.form.consoleActor;
-      if (!this.target.chrome) {
-        this.owner.onLocationChange(this.target.url, this.target.name);
-      }
-
-      let listeners = ["PageError", "ConsoleAPI", "NetworkActivity",
-                       "FileActivity", "LocationChange"];
-      this.client.attachConsole(this._consoleActor, listeners,
-                                this._onAttachConsole.bind(this, aCallback));
-      return;
-    }
     client.connect(function(aType, aTraits) {
       client.listTabs(this._onListTabs.bind(this, aCallback));
     }.bind(this));
@@ -4099,7 +4145,32 @@ WebConsoleConnectionProxy.prototype = {
    */
   _onListTabs: function WCCP__onListTabs(aCallback, aResponse)
   {
-    let selectedTab = aResponse.tabs[aResponse.selected];
+    let selectedTab;
+
+    if (this.remoteHost) {
+      this.owner._connectTimer.cancel();
+
+      let tabs = [];
+      for (let tab of aResponse.tabs) {
+        tabs.push(tab.title);
+      }
+
+      tabs.push(l10n.getStr("listTabs.globalConsoleActor"));
+
+      let selected = {};
+      let result = Services.prompt.select(null,
+        l10n.getStr("remoteWebConsoleSelectTabTitle"),
+        l10n.getStr("remoteWebConsoleSelectTabMessage"),
+        tabs.length, tabs, selected);
+
+      if (result && selected.value < aResponse.tabs.length) {
+        selectedTab = aResponse.tabs[selected.value];
+      }
+    }
+    else {
+      selectedTab = aResponse.tabs[aResponse.selected];
+    }
+
     if (selectedTab) {
       this._consoleActor = selectedTab.consoleActor;
       this.owner.onLocationChange(selectedTab.url, selectedTab.title);
@@ -4332,9 +4403,7 @@ WebConsoleConnectionProxy.prototype = {
     this.client.removeListener("locationChange", this._onLocationChange);
 
     try {
-      if (!this.target.isRemote) {
-        this.client.close(onDisconnect);
-      }
+      this.client.close(onDisconnect);
     }
     catch (ex) {
       Cu.reportError("Web Console disconnect exception: " + ex);
diff --git a/browser/devtools/webconsole/webconsole.xul b/browser/devtools/webconsole/webconsole.xul
index 9669d1a46ce7..ff602c90dd42 100644
--- a/browser/devtools/webconsole/webconsole.xul
+++ b/browser/devtools/webconsole/webconsole.xul
@@ -63,6 +63,12 @@
   <vbox class="hud-outer-wrapper" flex="1">
     <vbox class="hud-console-wrapper" flex="1">
       <toolbar class="hud-console-filter-toolbar devtools-toolbar" mode="full">
+#ifdef XP_MACOSX
+        <toolbarbutton id="webconsole-close-button"
+                       class="devtools-closebutton"
+                       tooltiptext="&btnClose.tooltip;"/>
+#endif
+
         <toolbarbutton label="&btnPageNet.label;" type="menu-button"
                        category="net" class="devtools-toolbarbutton webconsole-filter-button"
                        tooltiptext="&btnPageNet.tooltip;">
@@ -113,10 +119,29 @@
 
         <spacer flex="1"/>
 
+        <toolbarbutton label="&btnPosition.label;" type="menu"
+                       class="devtools-toolbarbutton"
+                       tooltiptext="&btnPosition.tooltip;">
+          <menupopup>
+            <menuitem label="&positionMenu.above;" type="checkbox"
+                      autocheck="false" consolePosition="above"/>
+            <menuitem label="&positionMenu.below;" type="checkbox"
+                      autocheck="false" consolePosition="below"/>
+            <menuitem label="&positionMenu.window;" type="checkbox"
+                      autocheck="false" consolePosition="window"/>
+          </menupopup>
+        </toolbarbutton>
+
         <textbox class="compact hud-filter-box devtools-searchinput" type="search"
                  placeholder="&filterBox.placeholder;"/>
         <toolbarbutton class="webconsole-clear-console-button devtools-toolbarbutton"
                        label="&btnClear.label;" tooltiptext="&btnClear.tooltip;"/>
+
+#ifndef XP_MACOSX
+        <toolbarbutton id="webconsole-close-button"
+                       class="devtools-closebutton"
+                       tooltiptext="&btnClose.tooltip;"/>
+#endif
       </toolbar>
       <richlistbox class="hud-output-node" orient="vertical" flex="1"
                    seltype="multiple" context="output-contextmenu"
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index fad262527ba9..29b51d7a96e7 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -198,15 +198,19 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY webDeveloperMenu.label       "Web Developer">
 <!ENTITY webDeveloperMenu.accesskey   "W">
 
-<!ENTITY devtoolsConnect.label        "Connect…">
-<!ENTITY devtoolsConnect.accesskey    "e">
-
 <!ENTITY errorConsoleCmd.label        "Error Console">
 <!ENTITY errorConsoleCmd.accesskey    "C">
 <!ENTITY errorConsoleCmd.commandkey   "j">
 
+<!ENTITY webConsoleCmd.label          "Web Console">
+<!ENTITY webConsoleCmd.accesskey      "W">
+<!ENTITY webConsoleCmd.commandkey     "k">
 <!ENTITY remoteWebConsoleCmd.label    "Remote Web Console">
 
+<!ENTITY inspectMenu.label            "Inspect">
+<!ENTITY inspectMenu.accesskey        "I">
+<!ENTITY inspectMenu.commandkey       "I">
+
 <!ENTITY inspectContextMenu.label     "Inspect Element">
 <!ENTITY inspectContextMenu.accesskey "Q">
 
@@ -229,15 +233,40 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
+<!ENTITY inspectCloseButton.tooltiptext "Close Inspector">
+<!ENTITY inspectSidebarCloseButton.tooltiptext "Close sidebar">
+
 <!ENTITY devToolbarCloseButton.tooltiptext "Close Developer Toolbar">
 <!ENTITY devToolbarMenu.label              "Developer Toolbar">
 <!ENTITY devToolbarMenu.accesskey          "v">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
-<!ENTITY devToolbarToolsButton.label       "Toggle Toolbox">
 <!ENTITY devToolbarOtherToolsButton.label  "More Tools">
 
-<!ENTITY devToolbox.accesskey              "B">
+<!ENTITY inspectorHTMLCopyInner.label       "Copy Inner HTML">
+<!ENTITY inspectorHTMLCopyInner.accesskey   "I">
+
+<!ENTITY inspectorHTMLCopyOuter.label       "Copy Outer HTML">
+<!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
+
+<!ENTITY inspectorHTMLDelete.label          "Delete Node">
+<!ENTITY inspectorHTMLDelete.accesskey      "D">
+
+<!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
+  -  alternate view for the Inspector, creating a 3D visualization of the
+  -  webpage. -->
+<!ENTITY inspect3DViewButton.label     "3D View">
+<!ENTITY inspect3DViewButton.accesskey "W">
+
+<!ENTITY inspectStyleButton.label     "Style">
+<!ENTITY inspectStyleButton.accesskey "S">
+
+<!-- LOCALIZATION NOTE (styleeditor.label): This menu item label appears
+  -  in the Tools menu. -->
+<!ENTITY styleeditor.label            "Style Editor">
+<!ENTITY styleeditor.accesskey        "y">
+<!ENTITY styleeditor.keycode          "VK_F7">
+<!ENTITY styleeditor.keytext          "F7">
 
 <!ENTITY getMoreDevtoolsCmd.label        "Get More Tools">
 <!ENTITY getMoreDevtoolsCmd.accesskey    "M">
@@ -605,6 +634,15 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY addonBarCloseButton.tooltip  "Close Add-on Bar">
 <!ENTITY toggleAddonBarCmd.key        "/">
 
+<!-- LOCALIZATION NOTE (markupButton.arialabel): The markup button is the button
+located in front of the breadcrumbs display in the inspector toolbar. The button
+doesn't display any label, but exposes a label to screen-readers with "aria-label".
+-->
+<!ENTITY markupButton.arialabel          "Markup">
+<!-- LOCALIZATION NOTE (markupButton.accesskey): The key bound to the Markup panel's
+toolbar button -->
+<!ENTITY markupButton.accesskey          "M">
+
 <!ENTITY socialToolbar.title        "Social Toolbar Button">
 <!ENTITY social.notLoggedIn.label   "Not logged in">
 
diff --git a/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd b/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd
deleted file mode 100644
index c00aa6a5ce46..000000000000
--- a/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- LOCALIZATION NOTE : FILE This file contains the Remove Connection strings.
-  - The Remote Connection window can be start by running the command:
-  - `devtools connect`
-  - -->
-
-<!ENTITY title      "Connect">
-<!ENTITY host       "Host:">
-<!ENTITY port       "Port:">
-<!ENTITY connect    "Connect">
-<!ENTITY connecting "Connecting…">
-<!ENTITY availability "Available remote objects:">
diff --git a/browser/locales/en-US/chrome/browser/devtools/debugger.properties b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
index 5c2d9cab6e7a..c9687bb29078 100644
--- a/browser/locales/en-US/chrome/browser/devtools/debugger.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
@@ -19,14 +19,6 @@ confirmTabSwitch.buttonSwitch.accessKey=S
 confirmTabSwitch.buttonOpen=Open anyway
 confirmTabSwitch.buttonOpen.accessKey=O
 
-# LOCALIZATION NOTE (open.commandkey): The key used to open the debugger in
-# combination to e.g. ctrl + shift
-open.commandkey=S
-
-# LOCALIZATION NOTE (debuggerMenu.accesskey): The access key used to open the
-# debugger.
-debuggerMenu.accesskey=D
-
 # LOCALIZATION NOTE (chromeDebuggerWindowTitle): The title displayed for the
 # chrome (browser) debugger window.
 chromeDebuggerWindowTitle=Browser Debugger
@@ -181,11 +173,6 @@ watchExpressionsScopeLabel=Watch expressions
 # the global scope.
 globalScopeLabel=Global
 
-# LOCALIZATION NOTE (ToolboxDebugger.label):
-# This string is displayed in the title of the tab when the debugger is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxDebugger.label=Debugger
-
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel=:
diff --git a/browser/locales/en-US/chrome/browser/devtools/inspector.dtd b/browser/locales/en-US/chrome/browser/devtools/inspector.dtd
deleted file mode 100644
index 897552ca002a..000000000000
--- a/browser/locales/en-US/chrome/browser/devtools/inspector.dtd
+++ /dev/null
@@ -1,10 +0,0 @@
-<!ENTITY inspectorHTMLCopyInner.label       "Copy Inner HTML">
-<!ENTITY inspectorHTMLCopyInner.accesskey   "I">
-
-<!ENTITY inspectorHTMLCopyOuter.label       "Copy Outer HTML">
-<!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
-
-<!ENTITY inspectorHTMLDelete.label          "Delete Node">
-<!ENTITY inspectorHTMLDelete.accesskey      "D">
-
-<!ENTITY inspector.selectButton.tooltip     "Select element with mouse">
diff --git a/browser/locales/en-US/chrome/browser/devtools/inspector.properties b/browser/locales/en-US/chrome/browser/devtools/inspector.properties
index c4989cab16c2..13cb5e1b9e84 100644
--- a/browser/locales/en-US/chrome/browser/devtools/inspector.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/inspector.properties
@@ -14,22 +14,38 @@
 # LOCALIZATION NOTE (confirmNavigationAway): Used in the Inspector tool, when
 # the user tries to navigate away from a web page, to confirm the change of
 # page.
-confirmNavigationAway.message2=If you leave this page, the changes you have made will be lost.
+confirmNavigationAway.message=Leaving this page will close the Inspector and the changes you have made will be lost.
 confirmNavigationAway.buttonLeave=Leave Page
 confirmNavigationAway.buttonLeaveAccesskey=L
 confirmNavigationAway.buttonStay=Stay on Page
 confirmNavigationAway.buttonStayAccesskey=S
 
 breadcrumbs.siblings=Siblings
+# LOCALIZATION NOTE (htmlPanel): Used in the Inspector tool's openInspectorUI
+# method when registering the HTML panel.
+
+# LOCALIZATION NOTE (inspectButtonWithShortcutKey.tooltip):
+# This button appears in the Inspector Toolbar. inspectButton is stateful,
+# if it's pressed users can select an element with the mouse.
+# %S is the keyboard shortcut.
+inspectButtonWithShortcutKey.tooltip=Select element with mouse (%S)
+
+# LOCALIZATION NOTE (inspectButton.tooltip):
+# Same as inspectButtonWithShortcutKey.tooltip but used when an add-on
+# overrides the shortcut key.
+inspectButton.tooltip=Select element with mouse
+
+# LOCALIZATION NOTE (markupButton.*):
+# This button is the button located at the beginning of the breadcrumbs
+# in the inspector toolbar. Its tooltip is built dynamically.
+# markupButton.tooltip is used on Mac.
+# On Windows and Linux, we use markupButton.tooltipWithAccesskey, where we append
+# the keyboard shortcut.
+markupButton.tooltip=Markup Panel
+markupButton.tooltipWithAccesskey=Markup Panel (%S)
+
 
 # LOCALIZATION NOTE (nodeMenu.tooltiptext)
 # This menu appears in the Infobar (on top of the highlighted node) once
 # the node is selected.
 nodeMenu.tooltiptext=Node operations
-
-
-# LOCALIZATION NOTE (inspector.*)
-# Used for the menuitem in the tool menu
-inspector.label=Inspector
-inspector.commandkey=I
-inspector.accesskey=I
diff --git a/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd b/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd
index 53aaf605c553..e88902ff4a49 100644
--- a/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd
@@ -16,7 +16,6 @@
   -  The text appears on the bottom right corner of the layout view when
   -  the corresponding box is hovered. -->
 
-<!ENTITY title                  "Box Model">
 <!ENTITY margins.tooltip        "margins">
 <!ENTITY borders.tooltip        "borders">
 <!ENTITY padding.tooltip        "padding">
diff --git a/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd b/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd
index 7210060e0c1d..6ac78727fa23 100644
--- a/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd
@@ -117,3 +117,9 @@
   -  the same name in browser.dtd.
   -->
 <!ENTITY errorConsoleCmd.commandkey   "j">
+
+<!-- LOCALIZATION NOTE (webConsoleCmd.commandkey): This command key launches
+  -  the browser WebConsole, the key should be identical to the property of
+  -  the same name in browser.dtd.
+  -->
+<!ENTITY webConsoleCmd.commandkey     "k">
diff --git a/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties b/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties
index dca0bc6d81c9..2e08c8d07c3b 100644
--- a/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties
@@ -52,14 +52,6 @@ saveStyleSheet.title=Save style sheet
 # LOCALIZATION NOTE  (saveStyleSheet.title): This is the *.css filter title
 saveStyleSheet.filter=CSS files
 
-# LOCALIZATION NOTE  (open.commandkey): This the key to use in
-# conjunction with shift to open the style editor
-open.commandkey=VK_F7
-
-# LOCALIZATION NOTE (open.accesskey): The access key used to open the style
-# editor.
-open.accesskey=y
-
 # LOCALIZATION NOTE  (saveStyleSheet.commandkey): This the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
 saveStyleSheet.commandkey=S
@@ -74,7 +66,3 @@ undo.commandkey=Z
 # platforms) to Redo a change in the editor.
 redo.commandkey=Z
 
-# LOCALIZATION NOTE (ToolboxStyleEditor.label):
-# This string is displayed in the title of the tab when the debugger is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxStyleEditor.label=Style Editor
diff --git a/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd b/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
index e28e4e07b416..f9f86b819139 100644
--- a/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
@@ -41,7 +41,3 @@
 <!ENTITY matched               "Matched">
 <!ENTITY parentMatch           "Parent Match">
 <!ENTITY unmatched             "Unmatched">
-
-<!-- FIXME: notes -->
-<!ENTITY computedViewTitle     "Computed">
-<!ENTITY ruleViewTitle         "Rules">
diff --git a/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties b/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
index 5f7f1861025d..5eab4a7b9913 100644
--- a/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
@@ -36,6 +36,13 @@ rule.sourceElement=element
 # e.g "Inherited from body#bodyID"
 rule.inheritedFrom=Inherited from %S
 
+# LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
+# sidebar of the Highlighter for the style inspector button.
+# "Computed" refers to the Computed Style of the element.
+style.highlighter.button.label2=Computed
+style.highlighter.accesskey2=C
+style.highlighter.button.tooltip2=Inspect element computed styles
+
 # LOCALIZATION NOTE (helpLinkTitle): For each style property
 # the user can hover it and get a help link button which allows one to
 # quickly jump to the documentation from the Mozilla Developer Network site.
@@ -119,6 +126,12 @@ rule.contextmenu.copypropertyvalue=Copy property value
 # view's context menu copy property value access key.
 rule.contextmenu.copypropertyvalue.accesskey=U
 
+# LOCALIZATION NOTE (ruleView.*): Button label, accesskey and tooltip text
+# associated with the Highlighter's CSS Rule View in the Style Sidebar.
+ruleView.label=Rules
+ruleView.accesskey=R
+ruleView.tooltiptext=View and Edit CSS
+
 # LOCALIZATION NOTE (ruleView.empty): Text displayed when the highlighter is
 # first opened and there's no node selected in the rule view.
 rule.empty=No element selected.
diff --git a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
deleted file mode 100644
index 29b63269353b..000000000000
--- a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY window.title  "Developer Tools">
-
-<!ENTITY closeCmd.key  "W">
diff --git a/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd b/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd
index e442518b66ce..b72bd488a518 100644
--- a/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd
@@ -60,9 +60,30 @@
 <!ENTITY btnConsoleWarnings     "Warnings">
 <!ENTITY btnConsoleLog          "Log">
 
+<!-- LOCALIZATION NOTE (btnPosition.label): The label shown for the menu which
+  -  allows the user to toggle between the Web Console positioning types. -->
+<!ENTITY btnPosition.label     "Position">
+
+<!-- LOCALIZATION NOTE (btnPosition.tooltip): The tooltip shown when the user
+  -  hovers the Position button in the Web Console toolbar. -->
+<!ENTITY btnPosition.tooltip   "Position the Web Console above or below the document">
+
+<!-- LOCALIZATION NOTE (positionMenu.above): When this option is selected the
+  -  Web Console interface is displayed above the web page. -->
+<!ENTITY positionMenu.above    "Above">
+
+<!-- LOCALIZATION NOTE (positionMenu.below): When this option is selected the
+  -  Web Console interface is displayed below the web page. -->
+<!ENTITY positionMenu.below    "Below">
+
+<!-- LOCALIZATION NOTE (positionMenu.window): When this option is selected the
+  -  Web Console interface is displayed in a floating panel. -->
+<!ENTITY positionMenu.window   "Window">
+
 <!ENTITY filterBox.placeholder "Filter">
 <!ENTITY btnClear.label        "Clear">
 <!ENTITY btnClear.tooltip      "Clear the Web Console output">
+<!ENTITY btnClose.tooltip      "Close the Web Console">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
diff --git a/browser/locales/en-US/chrome/browser/devtools/webconsole.properties b/browser/locales/en-US/chrome/browser/devtools/webconsole.properties
index 75784473847f..68b02d014377 100644
--- a/browser/locales/en-US/chrome/browser/devtools/webconsole.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/webconsole.properties
@@ -32,8 +32,6 @@ close.button=Close
 close.accesskey=C
 update.button=Update
 update.accesskey=U
-cmd.commandkey=k
-webConsoleCmd.accesskey=W
 # LOCALIZATION NOTE FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
 #
 # The "PropertyPanel" is used to display a JS object to the user.
@@ -168,12 +166,6 @@ remoteWebConsoleSelectTabMessage=Select one of the tabs you want to attach to, o
 # global console in the tabs selection.
 listTabs.globalConsoleActor=*Global Console*
 
-# LOCALIZATION NOTE (ToolboxWebconsole.label):
-# This string is displayed in the title of the tab when the web console is
-# displayed inside the developer tools window it is probably the same string
-# as webConsoleWindowTitleAndURL before the '-'
-ToolboxWebconsole.label=Web Console
-
 # LOCALIZATION NOTE (longStringEllipsis): The string displayed after a long
 # string. This string is clickable such that the rest of the string is retrieved
 # from the server.
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index eb46acb04180..1cde24633f19 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -37,9 +37,6 @@
     locale/browser/devtools/sourceeditor.dtd          (%chrome/browser/devtools/sourceeditor.dtd)
     locale/browser/devtools/layoutview.dtd            (%chrome/browser/devtools/layoutview.dtd)
     locale/browser/devtools/responsiveUI.properties   (%chrome/browser/devtools/responsiveUI.properties)
-    locale/browser/devtools/toolbox.dtd            (%chrome/browser/devtools/toolbox.dtd)
-    locale/browser/devtools/inspector.dtd          (%chrome/browser/devtools/inspector.dtd)
-    locale/browser/devtools/connection-screen.dtd  (%chrome/browser/devtools/connection-screen.dtd)
     locale/browser/newTab.dtd                      (%chrome/browser/newTab.dtd)
     locale/browser/newTab.properties               (%chrome/browser/newTab.properties)
     locale/browser/openLocation.dtd                (%chrome/browser/openLocation.dtd)
diff --git a/browser/makefiles.sh b/browser/makefiles.sh
index 2931b979c177..762153c4b980 100644
--- a/browser/makefiles.sh
+++ b/browser/makefiles.sh
@@ -39,7 +39,7 @@ browser/components/tabview/Makefile
 browser/components/thumbnails/Makefile
 browser/devtools/Makefile
 browser/devtools/debugger/Makefile
-browser/devtools/inspector/Makefile
+browser/devtools/highlighter/Makefile
 browser/devtools/scratchpad/Makefile
 browser/devtools/shared/Makefile
 browser/devtools/sourceeditor/Makefile
@@ -119,7 +119,7 @@ if [ "$ENABLE_TESTS" ]; then
     browser/components/test/Makefile
     browser/components/thumbnails/test/Makefile
     browser/devtools/debugger/test/Makefile
-    browser/devtools/inspector/test/Makefile
+    browser/devtools/highlighter/test/Makefile
     browser/devtools/scratchpad/test/Makefile
     browser/devtools/shared/test/Makefile
     browser/devtools/sourceeditor/test/Makefile
diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css
index 4bf94b8d4b96..4c9964a0f79f 100644
--- a/browser/themes/gnomestripe/browser.css
+++ b/browser/themes/gnomestripe/browser.css
@@ -1970,26 +1970,51 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
 
 /* Highlighter */
 
-.highlighter-outline {
+#highlighter-outline {
   box-shadow: 0 0 0 1px black;
   outline: 1px dashed white;
   outline-offset: -1px;
 }
 
-.highlighter-outline[locked]  {
+#highlighter-outline[locked]  {
   box-shadow: 0 0 0 1px rgba(0,0,0,0.3);
   outline-color: rgba(255,255,255,0.7);
 }
 
-/* Developer toolbar */
+/* Highlighter toolbar */
 
+#inspector-inspect-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#inspector-inspect-toolbutton[checked=true] {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#inspector-toolbar,
 #developer-toolbar {
   border-top: 1px solid hsla(210, 8%, 5%, .65);
 }
 
+#devtools-side-splitter {
+  -moz-appearance: none;
+  border: 0;
+  -moz-border-start: 1px solid #242b33;
+  min-width: 0;
+  width: 3px;
+  background-color: transparent;
+  -moz-margin-end: -3px;
+  position: relative;
+}
+
+#devtools-sidebar-box {
+  background-color: -moz-Field;
+}
+
 /* Highlighter - Node Infobar */
 
-.highlighter-nodeinfobar {
+#highlighter-nodeinfobar {
   color: hsl(200, 100%, 65%);
   border: 1px solid hsla(210, 19%, 63%, .5);
   border-radius: 3px;
@@ -1998,21 +2023,21 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
 
 /* Highlighter - Node Infobar - text */
 
-.highlighter-nodeinfobar-text {
+#highlighter-nodeinfobar-text {
   /* 100% - size of the buttons and margins */
   max-width: calc(100% - 2 * (26px + 6px));
   padding-bottom: 1px;
 }
 
-html|*.highlighter-nodeinfobar-tagname {
+html|*#highlighter-nodeinfobar-tagname {
   color: white;
 }
 
-html|*.highlighter-nodeinfobar-id {
+html|*#highlighter-nodeinfobar-id {
   color: hsl(90, 79%, 52%);
 }
 
-html|*.highlighter-nodeinfobar-pseudo-classes {
+html|*#highlighter-nodeinfobar-pseudo-classes {
   color: hsl(20, 100%, 70%);
 }
 
@@ -2026,7 +2051,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   min-height: 26px;
 }
 
-.highlighter-nodeinfobar-inspectbutton {
+#highlighter-nodeinfobar-inspectbutton {
   -moz-border-end-width: 1px;
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
   -moz-margin-end: 6px;
@@ -2034,26 +2059,26 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-.highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
+#highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
 }
 
-.highlighter-nodeinfobar-inspectbutton:active:hover,
-.highlighter-nodeinfobar-container:not([locked]) >  .highlighter-nodeinfobar >  .highlighter-nodeinfobar-inspectbutton {
+#highlighter-nodeinfobar-inspectbutton:active:hover,
+#highlighter-nodeinfobar-container:not([locked]) >  #highlighter-nodeinfobar >  #highlighter-nodeinfobar-inspectbutton {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-.highlighter-nodeinfobar-menu {
+#highlighter-nodeinfobar-menu {
   -moz-border-start-width: 1px;
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
   -moz-margin-start: 6px;
 }
 
-.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
+#highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
 }
 
-.highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
+#highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
   -moz-appearance: none !important;
   list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
   -moz-box-align: center;
@@ -2072,7 +2097,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   background-repeat: no-repeat;
 }
 
-.highlighter-nodeinfobar-arrow-top {
+#highlighter-nodeinfobar-arrow-top {
   margin-bottom: -8px;
   margin-top: 8px;
   border-right-color: hsla(210, 19%, 63%, .5);
@@ -2080,7 +2105,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   background-image: -moz-linear-gradient(bottom left, transparent 50%, hsl(209, 18%, 30%) 50%);
 }
 
-.highlighter-nodeinfobar-arrow-bottom {
+#highlighter-nodeinfobar-arrow-bottom {
   margin-top: -8px;
   margin-bottom: 8px;
   border-left-color: hsla(210, 19%, 63%, .5);
@@ -2088,12 +2113,12 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   background-image: -moz-linear-gradient(top right, transparent 50%, hsl(210, 24%, 16%) 50%);
 }
 
-.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
-.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar {
+#highlighter-nodeinfobar-container[position="top"] > #highlighter-nodeinfobar,
+#highlighter-nodeinfobar-container[position="overlap"] > #highlighter-nodeinfobar {
   box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
 }
 
-.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
+#highlighter-nodeinfobar-container[hide-arrow] > #highlighter-nodeinfobar {
   margin: 7px 0;
 }
 
@@ -2123,6 +2148,259 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   font-size: 120%;
 }
 
+/* Highlighter toolbar - breadcrumbs */
+
+#inspector-breadcrumbs {
+  -moz-margin-end: 3px;
+  /* A fake 1px-shadow is included in the border-images of the
+     inspector-breadcrumbs-buttons, to match toolbar-buttons style.
+     This negative margin compensate the extra row of pixels created
+     by the shadow.*/
+  margin-bottom: -1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up,
+#inspector-breadcrumbs > .scrollbutton-down {
+  -moz-appearance: none;
+  border: 1px solid hsla(210,8%,5%,.45);
+  background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
+  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
+  margin: 0 0 1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up {
+  -moz-border-start-width: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
+  border-color: hsla(210,8%,5%,.6);
+  background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
+  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
+  -moz-image-region: rect(0px 14px 16px 7px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
+  -moz-appearance: none;
+  list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
+  -moz-image-region: rect(0px 7px 16px 0px);
+  margin: 0 5px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+  opacity: 0.5;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
+  transform: scaleX(-1);
+}
+
+.inspector-breadcrumbs-button {
+  -moz-appearance: none;
+  background-color: transparent;
+  border-style: solid;
+  border-width: 1px 13px 2px 13px;
+  color: hsl(210,30%,85%);
+  width: 85px; /* Can't use max-width. See bug 723132 */
+  /* The content of the button can be larger than the button */
+  overflow: hidden;
+  min-height: 25px;
+
+  margin: 0 -11px 0 0;
+  padding: 0 9px;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > label {
+  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
+  color: hsl(208,100%,60%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
+  color: hsl(205,100%,70%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
+  color: hsl(20, 100%, 70%);
+}
+
+.inspector-breadcrumbs-id,
+.inspector-breadcrumbs-classes {
+  color: #8d99a6;
+}
+
+.inspector-breadcrumbs-pseudo-classes {
+  color: hsl(20, 100%, 85%);
+}
+
+/* Highlighter toolbar - breadcrumbs - LTR */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
+  margin-left: 0;
+  border-left-width: 0;
+}
+
+.inspector-breadcrumbs-button {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]),
+.inspector-breadcrumbs-button:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked][siblings-menu-open],
+.inspector-breadcrumbs-button[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]),
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked],
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
+  border-right-width: 0;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked],
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+/* Highlighter toolbar - breadcrumbs - RTL */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
+  margin-right: 0;
+  border-right-width: 0;
+}
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked][siblings-menu-open]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  border-left-width: 0;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+/* Highlighter toolbar - HTML Tree */
+
+#inspector-treepanel-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/treepanel-button.png");
+  -moz-margin-end: 0;
+  -moz-image-region: rect(0px 18px 16px 0px);
+}
+
+#inspector-treepanel-toolbutton[checked] {
+  -moz-image-region: rect(0px 36px 16px 18px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl),
+#inspector-treepanel-toolbutton:-moz-locale-dir(ltr) {
+  border-radius: 3px 0 0 3px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr),
+#inspector-treepanel-toolbutton:-moz-locale-dir(rtl) {
+  border-radius: 0 3px 3px 0;
+}
+
+/* Highlight toolbar - Option menu */
+
+#inspector-option-toolbarbutton:-moz-focusring {
+  outline: 1px dotted hsla(210,30%,85%,0.4);
+  outline-offset: -2px;
+}
+
 html|*#gcli-tooltip-frame,
 html|*#gcli-output-frame {
   padding: 0;
@@ -2306,13 +2584,33 @@ html|*#gcli-output-frame {
   background: rgba(0,0,0,.4);
 }
 
-#developer-toolbar-toolbox-button {
-  -moz-image-region: rect(64px, 22px, 80px, 0);
+#developer-toolbar-webconsole {
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+#developer-toolbar-inspector {
+  -moz-image-region: rect(16px, 16px, 32px, 0);
+}
+
+#developer-toolbar-styleeditor {
+  -moz-image-region: rect(32px, 16px, 48px, 0);
+}
+
+#developer-toolbar-debugger {
+  -moz-image-region: rect(48px, 16px, 64px, 0);
+}
+
+#developer-toolbar-other-tools {
+  -moz-image-region: rect(64px, 16px, 80px, 0);
+}
+
+#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
+  display: none;
 }
 
 /* Error counter */
 
-#developer-toolbar-toolbox-button[error-count]:before {
+#developer-toolbar-webconsole[error-count]:before {
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
diff --git a/browser/themes/gnomestripe/devtools/command-responsivemode.png b/browser/themes/gnomestripe/devtools/command-responsivemode.png
deleted file mode 100644
index cbfa599048c1065c7250a5cd74b9684724f3ded3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1083
zcmV-B1jPG^P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn000C6Nkl<Zc-qyL
zZAevj9LN9X$h<4O&Glf*%BNah3|g&BTO-FTGBsO4PaCvw=xodCrlOb;F*k=pDYFnW
zn>{UzO0owih;|zVdoglM>cwC%#$YhU7`2<(IQxCw_q6}zaJu(MZ+h|J_xtPTd++so
zJ)EP$j~+kQsO_iXh4I1^PauOVU#LN7^a3-A^a_`}z>Ffl2!DBj8D(s0Nm}ydo%?w`
z1C|$%K~_Ed?*r@^4a|ZIqePKEM~O04@0yv_{;d@_;0<JuwF}q{-Y+ei5I@%Me;ROX
zpIOics%z_$qUGVhC5rq3n!adBj+Tc5mnfsSDl@SEwgr48)#YaH`eHL@T_o9S3e49_
zmYVZdE%OxzKd^md?E)Hryn!LJc4+vYbeVOWwQy|U*gmu1JmBv-nCs;15a=;aA7}DA
z;O|1r-Q)~8^7QQjGF!f}fRSIGx2XN=yMdY`>)&V(-Q&D#&MBA{H!e9*c-hF?ynud0
z0rdcTU;pKdDbv%?b`mDedI7r69h@D(B~J%9eDWKJJx`wn%xb=20i!Uu@Rh0)MK3Jg
zkQtZtRyrom^7F(u58YBg_5l5e0_p(w9cURlCe9HBIDK#iaBpMI&bMJF4xjuAxL?)t
zI6L$7S-`8GUbBEvv@?5ATWC<e<%#lb$7AA*0v7KNDWLm$0W|=7@7eRI@~>xN$HduD
z0DbP@G<lK_YkBO%;gg?%hdg~2u=k1uP{5?JgGDdC_xWVG#f`<pd8B~W>k8<;UO*MV
z{`b&ug}m`JIagxh>?nXfcW?@DZ)U!gvss|$^vO?vdmnTCoPEwbeHJit_XP`}fQ6s*
z|Bw~zD#>lUIEaa}@lO2&J}<=SzFt5OV8^v5`1Q#@JXdh|GQo)vT=H~Q3l5+B2%_Xa
zcK9q{M%_6J7%R5Vjhp>;8m|8*%qyH>Z2T;BUc;Gvs`S81x~~_o4PbX62Oj{t?sEq{
zM7gj^=oZ}kd&DhYAq+Tt7LZZhYXPI6G7Hzfj@$;vy|(jM`|RLx-1jHzzFxpq;8uWq
z3-N*<yY6!bM~QNv<-_j&Ac#Frp9Q4vIB5Z6WlbP=&pD+d1^DFIAjQmCJ4>De65-H~
zDBvR?yAS6m_-vn9aD<HE*%dgNugLc#A$lGTeHM_mwZ{Spn_HL5b)FpY%wN$p)p)ll
z%~-cLLoR_7IP@b5*aBqV77Mn|Ea)OfV?py3xkCnGggy({(rtn4+OMpfy3<bu4*mZN
zxE~%Wl^6Ta3&_|7Jb3u1O=hPTm_Z(Qo|`hi^8zzUp8nEP$~qsUmLImffDE$sHJ%{&
zJ(9ozMx75ogS<Is#dvdW(R_K<&li@)NIo*i{tKm$=he1VCV&6{002ovPDHLkV1ncB
B5lR36

diff --git a/browser/themes/gnomestripe/devtools/command-scratchpad.png b/browser/themes/gnomestripe/devtools/command-scratchpad.png
deleted file mode 100644
index 5131ca5cbc6176c96a66f4a56d81fed95c4c9327..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#30006HNkl<Zc-qC5
zPfHt76vbV+5d8}7Tofs2(W;=((r?mDX;F!&U_`-w1(zjaD@B7+1ec|v7^+rcocx)n
z7%gc*P=uDEO^iak2VUTLnAf><<KoAhcjuhp+<`Eut5&OZ^$kt`%Y*0dJ)l&%9noq7
z=ijTeJD=BS_X1NY?JlsQ((e3kwdMuNmD}i_t5U@1w+bD#3gE%<%hL5st)xQ7DPO!Q
zS8_)GQs|<+00t9@&FvN`)~wZ3V0ka&x6AdBR#X1suyFEBu3cKq3ycesK&z?1CzJwO
zP5Cq79B4H!FqTSZyEndWKdFH;<}RqfQpVr!v-3D(?t=2C{=v};JC8HwE_i`aAzHS;
z8FLr>8xR($B+hXcl>Z_8WH5KZ3k-u@FY|OgvDx-7;DMJ4%mXj$_lD)+ftT{%L2m!>
zc~~AEczJ;#!)Q4Kc;KZ1AAwn9A%uB&DPJ%gD=F{-gWy{-)$wJ0<8cj~F%N<Yd;q&%
zw#UxnjCl~0KLF`mzR%9%jCl~eKtGT-91(^rBA5q31!fI%4CX;l-Z$hK%!A+s-fZn8
z+dr?awFZHE@Yqm+ndDx&)0M|Pcx))2@pAcIS04A^vEc<?%iA6h1|1B*V?zaE!fXgJ
z8_Ih^It0(=-U9N8e<{OPTHv<}$R~bU=I^w?Z|DDB-y~$7(gHvKnQIi9v>5+`=kEaG
WYW7HKLO22d0000<MNUMnLSTZG<`g>s

diff --git a/browser/themes/gnomestripe/devtools/command-tilt.png b/browser/themes/gnomestripe/devtools/command-tilt.png
deleted file mode 100644
index f816bba59cedb2fb2069b4d0a4ff09225e99cdb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1668
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
O0000<MNUMnLSTYCryzI$

diff --git a/browser/themes/gnomestripe/devtools/common.css b/browser/themes/gnomestripe/devtools/common.css
index 59b66d44b4b4..c2a1feb63781 100644
--- a/browser/themes/gnomestripe/devtools/common.css
+++ b/browser/themes/gnomestripe/devtools/common.css
@@ -188,65 +188,6 @@
   position: relative;
 }
 
-/* In-tools sidebar */
-
-.devtools-sidebar-tabs {
-  -moz-appearance: none;
-  margin: 0;
-}
-
-.devtools-sidebar-tabs > tabpanels {
-  -moz-appearance: none;
-  padding: 0;
-  border: 0;
-}
-
-.devtools-sidebar-tabs > tabs {
-  -moz-appearance: none;
-  position: static;
-  box-shadow: 0 1px 0 0 hsla(210, 16%, 76%, .2) inset;
-  background-image: linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
-  color: hsl(210,30%,85%);
-  margin-bottom: 0;
-  padding: 0;
-}
-
-.devtools-sidebar-tabs > tabs > .tabs-right,
-.devtools-sidebar-tabs > tabs > .tabs-left {
-  display: none;
-}
-
-.devtools-sidebar-tabs > tabs > tab {
-  -moz-appearance: none;
-  padding: 0;
-  margin: 0;
-  min-width: 78px;
-  min-height: 22px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  text-align: center;
-  color: inherit;
-  -moz-box-flex: 1;
-  border-width: 0;
-  -moz-border-end-width: 1px;
-  border-color: hsla(210,8%,5%,.6);
-  border-style: solid;
-  background: transparent;
-  border-radius: 0;
-}
-
-.devtools-sidebar-tabs > tabs > tab:-moz-focusring {
-  position: static;
-}
-
-.devtools-sidebar-tabs > tabs > tab:last-of-type {
-  -moz-border-end-width: 0;
-}
-
-.devtools-sidebar-tabs > tabs > tab[selected=true] {
-  background-image: linear-gradient(to bottom, hsl(201,45%,34%), hsl(205,44%,22%));
-  color: white !important;
-}
-
 /* Theme */
 
 .devtools-theme-background {
diff --git a/browser/themes/gnomestripe/devtools/dock-bottom.png b/browser/themes/gnomestripe/devtools/dock-bottom.png
deleted file mode 100644
index 83842f236ef5ede55a268e67077532fc1764746f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0YFJa
zK~y-6#gn~C13?spzuCWlN(=#wCY?p<l>U^m#7D5O5DN<nAI8GMLM$wN1jRC8vyGMA
z7J@}2RftI-u(La3lMTzdNrV(0xNz@f&Y64eFhXn1Dlk@J0~UZ&syRSu8qN|<2n>Kh
zIOvAfv{}Bpy}3APx_hQ+E}SZkWA*&<`f+)6eGl{!f$e6~t!l(Liq(<<1g?8r1-8-x
zYak{7r)TG5uj2=R%rNc4gZ=u`<HLqwm=ai@?Enx!1mJc2H?8rLIt9z?_#@yb#hD3^
z+$f+Z1iL`?eFad=PWDUS>oaHojd>f8ks77z^u{G13$|4$*j7bGs-Kr9=kg|q0LGK>
zJ!#C#^DL;Ww?9D5ENB?E+8#=&7+4reskqhl&@coLT5IghS{Xqd*vZ(+Lj?5D1oFGv
d7ytene*n2yf``D{mBs)7002ovPDHLkV1mh##`^#O

diff --git a/browser/themes/gnomestripe/devtools/dock-side.png b/browser/themes/gnomestripe/devtools/dock-side.png
deleted file mode 100644
index 9a940bc1e4e50a63d1522fc5604cb2cf44b05e82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0dYx0
zK~y-6#gn^A13?&tzkg#^qGBXPiUd)DAZTgt4PpYmfM6lMl7fg>Soj`_MNAq&5H*Pw
z3NaSm5~HhonXzzJ)=Nxb;lR(pFz4{i;f!dl`O7l?qz1YG%z?BC4ESSq&?uk@+}IDb
zmoEP>v9Y$YoX=&4Baui)s&b{;oSmCr0WJcAWG<IYYNY9Usv~wLlQDoq*q{gG1z=%u
z$tn~}RlorTFV9bty)knn5I<S=nTP;%gP#E)zJNlpbf7gwz!hNvn0m78lOI4NY(QWD
z+-t3G)ni>p<EdxB>5G}8!KIdEm%}dK3<Q*VtcT0tv@H9mT^?Zr*Wb-(JY_hIs~}Cc
zFJ_K~2#$Xxn3<j&-`U-3MdPVgV8|yp{FOk1tCaE#!(e-BvtLB=AFi&~_$pFL!F!=T
zs(iP)wytd3_FPXrIIedajQ_MxQ`j$}-`j|2t%=6d{XhmG4aC~v2AKfYXev&lb|?S-
a8{Yua!lFpTFEAhg0000<MNUMnLSTZp`P~Wt

diff --git a/browser/themes/gnomestripe/devtools/dock-window.png b/browser/themes/gnomestripe/devtools/dock-window.png
deleted file mode 100644
index 29d3b319a99a3c8b2ded8fbd8ae8d70970c792a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0)I(F
zK~y-6rBlyKR8bf`_rCk)jc*)B#2=&c!!Zn76qwRNa|(i>c7@u?RTxEB5kmh%P)N(7
zT`i)>qChBuC?O1glu}BRT7)w?m6JZ7^WK|x@7KZt6L)^g?{Ln6^PP_o5q2_c>!Lii
zyS#bd-dMmeN|lt`l7tX4lU@8dJw1~ZTfxg0`;K&Xo;;DNPjID(6VZPrn#PsmdUAYh
zB6F$#%FV3;C3UsYhK6LEy?HzKJCj{p*M;VT{nd~Po|5K)))u{`Wq*Zfnzf=b(G)p<
z_DnjRZjb#~%9_zwGAcA?Umv(JH}vrCYXIw;3_Ji$PoKX!To;X+j^hMGJRVPVcXu66
z)hEnSgTp0QR>3a@gTYw<;{dj%Y#BzN*_Sd1fVh-0l1e4*sSnc&Ev;>zZ{5DLTo%++
zC=~LyAp?LCLKKO}Q$*lWN=PY-wr%I%O^gg{oM$x7lx0~40DT()({(-KoVy?*A(bL2
zRnas}8$hn6y1E{K-O=9G7&1$aMj{cL^NkQS>B_}rt1(<!8q{^Ypok!_(In3=7JUFt
zHkT``ILhnq>kR<t0KfqtZ+k2p3P1pofc4SI8S=bhK`5n|5W-ot)=B`>T<Gmt8XSBa
zud1pPuICkq2<eW4bnbLdaq!7AV`TWHUlC0>qhsUw?BddbV4M?U%x!GkWjq>saY$!;
z?aSA1`kHMU05Kv$G9L3nC5AsaHMKHu?dk-88~_UlSYl;mHGl8^13J~!S!k$_>rx?j
zOoz(>2iWMk0_4cV$KdSTd=9{S0P<fgm=>-rFDnc035UZ`-}m+HPRBWCQb}w1SN@Zm
k|31GNV>|suz9Tk(KRCWA;;1x%9RL6T07*qoM6N<$g8X4xGynhq

diff --git a/browser/themes/gnomestripe/devtools/inspector.css b/browser/themes/gnomestripe/devtools/inspector.css
deleted file mode 100644
index 054658534278..000000000000
--- a/browser/themes/gnomestripe/devtools/inspector.css
+++ /dev/null
@@ -1,214 +0,0 @@
-#inspector-inspect-toolbutton {
-  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#inspector-inspect-toolbutton[checked=true] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-/* Highlighter toolbar - breadcrumbs */
-
-#inspector-breadcrumbs {
-  -moz-margin-end: 3px;
-  /* A fake 1px-shadow is included in the border-images of the
-     inspector-breadcrumbs-buttons, to match toolbar-buttons style.
-     This negative margin compensate the extra row of pixels created
-     by the shadow.*/
-  margin-bottom: -1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up,
-#inspector-breadcrumbs > .scrollbutton-down {
-  -moz-appearance: none;
-  border: 1px solid hsla(210,8%,5%,.45);
-  background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
-  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
-  margin: 0 0 1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
-  border-color: hsla(210,8%,5%,.6);
-  background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
-  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
-  -moz-image-region: rect(0px 14px 16px 7px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
-  -moz-appearance: none;
-  list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
-  -moz-image-region: rect(0px 7px 16px 0px);
-  margin: 0 5px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
-  opacity: 0.5;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
-  transform: scaleX(-1);
-}
-
-.inspector-breadcrumbs-button {
-  -moz-appearance: none;
-  background-color: transparent;
-  border-style: solid;
-  border-width: 1px 13px 2px 13px;
-  color: hsl(210,30%,85%);
-  width: 85px; /* Can't use max-width. See bug 723132 */
-  /* The content of the button can be larger than the button */
-  overflow: hidden;
-  min-height: 25px;
-
-  margin: 0 -11px 0 0;
-  padding: 0 9px;
-}
-
-.inspector-breadcrumbs-button:-moz-focusring > label {
-  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
-  color: hsl(208,100%,60%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
-  color: hsl(205,100%,70%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
-  color: hsl(20, 100%, 70%);
-}
-
-.inspector-breadcrumbs-id,
-.inspector-breadcrumbs-classes {
-  color: #8d99a6;
-}
-
-.inspector-breadcrumbs-pseudo-classes {
-  color: hsl(20, 100%, 85%);
-}
-
-/* Highlighter toolbar - breadcrumbs - LTR */
-
-.inspector-breadcrumbs-button {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
-  border-left-width: 0;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
-  border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - breadcrumbs - RTL */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
-  border-right-width: 0;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
diff --git a/browser/themes/gnomestripe/devtools/layout-background.png b/browser/themes/gnomestripe/devtools/layout-background.png
new file mode 100644
index 0000000000000000000000000000000000000000..6991cc0f2ab221e7488be16c3f9e4aa4d6228e73
GIT binary patch
literal 981
zcmV;`11kK9P)<h;3K|Lk000e1NJLTq000vJ000sQ1^@s6xeVoL00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+yxsDEjaStXd3_k17b-;
zK~y-)Rg}wa+(r;ZPj|D~<P6Cfiqcpy3~Q5Bwt@FqWgp~Q@)h|?$$;U<j5vHXo3HLH
z1P_pHRiSXJ?!gs*|MTzfT5DcjUbw%%r|UY5F|=(<S(emw&Ew-E08tdNZ5!wFnX)W#
z&JjfsNs=&*BayY1d7gQEe57q#(ljN@GK?`S%R-iA^nFi~BzW)9TJ!MmfDi&91byF=
z=Q&N&Ag|XeNs^$orYH)u)_nf_nK+K=x{i16-m$JL(=@Sd8^bUVLLh{|IF3xygb;%L
zevd565-BB3(=d)ByWI|B4Axrq`#tNr5<)--aZ@`@6Mf&4rYQhT(_pPd{yfDPLmbCg
zYf(y(Wf=h1>y@%BDT)H`J*U$N?>)QSj&)sG*Oe^Gn5Kznx7)F88^#!>X+mpFmSrr<
zf^&}3>BKM$EXzU&fxhpNQW8QS%QA!zeEIT)BuS7_6mhv+`1<uLLI}F9V_jF8rr~%z
z^8EZvmSt?)hEj@US*WUt!{Gpcl#*px5JDhB2vk*t)|z>qQA#n6BUM!)gy8AviMp=o
z`~HSOUDv$4ydZ>l`<0Z;^Ncjc;JrsFMb~xA^Gs0`SZjHGeWk8zq?Fv>-}CzVij<PR
z?|FK9;>V94L{Y@U!vj$ip?>-8)BB(N2q8Ee4h+M9bMD4g2!YGxf>H`=Ek#i<jw4x?
zA*IAQhm?}&a5%7S+s*!M+sN~rbzK>Tfh0+Y<Cr*(QA)9G8|%8FwWe)bmSws1BJVxc
z+BY|(#Cy-OEUfE_F@|9n0GQ_)=NunDe#ALP*L5UGf>H`&3?T$$*L4iTK;QQ_&Z??H
zDaC%jrz}f`VW21qwr%74_wRIFhf<0pNl4R_JkN2?p+5cj*ZZH~g%ED1Ow+`&EO_s^
zySpQbB8)Kr9FIqwbN`!}rs>U1t@RC!d7jy}4XrhC9N+5C&(BzENz)W#3~8Dogur``
zbB;XEk>~T7IF6a;nd9+zi=U=x$n%`@`Hc4-V+>VQF^(f`+cJ(L)>^#x0DSxQ?M+$R
zw)B0E5Q4kAJC4WW4GVy2n#i(@%jH5{*J!PA&hg>H2SNz!b~}oqK>hmZkM~g&aXOvo
z`=0Cdddn^EJ^THhWmy=8;TBWZ>lLLGLWtYqaUA&%hHv{do)ciN00000NkvXXu0mjf
DG;`Ue

literal 0
HcmV?d00001

diff --git a/browser/themes/gnomestripe/devtools/layout-buttons.png b/browser/themes/gnomestripe/devtools/layout-buttons.png
new file mode 100644
index 0000000000000000000000000000000000000000..8705bc51475de5e6759371cc30a32e67187f455a
GIT binary patch
literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0004oNkl<Zc-rli
z&q@Mu6h?nCxvizE3iDr!dJM}PeXA_el)ysG3{$Y6f_6Pgw8~ep@5Bsuj1<L1Em|D7
z^WA&AR~gVvCX-*~PaF^vo>*HF4|i4HQFuB3#bx}l_*jrJ4(_VH;~JMbe0AA!TePMr
zwT0zI8wYo`Z_M+90}k#LUQLlHcH=q!3+nHE99;8p{A-sk40-+udd!$_2aFUpL$t6H
z&lU#iZ2~n}bOr}^%1<BN>NzR4W{_mYd^=#M@B*}`rG@=qc?_t@=!J7QxKW?Jmn%J!
z1)c+HGWDLAG2afjQ&`u})6}A#Ew>LKqsI)hIJi+?G+eqkVo`WRWcedKy;BYI?SP)b
zGyOc5dfpas@+f5Vm|+%&Jn9EjwP?UX90-;VwY<uV`E~#=*@?bgO}vTs8PKaSi-SAm
z8>d>>_jbz<Kus2%!Lb8&@;3@A;&?$SIJk5CijM67^(>zQyp4VTTtU~R^6f=nc73l{
p$6eJAU$BJOT9O3rs{a4K;U}VSGM><Zg2Dg*002ovPDHLkV1gOT${7Fv

literal 0
HcmV?d00001

diff --git a/browser/themes/gnomestripe/devtools/layoutview.css b/browser/themes/gnomestripe/devtools/layoutview.css
index 552c9841e848..4d653c5c5e0c 100644
--- a/browser/themes/gnomestripe/devtools/layoutview.css
+++ b/browser/themes/gnomestripe/devtools/layoutview.css
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 body {
-  background: url(layout-background-grid.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
+  background: url(layout-background.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
   color: hsl(210,100%,85%);
   border-top: 1px solid black;
   -moz-box-sizing: border-box;
@@ -42,3 +42,17 @@ body {
   border-style: solid;
   border-color: hsl(210,100%,85%);
 }
+
+#togglebutton {
+  background-image: url(layout-buttons.png);
+  width: 16px;
+  height: 16px;
+}
+
+body.open {
+  background: url(layout-background-grid.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
+}
+
+body.open > #header > #togglebutton {
+  background-position: -16px 0;
+}
diff --git a/browser/themes/gnomestripe/devtools/toolbox.css b/browser/themes/gnomestripe/devtools/toolbox.css
deleted file mode 100644
index 13b5b4997a52..000000000000
--- a/browser/themes/gnomestripe/devtools/toolbox.css
+++ /dev/null
@@ -1,99 +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/. */
-
-#toolbox-tabs {
-  margin: 0;
-}
-
-#toolbox-dock-bottom {
-  list-style-image: url("chrome://browser/skin/devtools/dock-bottom.png");
-}
-
-#toolbox-dock-side {
-  list-style-image: url("chrome://browser/skin/devtools/dock-side.png");
-}
-
-#toolbox-dock-window {
-  list-style-image: url("chrome://browser/skin/devtools/dock-window.png");
-}
-
-.command-button {
-  margin: 0 10px;
-  width: 16px;
-  height: 32px;
-  background-repeat: no-repeat;
-  background-position: center center;
-}
-
-#command-button-responsive {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 16, 16, 0);
-}
-#command-button-responsive:hover {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 32, 16, 16);
-}
-#command-button-responsive:hover:active {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 48, 16, 32);
-}
-#command-button-responsive.toggled {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 64, 16, 48);
-}
-
-#command-button-tilt {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 16, 16, 0);
-}
-#command-button-tilt:hover {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 32, 16, 16);
-}
-
-#command-button-tilt:hover:active {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 48, 16, 32);
-}
-
-#command-button-tilt.toggled {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 64, 16, 48);
-}
-
-#command-button-scratchpad {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 16, 16, 0);
-}
-
-#command-button-scratchpad:hover {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 32, 16, 16);
-}
-
-#command-button-scratchpad:hover:active {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 48, 16, 32);
-}
-
-
-/* Tabs */
-
-.devtools-tabbar {
-  -moz-appearance: none;
-  background-image: linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
-  color: hsl(210,30%,85%);
-  padding: 4px 3px 3px;
-  box-shadow: 0 -3px 0 0 rgb(20,20,20) inset, 0 -4px 0 0 rgba(0,0,0,0.8) inset;
-}
-
-.devtools-tab {
-  -moz-appearance: none;
-  min-width: 78px;
-  min-height: 22px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  border-radius: 3px 3px 0 0;
-  color: inherit;
-  border-style: solid;
-  border-color: transparent;
-  border-width: 1px 1px 0;
-  margin: 0 5px;
-  padding: 0 10px 1px;
-}
-
-.devtools-tab[selected=true] {
-  border-color: hsla(210,8%,5%,.6);
-  background-color: rgb(20,20,20);
-  text-shadow: none;
-  color: white;
-}
diff --git a/browser/themes/gnomestripe/devtools/treepanel-button.png b/browser/themes/gnomestripe/devtools/treepanel-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a8802216bf178bc05813fc592df30d91cd49415
GIT binary patch
literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq001Na000mO1^@s6e(T*M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!$4Nv%RCwCVR$FTmK@^_Z-89vNv{qwm
zODndik(x^}`U{GbLJ)lr5%fv)L45Of_%7H-U%enj2$F&~P-`(Ips`Au*oIzAYMV46
zo88&*oRE}pd&&6Lz{d=kbG|)u_M2~(a?Z&?`cX$mPdkjq03LwSBHjWN0eL`GTreKx
z95A>5$VXf7@J4<aQ^f@h;7i0O@1F^rJ|eS&^!K?xqhqlLFwOq6u=3M08XAZ@R3$3I
zV=!wbk(wVPC;SC_L7hWGLr#-fB^e@&#T<J<^!G1!$v73Q=}hX?v?(NtIowu|0=?5e
zewyBdxhVsT#he{a$feolW-)1+CXoTgV$Kc?X`Y@g+&H}T?ncM3104YOE}Aky9IG%c
z05(KTv1rUmsM1HYw&TF15T{Gy9`7O2?sgJIwP}ho(ssB&y8TPsf1xO9imIL-wNV6$
zl2S_g;*-yAgo0;XGOhpmEnT`ee(9mb$&$#!$M1EWyLS7j!{La?@R$~#na<|NG=&mu
zTSZtqIXpaUf~MAGhysBCZm5$@<gy|UO-*&ISFK2`QkB#ct!qlz<vi+d-@UIij$=z;
z>|UBGmWoNkFo+B=7IV;tniNex>IV$MLwpTQ?d3;XfCB6w1LF^KBG>F_-H+(p2QOJ&
z=qI(xQRtVtI}78ax~0>Nl`T>!E)#AoiVyU?eDUP^NF>}Y)8d&gNiBBy>KiD0o`@X+
zKN@h;xZ3NDl3s619>&;gX6pGB`uZ^*7F{f;GZYN!hRMn@1&xHm8XO%J4nbWvOz@*T
z@kMnecO^Mh8sUTIEo&lI=TSuM#9t*0SwF(qy|hy<SET(2V?{sG1U0YSx^s70@S}ZC
zDa0?sxMsh#XlAy=v#FcgezgCMW)ZWtM!8ku_JZIKbn6sM(vp`Wc2l<p($AA9cGT74
j|L|<*AGFVpzXA*Z|5Kl~6^V5Y00000NkvXXu0mjflR<IX

literal 0
HcmV?d00001

diff --git a/browser/themes/gnomestripe/jar.mn b/browser/themes/gnomestripe/jar.mn
index f10067a6a654..4fb4850ef75f 100644
--- a/browser/themes/gnomestripe/jar.mn
+++ b/browser/themes/gnomestripe/jar.mn
@@ -105,9 +105,6 @@ browser.jar:
   skin/classic/browser/devtools/common.css            (devtools/common.css)
   skin/classic/browser/devtools/arrows.png            (devtools/arrows.png)
   skin/classic/browser/devtools/commandline.png       (devtools/commandline.png)
-  skin/classic/browser/devtools/command-responsivemode.png (devtools/command-responsivemode.png)
-  skin/classic/browser/devtools/command-scratchpad.png (devtools/command-scratchpad.png)
-  skin/classic/browser/devtools/command-tilt.png      (devtools/command-tilt.png)
   skin/classic/browser/devtools/alerticon-warning.png (devtools/alerticon-warning.png)
   skin/classic/browser/devtools/goto-mdn.png          (devtools/goto-mdn.png)
   skin/classic/browser/devtools/csshtmltree.css       (devtools/csshtmltree.css)
@@ -156,8 +153,11 @@ browser.jar:
   skin/classic/browser/devtools/itemArrow-ltr.png     (devtools/itemArrow-ltr.png)
   skin/classic/browser/devtools/inspect-button.png    (devtools/inspect-button.png)
   skin/classic/browser/devtools/dropmarker.png        (devtools/dropmarker.png)
+  skin/classic/browser/devtools/treepanel-button.png  (devtools/treepanel-button.png)
+  skin/classic/browser/devtools/layout-background.png (devtools/layout-background.png)
   skin/classic/browser/devtools/layout-background-grid.png (devtools/layout-background-grid.png)
   skin/classic/browser/devtools/layoutview.css        (devtools/layoutview.css)
+  skin/classic/browser/devtools/layout-buttons.png    (devtools/layout-buttons.png)
   skin/classic/browser/devtools/debugger-collapse.png  (devtools/debugger-collapse.png)
   skin/classic/browser/devtools/debugger-expand.png    (devtools/debugger-expand.png)
   skin/classic/browser/devtools/debugger-pause.png     (devtools/debugger-pause.png)
@@ -169,12 +169,7 @@ browser.jar:
   skin/classic/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
   skin/classic/browser/devtools/responsive-background.png (devtools/responsive-background.png)
   skin/classic/browser/devtools/tools-icons-small.png     (devtools/tools-icons-small.png)
-  skin/classic/browser/devtools/dock-bottom.png           (devtools/dock-bottom.png)
-  skin/classic/browser/devtools/dock-side.png             (devtools/dock-side.png)
-  skin/classic/browser/devtools/dock-window.png           (devtools/dock-window.png)
   skin/classic/browser/devtools/floating-scrollbars.css   (devtools/floating-scrollbars.css)
-  skin/classic/browser/devtools/inspector.css             (devtools/inspector.css)
-  skin/classic/browser/devtools/toolbox.css               (devtools/toolbox.css)
 #ifdef MOZ_SERVICES_SYNC
   skin/classic/browser/sync-16-throbber.png
   skin/classic/browser/sync-16.png
diff --git a/browser/themes/pinstripe/browser.css b/browser/themes/pinstripe/browser.css
index 614317940f3c..a4c6ed912e6a 100644
--- a/browser/themes/pinstripe/browser.css
+++ b/browser/themes/pinstripe/browser.css
@@ -3368,35 +3368,58 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 /* Highlighter */
 
-.highlighter-outline {
+#highlighter-outline {
   box-shadow: 0 0 0 1px black;
   outline: 1px dashed white;
   outline-offset: -1px;
 }
 
-.highlighter-outline[locked]  {
+#highlighter-outline[locked]  {
   box-shadow: 0 0 0 1px rgba(0,0,0,0.3);
   outline-color: rgba(255,255,255,0.7);
 }
 
-/* Developer toolbar */
+/* Highlighter toolbar */
 
+#inspector-inspect-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#inspector-inspect-toolbutton[checked=true] {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#inspector-toolbar,
 #developer-toolbar {
   border-top: 1px solid hsla(210, 8%, 5%, .65);
   padding-top: 4px;
   padding-bottom: 4px;
 }
 
+#inspector-toolbar:-moz-locale-dir(ltr),
 #developer-toolbar:-moz-locale-dir(ltr) {
   padding-left: 2px;
   padding-right: 16px; /* use -moz-padding-end when/if bug 631729 gets fixed */
 }
 
+#inspector-toolbar:-moz-locale-dir(rtl),
 #developer-toolbar:-moz-locale-dir(rtl) {
   padding-left: 4px;
   padding-right: 18px; /* use -moz-padding-end when/if bug 631729 gets fixed */
 }
 
+#devtools-side-splitter {
+  background-image: none !important;
+  border: 0;
+  -moz-border-start: 1px solid #242b33;
+  min-width: 0;
+  width: 3px;
+  background-color: transparent;
+  -moz-margin-end: -3px;
+  position: relative;
+}
+
 /* Lion Fullscreen window styling */
 @media (-moz-mac-lion-theme) {
   #navigator-toolbox[inFullscreen][tabsontop="true"]:not(:-moz-lwtheme)::before {
@@ -3411,9 +3434,13 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   }
 }
 
+#devtools-sidebar-box {
+  background-color: -moz-Field;
+}
+
 /* Highlighter - Node Infobar */
 
-.highlighter-nodeinfobar {
+#highlighter-nodeinfobar {
   color: hsl(200, 100%, 65%);
   border: 1px solid hsla(210, 19%, 63%, .5);
   border-radius: 3px;
@@ -3422,21 +3449,21 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 /* Highlighter - Node Infobar - text */
 
-.highlighter-nodeinfobar-text {
+#highlighter-nodeinfobar-text {
   /* 100% - size of the buttons + margins */
   max-width: calc(100% - 2 * (26px + 6px));
   padding-bottom: 1px;
 }
 
-html|*.highlighter-nodeinfobar-tagname {
+html|*#highlighter-nodeinfobar-tagname {
   color: white;
 }
 
-html|*.highlighter-nodeinfobar-id {
+html|*#highlighter-nodeinfobar-id {
   color: hsl(90, 79%, 52%);
 }
 
-html|*.highlighter-nodeinfobar-pseudo-classes {
+html|*#highlighter-nodeinfobar-pseudo-classes {
   color: hsl(20, 100%, 70%);
 }
 
@@ -3451,7 +3478,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   background-color: transparent;
 }
 
-.highlighter-nodeinfobar-inspectbutton {
+#highlighter-nodeinfobar-inspectbutton {
   -moz-border-end-width: 1px;
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
   -moz-margin-end: 6px;
@@ -3459,26 +3486,26 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-.highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
+#highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
 }
 
-.highlighter-nodeinfobar-inspectbutton:active:hover,
-.highlighter-nodeinfobar-container:not([locked]) >  .highlighter-nodeinfobar >  .highlighter-nodeinfobar-inspectbutton {
+#highlighter-nodeinfobar-inspectbutton:active:hover,
+#highlighter-nodeinfobar-container:not([locked]) >  #highlighter-nodeinfobar >  #highlighter-nodeinfobar-inspectbutton {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-.highlighter-nodeinfobar-menu {
+#highlighter-nodeinfobar-menu {
   -moz-border-start-width: 1px;
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
   -moz-margin-start: 6px;
 }
 
-.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
+#highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
 }
 
-.highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
+#highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
   -moz-appearance: none !important;
   list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
   -moz-box-align: center;
@@ -3497,7 +3524,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   background-repeat: no-repeat;
 }
 
-.highlighter-nodeinfobar-arrow-top {
+#highlighter-nodeinfobar-arrow-top {
   margin-bottom: -8px;
   margin-top: 8px;
   border-right-color: hsla(210, 19%, 63%, .5);
@@ -3505,7 +3532,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   background-image: -moz-linear-gradient(bottom left, transparent 50%, hsl(209, 18%, 30%) 50%);
 }
 
-.highlighter-nodeinfobar-arrow-bottom {
+#highlighter-nodeinfobar-arrow-bottom {
   margin-top: -8px;
   margin-bottom: 8px;
   border-left-color: hsla(210, 19%, 63%, .5);
@@ -3513,12 +3540,12 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   background-image: -moz-linear-gradient(top right, transparent 50%, hsl(210, 24%, 16%) 50%);
 }
 
-.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
-.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar {
+#highlighter-nodeinfobar-container[position="top"] > #highlighter-nodeinfobar,
+#highlighter-nodeinfobar-container[position="overlap"] > #highlighter-nodeinfobar {
   box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
 }
 
-.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
+#highlighter-nodeinfobar-container[hide-arrow] > #highlighter-nodeinfobar {
   margin: 7px 0;
 }
 
@@ -3548,6 +3575,256 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   font-size: 120%;
 }
 
+/* Highlighter toolbar - breadcrumbs */
+
+#inspector-breadcrumbs {
+  -moz-margin-end: 3px;
+  /* A fake 1px-shadow is included in the border-images of the
+     inspector-breadcrumbs-buttons, to match toolbar-buttons style.
+     This negative margin compensate the extra row of pixels created
+     by the shadow.*/
+  margin-bottom: -1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up,
+#inspector-breadcrumbs > .scrollbutton-down {
+  -moz-appearance: none;
+  border: 1px solid hsla(210,8%,5%,.45);
+  background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
+  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
+  margin: 0 0 1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up {
+  -moz-border-start-width: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
+  border-color: hsla(210,8%,5%,.6);
+  background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
+  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
+  -moz-appearance: none;
+  list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
+  -moz-image-region: rect(0px 7px 16px 0px);
+  margin: 0 5px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+  opacity: 0.5;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
+  -moz-image-region: rect(0px 14px 16px 7px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
+  transform: scaleX(-1);
+}
+
+.inspector-breadcrumbs-button {
+  -moz-appearance: none;
+  border-style: solid;
+  border-width: 1px 13px 2px 13px;
+  color: hsl(210,30%,85%);
+  width: 85px; /* Can't use max-width. See bug 723132 */
+  /* The content of the button can be larger than the button */
+  overflow: hidden;
+  min-height: 25px;
+
+  margin: 0 -11px 0 0;
+  padding: 0 9px;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > label {
+  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
+  color: hsl(208,100%,60%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
+  color: hsl(205,100%,70%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
+  color: hsl(20, 100%, 70%);
+}
+
+.inspector-breadcrumbs-id,
+.inspector-breadcrumbs-classes {
+  color: #8d99a6;
+}
+
+.inspector-breadcrumbs-pseudo-classes {
+  color: hsl(20, 100%, 85%);
+}
+
+/* Highlighter toolbar - breadcrumbs - LTR */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
+  border-left-width: 0;
+}
+
+.inspector-breadcrumbs-button {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]),
+.inspector-breadcrumbs-button:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked][siblings-menu-open],
+.inspector-breadcrumbs-button[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]),
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked],
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
+  border-right-width: 0;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked],
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+/* Highlighter toolbar - breadcrumbs - RTL */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
+  border-right-width: 0;
+}
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked][siblings-menu-open]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  border-left-width: 0;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
+}
+
+/* Highlighter toolbar - HTML Tree */
+
+#inspector-treepanel-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/treepanel-button.png");
+  -moz-margin-end: 0;
+  -moz-image-region: rect(0px 18px 16px 0px);
+}
+
+#inspector-treepanel-toolbutton[checked] {
+  -moz-image-region: rect(0px 36px 16px 18px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl),
+#inspector-treepanel-toolbutton:-moz-locale-dir(ltr) {
+  border-radius: @toolbarbuttonCornerRadius@ 0 0 @toolbarbuttonCornerRadius@;
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr),
+#inspector-treepanel-toolbutton:-moz-locale-dir(rtl) {
+  border-radius: 0 @toolbarbuttonCornerRadius@ @toolbarbuttonCornerRadius@ 0;
+}
+
+/* Highlight toolbar - Option menu */
+
+#inspector-option-toolbarbutton:-moz-focusring {
+  outline: 1px dotted hsla(210,30%,85%,0.4);
+  outline-offset: -2px;
+}
+
 html|*#gcli-tooltip-frame,
 html|*#gcli-output-frame {
   padding: 0;
@@ -3726,13 +4003,33 @@ html|*#gcli-output-frame {
   text-shadow: 0 0 6px hsl(208,100%,60%);
 }
 
-#developer-toolbar-toolbox-button {
+#developer-toolbar-webconsole {
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+#developer-toolbar-inspector {
+  -moz-image-region: rect(16px, 16px, 32px, 0);
+}
+
+#developer-toolbar-styleeditor {
+  -moz-image-region: rect(32px, 16px, 48px, 0);
+}
+
+#developer-toolbar-debugger {
+  -moz-image-region: rect(48px, 16px, 64px, 0);
+}
+
+#developer-toolbar-other-tools {
   -moz-image-region: rect(64px, 16px, 80px, 0);
 }
 
+#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
 /* Error counter */
 
-#developer-toolbar-toolbox-button[error-count]:before {
+#developer-toolbar-webconsole[error-count]:before {
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
diff --git a/browser/themes/pinstripe/devtools/command-responsivemode.png b/browser/themes/pinstripe/devtools/command-responsivemode.png
deleted file mode 100644
index cbfa599048c1065c7250a5cd74b9684724f3ded3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1083
zcmV-B1jPG^P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn000C6Nkl<Zc-qyL
zZAevj9LN9X$h<4O&Glf*%BNah3|g&BTO-FTGBsO4PaCvw=xodCrlOb;F*k=pDYFnW
zn>{UzO0owih;|zVdoglM>cwC%#$YhU7`2<(IQxCw_q6}zaJu(MZ+h|J_xtPTd++so
zJ)EP$j~+kQsO_iXh4I1^PauOVU#LN7^a3-A^a_`}z>Ffl2!DBj8D(s0Nm}ydo%?w`
z1C|$%K~_Ed?*r@^4a|ZIqePKEM~O04@0yv_{;d@_;0<JuwF}q{-Y+ei5I@%Me;ROX
zpIOics%z_$qUGVhC5rq3n!adBj+Tc5mnfsSDl@SEwgr48)#YaH`eHL@T_o9S3e49_
zmYVZdE%OxzKd^md?E)Hryn!LJc4+vYbeVOWwQy|U*gmu1JmBv-nCs;15a=;aA7}DA
z;O|1r-Q)~8^7QQjGF!f}fRSIGx2XN=yMdY`>)&V(-Q&D#&MBA{H!e9*c-hF?ynud0
z0rdcTU;pKdDbv%?b`mDedI7r69h@D(B~J%9eDWKJJx`wn%xb=20i!Uu@Rh0)MK3Jg
zkQtZtRyrom^7F(u58YBg_5l5e0_p(w9cURlCe9HBIDK#iaBpMI&bMJF4xjuAxL?)t
zI6L$7S-`8GUbBEvv@?5ATWC<e<%#lb$7AA*0v7KNDWLm$0W|=7@7eRI@~>xN$HduD
z0DbP@G<lK_YkBO%;gg?%hdg~2u=k1uP{5?JgGDdC_xWVG#f`<pd8B~W>k8<;UO*MV
z{`b&ug}m`JIagxh>?nXfcW?@DZ)U!gvss|$^vO?vdmnTCoPEwbeHJit_XP`}fQ6s*
z|Bw~zD#>lUIEaa}@lO2&J}<=SzFt5OV8^v5`1Q#@JXdh|GQo)vT=H~Q3l5+B2%_Xa
zcK9q{M%_6J7%R5Vjhp>;8m|8*%qyH>Z2T;BUc;Gvs`S81x~~_o4PbX62Oj{t?sEq{
zM7gj^=oZ}kd&DhYAq+Tt7LZZhYXPI6G7Hzfj@$;vy|(jM`|RLx-1jHzzFxpq;8uWq
z3-N*<yY6!bM~QNv<-_j&Ac#Frp9Q4vIB5Z6WlbP=&pD+d1^DFIAjQmCJ4>De65-H~
zDBvR?yAS6m_-vn9aD<HE*%dgNugLc#A$lGTeHM_mwZ{Spn_HL5b)FpY%wN$p)p)ll
z%~-cLLoR_7IP@b5*aBqV77Mn|Ea)OfV?py3xkCnGggy({(rtn4+OMpfy3<bu4*mZN
zxE~%Wl^6Ta3&_|7Jb3u1O=hPTm_Z(Qo|`hi^8zzUp8nEP$~qsUmLImffDE$sHJ%{&
zJ(9ozMx75ogS<Is#dvdW(R_K<&li@)NIo*i{tKm$=he1VCV&6{002ovPDHLkV1ncB
B5lR36

diff --git a/browser/themes/pinstripe/devtools/command-scratchpad.png b/browser/themes/pinstripe/devtools/command-scratchpad.png
deleted file mode 100644
index 5131ca5cbc6176c96a66f4a56d81fed95c4c9327..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#30006HNkl<Zc-qC5
zPfHt76vbV+5d8}7Tofs2(W;=((r?mDX;F!&U_`-w1(zjaD@B7+1ec|v7^+rcocx)n
z7%gc*P=uDEO^iak2VUTLnAf><<KoAhcjuhp+<`Eut5&OZ^$kt`%Y*0dJ)l&%9noq7
z=ijTeJD=BS_X1NY?JlsQ((e3kwdMuNmD}i_t5U@1w+bD#3gE%<%hL5st)xQ7DPO!Q
zS8_)GQs|<+00t9@&FvN`)~wZ3V0ka&x6AdBR#X1suyFEBu3cKq3ycesK&z?1CzJwO
zP5Cq79B4H!FqTSZyEndWKdFH;<}RqfQpVr!v-3D(?t=2C{=v};JC8HwE_i`aAzHS;
z8FLr>8xR($B+hXcl>Z_8WH5KZ3k-u@FY|OgvDx-7;DMJ4%mXj$_lD)+ftT{%L2m!>
zc~~AEczJ;#!)Q4Kc;KZ1AAwn9A%uB&DPJ%gD=F{-gWy{-)$wJ0<8cj~F%N<Yd;q&%
zw#UxnjCl~0KLF`mzR%9%jCl~eKtGT-91(^rBA5q31!fI%4CX;l-Z$hK%!A+s-fZn8
z+dr?awFZHE@Yqm+ndDx&)0M|Pcx))2@pAcIS04A^vEc<?%iA6h1|1B*V?zaE!fXgJ
z8_Ih^It0(=-U9N8e<{OPTHv<}$R~bU=I^w?Z|DDB-y~$7(gHvKnQIi9v>5+`=kEaG
WYW7HKLO22d0000<MNUMnLSTZG<`g>s

diff --git a/browser/themes/pinstripe/devtools/command-tilt.png b/browser/themes/pinstripe/devtools/command-tilt.png
deleted file mode 100644
index f816bba59cedb2fb2069b4d0a4ff09225e99cdb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1668
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
O0000<MNUMnLSTYCryzI$

diff --git a/browser/themes/pinstripe/devtools/common.css b/browser/themes/pinstripe/devtools/common.css
index 7fa892e45758..c8cfa326c108 100644
--- a/browser/themes/pinstripe/devtools/common.css
+++ b/browser/themes/pinstripe/devtools/common.css
@@ -203,60 +203,6 @@
   position: relative;
 }
 
-/* In-tools sidebar */
-
-.devtools-sidebar-tabs {
-  -moz-appearance: none;
-  margin: 0;
-}
-
-.devtools-sidebar-tabs > tabpanels {
-  padding: 0;
-}
-
-.devtools-sidebar-tabs > tabs {
-  -moz-appearance: none;
-  position: static;
-  box-shadow: 0 1px 0 0 hsla(210, 16%, 76%, .2) inset;
-  background-image: url(background-noise-toolbar.png), linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
-  color: hsl(210,30%,85%);
-  margin-bottom: 0;
-  padding: 0;
-}
-
-.devtools-sidebar-tabs > tabs > .tabs-right,
-.devtools-sidebar-tabs > tabs > .tabs-left {
-  display: none;
-}
-
-.devtools-sidebar-tabs > tabs > tab {
-  -moz-appearance: none;
-  padding: 0;
-  min-width: 78px;
-  min-height: 22px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  text-align: center;
-  color: inherit;
-  -moz-box-flex: 1;
-  border-width: 0;
-  -moz-border-end-width: 1px;
-  border-color: hsla(210,8%,5%,.6);
-  border-style: solid;
-}
-
-.devtools-sidebar-tabs > tabs > tab:-moz-focusring {
-  position: static;
-}
-
-.devtools-sidebar-tabs > tabs > tab:last-of-type {
-  -moz-border-end-width: 0;
-}
-
-.devtools-sidebar-tabs > tabs > tab[selected=true] {
-  background-image: url(background-noise-toolbar.png), linear-gradient(to bottom, hsl(201,45%,34%), hsl(205,44%,22%));
-  color: white !important;
-}
-
 /* Theme */
 
 .devtools-theme-background {
diff --git a/browser/themes/pinstripe/devtools/dock-bottom.png b/browser/themes/pinstripe/devtools/dock-bottom.png
deleted file mode 100644
index 83842f236ef5ede55a268e67077532fc1764746f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0YFJa
zK~y-6#gn~C13?spzuCWlN(=#wCY?p<l>U^m#7D5O5DN<nAI8GMLM$wN1jRC8vyGMA
z7J@}2RftI-u(La3lMTzdNrV(0xNz@f&Y64eFhXn1Dlk@J0~UZ&syRSu8qN|<2n>Kh
zIOvAfv{}Bpy}3APx_hQ+E}SZkWA*&<`f+)6eGl{!f$e6~t!l(Liq(<<1g?8r1-8-x
zYak{7r)TG5uj2=R%rNc4gZ=u`<HLqwm=ai@?Enx!1mJc2H?8rLIt9z?_#@yb#hD3^
z+$f+Z1iL`?eFad=PWDUS>oaHojd>f8ks77z^u{G13$|4$*j7bGs-Kr9=kg|q0LGK>
zJ!#C#^DL;Ww?9D5ENB?E+8#=&7+4reskqhl&@coLT5IghS{Xqd*vZ(+Lj?5D1oFGv
d7ytene*n2yf``D{mBs)7002ovPDHLkV1mh##`^#O

diff --git a/browser/themes/pinstripe/devtools/dock-side.png b/browser/themes/pinstripe/devtools/dock-side.png
deleted file mode 100644
index 9a940bc1e4e50a63d1522fc5604cb2cf44b05e82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0dYx0
zK~y-6#gn^A13?&tzkg#^qGBXPiUd)DAZTgt4PpYmfM6lMl7fg>Soj`_MNAq&5H*Pw
z3NaSm5~HhonXzzJ)=Nxb;lR(pFz4{i;f!dl`O7l?qz1YG%z?BC4ESSq&?uk@+}IDb
zmoEP>v9Y$YoX=&4Baui)s&b{;oSmCr0WJcAWG<IYYNY9Usv~wLlQDoq*q{gG1z=%u
z$tn~}RlorTFV9bty)knn5I<S=nTP;%gP#E)zJNlpbf7gwz!hNvn0m78lOI4NY(QWD
z+-t3G)ni>p<EdxB>5G}8!KIdEm%}dK3<Q*VtcT0tv@H9mT^?Zr*Wb-(JY_hIs~}Cc
zFJ_K~2#$Xxn3<j&-`U-3MdPVgV8|yp{FOk1tCaE#!(e-BvtLB=AFi&~_$pFL!F!=T
zs(iP)wytd3_FPXrIIedajQ_MxQ`j$}-`j|2t%=6d{XhmG4aC~v2AKfYXev&lb|?S-
a8{Yua!lFpTFEAhg0000<MNUMnLSTZp`P~Wt

diff --git a/browser/themes/pinstripe/devtools/dock-window.png b/browser/themes/pinstripe/devtools/dock-window.png
deleted file mode 100644
index 29d3b319a99a3c8b2ded8fbd8ae8d70970c792a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0)I(F
zK~y-6rBlyKR8bf`_rCk)jc*)B#2=&c!!Zn76qwRNa|(i>c7@u?RTxEB5kmh%P)N(7
zT`i)>qChBuC?O1glu}BRT7)w?m6JZ7^WK|x@7KZt6L)^g?{Ln6^PP_o5q2_c>!Lii
zyS#bd-dMmeN|lt`l7tX4lU@8dJw1~ZTfxg0`;K&Xo;;DNPjID(6VZPrn#PsmdUAYh
zB6F$#%FV3;C3UsYhK6LEy?HzKJCj{p*M;VT{nd~Po|5K)))u{`Wq*Zfnzf=b(G)p<
z_DnjRZjb#~%9_zwGAcA?Umv(JH}vrCYXIw;3_Ji$PoKX!To;X+j^hMGJRVPVcXu66
z)hEnSgTp0QR>3a@gTYw<;{dj%Y#BzN*_Sd1fVh-0l1e4*sSnc&Ev;>zZ{5DLTo%++
zC=~LyAp?LCLKKO}Q$*lWN=PY-wr%I%O^gg{oM$x7lx0~40DT()({(-KoVy?*A(bL2
zRnas}8$hn6y1E{K-O=9G7&1$aMj{cL^NkQS>B_}rt1(<!8q{^Ypok!_(In3=7JUFt
zHkT``ILhnq>kR<t0KfqtZ+k2p3P1pofc4SI8S=bhK`5n|5W-ot)=B`>T<Gmt8XSBa
zud1pPuICkq2<eW4bnbLdaq!7AV`TWHUlC0>qhsUw?BddbV4M?U%x!GkWjq>saY$!;
z?aSA1`kHMU05Kv$G9L3nC5AsaHMKHu?dk-88~_UlSYl;mHGl8^13J~!S!k$_>rx?j
zOoz(>2iWMk0_4cV$KdSTd=9{S0P<fgm=>-rFDnc035UZ`-}m+HPRBWCQb}w1SN@Zm
k|31GNV>|suz9Tk(KRCWA;;1x%9RL6T07*qoM6N<$g8X4xGynhq

diff --git a/browser/themes/pinstripe/devtools/inspector.css b/browser/themes/pinstripe/devtools/inspector.css
deleted file mode 100644
index 0c105cfe4b35..000000000000
--- a/browser/themes/pinstripe/devtools/inspector.css
+++ /dev/null
@@ -1,229 +0,0 @@
-%include ../shared.inc
-%filter substitution
-
-#inspector-inspect-toolbutton {
-  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#inspector-inspect-toolbutton[checked=true] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#inspector-toolbar {
-  padding-top: 4px;
-  padding-bottom: 4px;
-}
-
-#inspector-toolbar:-moz-locale-dir(ltr) {
-  padding-left: 2px;
-  padding-right: 16px; /* use -moz-padding-end when/if bug 631729 gets fixed */
-}
-
-#inspector-toolbar:-moz-locale-dir(rtl) {
-  padding-left: 4px;
-  padding-right: 18px; /* use -moz-padding-end when/if bug 631729 gets fixed */
-}
-
-#inspector-breadcrumbs {
-  -moz-margin-end: 3px;
-  /* A fake 1px-shadow is included in the border-images of the
-     inspector-breadcrumbs-buttons, to match toolbar-buttons style.
-     This negative margin compensate the extra row of pixels created
-     by the shadow.*/
-  margin-bottom: -1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up,
-#inspector-breadcrumbs > .scrollbutton-down {
-  -moz-appearance: none;
-  border: 1px solid hsla(210,8%,5%,.45);
-  background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
-  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
-  margin: 0 0 1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
-  border-color: hsla(210,8%,5%,.6);
-  background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
-  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
-  -moz-appearance: none;
-  list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
-  -moz-image-region: rect(0px 7px 16px 0px);
-  margin: 0 5px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
-  opacity: 0.5;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
-  -moz-image-region: rect(0px 14px 16px 7px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
-  transform: scaleX(-1);
-}
-
-.inspector-breadcrumbs-button {
-  -moz-appearance: none;
-  border-style: solid;
-  border-width: 1px 13px 2px 13px;
-  color: hsl(210,30%,85%);
-  width: 85px; /* Can't use max-width. See bug 723132 */
-  /* The content of the button can be larger than the button */
-  overflow: hidden;
-  min-height: 25px;
-
-  margin: 0 -11px 0 0;
-  padding: 0 9px;
-}
-
-.inspector-breadcrumbs-button:-moz-focusring > label {
-  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
-  color: hsl(208,100%,60%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
-  color: hsl(205,100%,70%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
-  color: hsl(20, 100%, 70%);
-}
-
-.inspector-breadcrumbs-id,
-.inspector-breadcrumbs-classes {
-  color: #8d99a6;
-}
-
-.inspector-breadcrumbs-pseudo-classes {
-  color: hsl(20, 100%, 85%);
-}
-
-/* Highlighter toolbar - breadcrumbs - LTR */
-
-.inspector-breadcrumbs-button {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
-  border-left-width: 0;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
-  border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - breadcrumbs - RTL */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
-  border-right-width: 0;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 fill stretch;
-}
diff --git a/browser/themes/pinstripe/devtools/layout-background.png b/browser/themes/pinstripe/devtools/layout-background.png
new file mode 100644
index 0000000000000000000000000000000000000000..6991cc0f2ab221e7488be16c3f9e4aa4d6228e73
GIT binary patch
literal 981
zcmV;`11kK9P)<h;3K|Lk000e1NJLTq000vJ000sQ1^@s6xeVoL00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+yxsDEjaStXd3_k17b-;
zK~y-)Rg}wa+(r;ZPj|D~<P6Cfiqcpy3~Q5Bwt@FqWgp~Q@)h|?$$;U<j5vHXo3HLH
z1P_pHRiSXJ?!gs*|MTzfT5DcjUbw%%r|UY5F|=(<S(emw&Ew-E08tdNZ5!wFnX)W#
z&JjfsNs=&*BayY1d7gQEe57q#(ljN@GK?`S%R-iA^nFi~BzW)9TJ!MmfDi&91byF=
z=Q&N&Ag|XeNs^$orYH)u)_nf_nK+K=x{i16-m$JL(=@Sd8^bUVLLh{|IF3xygb;%L
zevd565-BB3(=d)ByWI|B4Axrq`#tNr5<)--aZ@`@6Mf&4rYQhT(_pPd{yfDPLmbCg
zYf(y(Wf=h1>y@%BDT)H`J*U$N?>)QSj&)sG*Oe^Gn5Kznx7)F88^#!>X+mpFmSrr<
zf^&}3>BKM$EXzU&fxhpNQW8QS%QA!zeEIT)BuS7_6mhv+`1<uLLI}F9V_jF8rr~%z
z^8EZvmSt?)hEj@US*WUt!{Gpcl#*px5JDhB2vk*t)|z>qQA#n6BUM!)gy8AviMp=o
z`~HSOUDv$4ydZ>l`<0Z;^Ncjc;JrsFMb~xA^Gs0`SZjHGeWk8zq?Fv>-}CzVij<PR
z?|FK9;>V94L{Y@U!vj$ip?>-8)BB(N2q8Ee4h+M9bMD4g2!YGxf>H`=Ek#i<jw4x?
zA*IAQhm?}&a5%7S+s*!M+sN~rbzK>Tfh0+Y<Cr*(QA)9G8|%8FwWe)bmSws1BJVxc
z+BY|(#Cy-OEUfE_F@|9n0GQ_)=NunDe#ALP*L5UGf>H`&3?T$$*L4iTK;QQ_&Z??H
zDaC%jrz}f`VW21qwr%74_wRIFhf<0pNl4R_JkN2?p+5cj*ZZH~g%ED1Ow+`&EO_s^
zySpQbB8)Kr9FIqwbN`!}rs>U1t@RC!d7jy}4XrhC9N+5C&(BzENz)W#3~8Dogur``
zbB;XEk>~T7IF6a;nd9+zi=U=x$n%`@`Hc4-V+>VQF^(f`+cJ(L)>^#x0DSxQ?M+$R
zw)B0E5Q4kAJC4WW4GVy2n#i(@%jH5{*J!PA&hg>H2SNz!b~}oqK>hmZkM~g&aXOvo
z`=0Cdddn^EJ^THhWmy=8;TBWZ>lLLGLWtYqaUA&%hHv{do)ciN00000NkvXXu0mjf
DG;`Ue

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/devtools/layout-buttons.png b/browser/themes/pinstripe/devtools/layout-buttons.png
new file mode 100644
index 0000000000000000000000000000000000000000..8705bc51475de5e6759371cc30a32e67187f455a
GIT binary patch
literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0004oNkl<Zc-rli
z&q@Mu6h?nCxvizE3iDr!dJM}PeXA_el)ysG3{$Y6f_6Pgw8~ep@5Bsuj1<L1Em|D7
z^WA&AR~gVvCX-*~PaF^vo>*HF4|i4HQFuB3#bx}l_*jrJ4(_VH;~JMbe0AA!TePMr
zwT0zI8wYo`Z_M+90}k#LUQLlHcH=q!3+nHE99;8p{A-sk40-+udd!$_2aFUpL$t6H
z&lU#iZ2~n}bOr}^%1<BN>NzR4W{_mYd^=#M@B*}`rG@=qc?_t@=!J7QxKW?Jmn%J!
z1)c+HGWDLAG2afjQ&`u})6}A#Ew>LKqsI)hIJi+?G+eqkVo`WRWcedKy;BYI?SP)b
zGyOc5dfpas@+f5Vm|+%&Jn9EjwP?UX90-;VwY<uV`E~#=*@?bgO}vTs8PKaSi-SAm
z8>d>>_jbz<Kus2%!Lb8&@;3@A;&?$SIJk5CijM67^(>zQyp4VTTtU~R^6f=nc73l{
p$6eJAU$BJOT9O3rs{a4K;U}VSGM><Zg2Dg*002ovPDHLkV1gOT${7Fv

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/devtools/layoutview.css b/browser/themes/pinstripe/devtools/layoutview.css
index 552c9841e848..4d653c5c5e0c 100644
--- a/browser/themes/pinstripe/devtools/layoutview.css
+++ b/browser/themes/pinstripe/devtools/layoutview.css
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 body {
-  background: url(layout-background-grid.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
+  background: url(layout-background.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
   color: hsl(210,100%,85%);
   border-top: 1px solid black;
   -moz-box-sizing: border-box;
@@ -42,3 +42,17 @@ body {
   border-style: solid;
   border-color: hsl(210,100%,85%);
 }
+
+#togglebutton {
+  background-image: url(layout-buttons.png);
+  width: 16px;
+  height: 16px;
+}
+
+body.open {
+  background: url(layout-background-grid.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
+}
+
+body.open > #header > #togglebutton {
+  background-position: -16px 0;
+}
diff --git a/browser/themes/pinstripe/devtools/toolbox.css b/browser/themes/pinstripe/devtools/toolbox.css
deleted file mode 100644
index cb8a8b632a97..000000000000
--- a/browser/themes/pinstripe/devtools/toolbox.css
+++ /dev/null
@@ -1,99 +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/. */
-
-#toolbox-tabs {
-  margin: 0;
-}
-
-#toolbox-dock-bottom {
-  list-style-image: url("chrome://browser/skin/devtools/dock-bottom.png");
-}
-
-#toolbox-dock-side {
-  list-style-image: url("chrome://browser/skin/devtools/dock-side.png");
-}
-
-#toolbox-dock-window {
-  list-style-image: url("chrome://browser/skin/devtools/dock-window.png");
-}
-
-.command-button {
-  margin: 0 10px;
-  width: 16px;
-  height: 32px;
-  background-repeat: no-repeat;
-  background-position: center center;
-}
-
-#command-button-responsive {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 16, 16, 0);
-}
-#command-button-responsive:hover {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 32, 16, 16);
-}
-#command-button-responsive:hover:active {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 48, 16, 32);
-}
-#command-button-responsive.toggled {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 64, 16, 48);
-}
-
-#command-button-tilt {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 16, 16, 0);
-}
-#command-button-tilt:hover {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 32, 16, 16);
-}
-
-#command-button-tilt:hover:active {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 48, 16, 32);
-}
-
-#command-button-tilt.toggled {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 64, 16, 48);
-}
-
-#command-button-scratchpad {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 16, 16, 0);
-}
-
-#command-button-scratchpad:hover {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 32, 16, 16);
-}
-
-#command-button-scratchpad:hover:active {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 48, 16, 32);
-}
-
-
-/* Tabs */
-
-.devtools-tabbar {
-  -moz-appearance: none;
-  background-image: url(background-noise-toolbar.png), linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
-  color: hsl(210,30%,85%);
-  padding: 4px 3px 3px;
-  box-shadow: 0 -3px 0 0 rgb(20,20,20) inset, 0 -4px 0 0 rgba(0,0,0,0.8) inset;
-}
-
-.devtools-tab {
-  -moz-appearance: none;
-  min-width: 78px;
-  min-height: 22px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  border-radius: @toolbarbuttonCornerRadius@ @toolbarbuttonCornerRadius@ 0 0;
-  color: inherit;
-  border-style: solid;
-  border-color: transparent;
-  border-width: 1px 1px 0;
-  margin: 0 5px;
-  padding: 0 10px 1px;
-}
-
-.devtools-tab[selected=true] {
-  border-color: hsla(210,8%,5%,.6);
-  background-color: rgb(20,20,20);
-  text-shadow: none;
-  color: white;
-}
diff --git a/browser/themes/pinstripe/devtools/treepanel-button.png b/browser/themes/pinstripe/devtools/treepanel-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a8802216bf178bc05813fc592df30d91cd49415
GIT binary patch
literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq001Na000mO1^@s6e(T*M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!$4Nv%RCwCVR$FTmK@^_Z-89vNv{qwm
zODndik(x^}`U{GbLJ)lr5%fv)L45Of_%7H-U%enj2$F&~P-`(Ips`Au*oIzAYMV46
zo88&*oRE}pd&&6Lz{d=kbG|)u_M2~(a?Z&?`cX$mPdkjq03LwSBHjWN0eL`GTreKx
z95A>5$VXf7@J4<aQ^f@h;7i0O@1F^rJ|eS&^!K?xqhqlLFwOq6u=3M08XAZ@R3$3I
zV=!wbk(wVPC;SC_L7hWGLr#-fB^e@&#T<J<^!G1!$v73Q=}hX?v?(NtIowu|0=?5e
zewyBdxhVsT#he{a$feolW-)1+CXoTgV$Kc?X`Y@g+&H}T?ncM3104YOE}Aky9IG%c
z05(KTv1rUmsM1HYw&TF15T{Gy9`7O2?sgJIwP}ho(ssB&y8TPsf1xO9imIL-wNV6$
zl2S_g;*-yAgo0;XGOhpmEnT`ee(9mb$&$#!$M1EWyLS7j!{La?@R$~#na<|NG=&mu
zTSZtqIXpaUf~MAGhysBCZm5$@<gy|UO-*&ISFK2`QkB#ct!qlz<vi+d-@UIij$=z;
z>|UBGmWoNkFo+B=7IV;tniNex>IV$MLwpTQ?d3;XfCB6w1LF^KBG>F_-H+(p2QOJ&
z=qI(xQRtVtI}78ax~0>Nl`T>!E)#AoiVyU?eDUP^NF>}Y)8d&gNiBBy>KiD0o`@X+
zKN@h;xZ3NDl3s619>&;gX6pGB`uZ^*7F{f;GZYN!hRMn@1&xHm8XO%J4nbWvOz@*T
z@kMnecO^Mh8sUTIEo&lI=TSuM#9t*0SwF(qy|hy<SET(2V?{sG1U0YSx^s70@S}ZC
zDa0?sxMsh#XlAy=v#FcgezgCMW)ZWtM!8ku_JZIKbn6sM(vp`Wc2l<p($AA9cGT74
j|L|<*AGFVpzXA*Z|5Kl~6^V5Y00000NkvXXu0mjflR<IX

literal 0
HcmV?d00001

diff --git a/browser/themes/pinstripe/jar.mn b/browser/themes/pinstripe/jar.mn
index e69772656f95..600584c99e53 100644
--- a/browser/themes/pinstripe/jar.mn
+++ b/browser/themes/pinstripe/jar.mn
@@ -173,9 +173,6 @@ browser.jar:
 * skin/classic/browser/devtools/common.css                  (devtools/common.css)
   skin/classic/browser/devtools/arrows.png                  (devtools/arrows.png)
   skin/classic/browser/devtools/commandline.png             (devtools/commandline.png)
-  skin/classic/browser/devtools/command-responsivemode.png  (devtools/command-responsivemode.png)
-  skin/classic/browser/devtools/command-scratchpad.png      (devtools/command-scratchpad.png)
-  skin/classic/browser/devtools/command-tilt.png            (devtools/command-tilt.png)
   skin/classic/browser/devtools/alerticon-warning.png       (devtools/alerticon-warning.png)
   skin/classic/browser/devtools/goto-mdn.png                (devtools/goto-mdn.png)
   skin/classic/browser/devtools/csshtmltree.css             (devtools/csshtmltree.css)
@@ -226,8 +223,11 @@ browser.jar:
   skin/classic/browser/devtools/background-noise-toolbar.png (devtools/background-noise-toolbar.png)
   skin/classic/browser/devtools/inspect-button.png          (devtools/inspect-button.png)
   skin/classic/browser/devtools/dropmarker.png              (devtools/dropmarker.png)
+  skin/classic/browser/devtools/treepanel-button.png        (devtools/treepanel-button.png)
+  skin/classic/browser/devtools/layout-background.png       (devtools/layout-background.png)
   skin/classic/browser/devtools/layout-background-grid.png  (devtools/layout-background-grid.png)
   skin/classic/browser/devtools/layoutview.css              (devtools/layoutview.css)
+  skin/classic/browser/devtools/layout-buttons.png          (devtools/layout-buttons.png)
   skin/classic/browser/devtools/debugger-collapse.png       (devtools/debugger-collapse.png)
   skin/classic/browser/devtools/debugger-expand.png         (devtools/debugger-expand.png)
   skin/classic/browser/devtools/debugger-pause.png          (devtools/debugger-pause.png)
@@ -239,12 +239,7 @@ browser.jar:
   skin/classic/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
   skin/classic/browser/devtools/responsive-background.png   (devtools/responsive-background.png)
   skin/classic/browser/devtools/tools-icons-small.png       (devtools/tools-icons-small.png)
-  skin/classic/browser/devtools/dock-bottom.png             (devtools/dock-bottom.png)
-  skin/classic/browser/devtools/dock-side.png               (devtools/dock-side.png)
-  skin/classic/browser/devtools/dock-window.png             (devtools/dock-window.png)
   skin/classic/browser/devtools/floating-scrollbars.css     (devtools/floating-scrollbars.css)
-* skin/classic/browser/devtools/inspector.css               (devtools/inspector.css)
-* skin/classic/browser/devtools/toolbox.css                 (devtools/toolbox.css)
 #ifdef MOZ_SERVICES_SYNC
   skin/classic/browser/sync-throbber.png
   skin/classic/browser/sync-16.png
diff --git a/browser/themes/winstripe/browser.css b/browser/themes/winstripe/browser.css
index 96d3b972ad3a..b45ccb6932d4 100644
--- a/browser/themes/winstripe/browser.css
+++ b/browser/themes/winstripe/browser.css
@@ -2652,26 +2652,50 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 
 /* Highlighter */
 
-.highlighter-outline {
+#highlighter-outline {
   box-shadow: 0 0 0 1px black;
   outline: 1px dashed white;
   outline-offset: -1px;
 }
 
-.highlighter-outline[locked]  {
+#highlighter-outline[locked]  {
   box-shadow: 0 0 0 1px rgba(0,0,0,0.3);
   outline-color: rgba(255,255,255,0.7);
 }
 
-/* Developer toolbar */
+/* Highlighter toolbar */
 
+#inspector-inspect-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#inspector-inspect-toolbutton[checked=true] {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#inspector-toolbar,
 #developer-toolbar {
   border-top: 1px solid hsla(211,68%,6%,.65) !important;
 }
 
+#devtools-side-splitter {
+  border: 0;
+  -moz-border-start: 1px solid #242b33;
+  min-width: 0;
+  width: 3px;
+  background-color: transparent;
+  -moz-margin-end: -3px;
+  position: relative;
+}
+
+#devtools-sidebar-box {
+  background-color: -moz-Field;
+}
+
 /* Highlighter - Node Infobar */
 
-.highlighter-nodeinfobar {
+#highlighter-nodeinfobar {
   color: hsl(200, 100%, 65%);
   border: 1px solid hsla(210, 19%, 63%, .5);
   border-radius: 3px;
@@ -2680,21 +2704,21 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 
 /* Highlighter - Node Infobar - text */
 
-.highlighter-nodeinfobar-text {
+#highlighter-nodeinfobar-text {
   /* 100% - size of the buttons and margins */
   max-width: calc(100% - 2 * (26px + 6px));
   padding-bottom: 1px;
 }
 
-html|*.highlighter-nodeinfobar-tagname {
+html|*#highlighter-nodeinfobar-tagname {
   color: white;
 }
 
-html|*.highlighter-nodeinfobar-id {
+html|*#highlighter-nodeinfobar-id {
   color: hsl(90, 79%, 52%);
 }
 
-html|*.highlighter-nodeinfobar-pseudo-classes {
+html|*#highlighter-nodeinfobar-pseudo-classes {
   color: hsl(20, 100%, 70%);
 }
 
@@ -2709,7 +2733,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   background-color: transparent;
 }
 
-.highlighter-nodeinfobar-inspectbutton {
+#highlighter-nodeinfobar-inspectbutton {
   -moz-border-end-width: 1px;
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
   -moz-margin-end: 6px;
@@ -2717,26 +2741,26 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-.highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
+#highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
 }
 
-.highlighter-nodeinfobar-inspectbutton:active:hover,
-.highlighter-nodeinfobar-container:not([locked]) >  .highlighter-nodeinfobar >  .highlighter-nodeinfobar-inspectbutton {
+#highlighter-nodeinfobar-inspectbutton:active:hover,
+#highlighter-nodeinfobar-container:not([locked]) >  #highlighter-nodeinfobar >  #highlighter-nodeinfobar-inspectbutton {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-.highlighter-nodeinfobar-menu {
+#highlighter-nodeinfobar-menu {
   -moz-border-start-width: 1px;
   box-shadow: -1px 0 0 hsla(210,16%,76%,.15), 1px 0 0 hsla(210,16%,76%,.15) inset;
   -moz-margin-start: 6px;
 }
 
-.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
+#highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
   box-shadow: 1px 0 0 hsla(210,16%,76%,.15), -1px 0 0 hsla(210,16%,76%,.15) inset;
 }
 
-.highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
+#highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
   -moz-appearance: none !important;
   list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
   -moz-box-align: center;
@@ -2755,7 +2779,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   background-repeat: no-repeat;
 }
 
-.highlighter-nodeinfobar-arrow-top {
+#highlighter-nodeinfobar-arrow-top {
   margin-bottom: -8px;
   margin-top: 8px;
   border-right-color: hsla(210, 19%, 63%, .5);
@@ -2763,7 +2787,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   background-image: -moz-linear-gradient(bottom left, transparent 50%, hsl(209, 18%, 30%) 50%);
 }
 
-.highlighter-nodeinfobar-arrow-bottom {
+#highlighter-nodeinfobar-arrow-bottom {
   margin-top: -8px;
   margin-bottom: 8px;
   border-left-color: hsla(210, 19%, 63%, .5);
@@ -2771,12 +2795,12 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   background-image: -moz-linear-gradient(top right, transparent 50%, hsl(210, 24%, 16%) 50%);
 }
 
-.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
-.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar {
+#highlighter-nodeinfobar-container[position="top"] > #highlighter-nodeinfobar,
+#highlighter-nodeinfobar-container[position="overlap"] > #highlighter-nodeinfobar {
   box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
 }
 
-.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
+#highlighter-nodeinfobar-container[hide-arrow] > #highlighter-nodeinfobar {
   margin: 7px 0;
 }
 
@@ -2806,6 +2830,261 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   font-size: 120%;
 }
 
+/* Highlighter toolbar - breadcrumbs */
+
+#inspector-breadcrumbs {
+  -moz-margin-end: 3px;
+  /* A fake 1px-shadow is included in the border-images of the
+     inspector-breadcrumbs-buttons, to match toolbar-buttons style.
+     This negative margin compensate the extra row of pixels created
+     by the shadow.*/
+  margin: -1px 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up,
+#inspector-breadcrumbs > .scrollbutton-down {
+  -moz-appearance: none;
+  border: 1px solid hsla(210,8%,5%,.45);
+  background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
+  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
+  margin: 1px 0 1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up {
+  -moz-border-start-width: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
+  border-color: hsla(210,8%,5%,.6);
+  background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
+  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
+  -moz-appearance: none;
+  list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
+  -moz-image-region: rect(0px 7px 16px 0px);
+  margin: 0 5px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+  opacity: 0.5;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
+  -moz-image-region: rect(0px 14px 16px 7px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
+  transform: scaleX(-1);
+}
+
+.inspector-breadcrumbs-button {
+  -moz-appearance: none;
+  background-color: transparent;
+  border-style: solid;
+  border-width: 2px 13px;
+  outline: none;
+  color: hsl(210,30%,85%);
+  width: 85px; /* Can't use max-width. See bug 723132 */
+  /* The content of the button can be larger than the button */
+  overflow: hidden;
+  min-height: 25px;
+  margin: 0 -11px 0 0;
+  padding: 0 9px;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > .button-box {
+  border-width: 0;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > label {
+  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
+  color: hsl(200,100%,60%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
+  color: hsl(200,100%,70%);
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
+  color: hsl(20, 100%, 70%);
+}
+
+.inspector-breadcrumbs-id,
+.inspector-breadcrumbs-classes {
+  color: #8d99a6;
+}
+
+.inspector-breadcrumbs-pseudo-classes {
+  color: hsl(20, 100%, 85%);
+}
+
+/* Highlighter toolbar - breadcrumbs - LTR */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
+  border-left-width: 0;
+}
+
+.inspector-breadcrumbs-button {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]),
+.inspector-breadcrumbs-button:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked][siblings-menu-open],
+.inspector-breadcrumbs-button[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]),
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked],
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 2 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
+  border-right-width: 0;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked],
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+/* Highlighter toolbar - breadcrumbs - RTL */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
+  border-right-width: 0;
+}
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[checked][siblings-menu-open]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 2 13 2 13 fill stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  border-left-width: 0;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 2 13 2 13 fill stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 2 13 2 13 fill stretch;
+}
+
+/* Highlighter toolbar - HTML Tree */
+
+#inspector-treepanel-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/treepanel-button.png");
+  -moz-margin-end: 0;
+  -moz-image-region: rect(0px 18px 16px 0px);
+}
+
+#inspector-treepanel-toolbutton[checked] {
+  -moz-image-region: rect(0px 36px 16px 18px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl),
+#inspector-treepanel-toolbutton:-moz-locale-dir(ltr) {
+  border-radius: 3px 0 0 3px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr),
+#inspector-treepanel-toolbutton:-moz-locale-dir(rtl) {
+  border-radius: 0 3px 3px 0;
+}
+
+/* Highlight toolbar - Option menu */
+
+#inspector-option-toolbarbutton:-moz-focusring {
+  outline: 1px dotted hsla(210,30%,85%,0.4);
+  outline-offset: -2px;
+}
+
 html|*#gcli-tooltip-frame,
 html|*#gcli-output-frame {
   padding: 0;
@@ -2989,13 +3268,33 @@ html|*#gcli-output-frame {
   background: rgba(0,0,0,.4);
 }
 
-#developer-toolbar-toolbox-button {
+#developer-toolbar-webconsole {
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+#developer-toolbar-inspector {
+  -moz-image-region: rect(16px, 16px, 32px, 0);
+}
+
+#developer-toolbar-styleeditor {
+  -moz-image-region: rect(32px, 16px, 48px, 0);
+}
+
+#developer-toolbar-debugger {
+  -moz-image-region: rect(48px, 16px, 64px, 0);
+}
+
+#developer-toolbar-other-tools {
   -moz-image-region: rect(64px, 16px, 80px, 0);
 }
 
+#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
 /* Error counter */
 
-#developer-toolbar-toolbox-button[error-count]:before {
+#developer-toolbar-webconsole[error-count]:before {
   color: #FDF3DE;
   min-width: 16px;
   text-shadow: none;
diff --git a/browser/themes/winstripe/devtools/command-responsivemode.png b/browser/themes/winstripe/devtools/command-responsivemode.png
deleted file mode 100644
index cbfa599048c1065c7250a5cd74b9684724f3ded3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1083
zcmV-B1jPG^P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn000C6Nkl<Zc-qyL
zZAevj9LN9X$h<4O&Glf*%BNah3|g&BTO-FTGBsO4PaCvw=xodCrlOb;F*k=pDYFnW
zn>{UzO0owih;|zVdoglM>cwC%#$YhU7`2<(IQxCw_q6}zaJu(MZ+h|J_xtPTd++so
zJ)EP$j~+kQsO_iXh4I1^PauOVU#LN7^a3-A^a_`}z>Ffl2!DBj8D(s0Nm}ydo%?w`
z1C|$%K~_Ed?*r@^4a|ZIqePKEM~O04@0yv_{;d@_;0<JuwF}q{-Y+ei5I@%Me;ROX
zpIOics%z_$qUGVhC5rq3n!adBj+Tc5mnfsSDl@SEwgr48)#YaH`eHL@T_o9S3e49_
zmYVZdE%OxzKd^md?E)Hryn!LJc4+vYbeVOWwQy|U*gmu1JmBv-nCs;15a=;aA7}DA
z;O|1r-Q)~8^7QQjGF!f}fRSIGx2XN=yMdY`>)&V(-Q&D#&MBA{H!e9*c-hF?ynud0
z0rdcTU;pKdDbv%?b`mDedI7r69h@D(B~J%9eDWKJJx`wn%xb=20i!Uu@Rh0)MK3Jg
zkQtZtRyrom^7F(u58YBg_5l5e0_p(w9cURlCe9HBIDK#iaBpMI&bMJF4xjuAxL?)t
zI6L$7S-`8GUbBEvv@?5ATWC<e<%#lb$7AA*0v7KNDWLm$0W|=7@7eRI@~>xN$HduD
z0DbP@G<lK_YkBO%;gg?%hdg~2u=k1uP{5?JgGDdC_xWVG#f`<pd8B~W>k8<;UO*MV
z{`b&ug}m`JIagxh>?nXfcW?@DZ)U!gvss|$^vO?vdmnTCoPEwbeHJit_XP`}fQ6s*
z|Bw~zD#>lUIEaa}@lO2&J}<=SzFt5OV8^v5`1Q#@JXdh|GQo)vT=H~Q3l5+B2%_Xa
zcK9q{M%_6J7%R5Vjhp>;8m|8*%qyH>Z2T;BUc;Gvs`S81x~~_o4PbX62Oj{t?sEq{
zM7gj^=oZ}kd&DhYAq+Tt7LZZhYXPI6G7Hzfj@$;vy|(jM`|RLx-1jHzzFxpq;8uWq
z3-N*<yY6!bM~QNv<-_j&Ac#Frp9Q4vIB5Z6WlbP=&pD+d1^DFIAjQmCJ4>De65-H~
zDBvR?yAS6m_-vn9aD<HE*%dgNugLc#A$lGTeHM_mwZ{Spn_HL5b)FpY%wN$p)p)ll
z%~-cLLoR_7IP@b5*aBqV77Mn|Ea)OfV?py3xkCnGggy({(rtn4+OMpfy3<bu4*mZN
zxE~%Wl^6Ta3&_|7Jb3u1O=hPTm_Z(Qo|`hi^8zzUp8nEP$~qsUmLImffDE$sHJ%{&
zJ(9ozMx75ogS<Is#dvdW(R_K<&li@)NIo*i{tKm$=he1VCV&6{002ovPDHLkV1ncB
B5lR36

diff --git a/browser/themes/winstripe/devtools/command-scratchpad.png b/browser/themes/winstripe/devtools/command-scratchpad.png
deleted file mode 100644
index 5131ca5cbc6176c96a66f4a56d81fed95c4c9327..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#30006HNkl<Zc-qC5
zPfHt76vbV+5d8}7Tofs2(W;=((r?mDX;F!&U_`-w1(zjaD@B7+1ec|v7^+rcocx)n
z7%gc*P=uDEO^iak2VUTLnAf><<KoAhcjuhp+<`Eut5&OZ^$kt`%Y*0dJ)l&%9noq7
z=ijTeJD=BS_X1NY?JlsQ((e3kwdMuNmD}i_t5U@1w+bD#3gE%<%hL5st)xQ7DPO!Q
zS8_)GQs|<+00t9@&FvN`)~wZ3V0ka&x6AdBR#X1suyFEBu3cKq3ycesK&z?1CzJwO
zP5Cq79B4H!FqTSZyEndWKdFH;<}RqfQpVr!v-3D(?t=2C{=v};JC8HwE_i`aAzHS;
z8FLr>8xR($B+hXcl>Z_8WH5KZ3k-u@FY|OgvDx-7;DMJ4%mXj$_lD)+ftT{%L2m!>
zc~~AEczJ;#!)Q4Kc;KZ1AAwn9A%uB&DPJ%gD=F{-gWy{-)$wJ0<8cj~F%N<Yd;q&%
zw#UxnjCl~0KLF`mzR%9%jCl~eKtGT-91(^rBA5q31!fI%4CX;l-Z$hK%!A+s-fZn8
z+dr?awFZHE@Yqm+ndDx&)0M|Pcx))2@pAcIS04A^vEc<?%iA6h1|1B*V?zaE!fXgJ
z8_Ih^It0(=-U9N8e<{OPTHv<}$R~bU=I^w?Z|DDB-y~$7(gHvKnQIi9v>5+`=kEaG
WYW7HKLO22d0000<MNUMnLSTZG<`g>s

diff --git a/browser/themes/winstripe/devtools/command-tilt.png b/browser/themes/winstripe/devtools/command-tilt.png
deleted file mode 100644
index f816bba59cedb2fb2069b4d0a4ff09225e99cdb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1668
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
O0000<MNUMnLSTYCryzI$

diff --git a/browser/themes/winstripe/devtools/common.css b/browser/themes/winstripe/devtools/common.css
index 89ad2d02ab7a..50bb5c020667 100644
--- a/browser/themes/winstripe/devtools/common.css
+++ b/browser/themes/winstripe/devtools/common.css
@@ -209,65 +209,6 @@
   position: relative;
 }
 
-/* In-tools sidebar */
-
-.devtools-sidebar-tabs {
-  -moz-appearance: none;
-  margin: 0;
-}
-
-.devtools-sidebar-tabs > tabpanels {
-  -moz-appearance: none;
-  padding: 0;
-  border: 0;
-}
-
-.devtools-sidebar-tabs > tabs {
-  -moz-appearance: none;
-  position: static;
-  box-shadow: 0 1px 0 0 hsla(210, 16%, 76%, .2) inset;
-  background-image: linear-gradient(to bottom, hsl(210,11%,36%), hsl(210,11%,18%));
-  color: hsl(210,30%,85%);
-  margin-bottom: 0;
-  padding: 0;
-}
-
-.devtools-sidebar-tabs > tabs > .tabs-right,
-.devtools-sidebar-tabs > tabs > .tabs-left {
-  display: none;
-}
-
-.devtools-sidebar-tabs > tabs > tab {
-  -moz-appearance: none;
-  padding: 0;
-  margin: 0;
-  min-width: 78px;
-  min-height: 22px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  text-align: center;
-  color: inherit;
-  -moz-box-flex: 1;
-  border-width: 0;
-  -moz-border-end-width: 1px;
-  border-color: hsla(210,8%,5%,.6);
-  border-style: solid;
-  background: transparent;
-  border-radius: 0;
-}
-
-.devtools-sidebar-tabs > tabs > tab:-moz-focusring {
-  position: static;
-}
-
-.devtools-sidebar-tabs > tabs > tab:last-of-type {
-  -moz-border-end-width: 0;
-}
-
-.devtools-sidebar-tabs > tabs > tab[selected=true] {
-  background-image: linear-gradient(to bottom, hsl(201,45%,34%), hsl(205,44%,22%));
-  color: white !important;
-}
-
 /* Theme */
 
 .devtools-theme-background {
diff --git a/browser/themes/winstripe/devtools/dock-bottom.png b/browser/themes/winstripe/devtools/dock-bottom.png
deleted file mode 100644
index 83842f236ef5ede55a268e67077532fc1764746f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0YFJa
zK~y-6#gn~C13?spzuCWlN(=#wCY?p<l>U^m#7D5O5DN<nAI8GMLM$wN1jRC8vyGMA
z7J@}2RftI-u(La3lMTzdNrV(0xNz@f&Y64eFhXn1Dlk@J0~UZ&syRSu8qN|<2n>Kh
zIOvAfv{}Bpy}3APx_hQ+E}SZkWA*&<`f+)6eGl{!f$e6~t!l(Liq(<<1g?8r1-8-x
zYak{7r)TG5uj2=R%rNc4gZ=u`<HLqwm=ai@?Enx!1mJc2H?8rLIt9z?_#@yb#hD3^
z+$f+Z1iL`?eFad=PWDUS>oaHojd>f8ks77z^u{G13$|4$*j7bGs-Kr9=kg|q0LGK>
zJ!#C#^DL;Ww?9D5ENB?E+8#=&7+4reskqhl&@coLT5IghS{Xqd*vZ(+Lj?5D1oFGv
d7ytene*n2yf``D{mBs)7002ovPDHLkV1mh##`^#O

diff --git a/browser/themes/winstripe/devtools/dock-side.png b/browser/themes/winstripe/devtools/dock-side.png
deleted file mode 100644
index 9a940bc1e4e50a63d1522fc5604cb2cf44b05e82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0dYx0
zK~y-6#gn^A13?&tzkg#^qGBXPiUd)DAZTgt4PpYmfM6lMl7fg>Soj`_MNAq&5H*Pw
z3NaSm5~HhonXzzJ)=Nxb;lR(pFz4{i;f!dl`O7l?qz1YG%z?BC4ESSq&?uk@+}IDb
zmoEP>v9Y$YoX=&4Baui)s&b{;oSmCr0WJcAWG<IYYNY9Usv~wLlQDoq*q{gG1z=%u
z$tn~}RlorTFV9bty)knn5I<S=nTP;%gP#E)zJNlpbf7gwz!hNvn0m78lOI4NY(QWD
z+-t3G)ni>p<EdxB>5G}8!KIdEm%}dK3<Q*VtcT0tv@H9mT^?Zr*Wb-(JY_hIs~}Cc
zFJ_K~2#$Xxn3<j&-`U-3MdPVgV8|yp{FOk1tCaE#!(e-BvtLB=AFi&~_$pFL!F!=T
zs(iP)wytd3_FPXrIIedajQ_MxQ`j$}-`j|2t%=6d{XhmG4aC~v2AKfYXev&lb|?S-
a8{Yua!lFpTFEAhg0000<MNUMnLSTZp`P~Wt

diff --git a/browser/themes/winstripe/devtools/dock-window.png b/browser/themes/winstripe/devtools/dock-window.png
deleted file mode 100644
index 29d3b319a99a3c8b2ded8fbd8ae8d70970c792a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjyCFETeT
zF*2O>TrB_q0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#R<lvWx%#0)I(F
zK~y-6rBlyKR8bf`_rCk)jc*)B#2=&c!!Zn76qwRNa|(i>c7@u?RTxEB5kmh%P)N(7
zT`i)>qChBuC?O1glu}BRT7)w?m6JZ7^WK|x@7KZt6L)^g?{Ln6^PP_o5q2_c>!Lii
zyS#bd-dMmeN|lt`l7tX4lU@8dJw1~ZTfxg0`;K&Xo;;DNPjID(6VZPrn#PsmdUAYh
zB6F$#%FV3;C3UsYhK6LEy?HzKJCj{p*M;VT{nd~Po|5K)))u{`Wq*Zfnzf=b(G)p<
z_DnjRZjb#~%9_zwGAcA?Umv(JH}vrCYXIw;3_Ji$PoKX!To;X+j^hMGJRVPVcXu66
z)hEnSgTp0QR>3a@gTYw<;{dj%Y#BzN*_Sd1fVh-0l1e4*sSnc&Ev;>zZ{5DLTo%++
zC=~LyAp?LCLKKO}Q$*lWN=PY-wr%I%O^gg{oM$x7lx0~40DT()({(-KoVy?*A(bL2
zRnas}8$hn6y1E{K-O=9G7&1$aMj{cL^NkQS>B_}rt1(<!8q{^Ypok!_(In3=7JUFt
zHkT``ILhnq>kR<t0KfqtZ+k2p3P1pofc4SI8S=bhK`5n|5W-ot)=B`>T<Gmt8XSBa
zud1pPuICkq2<eW4bnbLdaq!7AV`TWHUlC0>qhsUw?BddbV4M?U%x!GkWjq>saY$!;
z?aSA1`kHMU05Kv$G9L3nC5AsaHMKHu?dk-88~_UlSYl;mHGl8^13J~!S!k$_>rx?j
zOoz(>2iWMk0_4cV$KdSTd=9{S0P<fgm=>-rFDnc035UZ`-}m+HPRBWCQb}w1SN@Zm
k|31GNV>|suz9Tk(KRCWA;;1x%9RL6T07*qoM6N<$g8X4xGynhq

diff --git a/browser/themes/winstripe/devtools/inspector.css b/browser/themes/winstripe/devtools/inspector.css
deleted file mode 100644
index 1b47e9f610f4..000000000000
--- a/browser/themes/winstripe/devtools/inspector.css
+++ /dev/null
@@ -1,218 +0,0 @@
-#inspector-inspect-toolbutton {
-  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#inspector-inspect-toolbutton[checked=true] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-/* Highlighter toolbar - breadcrumbs */
-
-#inspector-breadcrumbs {
-  -moz-margin-end: 3px;
-  /* A fake 1px-shadow is included in the border-images of the
-     inspector-breadcrumbs-buttons, to match toolbar-buttons style.
-     This negative margin compensate the extra row of pixels created
-     by the shadow.*/
-  margin: -1px 0;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up,
-#inspector-breadcrumbs > .scrollbutton-down {
-  -moz-appearance: none;
-  border: 1px solid hsla(210,8%,5%,.45);
-  background: -moz-linear-gradient(hsla(212,7%,57%,.35), hsla(212,7%,57%,.1)) padding-box;
-  box-shadow: 0 1px 0 hsla(210,16%,76%,.15) inset, 0 0 0 1px hsla(210,16%,76%,.15) inset, 0 1px 0 hsla(210,16%,76%,.15);
-  margin: 1px 0 1px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
-  border-color: hsla(210,8%,5%,.6);
-  background: -moz-linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
-  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
-  -moz-appearance: none;
-  list-style-image: url("chrome://browser/skin/devtools/breadcrumbs-scrollbutton.png");
-  -moz-image-region: rect(0px 7px 16px 0px);
-  margin: 0 5px;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
-  opacity: 0.5;
-}
-
-#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
-#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
-  -moz-image-region: rect(0px 14px 16px 7px);
-}
-
-#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
-#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
-  transform: scaleX(-1);
-}
-
-.inspector-breadcrumbs-button {
-  -moz-appearance: none;
-  background-color: transparent;
-  border-style: solid;
-  border-width: 2px 13px;
-  outline: none;
-  color: hsl(210,30%,85%);
-  width: 85px; /* Can't use max-width. See bug 723132 */
-  /* The content of the button can be larger than the button */
-  overflow: hidden;
-  min-height: 25px;
-  margin: 0 -11px 0 0;
-  padding: 0 9px;
-}
-
-.inspector-breadcrumbs-button:-moz-focusring > .button-box {
-  border-width: 0;
-}
-
-.inspector-breadcrumbs-button:-moz-focusring > label {
-  border-bottom: 1px dotted hsla(210,30%,85%,0.4);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
-  color: hsl(200,100%,60%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
-  color: hsl(200,100%,70%);
-}
-
-.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
-  color: hsl(20, 100%, 70%);
-}
-
-.inspector-breadcrumbs-id,
-.inspector-breadcrumbs-classes {
-  color: #8d99a6;
-}
-
-.inspector-breadcrumbs-pseudo-classes {
-  color: hsl(20, 100%, 85%);
-}
-
-/* Highlighter toolbar - breadcrumbs - LTR */
-
-.inspector-breadcrumbs-button {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 2 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
-  border-left-width: 0;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
-  border-right-width: 0;
-}
-
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-/* Highlighter toolbar - breadcrumbs - RTL */
-
-.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 2 13 2 13 fill stretch;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
-  border-right-width: 0;
-}
-
-#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
-  border-left-width: 0;
-}
-
-.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 2 13 2 13 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 2 13 2 13 fill stretch;
-}
diff --git a/browser/themes/winstripe/devtools/layout-background.png b/browser/themes/winstripe/devtools/layout-background.png
new file mode 100644
index 0000000000000000000000000000000000000000..6991cc0f2ab221e7488be16c3f9e4aa4d6228e73
GIT binary patch
literal 981
zcmV;`11kK9P)<h;3K|Lk000e1NJLTq000vJ000sQ1^@s6xeVoL00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+yxsDEjaStXd3_k17b-;
zK~y-)Rg}wa+(r;ZPj|D~<P6Cfiqcpy3~Q5Bwt@FqWgp~Q@)h|?$$;U<j5vHXo3HLH
z1P_pHRiSXJ?!gs*|MTzfT5DcjUbw%%r|UY5F|=(<S(emw&Ew-E08tdNZ5!wFnX)W#
z&JjfsNs=&*BayY1d7gQEe57q#(ljN@GK?`S%R-iA^nFi~BzW)9TJ!MmfDi&91byF=
z=Q&N&Ag|XeNs^$orYH)u)_nf_nK+K=x{i16-m$JL(=@Sd8^bUVLLh{|IF3xygb;%L
zevd565-BB3(=d)ByWI|B4Axrq`#tNr5<)--aZ@`@6Mf&4rYQhT(_pPd{yfDPLmbCg
zYf(y(Wf=h1>y@%BDT)H`J*U$N?>)QSj&)sG*Oe^Gn5Kznx7)F88^#!>X+mpFmSrr<
zf^&}3>BKM$EXzU&fxhpNQW8QS%QA!zeEIT)BuS7_6mhv+`1<uLLI}F9V_jF8rr~%z
z^8EZvmSt?)hEj@US*WUt!{Gpcl#*px5JDhB2vk*t)|z>qQA#n6BUM!)gy8AviMp=o
z`~HSOUDv$4ydZ>l`<0Z;^Ncjc;JrsFMb~xA^Gs0`SZjHGeWk8zq?Fv>-}CzVij<PR
z?|FK9;>V94L{Y@U!vj$ip?>-8)BB(N2q8Ee4h+M9bMD4g2!YGxf>H`=Ek#i<jw4x?
zA*IAQhm?}&a5%7S+s*!M+sN~rbzK>Tfh0+Y<Cr*(QA)9G8|%8FwWe)bmSws1BJVxc
z+BY|(#Cy-OEUfE_F@|9n0GQ_)=NunDe#ALP*L5UGf>H`&3?T$$*L4iTK;QQ_&Z??H
zDaC%jrz}f`VW21qwr%74_wRIFhf<0pNl4R_JkN2?p+5cj*ZZH~g%ED1Ow+`&EO_s^
zySpQbB8)Kr9FIqwbN`!}rs>U1t@RC!d7jy}4XrhC9N+5C&(BzENz)W#3~8Dogur``
zbB;XEk>~T7IF6a;nd9+zi=U=x$n%`@`Hc4-V+>VQF^(f`+cJ(L)>^#x0DSxQ?M+$R
zw)B0E5Q4kAJC4WW4GVy2n#i(@%jH5{*J!PA&hg>H2SNz!b~}oqK>hmZkM~g&aXOvo
z`=0Cdddn^EJ^THhWmy=8;TBWZ>lLLGLWtYqaUA&%hHv{do)ciN00000NkvXXu0mjf
DG;`Ue

literal 0
HcmV?d00001

diff --git a/browser/themes/winstripe/devtools/layout-buttons.png b/browser/themes/winstripe/devtools/layout-buttons.png
new file mode 100644
index 0000000000000000000000000000000000000000..8705bc51475de5e6759371cc30a32e67187f455a
GIT binary patch
literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0004oNkl<Zc-rli
z&q@Mu6h?nCxvizE3iDr!dJM}PeXA_el)ysG3{$Y6f_6Pgw8~ep@5Bsuj1<L1Em|D7
z^WA&AR~gVvCX-*~PaF^vo>*HF4|i4HQFuB3#bx}l_*jrJ4(_VH;~JMbe0AA!TePMr
zwT0zI8wYo`Z_M+90}k#LUQLlHcH=q!3+nHE99;8p{A-sk40-+udd!$_2aFUpL$t6H
z&lU#iZ2~n}bOr}^%1<BN>NzR4W{_mYd^=#M@B*}`rG@=qc?_t@=!J7QxKW?Jmn%J!
z1)c+HGWDLAG2afjQ&`u})6}A#Ew>LKqsI)hIJi+?G+eqkVo`WRWcedKy;BYI?SP)b
zGyOc5dfpas@+f5Vm|+%&Jn9EjwP?UX90-;VwY<uV`E~#=*@?bgO}vTs8PKaSi-SAm
z8>d>>_jbz<Kus2%!Lb8&@;3@A;&?$SIJk5CijM67^(>zQyp4VTTtU~R^6f=nc73l{
p$6eJAU$BJOT9O3rs{a4K;U}VSGM><Zg2Dg*002ovPDHLkV1gOT${7Fv

literal 0
HcmV?d00001

diff --git a/browser/themes/winstripe/devtools/layoutview.css b/browser/themes/winstripe/devtools/layoutview.css
index 552c9841e848..4d653c5c5e0c 100644
--- a/browser/themes/winstripe/devtools/layoutview.css
+++ b/browser/themes/winstripe/devtools/layoutview.css
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 body {
-  background: url(layout-background-grid.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
+  background: url(layout-background.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
   color: hsl(210,100%,85%);
   border-top: 1px solid black;
   -moz-box-sizing: border-box;
@@ -42,3 +42,17 @@ body {
   border-style: solid;
   border-color: hsl(210,100%,85%);
 }
+
+#togglebutton {
+  background-image: url(layout-buttons.png);
+  width: 16px;
+  height: 16px;
+}
+
+body.open {
+  background: url(layout-background-grid.png), -moz-radial-gradient(50% 70%, circle cover, hsl(210,53%,45%) 0%, hsl(210,54%,33%) 100%);
+}
+
+body.open > #header > #togglebutton {
+  background-position: -16px 0;
+}
diff --git a/browser/themes/winstripe/devtools/toolbox.css b/browser/themes/winstripe/devtools/toolbox.css
deleted file mode 100644
index dae0d34be44c..000000000000
--- a/browser/themes/winstripe/devtools/toolbox.css
+++ /dev/null
@@ -1,103 +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/. */
-
-#toolbox-tabs {
-  margin: 0;
-}
-
-#toolbox-dock-bottom {
-  list-style-image: url("chrome://browser/skin/devtools/dock-bottom.png");
-}
-
-#toolbox-dock-side {
-  list-style-image: url("chrome://browser/skin/devtools/dock-side.png");
-}
-
-#toolbox-dock-window {
-  list-style-image: url("chrome://browser/skin/devtools/dock-window.png");
-}
-
-.command-button {
-  margin: 0 10px;
-  width: 16px;
-  height: 32px;
-  background-repeat: no-repeat;
-  background-position: center center;
-}
-
-#command-button-responsive {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 16, 16, 0);
-}
-#command-button-responsive:hover {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 32, 16, 16);
-}
-#command-button-responsive:hover:active {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 48, 16, 32);
-}
-#command-button-responsive.toggled {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-responsivemode.png), 0, 64, 16, 48);
-}
-
-#command-button-tilt {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 16, 16, 0);
-}
-#command-button-tilt:hover {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 32, 16, 16);
-}
-
-#command-button-tilt:hover:active {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 48, 16, 32);
-}
-
-#command-button-tilt.toggled {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-tilt.png), 0, 64, 16, 48);
-}
-
-#command-button-scratchpad {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 16, 16, 0);
-}
-
-#command-button-scratchpad:hover {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 32, 16, 16);
-}
-
-#command-button-scratchpad:hover:active {
-  background-image: -moz-image-rect(url(chrome://browser/skin/devtools/command-scratchpad.png), 0, 48, 16, 32);
-}
-
-
-/* Tabs */
-
-.devtools-tabbar {
-  -moz-appearance: none;
-  background-image: linear-gradient(to bottom, hsl(209,18%,34%), hsl(210,24%,16%));
-  color: hsl(210,30%,85%);
-  padding: 4px 3px 3px;
-  box-shadow: 0 -3px 0 0 rgb(20,20,20) inset, 0 -4px 0 0 rgba(0,0,0,0.8) inset;
-}
-
-.devtools-tab {
-  -moz-appearance: none;
-  min-width: 78px;
-  min-height: 22px;
-  text-shadow: 0 -1px 0 hsla(210,8%,5%,.45);
-  border-radius: 3px 3px 0 0;
-  color: inherit;
-  border-style: solid;
-  border-color: transparent;
-  border-width: 1px 1px 0;
-  margin: 0 5px;
-  padding: 0 10px 1px;
-}
-
-.devtools-tab[selected=true] {
-  border-color: hsla(210,8%,5%,.6);
-  background-color: rgb(20,20,20);
-  text-shadow: none;
-  color: white;
-}
-
-.devtools-tab > .radio-label-box {
-  -moz-margin-start: 0px
-}
diff --git a/browser/themes/winstripe/devtools/treepanel-button.png b/browser/themes/winstripe/devtools/treepanel-button.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a8802216bf178bc05813fc592df30d91cd49415
GIT binary patch
literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq001Na000mO1^@s6e(T*M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!$4Nv%RCwCVR$FTmK@^_Z-89vNv{qwm
zODndik(x^}`U{GbLJ)lr5%fv)L45Of_%7H-U%enj2$F&~P-`(Ips`Au*oIzAYMV46
zo88&*oRE}pd&&6Lz{d=kbG|)u_M2~(a?Z&?`cX$mPdkjq03LwSBHjWN0eL`GTreKx
z95A>5$VXf7@J4<aQ^f@h;7i0O@1F^rJ|eS&^!K?xqhqlLFwOq6u=3M08XAZ@R3$3I
zV=!wbk(wVPC;SC_L7hWGLr#-fB^e@&#T<J<^!G1!$v73Q=}hX?v?(NtIowu|0=?5e
zewyBdxhVsT#he{a$feolW-)1+CXoTgV$Kc?X`Y@g+&H}T?ncM3104YOE}Aky9IG%c
z05(KTv1rUmsM1HYw&TF15T{Gy9`7O2?sgJIwP}ho(ssB&y8TPsf1xO9imIL-wNV6$
zl2S_g;*-yAgo0;XGOhpmEnT`ee(9mb$&$#!$M1EWyLS7j!{La?@R$~#na<|NG=&mu
zTSZtqIXpaUf~MAGhysBCZm5$@<gy|UO-*&ISFK2`QkB#ct!qlz<vi+d-@UIij$=z;
z>|UBGmWoNkFo+B=7IV;tniNex>IV$MLwpTQ?d3;XfCB6w1LF^KBG>F_-H+(p2QOJ&
z=qI(xQRtVtI}78ax~0>Nl`T>!E)#AoiVyU?eDUP^NF>}Y)8d&gNiBBy>KiD0o`@X+
zKN@h;xZ3NDl3s619>&;gX6pGB`uZ^*7F{f;GZYN!hRMn@1&xHm8XO%J4nbWvOz@*T
z@kMnecO^Mh8sUTIEo&lI=TSuM#9t*0SwF(qy|hy<SET(2V?{sG1U0YSx^s70@S}ZC
zDa0?sxMsh#XlAy=v#FcgezgCMW)ZWtM!8ku_JZIKbn6sM(vp`Wc2l<p($AA9cGT74
j|L|<*AGFVpzXA*Z|5Kl~6^V5Y00000NkvXXu0mjflR<IX

literal 0
HcmV?d00001

diff --git a/browser/themes/winstripe/jar.mn b/browser/themes/winstripe/jar.mn
index 7cfbef7ca4f4..efa829dced60 100644
--- a/browser/themes/winstripe/jar.mn
+++ b/browser/themes/winstripe/jar.mn
@@ -133,10 +133,7 @@ browser.jar:
         skin/classic/browser/devtools/alerticon-warning.png         (devtools/alerticon-warning.png)
         skin/classic/browser/devtools/goto-mdn.png                  (devtools/goto-mdn.png)
         skin/classic/browser/devtools/csshtmltree.css               (devtools/csshtmltree.css)
-        skin/classic/browser/devtools/commandline.css               (devtools/commandline.css)
-        skin/classic/browser/devtools/command-responsivemode.png    (devtools/command-responsivemode.png)
-        skin/classic/browser/devtools/command-scratchpad.png        (devtools/command-scratchpad.png)
-        skin/classic/browser/devtools/command-tilt.png              (devtools/command-tilt.png)
+        skin/classic/browser/devtools/commandline.css                      (devtools/commandline.css)
         skin/classic/browser/devtools/markup-view.css               (devtools/markup-view.css)
         skin/classic/browser/devtools/orion.css                     (devtools/orion.css)
         skin/classic/browser/devtools/orion-container.css           (devtools/orion-container.css)
@@ -182,8 +179,11 @@ browser.jar:
         skin/classic/browser/devtools/itemArrow-ltr.png             (devtools/itemArrow-ltr.png)
         skin/classic/browser/devtools/inspect-button.png            (devtools/inspect-button.png)
         skin/classic/browser/devtools/dropmarker.png                (devtools/dropmarker.png)
+        skin/classic/browser/devtools/treepanel-button.png          (devtools/treepanel-button.png)
+        skin/classic/browser/devtools/layout-background.png         (devtools/layout-background.png)
         skin/classic/browser/devtools/layout-background-grid.png    (devtools/layout-background-grid.png)
         skin/classic/browser/devtools/layoutview.css                (devtools/layoutview.css)
+        skin/classic/browser/devtools/layout-buttons.png            (devtools/layout-buttons.png)
         skin/classic/browser/devtools/debugger-collapse.png         (devtools/debugger-collapse.png)
         skin/classic/browser/devtools/debugger-expand.png           (devtools/debugger-expand.png)
         skin/classic/browser/devtools/debugger-pause.png            (devtools/debugger-pause.png)
@@ -195,12 +195,7 @@ browser.jar:
         skin/classic/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
         skin/classic/browser/devtools/responsive-background.png     (devtools/responsive-background.png)
         skin/classic/browser/devtools/tools-icons-small.png         (devtools/tools-icons-small.png)
-        skin/classic/browser/devtools/dock-bottom.png               (devtools/dock-bottom.png)
-        skin/classic/browser/devtools/dock-side.png                 (devtools/dock-side.png)
-        skin/classic/browser/devtools/dock-window.png               (devtools/dock-window.png)
         skin/classic/browser/devtools/floating-scrollbars.css       (devtools/floating-scrollbars.css)
-        skin/classic/browser/devtools/inspector.css                 (devtools/inspector.css)
-        skin/classic/browser/devtools/toolbox.css                   (devtools/toolbox.css)
 #ifdef MOZ_SERVICES_SYNC
         skin/classic/browser/sync-throbber.png
         skin/classic/browser/sync-16.png
@@ -342,13 +337,10 @@ browser.jar:
         skin/classic/aero/browser/devtools/common.css                (devtools/common.css)
         skin/classic/aero/browser/devtools/arrows.png                (devtools/arrows.png)
         skin/classic/aero/browser/devtools/commandline.png           (devtools/commandline.png)
-        skin/classic/aero/browser/devtools/command-responsivemode.png (devtools/command-responsivemode.png)
-        skin/classic/aero/browser/devtools/command-scratchpad.png    (devtools/command-scratchpad.png)
-        skin/classic/aero/browser/devtools/command-tilt.png          (devtools/command-tilt.png)
         skin/classic/aero/browser/devtools/alerticon-warning.png     (devtools/alerticon-warning.png)
         skin/classic/aero/browser/devtools/goto-mdn.png              (devtools/goto-mdn.png)
         skin/classic/aero/browser/devtools/csshtmltree.css           (devtools/csshtmltree.css)
-        skin/classic/aero/browser/devtools/commandline.css           (devtools/commandline.css)
+        skin/classic/aero/browser/devtools/commandline.css                  (devtools/commandline.css)
         skin/classic/aero/browser/devtools/markup-view.css           (devtools/markup-view.css)
         skin/classic/aero/browser/devtools/orion.css                 (devtools/orion.css)
         skin/classic/aero/browser/devtools/orion-container.css       (devtools/orion-container.css)
@@ -394,8 +386,11 @@ browser.jar:
         skin/classic/aero/browser/devtools/itemArrow-ltr.png         (devtools/itemArrow-ltr.png)
         skin/classic/aero/browser/devtools/inspect-button.png        (devtools/inspect-button.png)
         skin/classic/aero/browser/devtools/dropmarker.png            (devtools/dropmarker.png)
+        skin/classic/aero/browser/devtools/treepanel-button.png      (devtools/treepanel-button.png)
+        skin/classic/aero/browser/devtools/layout-background.png     (devtools/layout-background.png)
         skin/classic/aero/browser/devtools/layout-background-grid.png (devtools/layout-background-grid.png)
         skin/classic/aero/browser/devtools/layoutview.css            (devtools/layoutview.css)
+        skin/classic/aero/browser/devtools/layout-buttons.png        (devtools/layout-buttons.png)
         skin/classic/aero/browser/devtools/debugger-collapse.png     (devtools/debugger-collapse.png)
         skin/classic/aero/browser/devtools/debugger-expand.png       (devtools/debugger-expand.png)
         skin/classic/aero/browser/devtools/debugger-pause.png        (devtools/debugger-pause.png)
@@ -407,12 +402,7 @@ browser.jar:
         skin/classic/aero/browser/devtools/responsive-vertical-resizer.png (devtools/responsive-vertical-resizer.png)
         skin/classic/aero/browser/devtools/responsive-background.png (devtools/responsive-background.png)
         skin/classic/aero/browser/devtools/tools-icons-small.png     (devtools/tools-icons-small.png)
-        skin/classic/aero/browser/devtools/dock-bottom.png           (devtools/dock-bottom.png)
-        skin/classic/aero/browser/devtools/dock-side.png             (devtools/dock-side.png)
-        skin/classic/aero/browser/devtools/dock-window.png           (devtools/dock-window.png)
         skin/classic/aero/browser/devtools/floating-scrollbars.css   (devtools/floating-scrollbars.css)
-        skin/classic/aero/browser/devtools/inspector.css             (devtools/inspector.css)
-        skin/classic/aero/browser/devtools/toolbox.css               (devtools/toolbox.css)
 #ifdef MOZ_SERVICES_SYNC
         skin/classic/aero/browser/sync-throbber.png
         skin/classic/aero/browser/sync-16.png
diff --git a/toolkit/devtools/webconsole/WebConsoleUtils.jsm b/toolkit/devtools/webconsole/WebConsoleUtils.jsm
index af5763e6e3f9..a3422a8827a8 100644
--- a/toolkit/devtools/webconsole/WebConsoleUtils.jsm
+++ b/toolkit/devtools/webconsole/WebConsoleUtils.jsm
@@ -28,12 +28,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "gActivityDistributor",
                                    "@mozilla.org/network/http-activity-distributor;1",
                                    "nsIHttpActivityDistributor");
 
-XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
-                                  "resource:///modules/devtools/gDevTools.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
-                                  "resource:///modules/devtools/Target.jsm");
-
 this.EXPORTED_SYMBOLS = ["WebConsoleUtils", "JSPropertyProvider", "JSTermHelpers",
                          "PageErrorListener", "ConsoleAPIListener",
                          "NetworkResponseListener", "NetworkMonitor",
@@ -1570,12 +1564,7 @@ this.JSTermHelpers = function JSTermHelpers(aOwner)
   Object.defineProperty(aOwner.sandbox, "$0", {
     get: function() {
       try {
-        let window = aOwner.chromeWindow();
-        let target = TargetFactory.forTab(window.gBrowser.selectedTab);
-        let panel = gDevTools.getPanelForTarget("inspector", target);
-        if (panel) {
-          return panel.selection.node;
-        }
+        return aOwner.chromeWindow().InspectorUI.selection;
       }
       catch (ex) {
         aOwner.window.console.error(ex.message);

From 878954fbc822898d85c508dbaa35e41ed06d4c05 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Tue, 27 Nov 2012 18:19:23 +0200
Subject: [PATCH 135/160] Bug 812814 - Add a way to edit or remove watch
 expressions while the debugger is paused, r=past

---
 .../devtools/debugger/debugger-controller.js  |   9 +-
 browser/devtools/debugger/debugger-panes.js   |  55 +-
 browser/devtools/debugger/test/Makefile.in    |   1 +
 ...wser_dbg_bug727429_watch-expressions-01.js |  16 +-
 .../browser_dbg_propertyview-edit-watch.js    | 502 ++++++++++++++++++
 .../test/browser_dbg_propertyview-edit.js     |   6 +-
 .../test/browser_dbg_watch-expressions.html   |   3 +-
 browser/devtools/shared/VariablesView.jsm     | 240 +++++++--
 .../browser/devtools/debugger.properties      |  12 +
 .../themes/gnomestripe/devtools/debugger.css  |  23 +-
 .../themes/pinstripe/devtools/debugger.css    |  23 +-
 .../themes/winstripe/devtools/debugger.css    |  23 +-
 12 files changed, 837 insertions(+), 76 deletions(-)
 create mode 100644 browser/devtools/debugger/test/browser_dbg_propertyview-edit-watch.js

diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js
index 110d872834e9..3609121173d7 100644
--- a/browser/devtools/debugger/debugger-controller.js
+++ b/browser/devtools/debugger/debugger-controller.js
@@ -509,7 +509,7 @@ StackFrames.prototype = {
       // If an error was thrown during the evaluation of the watch expressions,
       // then at least one expression evaluation could not be performed.
       if (this.currentEvaluation.throw) {
-        DebuggerView.WatchExpressions.removeExpression(0);
+        DebuggerView.WatchExpressions.removeExpressionAt(0);
         DebuggerController.StackFrames.syncWatchExpressions();
         return;
       }
@@ -600,11 +600,15 @@ StackFrames.prototype = {
 
     // If watch expressions evaluation results are available, create a scope
     // to contain all the values.
-    if (watchExpressionsEvaluation) {
+    if (this.syncedWatchExpressions && watchExpressionsEvaluation) {
       let label = L10N.getStr("watchExpressionsScopeLabel");
       let arrow = L10N.getStr("watchExpressionsSeparatorLabel");
       let scope = DebuggerView.Variables.addScope(label);
       scope.separator = arrow;
+      scope.allowNameInput = true;
+      scope.allowDeletion = true;
+      scope.switch = DebuggerView.WatchExpressions.switchExpression;
+      scope.delete = DebuggerView.WatchExpressions.deleteExpression;
 
       // The evaluation hasn't thrown, so display the returned results and
       // always expand the watch expressions scope by default.
@@ -939,6 +943,7 @@ StackFrames.prototype = {
       this.syncedWatchExpressions =
         this.currentWatchExpressions = null;
     }
+    this.currentFrame = null;
     this._onFrames();
   },
 
diff --git a/browser/devtools/debugger/debugger-panes.js b/browser/devtools/debugger/debugger-panes.js
index 4299562f62d8..ff2fdc84efc1 100644
--- a/browser/devtools/debugger/debugger-panes.js
+++ b/browser/devtools/debugger/debugger-panes.js
@@ -945,6 +945,8 @@ create({ constructor: BreakpointsView, proto: MenuContainer.prototype }, {
 function WatchExpressionsView() {
   dumpn("WatchExpressionsView was instantiated");
   MenuContainer.call(this);
+  this.switchExpression = this.switchExpression.bind(this);
+  this.deleteExpression = this.deleteExpression.bind(this);
   this._createItemView = this._createItemView.bind(this);
   this._onClick = this._onClick.bind(this);
   this._onClose = this._onClose.bind(this);
@@ -1028,11 +1030,54 @@ create({ constructor: WatchExpressionsView, proto: MenuContainer.prototype }, {
    * @param number aIndex
    *        The index used to identify the watch expression.
    */
-  removeExpression: function DVWE_removeExpression(aIndex) {
+  removeExpressionAt: function DVWE_removeExpressionAt(aIndex) {
     this.remove(this._cache[aIndex]);
     this._cache.splice(aIndex, 1);
   },
 
+  /**
+   * Changes the watch expression corresponding to the specified variable item.
+   *
+   * @param Variable aVar
+   *        The variable representing the watch expression evaluation.
+   * @param string aExpression
+   *        The new watch expression text.
+   */
+  switchExpression: function DVWE_switchExpression(aVar, aExpression) {
+    let expressionItem =
+      [i for (i of this._cache) if (i.attachment.expression == aVar.name)][0];
+
+    // Remove the watch expression if it's going to be a duplicate.
+    if (!aExpression || this.getExpressions().indexOf(aExpression) != -1) {
+      this.deleteExpression(aVar);
+      return;
+    }
+
+    // Save the watch expression code string.
+    expressionItem.attachment.expression = aExpression;
+    expressionItem.target.inputNode.value = aExpression;
+
+    // Synchronize with the controller's watch expressions store.
+    DebuggerController.StackFrames.syncWatchExpressions();
+  },
+
+  /**
+   * Removes the watch expression corresponding to the specified variable item.
+   *
+   * @param Variable aVar
+   *        The variable representing the watch expression evaluation.
+   */
+  deleteExpression: function DVWE_deleteExpression(aVar) {
+    let expressionItem =
+      [i for (i of this._cache) if (i.attachment.expression == aVar.name)][0];
+
+    // Remove the watch expression at its respective index.
+    this.removeExpressionAt(this._cache.indexOf(expressionItem));
+
+    // Synchronize with the controller's watch expressions store.
+    DebuggerController.StackFrames.syncWatchExpressions();
+  },
+
   /**
    * Gets the watch expression code string for an item in this container.
    *
@@ -1101,7 +1146,7 @@ create({ constructor: WatchExpressionsView, proto: MenuContainer.prototype }, {
    */
   _onClose: function DVWE__onClose(e) {
     let expressionItem = this.getItemForElement(e.target);
-    this.removeExpression(this._cache.indexOf(expressionItem));
+    this.removeExpressionAt(this._cache.indexOf(expressionItem));
 
     // Synchronize with the controller's watch expressions store.
     DebuggerController.StackFrames.syncWatchExpressions();
@@ -1116,15 +1161,15 @@ create({ constructor: WatchExpressionsView, proto: MenuContainer.prototype }, {
   _onBlur: function DVWE__onBlur({ target: textbox }) {
     let expressionItem = this.getItemForElement(textbox);
     let oldExpression = expressionItem.attachment.expression;
-    let newExpression = textbox.value;
+    let newExpression = textbox.value.trim();
 
     // Remove the watch expression if it's empty.
     if (!newExpression) {
-      this.removeExpression(this._cache.indexOf(expressionItem));
+      this.removeExpressionAt(this._cache.indexOf(expressionItem));
     }
     // Remove the watch expression if it's a duplicate.
     else if (!oldExpression && this.getExpressions().indexOf(newExpression) != -1) {
-      this.removeExpression(this._cache.indexOf(expressionItem));
+      this.removeExpressionAt(this._cache.indexOf(expressionItem));
     }
     // Expression is eligible.
     else {
diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in
index 0918e802d399..97acb87efd60 100644
--- a/browser/devtools/debugger/test/Makefile.in
+++ b/browser/devtools/debugger/test/Makefile.in
@@ -33,6 +33,7 @@ MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_propertyview-09.js \
 	browser_dbg_propertyview-10.js \
 	browser_dbg_propertyview-edit.js \
+	browser_dbg_propertyview-edit-watch.js \
 	browser_dbg_propertyview-data.js \
 	browser_dbg_propertyview-filter-01.js \
 	browser_dbg_propertyview-filter-02.js \
diff --git a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js
index 9e938e2f510c..29eab3093d50 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js
@@ -52,6 +52,20 @@ function test()
     is(gWatch.getExpressions().length, 1,
       "Duplicate watch expressions are automatically removed");
 
+    addAndCheckExpressions(2, 0, "a\t", true);
+    addAndCheckExpressions(2, 0, "a\r", true);
+    addAndCheckExpressions(2, 0, "a\n", true);
+    gDebugger.editor.focus();
+    is(gWatch.getExpressions().length, 1,
+      "Duplicate watch expressions are automatically removed");
+
+    addAndCheckExpressions(2, 0, "\ta", true);
+    addAndCheckExpressions(2, 0, "\ra", true);
+    addAndCheckExpressions(2, 0, "\na", true);
+    gDebugger.editor.focus();
+    is(gWatch.getExpressions().length, 1,
+      "Duplicate watch expressions are automatically removed");
+
 
     addAndCheckCustomExpression(2, 0, "bazΩΩka");
     addAndCheckCustomExpression(3, 0, "bambøøcha");
@@ -194,7 +208,7 @@ function test()
   }
 
   function removeAndCheckExpression(total, index, string) {
-    gWatch.removeExpression(index);
+    gWatch.removeExpressionAt(index);
 
     is(gWatch.getExpressions().length, total,
       "There should be " + total + " watch expressions available (1)");
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-edit-watch.js b/browser/devtools/debugger/test/browser_dbg_propertyview-edit-watch.js
new file mode 100644
index 000000000000..b6c82443faa2
--- /dev/null
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-edit-watch.js
@@ -0,0 +1,502 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * Make sure that the editing or removing watch expressions works properly.
+ */
+
+const TAB_URL = EXAMPLE_URL + "browser_dbg_watch-expressions.html";
+
+var gPane = null;
+var gTab = null;
+var gDebuggee = null;
+var gDebugger = null;
+var gWatch = null;
+var gVars = null;
+
+requestLongerTimeout(2);
+
+function test() {
+  debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
+    gTab = aTab;
+    gDebuggee = aDebuggee;
+    gPane = aPane;
+    gDebugger = gPane.contentWindow;
+    gWatch = gDebugger.DebuggerView.WatchExpressions;
+    gVars = gDebugger.DebuggerView.Variables;
+
+    gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
+    gDebugger.DebuggerView.Variables.nonEnumVisible = false;
+    testFrameEval();
+  });
+}
+
+function testFrameEval() {
+  gDebugger.addEventListener("Debugger:FetchedWatchExpressions", function test() {
+    gDebugger.removeEventListener("Debugger:FetchedWatchExpressions", test, false);
+    Services.tm.currentThread.dispatch({ run: function() {
+
+      is(gDebugger.DebuggerController.activeThread.state, "paused",
+        "Should only be getting stack frames while paused.");
+
+      var localScope = gDebugger.DebuggerView.Variables._list.querySelectorAll(".scope")[1],
+          localNodes = localScope.querySelector(".details").childNodes,
+          aArg = localNodes[1],
+          varT = localNodes[3];
+
+      is(aArg.querySelector(".name").getAttribute("value"), "aArg",
+        "Should have the right name for 'aArg'.");
+      is(varT.querySelector(".name").getAttribute("value"), "t",
+        "Should have the right name for 't'.");
+
+      is(aArg.querySelector(".value").getAttribute("value"), "undefined",
+        "Should have the right initial value for 'aArg'.");
+      is(varT.querySelector(".value").getAttribute("value"), "\"Browser Debugger Watch Expressions Test\"",
+        "Should have the right initial value for 't'.");
+
+      is(gWatch._container._parent.querySelectorAll(".dbg-expression[hidden=true]").length, 5,
+        "There should be 5 hidden nodes in the watch expressions container");
+      is(gWatch._container._parent.querySelectorAll(".dbg-expression:not([hidden=true])").length, 0,
+        "There should be 0 visible nodes in the watch expressions container");
+
+      let label = gDebugger.L10N.getStr("watchExpressionsScopeLabel");
+      let scope = gVars._currHierarchy.get(label);
+
+      ok(scope, "There should be a wach expressions scope in the variables view");
+      is(scope._store.size, 5, "There should be 5 evaluations availalble");
+
+      is(scope.get("this")._isShown, true,
+        "Should have the right visibility state for 'this'.");
+      is(scope.get("this").target.querySelectorAll(".dbg-variables-delete").length, 1,
+        "Should have the one close button visible for 'this'.");
+      is(scope.get("this").name, "this",
+        "Should have the right name for 'this'.");
+      is(scope.get("this").value.type, "object",
+        "Should have the right value type for 'this'.");
+      is(scope.get("this").value.class, "Proxy",
+        "Should have the right value type for 'this'.");
+
+      is(scope.get("ermahgerd")._isShown, true,
+        "Should have the right visibility state for 'ermahgerd'.");
+      is(scope.get("ermahgerd").target.querySelectorAll(".dbg-variables-delete").length, 1,
+        "Should have the one close button visible for 'ermahgerd'.");
+      is(scope.get("ermahgerd").name, "ermahgerd",
+        "Should have the right name for 'ermahgerd'.");
+      is(scope.get("ermahgerd").value.type, "object",
+        "Should have the right value type for 'ermahgerd'.");
+      is(scope.get("ermahgerd").value.class, "Function",
+        "Should have the right value type for 'ermahgerd'.");
+
+      is(scope.get("aArg")._isShown, true,
+        "Should have the right visibility state for 'aArg'.");
+      is(scope.get("aArg").target.querySelectorAll(".dbg-variables-delete").length, 1,
+        "Should have the one close button visible for 'aArg'.");
+      is(scope.get("aArg").name, "aArg",
+        "Should have the right name for 'aArg'.");
+      is(scope.get("aArg").value, undefined,
+        "Should have the right value for 'aArg'.");
+
+      is(scope.get("document.title")._isShown, true,
+        "Should have the right visibility state for 'document.title'.");
+      is(scope.get("document.title").target.querySelectorAll(".dbg-variables-delete").length, 1,
+        "Should have the one close button visible for 'document.title'.");
+      is(scope.get("document.title").name, "document.title",
+        "Should have the right name for 'document.title'.");
+      is(scope.get("document.title").value, "42",
+        "Should have the right value for 'document.title'.");
+      is(typeof scope.get("document.title").value, "string",
+        "Should have the right value type for 'document.title'.");
+
+      is(scope.get("document.title = 42")._isShown, true,
+        "Should have the right visibility state for 'document.title = 42'.");
+      is(scope.get("document.title = 42").target.querySelectorAll(".dbg-variables-delete").length, 1,
+        "Should have the one close button visible for 'document.title = 42'.");
+      is(scope.get("document.title = 42").name, "document.title = 42",
+        "Should have the right name for 'document.title = 42'.");
+      is(scope.get("document.title = 42").value, 42,
+        "Should have the right value for 'document.title = 42'.");
+      is(typeof scope.get("document.title = 42").value, "number",
+        "Should have the right value type for 'document.title = 42'.");
+
+      testModification(scope.get("document.title = 42").target, test1, function(scope) {
+        testModification(scope.get("aArg").target, test2, function(scope) {
+          testModification(scope.get("aArg = 44").target, test3, function(scope) {
+            testModification(scope.get("document.title = 43").target, test4, function(scope) {
+              testModification(scope.get("document.title").target, test5, function(scope) {
+                testExprDeletion(scope.get("this").target, test6, function(scope) {
+                  testExprDeletion(scope.get("ermahgerd").target, test7, function(scope) {
+                    resumeAndFinish();
+                  }, 44, 0, true);
+                }, 44);
+              }, " \t\r\n", "\"43\"", 44, 1, true);
+            }, " \t\r\ndocument.title \t\r\n", "\"43\"", 44);
+          }, " \t\r\ndocument.title \t\r\n", "\"43\"", 44);
+        }, "aArg = 44", 44, 44);
+      }, "document.title = 43", 43, "undefined");
+    }}, 0);
+  }, false);
+
+  addWatchExpression("this");
+  addWatchExpression("ermahgerd");
+  addWatchExpression("aArg");
+  addWatchExpression("document.title");
+  addWatchExpression("document.title = 42");
+
+  executeSoon(function() {
+    gDebuggee.ermahgerd(); // ermahgerd!!
+  });
+}
+
+function testModification(aVar, aTest, aCallback, aNewValue, aNewResult, aArgResult,
+                          aLocalScopeIndex = 1, aDeletionFlag = null)
+{
+  function makeChangesAndExitInputMode() {
+    EventUtils.sendString(aNewValue);
+    EventUtils.sendKey("RETURN");
+  }
+
+  EventUtils.sendMouseEvent({ type: "dblclick" },
+    aVar.querySelector(".name"),
+    gDebugger);
+
+  executeSoon(function() {
+    ok(aVar.querySelector(".element-name-input"),
+      "There should be an input element created.");
+
+    let testContinued = false;
+    let fetchedVariables = false;
+    let fetchedExpressions = false;
+
+    let countV = 0;
+    gDebugger.addEventListener("Debugger:FetchedVariables", function testV() {
+      // We expect 2 Debugger:FetchedVariables events, one from the global
+      // object scope and the regular one.
+      if (++countV < 2) {
+        info("Number of received Debugger:FetchedVariables events: " + countV);
+        return;
+      }
+      gDebugger.removeEventListener("Debugger:FetchedVariables", testV, false);
+      fetchedVariables = true;
+      executeSoon(continueTest);
+    }, false);
+
+    let countE = 0;
+    gDebugger.addEventListener("Debugger:FetchedWatchExpressions", function testE() {
+      // We expect only one Debugger:FetchedWatchExpressions event, since all
+      // expressions are evaluated at the same time.
+      if (++countE < 1) {
+        info("Number of received Debugger:FetchedWatchExpressions events: " + countE);
+        return;
+      }
+      gDebugger.removeEventListener("Debugger:FetchedWatchExpressions", testE, false);
+      fetchedExpressions = true;
+      executeSoon(continueTest);
+    }, false);
+
+    function continueTest() {
+      if (testContinued || !fetchedVariables || !fetchedExpressions) {
+        return;
+      }
+      testContinued = true;
+
+      // Get the variable reference anew, since the old ones were discarded when
+      // we resumed.
+      var localScope = gDebugger.DebuggerView.Variables._list.querySelectorAll(".scope")[aLocalScopeIndex],
+          localNodes = localScope.querySelector(".details").childNodes,
+          aArg = localNodes[1];
+
+      is(aArg.querySelector(".value").getAttribute("value"), aArgResult,
+        "Should have the right value for 'aArg'.");
+
+      let label = gDebugger.L10N.getStr("watchExpressionsScopeLabel");
+      let scope = gVars._currHierarchy.get(label);
+      info("Found the watch expressions scope: " + scope);
+
+      let aExp = scope.get(aVar.querySelector(".name").getAttribute("value"));
+      info("Found the watch expression variable: " + aExp);
+
+      if (aDeletionFlag) {
+        ok(fetchedVariables, "The variables should have been fetched.");
+        ok(fetchedExpressions, "The variables should have been fetched.");
+        is(aExp, undefined, "The watch expression should not have been found.");
+        performCallback(scope);
+        return;
+      }
+
+      is(aExp.target.querySelector(".name").getAttribute("value"), aNewValue.trim(),
+        "Should have the right name for '" + aNewValue + "'.");
+      is(aExp.target.querySelector(".value").getAttribute("value"), aNewResult,
+        "Should have the right value for '" + aNewValue + "'.");
+
+      performCallback(scope);
+    }
+
+    makeChangesAndExitInputMode();
+  });
+
+  function performCallback(scope) {
+    executeSoon(function() {
+      aTest(scope);
+      aCallback(scope);
+    });
+  }
+}
+
+function testExprDeletion(aVar, aTest, aCallback, aArgResult,
+                          aLocalScopeIndex = 1, aFinalFlag = null)
+{
+  let testContinued = false;
+  let fetchedVariables = false;
+  let fetchedExpressions = false;
+
+  let countV = 0;
+  gDebugger.addEventListener("Debugger:FetchedVariables", function testV() {
+    // We expect 2 Debugger:FetchedVariables events, one from the global
+    // object scope and the regular one.
+    if (++countV < 2) {
+      info("Number of received Debugger:FetchedVariables events: " + countV);
+      return;
+    }
+    gDebugger.removeEventListener("Debugger:FetchedVariables", testV, false);
+    fetchedVariables = true;
+    executeSoon(continueTest);
+  }, false);
+
+  let countE = 0;
+  gDebugger.addEventListener("Debugger:FetchedWatchExpressions", function testE() {
+    // We expect only one Debugger:FetchedWatchExpressions event, since all
+    // expressions are evaluated at the same time.
+    if (++countE < 1) {
+      info("Number of received Debugger:FetchedWatchExpressions events: " + countE);
+      return;
+    }
+    gDebugger.removeEventListener("Debugger:FetchedWatchExpressions", testE, false);
+    fetchedExpressions = true;
+    executeSoon(continueTest);
+  }, false);
+
+  function continueTest() {
+    if ((testContinued || !fetchedVariables || !fetchedExpressions) && !aFinalFlag) {
+      return;
+    }
+    testContinued = true;
+
+    // Get the variable reference anew, since the old ones were discarded when
+    // we resumed.
+    var localScope = gDebugger.DebuggerView.Variables._list.querySelectorAll(".scope")[aLocalScopeIndex],
+        localNodes = localScope.querySelector(".details").childNodes,
+        aArg = localNodes[1];
+
+    is(aArg.querySelector(".value").getAttribute("value"), aArgResult,
+      "Should have the right value for 'aArg'.");
+
+    let label = gDebugger.L10N.getStr("watchExpressionsScopeLabel");
+    let scope = gVars._currHierarchy.get(label);
+    info("Found the watch expressions scope: " + scope);
+
+    if (aFinalFlag) {
+      ok(fetchedVariables, "The variables should have been fetched.");
+      ok(!fetchedExpressions, "The variables should never have been fetched.");
+      is(scope, undefined, "The watch expressions scope should not have been found.");
+      performCallback(scope);
+      return;
+    }
+
+    let aExp = scope.get(aVar.querySelector(".name").getAttribute("value"));
+    info("Found the watch expression variable: " + aExp);
+
+    is(aExp, undefined, "Should not have found the watch expression after deletion.");
+    performCallback(scope);
+  }
+
+  function performCallback(scope) {
+    executeSoon(function() {
+      aTest(scope);
+      aCallback(scope);
+    });
+  }
+
+  EventUtils.sendMouseEvent({ type: "click" },
+    aVar.querySelector(".dbg-variables-delete"),
+    gDebugger);
+}
+
+function test1(scope) {
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression[hidden=true]").length, 5,
+    "There should be 5 hidden nodes in the watch expressions container");
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression:not([hidden=true])").length, 0,
+    "There should be 0 visible nodes in the watch expressions container");
+
+  ok(scope, "There should be a wach expressions scope in the variables view");
+  is(scope._store.size, 5, "There should be 5 evaluations availalble");
+
+  is(gWatch._cache[0].target.inputNode.value, "document.title = 43",
+    "The first textbox input value is not the correct one");
+  is(gWatch._cache[0].attachment.expression, "document.title = 43",
+    "The first textbox input value is not the correct one");
+  is(gWatch._cache[1].target.inputNode.value, "document.title",
+    "The second textbox input value is not the correct one");
+  is(gWatch._cache[1].attachment.expression, "document.title",
+    "The second textbox input value is not the correct one");
+  is(gWatch._cache[2].target.inputNode.value, "aArg",
+    "The third textbox input value is not the correct one");
+  is(gWatch._cache[2].attachment.expression, "aArg",
+    "The third textbox input value is not the correct one");
+  is(gWatch._cache[3].target.inputNode.value, "ermahgerd",
+    "The fourth textbox input value is not the correct one");
+  is(gWatch._cache[3].attachment.expression, "ermahgerd",
+    "The fourth textbox input value is not the correct one");
+  is(gWatch._cache[4].target.inputNode.value, "this",
+    "The fifth textbox input value is not the correct one");
+  is(gWatch._cache[4].attachment.expression, "this",
+    "The fifth textbox input value is not the correct one");
+}
+
+function test2(scope) {
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression[hidden=true]").length, 5,
+    "There should be 5 hidden nodes in the watch expressions container");
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression:not([hidden=true])").length, 0,
+    "There should be 0 visible nodes in the watch expressions container");
+
+  ok(scope, "There should be a wach expressions scope in the variables view");
+  is(scope._store.size, 5, "There should be 5 evaluations availalble");
+
+  is(gWatch._cache[0].target.inputNode.value, "document.title = 43",
+    "The first textbox input value is not the correct one");
+  is(gWatch._cache[0].attachment.expression, "document.title = 43",
+    "The first textbox input value is not the correct one");
+  is(gWatch._cache[1].target.inputNode.value, "document.title",
+    "The second textbox input value is not the correct one");
+  is(gWatch._cache[1].attachment.expression, "document.title",
+    "The second textbox input value is not the correct one");
+  is(gWatch._cache[2].target.inputNode.value, "aArg = 44",
+    "The third textbox input value is not the correct one");
+  is(gWatch._cache[2].attachment.expression, "aArg = 44",
+    "The third textbox input value is not the correct one");
+  is(gWatch._cache[3].target.inputNode.value, "ermahgerd",
+    "The fourth textbox input value is not the correct one");
+  is(gWatch._cache[3].attachment.expression, "ermahgerd",
+    "The fourth textbox input value is not the correct one");
+  is(gWatch._cache[4].target.inputNode.value, "this",
+    "The fifth textbox input value is not the correct one");
+  is(gWatch._cache[4].attachment.expression, "this",
+    "The fifth textbox input value is not the correct one");
+}
+
+function test3(scope) {
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression[hidden=true]").length, 4,
+    "There should be 4 hidden nodes in the watch expressions container");
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression:not([hidden=true])").length, 0,
+    "There should be 0 visible nodes in the watch expressions container");
+
+  ok(scope, "There should be a wach expressions scope in the variables view");
+  is(scope._store.size, 4, "There should be 4 evaluations availalble");
+
+  is(gWatch._cache[0].target.inputNode.value, "document.title = 43",
+    "The first textbox input value is not the correct one");
+  is(gWatch._cache[0].attachment.expression, "document.title = 43",
+    "The first textbox input value is not the correct one");
+  is(gWatch._cache[1].target.inputNode.value, "document.title",
+    "The second textbox input value is not the correct one");
+  is(gWatch._cache[1].attachment.expression, "document.title",
+    "The second textbox input value is not the correct one");
+  is(gWatch._cache[2].target.inputNode.value, "ermahgerd",
+    "The third textbox input value is not the correct one");
+  is(gWatch._cache[2].attachment.expression, "ermahgerd",
+    "The third textbox input value is not the correct one");
+  is(gWatch._cache[3].target.inputNode.value, "this",
+    "The fourth textbox input value is not the correct one");
+  is(gWatch._cache[3].attachment.expression, "this",
+    "The fourth textbox input value is not the correct one");
+}
+
+function test4(scope) {
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression[hidden=true]").length, 3,
+    "There should be 3 hidden nodes in the watch expressions container");
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression:not([hidden=true])").length, 0,
+    "There should be 0 visible nodes in the watch expressions container");
+
+  ok(scope, "There should be a wach expressions scope in the variables view");
+  is(scope._store.size, 3, "There should be 3 evaluations availalble");
+
+  is(gWatch._cache[0].target.inputNode.value, "document.title",
+    "The first textbox input value is not the correct one");
+  is(gWatch._cache[0].attachment.expression, "document.title",
+    "The first textbox input value is not the correct one");
+  is(gWatch._cache[1].target.inputNode.value, "ermahgerd",
+    "The second textbox input value is not the correct one");
+  is(gWatch._cache[1].attachment.expression, "ermahgerd",
+    "The second textbox input value is not the correct one");
+  is(gWatch._cache[2].target.inputNode.value, "this",
+    "The third textbox input value is not the correct one");
+  is(gWatch._cache[2].attachment.expression, "this",
+    "The third textbox input value is not the correct one");
+}
+
+function test5(scope) {
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression[hidden=true]").length, 2,
+    "There should be 2 hidden nodes in the watch expressions container");
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression:not([hidden=true])").length, 0,
+    "There should be 0 visible nodes in the watch expressions container");
+
+  ok(scope, "There should be a wach expressions scope in the variables view");
+  is(scope._store.size, 2, "There should be 2 evaluations availalble");
+
+  is(gWatch._cache[0].target.inputNode.value, "ermahgerd",
+    "The second textbox input value is not the correct one");
+  is(gWatch._cache[0].attachment.expression, "ermahgerd",
+    "The second textbox input value is not the correct one");
+  is(gWatch._cache[1].target.inputNode.value, "this",
+    "The third textbox input value is not the correct one");
+  is(gWatch._cache[1].attachment.expression, "this",
+    "The third textbox input value is not the correct one");
+}
+
+function test6(scope) {
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression[hidden=true]").length, 1,
+    "There should be 1 hidden nodes in the watch expressions container");
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression:not([hidden=true])").length, 0,
+    "There should be 0 visible nodes in the watch expressions container");
+
+  ok(scope, "There should be a wach expressions scope in the variables view");
+  is(scope._store.size, 1, "There should be 1 evaluation availalble");
+
+  is(gWatch._cache[0].target.inputNode.value, "ermahgerd",
+    "The third textbox input value is not the correct one");
+  is(gWatch._cache[0].attachment.expression, "ermahgerd",
+    "The third textbox input value is not the correct one");
+}
+
+function test7(scope) {
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression[hidden=true]").length, 0,
+    "There should be 0 hidden nodes in the watch expressions container");
+  is(gWatch._container._parent.querySelectorAll(".dbg-expression:not([hidden=true])").length, 0,
+    "There should be 0 visible nodes in the watch expressions container");
+
+  is(scope, undefined, "There should be no watch expressions scope available.");
+  is(gWatch._cache.length, 0, "The watch expressions cache should be empty.");
+}
+
+function addWatchExpression(string) {
+  gWatch.addExpression(string);
+  gDebugger.editor.focus();
+}
+
+function resumeAndFinish() {
+  gDebugger.DebuggerController.activeThread.resume(function() {
+    closeDebuggerAndFinish();
+  });
+}
+
+registerCleanupFunction(function() {
+  removeTab(gTab);
+  gPane = null;
+  gTab = null;
+  gDebuggee = null;
+  gDebugger = null;
+  gWatch = null;
+  gVars = null;
+});
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js b/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js
index f3ae5f48a649..6f5ca0cb301f 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js
@@ -4,6 +4,10 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
+/**
+ * Make sure that the editing variables or properties values works properly.
+ */
+
 const TAB_URL = EXAMPLE_URL + "browser_dbg_frame-parameters.html";
 
 var gPane = null;
@@ -70,7 +74,7 @@ function testModification(aVar, aCallback, aNewValue, aNewResult) {
     gDebugger);
 
   executeSoon(function() {
-    ok(aVar.querySelector(".element-input"),
+    ok(aVar.querySelector(".element-value-input"),
       "There should be an input element created.");
 
     let count = 0;
diff --git a/browser/devtools/debugger/test/browser_dbg_watch-expressions.html b/browser/devtools/debugger/test/browser_dbg_watch-expressions.html
index c034a0d5ed62..5ced7372b696 100644
--- a/browser/devtools/debugger/test/browser_dbg_watch-expressions.html
+++ b/browser/devtools/debugger/test/browser_dbg_watch-expressions.html
@@ -6,7 +6,8 @@
     <!-- Any copyright is dedicated to the Public Domain.
          http://creativecommons.org/publicdomain/zero/1.0/ -->
     <script type="text/javascript">
-      function ermahgerd() {
+      function ermahgerd(aArg) {
+        var t = document.title;
         debugger;
         (function() {
           var a = undefined;
diff --git a/browser/devtools/shared/VariablesView.jsm b/browser/devtools/shared/VariablesView.jsm
index 6e9b1bc9223a..9c2f575f4ea7 100644
--- a/browser/devtools/shared/VariablesView.jsm
+++ b/browser/devtools/shared/VariablesView.jsm
@@ -20,7 +20,9 @@ this.EXPORTED_SYMBOLS = ["VariablesView", "create"];
  * Requires the devtools common.css and debugger.css skin stylesheets.
  *
  * To allow replacing variable or property values in this view, provide an
- * "eval" function property.
+ * "eval" function property. To allow replacing variable or property values,
+ * provide a "switch" function. To handle deleting variables or properties,
+ * provide a "delete" function.
  *
  * @param nsIDOMNode aParentNode
  *        The parent node to hold this view.
@@ -415,6 +417,8 @@ function Scope(aView, aName, aFlags = {}) {
 
   this.ownerView = aView;
   this.eval = aView.eval;
+  this.switch = aView.switch;
+  this.delete = aView.delete;
 
   this._store = new Map();
   this._init(aName.trim(), aFlags);
@@ -635,6 +639,24 @@ Scope.prototype = {
    */
   set twisty(aFlag) aFlag ? this.showArrow() : this.hideArrow(),
 
+  /**
+   * Specifies if editing variable or property names is allowed.
+   * This flag applies non-recursively to the current scope.
+   */
+  allowNameInput: false,
+
+  /**
+   * Specifies if editing variable or property values is allowed.
+   * This flag applies non-recursively to the current scope.
+   */
+  allowValueInput: true,
+
+  /**
+   * Specifies if removing variables or properties values is allowed.
+   * This flag applies non-recursively to the current scope.
+   */
+  allowDeletion: false,
+
   /**
    * Gets the id associated with this item.
    * @return string
@@ -917,11 +939,14 @@ Scope.prototype = {
  *        The variable's descriptor.
  */
 function Variable(aScope, aName, aDescriptor) {
+  this._onClose = this._onClose.bind(this);
   this._displayTooltip = this._displayTooltip.bind(this);
-  this._activateInput = this._activateInput.bind(this);
-  this._deactivateInput = this._deactivateInput.bind(this);
-  this._saveInput = this._saveInput.bind(this);
-  this._onInputKeyPress = this._onInputKeyPress.bind(this);
+  this._activateNameInput = this._activateNameInput.bind(this);
+  this._activateValueInput = this._activateValueInput.bind(this);
+  this._deactivateNameInput = this._deactivateNameInput.bind(this);
+  this._deactivateValueInput = this._deactivateValueInput.bind(this);
+  this._onNameInputKeyPress = this._onNameInputKeyPress.bind(this);
+  this._onValueInputKeyPress = this._onValueInputKeyPress.bind(this);
 
   Scope.call(this, aScope, aName, aDescriptor);
   this._setGrip(aDescriptor.value);
@@ -1180,6 +1205,12 @@ create({ constructor: Variable, proto: Scope.prototype }, {
       separatorLabel.hidden = true;
       valueLabel.hidden = true;
     }
+    if (this.ownerView.allowDeletion) {
+      let closeNode = this._closeNode = document.createElement("toolbarbutton");
+      closeNode.className = "dbg-variables-delete plain devtools-closebutton";
+      closeNode.addEventListener("click", this._onClose, false);
+      this._title.appendChild(closeNode);
+    }
   },
 
   /**
@@ -1215,6 +1246,16 @@ create({ constructor: Variable, proto: Scope.prototype }, {
 
     this._target.appendChild(tooltip);
     this._target.setAttribute("tooltip", tooltip.id);
+
+    if (this.ownerView.allowNameInput) {
+      this._name.setAttribute("tooltiptext", L10N.getStr("variablesEditableNameTooltip"));
+    }
+    if (this.ownerView.allowValueInput) {
+      this._valueLabel.setAttribute("tooltiptext", L10N.getStr("variablesEditableValueTooltip"));
+    }
+    if (this.ownerView.allowDeletion) {
+      this._closeNode.setAttribute("tooltiptext", L10N.getStr("variablesCloseButtonTooltip"));
+    }
   },
 
   /**
@@ -1255,44 +1296,54 @@ create({ constructor: Variable, proto: Scope.prototype }, {
   _addEventListeners: function V__addEventListeners() {
     this._arrow.addEventListener("mousedown", this.toggle, false);
     this._name.addEventListener("mousedown", this.toggle, false);
-    this._valueLabel.addEventListener("click", this._activateInput, false);
+    this._name.addEventListener("dblclick", this._activateNameInput, false);
+    this._valueLabel.addEventListener("click", this._activateValueInput, false);
   },
 
   /**
-   * Makes this variable's value editable.
+   * The click listener for the close button.
    */
-  _activateInput: function V__activateInput(e) {
-    if (!this.eval) {
-      return;
-    }
-    let window = this.window;
-    let document = this.document;
+  _onClose: function V__onClose() {
+    this.hide();
 
-    let title = this._title;
-    let valueLabel = this._valueLabel;
-    let initialString = this._valueLabel.getAttribute("value");
+    if (this.delete) {
+      this.delete(this);
+    }
+  },
+
+  /**
+   * Creates a textbox node in place of a label.
+   *
+   * @param nsIDOMNode aLabel
+   *        The label to be replaced with a textbox.
+   * @param string aClassName
+   *        The class to be applied to the textbox.
+   * @param object aCallbacks
+   *        An object containing the onKeypress and onBlur callbacks.
+   */
+  _activateInput: function V__activateInput(aLabel, aClassName, aCallbacks) {
+    let initialString = aLabel.getAttribute("value");
 
     // Create a texbox input element which will be shown in the current
-    // element's value location.
+    // element's specified label location.
     let input = this.document.createElement("textbox");
     input.setAttribute("value", initialString);
-    input.className = "plain element-input";
+    input.className = "plain " + aClassName;
     input.width = this._target.clientWidth;
 
-    title.removeChild(valueLabel);
-    title.appendChild(input);
+    aLabel.parentNode.replaceChild(input, aLabel);
     input.select();
 
     // When the value is a string (displayed as "value"), then we probably want
     // to change it to another string in the textbox, so to avoid typing the ""
     // again, tackle with the selection bounds just a bit.
-    if (valueLabel.getAttribute("value").match(/^"[^"]*"$/)) {
+    if (aLabel.getAttribute("value").match(/^"[^"]*"$/)) {
       input.selectionEnd--;
       input.selectionStart++;
     }
 
-    input.addEventListener("keypress", this._onInputKeyPress, false);
-    input.addEventListener("blur", this._deactivateInput, false);
+    input.addEventListener("keypress", aCallbacks.onKeypress, false);
+    input.addEventListener("blur", aCallbacks.onBlur, false);
 
     this._prevExpandable = this.twisty;
     this._prevExpanded = this.expanded;
@@ -1302,18 +1353,17 @@ create({ constructor: Variable, proto: Scope.prototype }, {
   },
 
   /**
-   * Deactivates this variable's editable mode.
+   * Removes the textbox node in place of a label.
+   *
+   * @param nsIDOMNode aLabel
+   *        The label which was replaced with a textbox.
+   * @param object aCallbacks
+   *        An object containing the onKeypress and onBlur callbacks.
    */
-  _deactivateInput: function V__deactivateInput(e) {
-    let input = e.target;
-    let title = this._title;
-    let valueLabel = this._valueLabel;
-
-    title.removeChild(input);
-    title.appendChild(valueLabel);
-
-    input.removeEventListener("keypress", this._onInputKeyPress, false);
-    input.removeEventListener("blur", this._deactivateInput, false);
+  _deactivateInput: function V__deactivateInput(aLabel, aInput, aCallbacks) {
+    aInput.parentNode.replaceChild(aLabel, aInput);
+    aInput.removeEventListener("keypress", aCallbacks.onKeypress, false);
+    aInput.removeEventListener("blur", aCallbacks.onBlur, false);
 
     this._locked = false;
     this.twisty = this._prevExpandable;
@@ -1321,37 +1371,123 @@ create({ constructor: Variable, proto: Scope.prototype }, {
   },
 
   /**
-   * Deactivates this variable's editable mode and evaluates a new value.
+   * Makes this variable's name editable.
    */
-  _saveInput: function V__saveInput(e) {
-    let input = e.target;
-    let valueLabel = this._valueLabel;
-    let initialString = this._valueLabel.getAttribute("value");
-    let currentString = input.value;
+  _activateNameInput: function V__activateNameInput() {
+    if (!this.ownerView.allowNameInput || !this.switch) {
+      return;
+    }
+    this._activateInput(this._name, "element-name-input", {
+      onKeypress: this._onNameInputKeyPress,
+      onBlur: this._deactivateNameInput
+    });
+    this._separatorLabel.hidden = true;
+    this._valueLabel.hidden = true;
+  },
 
-    this._deactivateInput(e);
+  /**
+   * Deactivates this variable's editable name mode.
+   */
+  _deactivateNameInput: function V__deactivateNameInput(e) {
+    this._deactivateInput(this._name, e.target, {
+      onKeypress: this._onNameInputKeyPress,
+      onBlur: this._deactivateNameInput
+    });
+    this._separatorLabel.hidden = false;
+    this._valueLabel.hidden = false;
+  },
+
+  /**
+   * Makes this variable's value editable.
+   */
+  _activateValueInput: function V__activateValueInput() {
+    if (!this.ownerView.allowValueInput || !this.eval) {
+      return;
+    }
+    this._activateInput(this._valueLabel, "element-value-input", {
+      onKeypress: this._onValueInputKeyPress,
+      onBlur: this._deactivateValueInput
+    });
+  },
+
+  /**
+   * Deactivates this variable's editable value mode.
+   */
+  _deactivateValueInput: function V__deactivateValueInput(e) {
+    this._deactivateInput(this._valueLabel, e.target, {
+      onKeypress: this._onValueInputKeyPress,
+      onBlur: this._deactivateValueInput
+    });
+  },
+
+  /**
+   * Disables this variable prior to a new name switch or value evaluation.
+   */
+  _disable: function V__disable() {
+    this.twisty = false;
+    this._separatorLabel.hidden = true;
+    this._valueLabel.hidden = true;
+    this._enum.hidden = true;
+    this._nonenum.hidden = true;
+  },
+
+  /**
+   * Deactivates this variable's editable mode and callbacks the new name.
+   */
+  _saveNameInput: function V__saveNameInput(e) {
+    let input = e.target;
+    let initialString = this._name.getAttribute("value");
+    let currentString = input.value.trim();
+    this._deactivateNameInput(e);
 
     if (initialString != currentString) {
-      this._arrow.setAttribute("invisible", "");
-      this._separatorLabel.hidden = true;
-      this._valueLabel.hidden = true;
-      this._enum.hidden = true;
-      this._nonenum.hidden = true;
-      this.eval("(" + this._symbolicName + "=" + currentString + ")");
+      this._disable();
+      this._name.value = currentString;
+      this.switch(this, currentString);
     }
   },
 
   /**
-   * The key press listener for this variable's editable mode textbox.
+   * Deactivates this variable's editable mode and evaluates the new value.
    */
-  _onInputKeyPress: function V__onInputKeyPress(e) {
+  _saveValueInput: function V__saveValueInput(e) {
+    let input = e.target;
+    let initialString = this._valueLabel.getAttribute("value");
+    let currentString = input.value.trim();
+    this._deactivateValueInput(e);
+
+    if (initialString != currentString) {
+      this._disable();
+      this.eval(this._symbolicName + "=" + currentString);
+    }
+  },
+
+  /**
+   * The key press listener for this variable's editable name textbox.
+   */
+  _onNameInputKeyPress: function V__onNameInputKeyPress(e) {
     switch(e.keyCode) {
       case e.DOM_VK_RETURN:
       case e.DOM_VK_ENTER:
-        this._saveInput(e);
+        this._saveNameInput(e);
         return;
       case e.DOM_VK_ESCAPE:
-        this._deactivateInput(e);
+        this._deactivateNameInput(e);
+        return;
+    }
+  },
+
+  /**
+   * The key press listener for this variable's editable value textbox.
+   */
+  _onValueInputKeyPress: function V__onValueInputKeyPress(e) {
+    switch(e.keyCode) {
+      case e.DOM_VK_RETURN:
+      case e.DOM_VK_ENTER:
+        this._saveValueInput(e);
+        return;
+      case e.DOM_VK_ESCAPE:
+        this._deactivateValueInput(e);
         return;
     }
   },
@@ -1361,6 +1497,7 @@ create({ constructor: Variable, proto: Scope.prototype }, {
   _initialDescriptor: null,
   _separatorLabel: null,
   _valueLabel: null,
+  _closeNode: null,
   _tooltip: null,
   _valueGrip: null,
   _valueString: "",
@@ -1700,6 +1837,7 @@ XPCOMUtils.defineLazyGetter(L10N, "stringBundle", function() {
 
 /**
  * The separator label between the variables or properties name and value.
+ * This property applies non-recursively to the current scope.
  */
 Scope.prototype.separator = L10N.getStr("variablesSeparatorLabel");
 
diff --git a/browser/locales/en-US/chrome/browser/devtools/debugger.properties b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
index c9687bb29078..a31821535a97 100644
--- a/browser/locales/en-US/chrome/browser/devtools/debugger.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
@@ -173,6 +173,18 @@ watchExpressionsScopeLabel=Watch expressions
 # the global scope.
 globalScopeLabel=Global
 
+# LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
+# in the variables list on an item with an editable name.
+variablesEditableNameTooltip=Double click to edit
+
+# LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
+# in the variables list on an item with an editable name.
+variablesEditableValueTooltip=Click to change value
+
+# LOCALIZATION NOTE (variablesCloseButtonTooltip): The text that is displayed
+# in the variables list on an item with which can be removed.
+variablesCloseButtonTooltip=Click to remove
+
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel=:
diff --git a/browser/themes/gnomestripe/devtools/debugger.css b/browser/themes/gnomestripe/devtools/debugger.css
index 1c3ee5a5988f..f7171955ef06 100644
--- a/browser/themes/gnomestripe/devtools/debugger.css
+++ b/browser/themes/gnomestripe/devtools/debugger.css
@@ -161,6 +161,10 @@
   font-weight: 600;
 }
 
+.dbg-stackframe-details {
+  -moz-padding-start: 4px;
+}
+
 /**
  * Breakpoints view
  */
@@ -209,10 +213,6 @@
   -moz-padding-start: 8px;
 }
 
-.dbg-expression:last-child {
-  margin-bottom: 4px;
-}
-
 .dbg-expression-arrow {
   width: 10px;
   height: auto;
@@ -236,6 +236,11 @@
   min-height: 10px;
 }
 
+.dbg-variables-delete:not(:hover) {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+  opacity: 0.5;
+}
+
 /**
  * Scope element
  */
@@ -278,6 +283,7 @@
 
 .variable > .title > .value {
   -moz-padding-start: 6px;
+  -moz-padding-end: 4px;
 }
 
 .variable:not([non-header]) > .details {
@@ -304,6 +310,7 @@
 
 .property > .title > .value {
   -moz-padding-start: 6px;
+  -moz-padding-end: 4px;
 }
 
 .property:not([non-header]) > .details {
@@ -373,10 +380,16 @@
  * Variables and properties editing
  */
 
-#variables .element-input {
+#variables .element-value-input {
   -moz-margin-start: 5px !important;
 }
 
+#variables .element-name-input {
+  -moz-margin-start: -1px !important;
+  color: #048;
+  font-weight: 600;
+}
+
 /**
  * Variables and properties searching
  */
diff --git a/browser/themes/pinstripe/devtools/debugger.css b/browser/themes/pinstripe/devtools/debugger.css
index b3410c32f940..8e4fd933d0e8 100644
--- a/browser/themes/pinstripe/devtools/debugger.css
+++ b/browser/themes/pinstripe/devtools/debugger.css
@@ -163,6 +163,10 @@
   font-weight: 600;
 }
 
+.dbg-stackframe-details {
+  -moz-padding-start: 4px;
+}
+
 /**
  * Breakpoints view
  */
@@ -211,10 +215,6 @@
   -moz-padding-start: 8px;
 }
 
-.dbg-expression:last-child {
-  margin-bottom: 4px;
-}
-
 .dbg-expression-arrow {
   width: 10px;
   height: auto;
@@ -238,6 +238,11 @@
   min-height: 10px;
 }
 
+.dbg-variables-delete:not(:hover) {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+  opacity: 0.5;
+}
+
 /**
  * Scope element
  */
@@ -280,6 +285,7 @@
 
 .variable > .title > .value {
   -moz-padding-start: 6px;
+  -moz-padding-end: 4px;
 }
 
 .variable:not([non-header]) > .details {
@@ -306,6 +312,7 @@
 
 .property > .title > .value {
   -moz-padding-start: 6px;
+  -moz-padding-end: 4px;
 }
 
 .property:not([non-header]) > .details {
@@ -375,10 +382,16 @@
  * Variables and properties editing
  */
 
-#variables .element-input {
+#variables .element-value-input {
   -moz-margin-start: 5px !important;
 }
 
+#variables .element-name-input {
+  -moz-margin-start: -1px !important;
+  color: #048;
+  font-weight: 600;
+}
+
 /**
  * Variables and properties searching
  */
diff --git a/browser/themes/winstripe/devtools/debugger.css b/browser/themes/winstripe/devtools/debugger.css
index fbc236246a16..23abaff60737 100644
--- a/browser/themes/winstripe/devtools/debugger.css
+++ b/browser/themes/winstripe/devtools/debugger.css
@@ -169,6 +169,10 @@
   font-weight: 600;
 }
 
+.dbg-stackframe-details {
+  -moz-padding-start: 4px;
+}
+
 /**
  * Breakpoints view
  */
@@ -217,10 +221,6 @@
   -moz-padding-start: 8px;
 }
 
-.dbg-expression:last-child {
-  margin-bottom: 4px;
-}
-
 .dbg-expression-arrow {
   width: 10px;
   height: auto;
@@ -244,6 +244,11 @@
   min-height: 10px;
 }
 
+.dbg-variables-delete:not(:hover) {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+  opacity: 0.5;
+}
+
 /**
  * Scope element
  */
@@ -286,6 +291,7 @@
 
 .variable > .title > .value {
   -moz-padding-start: 6px;
+  -moz-padding-end: 4px;
 }
 
 .variable:not([non-header]) > .details {
@@ -312,6 +318,7 @@
 
 .property > .title > .value {
   -moz-padding-start: 6px;
+  -moz-padding-end: 4px;
 }
 
 .property:not([non-header]) > .details {
@@ -381,10 +388,16 @@
  * Variables and properties editing
  */
 
-#variables .element-input {
+#variables .element-value-input {
   -moz-margin-start: 5px !important;
 }
 
+#variables .element-name-input {
+  -moz-margin-start: -1px !important;
+  color: #048;
+  font-weight: 600;
+}
+
 /**
  * Variables and properties searching
  */

From 64d9e2f0dd994758ca27de941c2b5d412fd6bbf5 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Tue, 27 Nov 2012 18:19:23 +0200
Subject: [PATCH 136/160] Bug 815277 - Source editor's 'Find' and 'Jump to
 line' commands should use the frontend UI, r=past

---
 browser/devtools/debugger/debugger-toolbar.js | 39 ++++-----
 browser/devtools/debugger/debugger-view.js    |  2 +-
 browser/devtools/debugger/debugger.xul        | 80 ++++++++++++-------
 ...rowser_dbg_bug731394_editor-contextmenu.js |  2 -
 browser/devtools/shared/LayoutHelpers.jsm     | 13 ++-
 .../chrome/browser/devtools/debugger.dtd      | 40 ++++++++++
 6 files changed, 122 insertions(+), 54 deletions(-)

diff --git a/browser/devtools/debugger/debugger-toolbar.js b/browser/devtools/debugger/debugger-toolbar.js
index 8f0341a6a4b1..855465eef3dc 100644
--- a/browser/devtools/debugger/debugger-toolbar.js
+++ b/browser/devtools/debugger/debugger-toolbar.js
@@ -34,10 +34,10 @@ ToolbarView.prototype = {
     this._chromeGlobals = document.getElementById("chrome-globals");
     this._scripts = document.getElementById("sources");
 
-    let resumeKey = LayoutHelpers.prettyKey(document.getElementById("resumeKey"));
-    let stepOverKey = LayoutHelpers.prettyKey(document.getElementById("stepOverKey"));
-    let stepInKey = LayoutHelpers.prettyKey(document.getElementById("stepInKey"));
-    let stepOutKey = LayoutHelpers.prettyKey(document.getElementById("stepOutKey"));
+    let resumeKey = LayoutHelpers.prettyKey(document.getElementById("resumeKey"), true);
+    let stepOverKey = LayoutHelpers.prettyKey(document.getElementById("stepOverKey"), true);
+    let stepInKey = LayoutHelpers.prettyKey(document.getElementById("stepInKey"), true);
+    let stepOutKey = LayoutHelpers.prettyKey(document.getElementById("stepOutKey"), true);
     this._resumeTooltip = L10N.getFormatStr("resumeButtonTooltip", [resumeKey]);
     this._pauseTooltip = L10N.getFormatStr("pauseButtonTooltip", [resumeKey]);
     this._stepOverTooltip = L10N.getFormatStr("stepOverTooltip", [stepOverKey]);
@@ -577,11 +577,11 @@ FilterView.prototype = {
     this._variableOperatorButton = document.getElementById("variable-operator-button");
     this._variableOperatorLabel = document.getElementById("variable-operator-label");
 
-    this._globalSearchKey = LayoutHelpers.prettyKey(document.getElementById("globalSearchKey"));
-    this._fileSearchKey = LayoutHelpers.prettyKey(document.getElementById("fileSearchKey"));
-    this._lineSearchKey = LayoutHelpers.prettyKey(document.getElementById("lineSearchKey"));
-    this._tokenSearchKey = LayoutHelpers.prettyKey(document.getElementById("tokenSearchKey"));
-    this._variableSearchKey = LayoutHelpers.prettyKey(document.getElementById("variableSearchKey"));
+    this._fileSearchKey = LayoutHelpers.prettyKey(document.getElementById("fileSearchKey"), true);
+    this._globalSearchKey = LayoutHelpers.prettyKey(document.getElementById("globalSearchKey"), true);
+    this._tokenSearchKey = LayoutHelpers.prettyKey(document.getElementById("tokenSearchKey"), true);
+    this._lineSearchKey = LayoutHelpers.prettyKey(document.getElementById("lineSearchKey"), true);
+    this._variableSearchKey = LayoutHelpers.prettyKey(document.getElementById("variableSearchKey"), true);
 
     this._searchbox.addEventListener("click", this._onClick, false);
     this._searchbox.addEventListener("select", this._onSearch, false);
@@ -879,7 +879,7 @@ FilterView.prototype = {
 
     // Perform a global search based on the specified operator.
     if (isGlobal) {
-      if (isReturnKey && isDifferentToken) {
+      if (isReturnKey && (isDifferentToken || DebuggerView.GlobalSearch.hidden)) {
         DebuggerView.GlobalSearch.performSearch(token);
       } else {
         DebuggerView.GlobalSearch[["focusNextMatch", "focusPrevMatch"][action]]();
@@ -934,10 +934,10 @@ FilterView.prototype = {
   },
 
   /**
-   * Called when the source line filter key sequence was pressed.
+   * Called when the global search filter key sequence was pressed.
    */
-  _doLineSearch: function DVF__doLineSearch() {
-    this._doSearch(SEARCH_LINE_FLAG);
+  _doGlobalSearch: function DVF__doGlobalSearch() {
+    this._doSearch(SEARCH_GLOBAL_FLAG);
     this._searchboxPanel.hidePopup();
   },
 
@@ -950,10 +950,10 @@ FilterView.prototype = {
   },
 
   /**
-   * Called when the global search filter key sequence was pressed.
+   * Called when the source line filter key sequence was pressed.
    */
-  _doGlobalSearch: function DVF__doGlobalSearch() {
-    this._doSearch(SEARCH_GLOBAL_FLAG);
+  _doLineSearch: function DVF__doLineSearch() {
+    this._doSearch(SEARCH_LINE_FLAG);
     this._searchboxPanel.hidePopup();
   },
 
@@ -974,10 +974,13 @@ FilterView.prototype = {
   _tokenOperatorLabel: null,
   _lineOperatorButton: null,
   _lineOperatorLabel: null,
-  _globalSearchKey: "",
+  _variableOperatorButton: null,
+  _variableOperatorLabel: null,
   _fileSearchKey: "",
-  _lineSearchKey: "",
+  _globalSearchKey: "",
   _tokenSearchKey: "",
+  _lineSearchKey: "",
+  _variableSearchKey: "",
   _target: null,
   _prevSearchedFile: "",
   _prevSearchedLine: -1,
diff --git a/browser/devtools/debugger/debugger-view.js b/browser/devtools/debugger/debugger-view.js
index bce66d496334..0928901a0982 100644
--- a/browser/devtools/debugger/debugger-view.js
+++ b/browser/devtools/debugger/debugger-view.js
@@ -15,8 +15,8 @@ const GLOBAL_SEARCH_LINE_MAX_LENGTH = 300; // chars
 const GLOBAL_SEARCH_EXPAND_MAX_RESULTS = 50;
 const GLOBAL_SEARCH_ACTION_MAX_DELAY = 1500; // ms
 const SEARCH_GLOBAL_FLAG = "!";
-const SEARCH_LINE_FLAG = ":";
 const SEARCH_TOKEN_FLAG = "#";
+const SEARCH_LINE_FLAG = ":";
 const SEARCH_VARIABLE_FLAG = "*";
 
 /**
diff --git a/browser/devtools/debugger/debugger.xul b/browser/devtools/debugger/debugger.xul
index c63b714650d7..9ed58abc2487 100644
--- a/browser/devtools/debugger/debugger.xul
+++ b/browser/devtools/debugger/debugger.xul
@@ -35,12 +35,12 @@
              oncommand="DebuggerView.Toolbar._onStepOutPressed()"/>
     <command id="fileSearchCommand"
              oncommand="DebuggerView.Filtering._doFileSearch()"/>
-    <command id="lineSearchCommand"
-             oncommand="DebuggerView.Filtering._doLineSearch()"/>
-    <command id="tokenSearchCommand"
-             oncommand="DebuggerView.Filtering._doTokenSearch()"/>
     <command id="globalSearchCommand"
              oncommand="DebuggerView.Filtering._doGlobalSearch()"/>
+    <command id="tokenSearchCommand"
+             oncommand="DebuggerView.Filtering._doTokenSearch()"/>
+    <command id="lineSearchCommand"
+             oncommand="DebuggerView.Filtering._doLineSearch()"/>
     <command id="variableSearchCommand"
              oncommand="DebuggerView.Filtering._doVariableSearch()"/>
     <command id="addBreakpointCommand"
@@ -73,10 +73,33 @@
       <menuseparator/>
       <menuitem id="se-cMenu-selectAll"/>
       <menuseparator/>
-      <menuitem id="se-cMenu-find"/>
-      <menuitem id="se-cMenu-findAgain"/>
+      <menuitem id="se-dbg-cMenu-findFile"
+                label="&debuggerUI.searchFile;"
+                accesskey="&debuggerUI.searchFile.key;"
+                key="fileSearchKey"
+                command="fileSearchCommand"/>
+      <menuitem id="se-dbg-cMenu-findGlobal"
+                label="&debuggerUI.searchGlobal;"
+                accesskey="&debuggerUI.searchGlobal.key;"
+                key="globalSearchKey"
+                command="globalSearchCommand"/>
       <menuseparator/>
-      <menuitem id="se-cMenu-gotoLine"/>
+      <menuitem id="se-dbg-cMenu-findToken"
+                label="&debuggerUI.searchToken;"
+                accesskey="&debuggerUI.searchToken.key;"
+                key="tokenSearchKey"
+                command="tokenSearchCommand"/>
+      <menuitem id="se-dbg-cMenu-findLine"
+                label="&debuggerUI.searchLine;"
+                accesskey="&debuggerUI.searchLine.key;"
+                key="lineSearchKey"
+                command="lineSearchCommand"/>
+      <menuseparator/>
+      <menuitem id="se-dbg-cMenu-findVariable"
+                label="&debuggerUI.searchVariable;"
+                accesskey="&debuggerUI.searchVariable.key;"
+                key="variableSearchKey"
+                command="variableSearchCommand"/>
     </menupopup>
     <menupopup id="debuggerPrefsContextMenu"
                position="before_end"
@@ -105,48 +128,46 @@
     </menupopup>
   </popupset>
 
-  <keyset id="sourceEditorKeys"/>
-
   <keyset id="debuggerKeys">
     <key id="resumeKey"
-         keycode="VK_F6"
+         keycode="&debuggerUI.stepping.resume;"
          command="resumeCommand"/>
     <key id="stepOverKey"
-         keycode="VK_F7"
+         keycode="&debuggerUI.stepping.stepOver;"
          command="stepOverCommand"/>
     <key id="stepInKey"
-         keycode="VK_F8"
+         keycode="&debuggerUI.stepping.stepIn;"
          command="stepInCommand"/>
     <key id="stepOutKey"
-         keycode="VK_F8"
+         keycode="&debuggerUI.stepping.stepOut;"
          modifiers="shift"
          command="stepOutCommand"/>
     <key id="fileSearchKey"
-         key="P"
-         modifiers="control shift"
+         key="&debuggerUI.searchFile.key;"
+         modifiers="accel"
          command="fileSearchCommand"/>
-    <key id="lineSearchKey"
-         key="G"
-         modifiers="control shift"
-         command="lineSearchCommand"/>
-    <key id="tokenSearchKey"
-         key="T"
-         modifiers="control shift"
-         command="tokenSearchCommand"/>
     <key id="globalSearchKey"
-         key="F"
-         modifiers="control shift"
+         key="&debuggerUI.searchGlobal.key;"
+         modifiers="accel alt"
          command="globalSearchCommand"/>
+    <key id="tokenSearchKey"
+         key="&debuggerUI.searchToken.key;"
+         modifiers="accel"
+         command="tokenSearchCommand"/>
+    <key id="lineSearchKey"
+         key="&debuggerUI.searchLine.key;"
+         modifiers="accel"
+         command="lineSearchCommand"/>
     <key id="variableSearchKey"
-         key="V"
-         modifiers="control shift"
+         key="&debuggerUI.searchVariable.key;"
+         modifiers="accel alt"
          command="variableSearchCommand"/>
     <key id="addBreakpointKey"
-         key="B"
+         key="&debuggerUI.seMenuBreak.key;"
          modifiers="accel"
          command="addBreakpointCommand"/>
     <key id="addConditionalBreakpointKey"
-         key="B"
+         key="&debuggerUI.seMenuCondBreak.key;"
          modifiers="accel shift"
          command="addConditionalBreakpointCommand"/>
   </keyset>
@@ -181,6 +202,7 @@
       <spacer flex="1"/>
       <toolbarbutton id="toggle-panes"
                      class="devtools-toolbarbutton"
+                     tooltiptext="&debuggerUI.panesButton.tooltip;"
                      tabindex="0"/>
       <toolbarbutton id="debugger-options"
                      class="devtools-option-toolbarbutton"
diff --git a/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js b/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
index 9ac7911df420..8af191ae1d85 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
@@ -97,8 +97,6 @@ function test()
        "#editMenuKeys not found");
     ok(document.getElementById("sourceEditorCommands"),
        "#sourceEditorCommands found");
-    ok(document.getElementById("sourceEditorKeys"),
-       "#sourceEditorKeys found");
 
     // Map command ids to their expected disabled state.
     let commands = {"se-cmd-undo": true, "se-cmd-redo": true,
diff --git a/browser/devtools/shared/LayoutHelpers.jsm b/browser/devtools/shared/LayoutHelpers.jsm
index 64dd465478e1..0c174b92ee2f 100644
--- a/browser/devtools/shared/LayoutHelpers.jsm
+++ b/browser/devtools/shared/LayoutHelpers.jsm
@@ -326,10 +326,12 @@ this.LayoutHelpers = LayoutHelpers = {
    *
    * @param Node aElemKey
    *        The key element to get the modifiers from.
+   * @param boolean aAllowCloverleaf
+   *        Pass true to use the cloverleaf symbol instead of a descriptive string.
    * @return string
    *         A prettified and properly separated modifier keys string.
    */
-  prettyKey: function LH_prettyKey(aElemKey)
+  prettyKey: function LH_prettyKey(aElemKey, aAllowCloverleaf)
   {
     let elemString = "";
     let elemMod = aElemKey.getAttribute("modifiers");
@@ -338,9 +340,12 @@ this.LayoutHelpers = LayoutHelpers = {
       if (Services.appinfo.OS == "Darwin") {
         // XXX bug 779642 Use "Cmd-" literal vs. cloverleaf meta-key until
         // Orion adds variable height lines.
-        // elemString += PlatformKeys.GetStringFromName("VK_META") +
-        //               PlatformKeys.GetStringFromName("MODIFIER_SEPARATOR");
-        elemString += "Cmd-";
+        if (!aAllowCloverleaf) {
+          elemString += "Cmd-";
+        } else {
+          elemString += PlatformKeys.GetStringFromName("VK_META") +
+                        PlatformKeys.GetStringFromName("MODIFIER_SEPARATOR");
+        }
       } else {
         elemString += PlatformKeys.GetStringFromName("VK_CONTROL") +
                       PlatformKeys.GetStringFromName("MODIFIER_SEPARATOR");
diff --git a/browser/locales/en-US/chrome/browser/devtools/debugger.dtd b/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
index d12191ec9c42..e2f248303238 100644
--- a/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
@@ -35,6 +35,10 @@
   -  the button that closes the debugger UI. -->
 <!ENTITY debuggerUI.closeButton.tooltip "Close">
 
+<!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
+  -  the button that toggles the panes visible or hidden in the debugger UI. -->
+<!ENTITY debuggerUI.panesButton.tooltip "Toggle panes">
+
 <!-- LOCALIZATION NOTE (debuggerUI.optsButton.tooltip): This is the tooltip for
   -  the button that opens up an options context menu for the debugger UI. -->
 <!ENTITY debuggerUI.optsButton.tooltip  "Debugger Options">
@@ -64,6 +68,31 @@
   -  appears in the filter panel popup as a description. -->
 <!ENTITY debuggerUI.searchPanelTitle    "Operators">
 
+<!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
+  -  in the source editor's context menu for the scripts search operation. -->
+<!ENTITY debuggerUI.searchFile          "Filter scripts">
+<!ENTITY debuggerUI.searchFile.key      "P">
+
+<!-- LOCALIZATION NOTE (debuggerUI.searchGlobal): This is the text that appears
+  -  in the source editor's context menu for the global search operation. -->
+<!ENTITY debuggerUI.searchGlobal        "Search in all files">
+<!ENTITY debuggerUI.searchGlobal.key    "F">
+
+<!-- LOCALIZATION NOTE (debuggerUI.searchToken): This is the text that appears
+  -  in the source editor's context menu for the token search operation. -->
+<!ENTITY debuggerUI.searchToken         "Find">
+<!ENTITY debuggerUI.searchToken.key     "F">
+
+<!-- LOCALIZATION NOTE (debuggerUI.searchLine): This is the text that appears
+  -  in the source editor's context menu for the line search operation. -->
+<!ENTITY debuggerUI.searchLine          "Jump to line...">
+<!ENTITY debuggerUI.searchLine.key      "J">
+
+<!-- LOCALIZATION NOTE (debuggerUI.searchVariable): This is the text that appears
+  -  in the source editor's context menu for the variables search operation. -->
+<!ENTITY debuggerUI.searchVariable      "Filter variables">
+<!ENTITY debuggerUI.searchVariable.key  "V">
+
 <!-- LOCALIZATION NOTE (debuggerUI.condBreakPanelTitle): This is the text that
   -  appears in the conditional breakpoint panel popup as a description. -->
 <!ENTITY debuggerUI.condBreakPanelTitle "This breakpoint will stop execution only if the following expression is true">
@@ -71,8 +100,19 @@
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuBreak): This is the text that
   -  appears in the source editor context menu for adding a breakpoint. -->
 <!ENTITY debuggerUI.seMenuBreak         "Add breakpoint">
+<!ENTITY debuggerUI.seMenuBreak.key     "B">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuCondBreak): This is the text that
   -  appears in the source editor context menu for adding a conditional
   -  breakpoint. -->
 <!ENTITY debuggerUI.seMenuCondBreak     "Add conditional breakpoint">
+<!ENTITY debuggerUI.seMenuCondBreak.key "B">
+
+<!-- LOCALIZATION NOTE (debuggerUI.stepping): These are the keycodes that
+  -  control the stepping commands in the debugger (continue, step over,
+  -  step in and step out). -->
+<!ENTITY debuggerUI.stepping.resume     "VK_F6">
+<!ENTITY debuggerUI.stepping.stepOver   "VK_F7">
+<!ENTITY debuggerUI.stepping.stepIn     "VK_F8">
+<!ENTITY debuggerUI.stepping.stepOut    "VK_F8">
+

From fa4a75700c0f1740e6dbe0617fdea65746cfb3ab Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Tue, 27 Nov 2012 18:19:24 +0200
Subject: [PATCH 137/160] Bug 791323 - Need a mechanism to select a script
 programmatically in the debugger, r=rcampbell

---
 browser/devtools/debugger/debugger-toolbar.js | 14 ++++
 browser/devtools/debugger/test/Makefile.in    |  1 +
 .../browser_dbg_reload-preferred-script.js    | 79 +++++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 browser/devtools/debugger/test/browser_dbg_reload-preferred-script.js

diff --git a/browser/devtools/debugger/debugger-toolbar.js b/browser/devtools/debugger/debugger-toolbar.js
index 855465eef3dc..8efea073b594 100644
--- a/browser/devtools/debugger/debugger-toolbar.js
+++ b/browser/devtools/debugger/debugger-toolbar.js
@@ -370,6 +370,20 @@ create({ constructor: SourcesView, proto: MenuContainer.prototype }, {
     this._container.removeEventListener("click", this._onClick, false);
   },
 
+  /**
+   * Sets the preferred source url to be displayed in this container.
+   * @param string aValue
+   */
+  set preferredSource(aValue) {
+    this._preferredValue = aValue;
+
+    // Selects the element with the specified value in this container,
+    // if already inserted.
+    if (this.containsValue(aValue)) {
+      this.selectedValue = aValue;
+    }
+  },
+
   /**
    * The select listener for the sources container.
    */
diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in
index 97acb87efd60..dca2b7e2f528 100644
--- a/browser/devtools/debugger/test/Makefile.in
+++ b/browser/devtools/debugger/test/Makefile.in
@@ -45,6 +45,7 @@ MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_propertyview-filter-08.js \
 	browser_dbg_propertyview-reexpand.js \
 	browser_dbg_reload-same-script.js \
+	browser_dbg_reload-preferred-script.js \
 	browser_dbg_pane-collapse.js \
 	browser_dbg_panesize.js \
 	browser_dbg_panesize-inner.js \
diff --git a/browser/devtools/debugger/test/browser_dbg_reload-preferred-script.js b/browser/devtools/debugger/test/browser_dbg_reload-preferred-script.js
new file mode 100644
index 000000000000..4920fc50a766
--- /dev/null
+++ b/browser/devtools/debugger/test/browser_dbg_reload-preferred-script.js
@@ -0,0 +1,79 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests if the preferred script is shown when a page is loaded.
+ */
+
+const TAB_URL = EXAMPLE_URL + "browser_dbg_script-switching.html";
+
+let gPane = null;
+let gTab = null;
+let gDebuggee = null;
+let gDebugger = null;
+let gView = null;
+
+requestLongerTimeout(2);
+
+function test()
+{
+  let expectedScript = "test-script-switching-02.js";
+  let expectedScriptShown = false;
+  let scriptShownUrl = null;
+  let resumed = false;
+  let testStarted = false;
+
+  debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
+    gTab = aTab;
+    gDebuggee = aDebuggee;
+    gPane = aPane;
+    gDebugger = gPane.contentWindow;
+    gView = gDebugger.DebuggerView;
+    resumed = true;
+
+    gView.Sources.preferredSource = EXAMPLE_URL + expectedScript;
+    startTest();
+  });
+
+  function onScriptShown(aEvent)
+  {
+    expectedScriptShown = aEvent.detail.url.indexOf(expectedScript) != -1;
+    scriptShownUrl = aEvent.detail.url;
+    startTest();
+  }
+
+  window.addEventListener("Debugger:SourceShown", onScriptShown);
+
+  function startTest()
+  {
+    if (expectedScriptShown && resumed && !testStarted) {
+      window.removeEventListener("Debugger:SourceShown", onScriptShown);
+      testStarted = true;
+      Services.tm.currentThread.dispatch({ run: performTest }, 0);
+    }
+  }
+
+  function performTest()
+  {
+    info("Currently preferred script: " + gView.Sources.preferredValue);
+    info("Currently selected script: " + gView.Sources.selectedValue);
+
+    isnot(gView.Sources.preferredValue.indexOf(expectedScript), -1,
+      "The preferred script url wasn't set correctly.");
+    isnot(gView.Sources.selectedValue.indexOf(expectedScript), -1,
+      "The selected script isn't the correct one.");
+    is(gView.Sources.selectedValue, scriptShownUrl,
+      "The shown script is not the the correct one.");
+
+    closeDebuggerAndFinish();
+  }
+
+  registerCleanupFunction(function() {
+    removeTab(gTab);
+    gPane = null;
+    gTab = null;
+    gDebuggee = null;
+    gDebugger = null;
+    gView = null;
+  });
+}

From 2c6aa4fd598062a27a14b9abcad4cc267752ee78 Mon Sep 17 00:00:00 2001
From: Panos Astithas <past@mozilla.com>
Date: Tue, 27 Nov 2012 14:29:46 +0200
Subject: [PATCH 138/160] Bug 812869 - Breakpoint clients sometimes don't know
 how to remove themselves, r=vporof

---
 .../devtools/debugger/debugger-controller.js  |   5 +-
 .../debugger/server/dbg-script-actors.js      |  10 +-
 .../debugger/tests/unit/test_breakpoint-12.js | 101 ++++++++++++++++++
 .../devtools/debugger/tests/unit/xpcshell.ini |   1 +
 4 files changed, 113 insertions(+), 4 deletions(-)
 create mode 100644 toolkit/devtools/debugger/tests/unit/test_breakpoint-12.js

diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js
index 3609121173d7..98e5c1e6e08f 100644
--- a/browser/devtools/debugger/debugger-controller.js
+++ b/browser/devtools/debugger/debugger-controller.js
@@ -1326,11 +1326,10 @@ Breakpoints.prototype = {
     this.activeThread.setBreakpoint(aLocation, function(aResponse, aBreakpointClient) {
       let { url, line } = aResponse.actualLocation || aLocation;
 
-      // Prevent this new breakpoint from being repositioned on top of an
-      // already existing one.
+      // If the response contains a breakpoint that exists in the cache, prevent
+      // it from being shown in the source editor at an incorrect position.
       if (this.getBreakpoint(url, line)) {
         this._hideBreakpoint(aBreakpointClient);
-        aBreakpointClient.remove();
         return;
       }
 
diff --git a/toolkit/devtools/debugger/server/dbg-script-actors.js b/toolkit/devtools/debugger/server/dbg-script-actors.js
index 8620f251f0e5..a912557451b2 100644
--- a/toolkit/devtools/debugger/server/dbg-script-actors.js
+++ b/toolkit/devtools/debugger/server/dbg-script-actors.js
@@ -578,13 +578,21 @@ ThreadActor.prototype = {
             inner.setBreakpoint(lines[line][i], bpActor);
             codeFound = true;
           }
+          bpActor.addScript(inner, this);
           actualLocation = {
             url: aLocation.url,
             line: line,
             column: aLocation.column
           };
+          // If there wasn't already a breakpoint at that line, update the cache
+          // as well.
+          if (scriptBreakpoints[line] && scriptBreakpoints[line].actor) {
+            let existing = scriptBreakpoints[line].actor;
+            bpActor.onDelete();
+            delete scriptBreakpoints[oldLine];
+            return { actor: existing.actorID, actualLocation: actualLocation };
+          }
           bpActor.location = actualLocation;
-          // Update the cache as well.
           scriptBreakpoints[line] = scriptBreakpoints[oldLine];
           scriptBreakpoints[line].line = line;
           delete scriptBreakpoints[oldLine];
diff --git a/toolkit/devtools/debugger/tests/unit/test_breakpoint-12.js b/toolkit/devtools/debugger/tests/unit/test_breakpoint-12.js
new file mode 100644
index 000000000000..7a70f877ccbb
--- /dev/null
+++ b/toolkit/devtools/debugger/tests/unit/test_breakpoint-12.js
@@ -0,0 +1,101 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Make sure that setting a breakpoint twice in a line without bytecodes works
+ * as expected.
+ */
+
+const NUM_BREAKPOINTS = 10;
+var gDebuggee;
+var gClient;
+var gThreadClient;
+var gPath = getFilePath('test_breakpoint-12.js');
+var gBpActor;
+var gCount = 1;
+
+function run_test()
+{
+  initTestDebuggerServer();
+  gDebuggee = addTestGlobal("test-stack");
+  gClient = new DebuggerClient(DebuggerServer.connectPipe());
+  gClient.connect(function () {
+    attachTestGlobalClientAndResume(gClient,
+                                    "test-stack",
+                                    function (aResponse, aThreadClient) {
+      gThreadClient = aThreadClient;
+      test_child_skip_breakpoint();
+    });
+  });
+  do_test_pending();
+}
+
+function test_child_skip_breakpoint()
+{
+  gThreadClient.addOneTimeListener("paused", function (aEvent, aPacket) {
+    let location = { url: gPath, line: gDebuggee.line0 + 3};
+    gThreadClient.setBreakpoint(location, function (aResponse, bpClient) {
+      // Check that the breakpoint has properly skipped forward one line.
+      do_check_eq(aResponse.actualLocation.url, location.url);
+      do_check_eq(aResponse.actualLocation.line, location.line + 1);
+      gBpActor = aResponse.actor;
+
+      // Set more breakpoints at the same location.
+      set_breakpoints(location);
+    });
+
+  });
+
+  gDebuggee.eval("var line0 = Error().lineNumber;\n" +
+                 "function foo() {\n" + // line0 + 1
+                 "  this.a = 1;\n" +    // line0 + 2
+                 "  // A comment.\n" +  // line0 + 3
+                 "  this.b = 2;\n" +    // line0 + 4
+                 "}\n" +                // line0 + 5
+                 "debugger;\n" +        // line0 + 6
+                 "foo();\n");           // line0 + 7
+}
+
+// Set many breakpoints at the same location.
+function set_breakpoints(location) {
+  do_check_neq(gCount, NUM_BREAKPOINTS);
+  gThreadClient.setBreakpoint(location, function (aResponse, bpClient) {
+    // Check that the breakpoint has properly skipped forward one line.
+    do_check_eq(aResponse.actualLocation.url, location.url);
+    do_check_eq(aResponse.actualLocation.line, location.line + 1);
+    // Check that the same breakpoint actor was returned.
+    do_check_eq(aResponse.actor, gBpActor);
+
+    if (++gCount < NUM_BREAKPOINTS) {
+      set_breakpoints(location);
+      return;
+    }
+
+    // After setting all the breakpoints, check that only one has effectively
+    // remained.
+    gThreadClient.addOneTimeListener("paused", function (aEvent, aPacket) {
+      // Check the return value.
+      do_check_eq(aPacket.type, "paused");
+      do_check_eq(aPacket.frame.where.url, gPath);
+      do_check_eq(aPacket.frame.where.line, location.line + 1);
+      do_check_eq(aPacket.why.type, "breakpoint");
+      do_check_eq(aPacket.why.actors[0], bpClient.actor);
+      // Check that the breakpoint worked.
+      do_check_eq(gDebuggee.a, 1);
+      do_check_eq(gDebuggee.b, undefined);
+
+      gThreadClient.addOneTimeListener("paused", function (aEvent, aPacket) {
+        // We don't expect any more pauses after the breakpoint was hit once.
+        do_check_true(false);
+      });
+      gThreadClient.resume(function () {
+        // Give any remaining breakpoints a chance to trigger.
+        do_timeout(1000, finishClient.bind(null, gClient));
+      });
+
+    });
+    // Continue until the breakpoint is hit.
+    gThreadClient.resume();
+  });
+
+}
diff --git a/toolkit/devtools/debugger/tests/unit/xpcshell.ini b/toolkit/devtools/debugger/tests/unit/xpcshell.ini
index 7883991062c0..d64b7957120d 100644
--- a/toolkit/devtools/debugger/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/debugger/tests/unit/xpcshell.ini
@@ -45,6 +45,7 @@ tail =
 [test_breakpoint-09.js]
 [test_breakpoint-10.js]
 [test_breakpoint-11.js]
+[test_breakpoint-12.js]
 [test_listscripts-01.js]
 [test_objectgrips-01.js]
 [test_objectgrips-02.js]

From 2cef0b1514fde281727157ff6bb46d7a66345f74 Mon Sep 17 00:00:00 2001
From: Chris AtLee <catlee@mozilla.com>
Date: Tue, 27 Nov 2012 06:21:07 -0800
Subject: [PATCH 139/160] Bug 813826: gecko configs for otoro builds. r=nthomas
 DONTBUILD

--HG--
extra : rebase_source : 2af6efb4c7851f338f4594ca3757dc4a2ac1762d
---
 b2g/config/otoro/config.json     |  20 ++++++
 b2g/config/otoro/releng-otoro.tt |   8 +++
 b2g/config/otoro/sources.xml     | 108 +++++++++++++++++++++++++++++++
 3 files changed, 136 insertions(+)
 create mode 100644 b2g/config/otoro/config.json
 create mode 100644 b2g/config/otoro/releng-otoro.tt
 create mode 100644 b2g/config/otoro/sources.xml

diff --git a/b2g/config/otoro/config.json b/b2g/config/otoro/config.json
new file mode 100644
index 000000000000..0e2887f231af
--- /dev/null
+++ b/b2g/config/otoro/config.json
@@ -0,0 +1,20 @@
+{
+    "config_version": 1,
+    "tooltool_manifest": "releng-otoro.tt",
+    "mock_target": "mozilla-centos6-i386",
+    "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel"],
+    "mock_files": [["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"]],
+    "build_targets": [],
+    "upload_files": [
+        "{workdir}/out/target/product/otoro/*.img",
+        "{objdir}/dist/b2g-update/*.mar",
+        "{objdir}/dist/b2g-*.tar.gz",
+        "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
+        "{workdir}/sources.xml"
+    ],
+    "env": {
+        "VARIANT": "user",
+        "B2GUPDATER": "1"
+    },
+    "gaia": {"vcs": "hgtool", "repo": "http://hg.mozilla.org/projects/gaia"}
+}
diff --git a/b2g/config/otoro/releng-otoro.tt b/b2g/config/otoro/releng-otoro.tt
new file mode 100644
index 000000000000..dd9993522b8d
--- /dev/null
+++ b/b2g/config/otoro/releng-otoro.tt
@@ -0,0 +1,8 @@
+[
+{
+"size": 868355892,
+"digest": "0ccae39ee8910947fe3cf51fa3a45e820d2ff11571f6ccec29d9b3e5ae7f7709c1ad657210fbfea98baadd032c3d6a58e00ddbb2e93acafd751089869a72fed6",
+"algorithm": "sha512",
+"filename": "gonk.tar.xz"
+}
+]
diff --git a/b2g/config/otoro/sources.xml b/b2g/config/otoro/sources.xml
new file mode 100644
index 000000000000..87209fe131f2
--- /dev/null
+++ b/b2g/config/otoro/sources.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" ?><manifest>
+  <!-- This is only a record of which revisions were pulled to generate the
+       gonk.tar.xz snapshot referred to by releng-otoro.tt -->
+
+  <remote fetch="https://android.googlesource.com/" name="aosp"/>
+  <remote fetch="git://github.com/mozilla-b2g/" name="b2g"/>
+  <remote fetch="git://github.com/mozilla/" name="mozilla"/>
+  <remote fetch="git://codeaurora.org/" name="caf"/>
+  <remote fetch="git://android.git.linaro.org/" name="linaro"/>
+  <default remote="caf" revision="ics_chocolate_rb4.2" sync-j="4"/>
+
+  <!-- Gonk specific things and forks -->
+  <project name="platform_build" path="build" remote="b2g" revision="273ba23d5c6c9f6a34995a3cc429804d1449ca9f">
+    <copyfile dest="Makefile" src="core/root.mk"/>
+  </project>
+  <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f4377622f4c40275546c7816c0d4b21e800b4c6"/>
+  <project name="rilproxy" path="rilproxy" remote="b2g" revision="32106d4ea635ebe17a1610b643b398db639b8b97"/>
+  <project name="librecovery" path="librecovery" remote="b2g" revision="b7911c064a71a5c18e2c92f869f6364a798b46cd"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="6ee1f8987ef36d688f97064c003ad57849dfadf2"/>
+
+  <!-- Stock Android things -->
+  <!-- Information: platform/abi/cpp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
+  <!-- Information: platform/bionic is tagged with M8960AAAAANLYA100715A --><project name="platform/bionic" path="bionic" revision="cd5dfce80bc3f0139a56b58aca633202ccaee7f8"/>
+  <!-- Information: platform/bootable/recovery is tagged with M8960AAAAANLYA100715A --><project name="platform/bootable/recovery" path="bootable/recovery" revision="e0a9ac010df3afaa47ba107192c05ac8b5516435"/>
+  <!-- Information: platform/development is tagged with M8960AAAAANLYA100715A --><project name="platform/development" path="development" revision="a384622f5fcb1d2bebb9102591ff7ae91fe8ed2d"/>
+  <!-- Information: device/common is tagged with M8960AAAAANLYA1005304 --><project name="device/common" path="device/common" revision="7c65ea240157763b8ded6154a17d3c033167afb7"/>
+  <!-- Information: device/sample is tagged with M8960AAAAANLYA100715A --><project name="device/sample" path="device/sample" revision="c328f3d4409db801628861baa8d279fb8855892f"/>
+  <!-- Information: platform/external/apache-http is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/apache-http" path="external/apache-http" revision="6c9d8c58d3ed710f87c26820d903bb8aad81754f"/>
+  <!-- Information: platform/external/bluetooth/bluez is tagged with M76XXUSNEKNLYA2040 --><project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="1023c91c66e9c3bd1132480051993bf7827770f6"/>
+  <!-- Information: platform/external/bluetooth/glib is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="c6b49241cc1a8950723a5f74f8f4b4f4c3fa970e"/>
+  <!-- Information: platform/external/bluetooth/hcidump is tagged with M8960AAAAANLYA1005304 --><project name="platform/external/bluetooth/hcidump" path="external/bluetooth/hcidump" revision="02b1eb24fbb3d0135a81edb4a2175b1397308d7d"/>
+  <!-- Information: platform/external/bsdiff is tagged with A8064AAAAANLYA1334 --><project name="platform/external/bsdiff" path="external/bsdiff" revision="81872540236d9bb15cccf963d05b9de48baa5375"/>
+  <!-- Information: platform/external/bzip2 is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/bzip2" path="external/bzip2" revision="048dacdca43eed1534689ececcf2781c63e1e4ba"/>
+  <!-- Information: platform/external/dbus is tagged with M8960AAAAANLYA100715A --><project name="platform/external/dbus" path="external/dbus" revision="c7517b6195dc6926728352113e6cc335da3f9c9e"/>
+  <!-- Information: platform/external/dhcpcd is tagged with M8960AAAAANLYA100715A --><project name="platform/external/dhcpcd" path="external/dhcpcd" revision="1e00fb67022d0921af0fead263f81762781b9ffa"/>
+  <!-- Information: platform/external/dnsmasq is tagged with A8064AAAAANLYA1334 --><project name="platform/external/dnsmasq" path="external/dnsmasq" revision="f621afad94df46204c25fc2593a19d704d2637f5"/>
+  <!-- Information: platform/external/e2fsprogs is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="d5f550bb2f556c5d287f7c8d2b77223654bcec37"/>
+  <!-- Information: platform/external/expat is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/expat" path="external/expat" revision="6df134250feab71edb5915ecaa6268210bca76c5"/>
+  <!-- Information: platform/external/fdlibm is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/fdlibm" path="external/fdlibm" revision="988ffeb12a6e044ae3504838ef1fee3fe0716934"/>
+  <!-- Information: platform/external/flac is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/flac" path="external/flac" revision="5893fbe890f5dab8e4146d2baa4bd2691c0739e0"/>
+  <!-- Information: platform/external/freetype is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/freetype" path="external/freetype" revision="aeb407daf3711a10a27f3bc2223c5eb05158076e"/>
+  <!-- Information: platform/external/giflib is tagged with A8064AAAAANLYA1334 --><project name="platform/external/giflib" path="external/giflib" revision="b2597268aef084202a8c349d1cc072c03c6e22eb"/>
+  <!-- Information: platform/external/gtest is tagged with android-4.2_r1 --><project name="platform/external/gtest" path="external/gtest" remote="linaro" revision="344e5f3db17615cc853073a02968a603efd39109"/>
+  <!-- Information: platform/external/harfbuzz is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/harfbuzz" path="external/harfbuzz" revision="116610d63a859521dacf00fb6818ee9ab2e666f6"/>
+  <!-- Information: platform/external/icu4c is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/icu4c" path="external/icu4c" revision="0fa67b93b831c6636ca18b152a1b1b14cc99b034"/>
+  <!-- Information: platform/external/iptables is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/iptables" path="external/iptables" revision="3b2deb17f065c5664bb25e1a28489e5792eb63ff"/>
+  <!-- Information: platform/external/jhead is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/jhead" path="external/jhead" revision="754078052c687f6721536009c816644c73e4f145"/>
+  <!-- Information: platform/external/jpeg is tagged with M8960AAAAANLYA1005304 --><project name="platform/external/jpeg" path="external/jpeg" revision="a62e464d672a4623233180e4023034bf825f066e"/>
+  <!-- Information: platform/external/libgsm is tagged with A8064AAAAANLYA1334 --><project name="platform/external/libgsm" path="external/libgsm" revision="5e4516958690b9a1b2c98f88eeecba3edd2dbda4"/>
+  <!-- Information: platform/external/liblzf is tagged with A8064AAAAANLYA1334 --><project name="platform/external/liblzf" path="external/liblzf" revision="6946aa575b0949d045722794850896099d937cbb"/>
+  <!-- Information: platform/external/libnfc-nxp is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="3a912b065a31a72c63ad56ac224cfeaa933423b6"/>
+  <!-- Information: platform/external/libnl-headers is tagged with A8064AAAAANLYA1334 --><project name="platform/external/libnl-headers" path="external/libnl-headers" revision="6ccf7349d61f73ac26a0675d735d903ab919c658"/>
+  <!-- Information: platform/external/libphonenumber is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/libphonenumber" path="external/libphonenumber" revision="8d22c9a05eda1935c6dc27d188158e6ee38dc016"/>
+  <!-- Information: platform/external/libpng is tagged with M8960AAAAANLYA100715A --><project name="platform/external/libpng" path="external/libpng" revision="9c3730f0efa69f580f03463c237cd928f3196404"/>
+  <!-- Information: platform/external/libvpx is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/libvpx" path="external/libvpx" revision="3a40da0d96da5c520e7707aa14f48a80956e20d7"/>
+  <!-- Information: platform/external/llvm is tagged with M8960AAAAANLYA1005304 --><project name="platform/external/llvm" path="external/llvm" revision="bff5923831940309f7d8ddbff5826ca6ed2dc050"/>
+  <!-- Information: platform/external/mksh is tagged with M8960AAAAANLYA1005304 --><project name="platform/external/mksh" path="external/mksh" revision="ec646e8f5e7dac9a77d1de549c6ed92c04d0cd4b"/>
+  <project name="platform_external_opensans" path="external/opensans" remote="b2g" revision="b5b4c226ca1d71e936153cf679dda6d3d60e2354"/>
+  <!-- Information: platform/external/openssl is tagged with AU_LINUX_ANDROID_ICS.04.00.04.00.110 --><project name="platform/external/openssl" path="external/openssl" revision="27d333cce9a31c806b4bfa042925f045c727aecd"/>
+  <!-- Information: platform/external/protobuf is tagged with A8064AAAAANLYA1334 --><project name="platform/external/protobuf" path="external/protobuf" revision="e217977611c52bccde7f7c78e1d3c790c6357431"/>
+  <!-- Information: platform/external/safe-iop is tagged with A8064AAAAANLYA1334 --><project name="platform/external/safe-iop" path="external/safe-iop" revision="07073634e2e3aa4f518e36ed5dec3aabc549d5fb"/>
+  <project name="screencap-gonk" path="external/screencap-gonk" remote="b2g" revision="e6403c71e9eca8cb943739d5a0a192deac60fc51"/>
+  <!-- Information: platform/external/skia is tagged with M8960AAAAANLYA100715A --><project name="platform/external/skia" path="external/skia" revision="7d90c85f2c0e3b747f7c7eff8bc9253b0063b439"/>
+  <!-- Information: platform/external/sonivox is tagged with M8960AAAAANLYA1005304 --><project name="platform/external/sonivox" path="external/sonivox" revision="7c967779dfc61ac1f346e972de91d4bfce7dccbb"/>
+  <!-- Information: platform/external/speex is tagged with A8064AAAAANLYA1334 --><project name="platform/external/speex" path="external/speex" revision="ebe6230a7f7c69f5a4389f2b09b7b19ef9e94f32"/>
+  <project name="platform/external/sqlite" path="external/sqlite" revision="fb30e613139b8836fdc8e81e166cf3a76e5fa17f"/>
+  <!-- Information: platform/external/stlport is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/stlport" path="external/stlport" revision="a6734e0645fce81c9610de0488b729207bfa576e"/>
+  <!-- Information: platform/external/strace is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/strace" path="external/strace" revision="c9fd2e5ef7d002e12e7cf2512506c84a9414b0fd"/>
+  <!-- Information: platform/external/tagsoup is tagged with A8064AAAAANLYA1334 --><project name="platform/external/tagsoup" path="external/tagsoup" revision="68c2ec9e0acdb3214b7fb91dbab8c9fab8736817"/>
+  <!-- Information: platform/external/tinyalsa is tagged with M8960AAAAANLYA1005304 --><project name="platform/external/tinyalsa" path="external/tinyalsa" revision="06cc244ee512c1352215e543615738bc8ac82814"/>
+  <!-- Information: platform/external/tremolo is tagged with A8064AAAAANLYA1334 --><project name="platform/external/tremolo" path="external/tremolo" revision="25bd78d2392dbdc879ae53382cde9d019f79cf6f"/>
+  <project name="unbootimg" path="external/unbootimg" remote="b2g" revision="9464623d92eb8668544916dc5a8f4f6337d0bc08"/>
+  <!-- Information: platform/external/webp is tagged with A8064AAAAANLYA1334 --><project name="platform/external/webp" path="external/webp" revision="88fe2b83c4b9232cd08729556fd0485d6a6a92cd"/>
+  <!-- Information: platform/external/webrtc is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/webrtc" path="external/webrtc" revision="137024dc8a2e9251a471e20518a9c3ae06f81f23"/>
+  <!-- Information: platform/external/wpa_supplicant is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/wpa_supplicant" path="external/wpa_supplicant" revision="a01d37870bbf9892d43e792e5de0683ca41c5497"/>
+  <!-- Information: platform/external/hostap is tagged with M8960AAAAANLYA1047 --><project name="platform/external/hostap" path="external/hostap" revision="bf04b0faadbdeb4b7943f2e2c4c5aa59df872bb1"/>
+  <!-- Information: platform/external/zlib is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/zlib" path="external/zlib" revision="f96a1d1ebfdf1cd582210fd09c23d8f59e0ae094"/>
+  <!-- Information: platform/external/yaffs2 is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/external/yaffs2" path="external/yaffs2" revision="0afa916204c664b3114429637b63af1321a0aeca"/>
+  <!-- Information: platform/frameworks/base is tagged with M76XXUSNEKNLYA2040 --><project name="platform/frameworks/base" path="frameworks/base" revision="eb2bc75803ca179353c24c364a9c8a8ce23e8b78"/>
+  <!-- Information: platform/frameworks/opt/emoji is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="a95d8db002770469d72dfaf59ff37ac96db29a87"/>
+  <!-- Information: platform/frameworks/support is tagged with M8960AAAAANLYA1005304 --><project name="platform/frameworks/support" path="frameworks/support" revision="27208692b001981f1806f4f396434f4eac78b909"/>
+  <!-- Information: platform/hardware/libhardware is tagged with M8960AAAAANLYA1049B --><project name="platform/hardware/libhardware" path="hardware/libhardware" revision="4a619901847621f8a7305edf42dd07347a140484"/>
+  <!-- Information: platform/hardware/libhardware_legacy is tagged with M8960AAAAANLYA153611 --><project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="87b4d7afa8f854b445e2d0d95091f6f6069f2b30"/>
+  <!-- Information: platform/libcore is tagged with M8960AAAAANLYA100715A --><project name="platform/libcore" path="libcore" revision="30841f9fba9ccd5c54f4f079f495994db97f283e"/>
+  <!-- Information: platform/ndk is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/ndk" path="ndk" revision="9f555971e1481854d5b4dc11b3e6af9fff4f241f"/>
+  <!-- Information: platform/prebuilt is tagged with M8960AAAAANLYA1005304 --><project name="platform/prebuilt" path="prebuilt" revision="447ea790fcc957dde59730ecc2a65ca263bdc733"/>
+  <!-- Information: platform/system/bluetooth is tagged with M8960AAAAANLYA100703 --><project name="platform/system/bluetooth" path="system/bluetooth" revision="7772cad4823f1f427ce1d4df84a55982386d6d18"/>
+  <!-- Information: platform/system/core is tagged with M76XXUSNEKNLYA2040 --><project name="platform/system/core" path="system/core" revision="bf1970408676ce570b8f4dc3efa038e47552137f"/>
+  <!-- Information: platform/system/extras is tagged with M8960AAAAANLYA1005304 --><project name="platform/system/extras" path="system/extras" revision="01db6c1254e1407740a543f24317fc540fc4c049"/>
+  <!-- Information: platform/system/media is tagged with M8960AAAAANLYA1005304 --><project name="platform/system/media" path="system/media" revision="7f71c7fd362bbd992ff2e0e80f7af5859ad116ad"/>
+  <!-- Information: platform/system/netd is tagged with M8960AAAAANLYA1049 --><project name="platform/system/netd" path="system/netd" revision="306e765248e3900041bf2737e9f57b1b5694a4ce"/>
+  <!-- Information: platform/system/vold is tagged with M8960AAAAANLYA100715A --><project name="platform/system/vold" path="system/vold" revision="99fff257d53cc045d1460841edca5d901dacfcf5"/>
+
+  <!-- Otoro/Unagi specific things -->
+  <!-- Information: device/qcom/common is tagged with M8960AAAAANLYA100715A --><project name="device/qcom/common" path="device/qcom/common" revision="b9cdab8e1e1a215a8c65b8d5816f666bec7be205"/>
+  <!-- Information: platform/vendor/qcom/msm7627a is tagged with M8960AAAAANLYA100715A --><project name="platform/vendor/qcom/msm7627a" path="device/qcom/msm7627a" revision="d920a502ba17cf4d716f8b1a615f07e796b0501a"/>
+  <project name="android-device-otoro" path="device/qcom/otoro" remote="b2g" revision="e3e99b264dd0230108aa78f2b653db4ce0e494fb"/>
+  <project name="android-device-unagi" path="device/qcom/unagi" remote="b2g" revision="f8ca54267ed2ceabefadf96b6953814ac89c5056"/>
+  <project name="codeaurora_kernel_msm" path="kernel" remote="b2g" revision="0a01247e4b0880f93424b27251cd3a1f6b19dbb2"/>
+  <!-- Information: platform/hardware/qcom/camera is tagged with M76XXUSNEKNLYA2040 --><project name="platform/hardware/qcom/camera" path="hardware/qcom/camera" revision="1acf77a75e30f3fc8b1eed2057c97adf1cb1633f"/>
+  <project name="hardware_qcom_display" path="hardware/qcom/display" remote="b2g" revision="6405d30f2fac7d8a1f2cb17b99fb7dd0a8bcfdac"/>
+  <!-- Information: platform/hardware/qcom/media is tagged with M8960AAAAANLYA100715A --><project name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="552c3ddb7174a01f3508782d40c4d8c845ab441a"/>
+  <!-- Information: platform/hardware/qcom/gps is tagged with M8960AAAAANLYA100705 --><project name="platform/hardware/qcom/gps" path="hardware/qcom/gps" revision="23d5707b320d7fc69f8ba3b7d84d78a1c5681708"/>
+  <!-- Information: platform/hardware/msm7k is tagged with AU_LINUX_GECKO_ICS_STRAWBERRY.01.00.00.19.117 --><project name="platform/hardware/msm7k" path="hardware/msm7k" revision="8892d46805c5639b55dd07547745c5180da861e7"/>
+  <!-- Information: platform/vendor/qcom-opensource/omx/mm-core is tagged with M8960AAAAANLYA100715A --><project name="platform/vendor/qcom-opensource/omx/mm-core" path="vendor/qcom/opensource/omx/mm-core" revision="ab17ac9a074b4bb69986a8436336bdfbbaf9cd39"/>
+  <!-- Information: platform/hardware/ril is tagged with M76XXUSNEKNLYA1610 --><project name="platform/hardware/ril" path="hardware/ril" remote="caf" revision="fe9a3f63922143b57e79ed570bab2328df8c83a5"/>
+</manifest>

From 31cbd69fde645fced3598fd064c21560e10909a7 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Tue, 27 Nov 2012 15:50:43 +0000
Subject: [PATCH 140/160] Backout 66f3565f4817, 131bc42cd637 & 8cdd43b76d19
 (bug 793111) for B2G marionette failures

---
 .../interfaces/nsIDOMMobileConnection.idl     |  12 +-
 .../tests/marionette/test_mobile_iccinfo.js   |  60 +---
 dom/system/gonk/RadioInterfaceLayer.js        |   2 -
 dom/system/gonk/ril_consts.js                 |  11 +-
 dom/system/gonk/ril_worker.js                 | 287 +-----------------
 dom/system/gonk/tests/test_ril_worker_icc.js  |  55 ----
 6 files changed, 8 insertions(+), 419 deletions(-)

diff --git a/dom/network/interfaces/nsIDOMMobileConnection.idl b/dom/network/interfaces/nsIDOMMobileConnection.idl
index ac092b80f958..79424d84dfe4 100644
--- a/dom/network/interfaces/nsIDOMMobileConnection.idl
+++ b/dom/network/interfaces/nsIDOMMobileConnection.idl
@@ -415,7 +415,7 @@ interface nsIDOMMozMobileCellInfo: nsISupports
   readonly attribute unsigned long gsmCellId;
 };
 
-[scriptable, uuid(352e7f1a-c09f-44ed-8fde-a138b09a0ea9)]
+[scriptable, uuid(a71c66ed-dfb0-4c33-9942-049e6f03dbed)]
 interface nsIDOMMozMobileICCInfo : nsISupports
 {
    /**
@@ -438,16 +438,6 @@ interface nsIDOMMozMobileICCInfo : nsISupports
    */
   readonly attribute DOMString spn;
 
-  /**
-   * Network name must be a part of displayed carrier name.
-   */
-  readonly attribute boolean isDisplayNetworkNameRequired;
-
-  /**
-   * Service provider name must be a part of displayed carrier name.
-   */
-  readonly attribute boolean isDisplaySpnRequired;
-
   /**
    * Mobile Station ISDN Number (MSISDN) of the subscriber's, aka
    * his phone number.
diff --git a/dom/network/tests/marionette/test_mobile_iccinfo.js b/dom/network/tests/marionette/test_mobile_iccinfo.js
index f9897f4a45eb..6e027af133c3 100644
--- a/dom/network/tests/marionette/test_mobile_iccinfo.js
+++ b/dom/network/tests/marionette/test_mobile_iccinfo.js
@@ -9,39 +9,6 @@ let connection = navigator.mozMobileConnection;
 ok(connection instanceof MozMobileConnection,
    "connection is instanceof " + connection.constructor);
 
-let emulatorCmdPendingCount = 0;
-function sendEmulatorCommand(cmd, callback) {
-  emulatorCmdPendingCount++;
-  runEmulatorCmd(cmd, function (result) {
-    emulatorCmdPendingCount--;
-    is(result[result.length - 1], "OK");
-    callback(result);
-  });
-}
-
-function setEmulatorMccMnc(mcc, mnc, callback) {
-  let cmd = "operator set 0 Android,Android," + mcc + mnc;
-  sendEmulatorCommand(cmd, function (result) {
-    let re = new RegExp("" + mcc + mnc + "$");
-    ok(result[0].match(re), "MCC/MNC should be changed.");
-    if (callback) {
-      callback();
-    }
-  });
-}
-
-function waitForIccInfoChange(callback) {
-  connection.addEventListener("iccinfochange", function handler() {
-    connection.removeEventListener("iccinfochange", handler);
-    callback();
-  });
-}
-
-function finalize() {
-  SpecialPowers.removePermission("mobileconnection", document);
-  finish();
-}
-
 // The emulator's hard coded iccid value.
 // See it here {B2G_HOME}/external/qemu/telephony/sim_card.c#L299.
 is(connection.iccInfo.iccid, 89014103211118510720);
@@ -55,28 +22,5 @@ is(connection.iccInfo.spn, "Android");
 // See {B2G_HOME}/external/qemu/telephony/sim_card.c, in asimcard_io()
 is(connection.iccInfo.msisdn, "15555215554");
 
-// Test display condition change.
-function testDisplayConditionChange(func, caseArray, oncomplete) {
-  (function do_call(index) {
-    let next = index < (caseArray.length - 1) ? do_call.bind(null, index + 1) : oncomplete;
-    caseArray[index].push(next);
-    func.apply(null, caseArray[index]);
-  })(0);
-}
-
-function testSPN(mcc, mnc, expectedIsDisplayNetworkNameRequired,
-                  expectedIsDisplaySpnRequired, callback) {
-  waitForIccInfoChange(function() {
-    is(connection.iccInfo.isDisplayNetworkNameRequired,
-       expectedIsDisplayNetworkNameRequired);
-    is(connection.iccInfo.isDisplaySpnRequired,
-       expectedIsDisplaySpnRequired);
-    window.setTimeout(callback, 0);
-  });
-  setEmulatorMccMnc(mcc, mnc);
-}
-
-testDisplayConditionChange(testSPN, [
-  [123, 456, false, true], // Not in HPLMN.
-  [310, 260, true, false], // inside HPLMN.
-], finalize);
+SpecialPowers.removePermission("mobileconnection", document);
+finish();
diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index 50714e4a0a36..2c1032336351 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -1497,8 +1497,6 @@ RadioInterfaceLayer.prototype = {
                          oldIcc.mcc != message.mcc || 
                          oldIcc.mnc != message.mnc ||
                          oldIcc.spn != message.spn ||
-                         oldIcc.isDisplayNetworkNameRequired != message.isDisplayNetworkNameRequired ||
-                         oldIcc.isDisplaySpnRequired != message.isDisplaySpnRequired ||
                          oldIcc.msisdn != message.msisdn;
     if (!iccInfoChanged) {
       return;
diff --git a/dom/system/gonk/ril_consts.js b/dom/system/gonk/ril_consts.js
index d29a0e47250d..63e9f2d46b48 100644
--- a/dom/system/gonk/ril_consts.js
+++ b/dom/system/gonk/ril_consts.js
@@ -405,7 +405,6 @@ this.ICC_COMMAND_UPDATE_RECORD = 0xdc;
 this.ICC_EF_ICCID  = 0x2fe2;
 this.ICC_EF_IMG    = 0x4f20;
 this.ICC_EF_PBR    = 0x4f30;
-this.ICC_EF_PLMNsel = 0x6f30; // PLMN for SIM
 this.ICC_EF_SST    = 0x6f38;
 this.ICC_EF_UST    = 0x6f38; // For USIM
 this.ICC_EF_ADN    = 0x6f3a;
@@ -564,10 +563,6 @@ this.COMPREHENSIONTLV_TAG_ICON_ID_LIST = 0x1f;
 this.COMPREHENSIONTLV_TAG_IMMEDIATE_RESPONSE = 0x2b;
 this.COMPREHENSIONTLV_TAG_URL = 0x31;
 
-// Tags for Service Provider Display Information TLV
-this.SPDI_TAG_SPDI = 0xa3;
-this.SPDI_TAG_PLMN_LIST = 0x80;
-
 // Device identifiers, see TS 11.14, clause 12.7
 this.STK_DEVICE_ID_KEYPAD = 0x01;
 this.STK_DEVICE_ID_DISPLAY = 0x02;
@@ -911,8 +906,6 @@ this.GECKO_ICC_SERVICES = {
   sim: {
     ADN: 2,
     FDN: 3,
-    PLMNSEL: 7,
-    SPN: 17,
     SDN: 18,
     DATA_DOWNLOAD_SMS_PP: 26,
     BDN: 31
@@ -921,9 +914,7 @@ this.GECKO_ICC_SERVICES = {
     FDN: 2,
     SDN: 4,
     BDN: 6,
-    SPN: 19,
-    DATA_DOWNLOAD_SMS_PP: 28,
-    SPDI: 51
+    DATA_DOWNLOAD_SMS_PP: 28
   }
 };
 
diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js
index 6300c8856f98..f14099baba2e 100644
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -703,11 +703,6 @@ let RIL = {
     this.IMEISV = null;
     this.SMSC = null;
 
-    /**
-     * ICC information that is not exposed to Gaia.
-     */
-    this.iccInfoPrivate = {};
-
     /**
      * ICC information, such as MSISDN, IMSI, ...etc.
      */
@@ -1176,6 +1171,7 @@ let RIL = {
     this.getIMSI();
     this.getMSISDN();
     this.getAD();
+    this.getSPN();
     this.getSST();
     this.getMBDN();
   },
@@ -1188,86 +1184,6 @@ let RIL = {
     this.sendDOMMessage(this.iccInfo);
   },
 
-  /**
-   * This will compute the spnDisplay field of the network.
-   * See TS 22.101 Annex A and TS 51.011 10.3.11 for details.
-   *
-   * @return True if some of iccInfo is changed in by this function.
-   */
-  updateDisplayCondition: function updateDisplayCondition() {
-    // If EFspn isn't existed in SIM or it haven't been read yet, we should
-    // just set isDisplayNetworkNameRequired = true and
-    // isDisplaySpnRequired = false
-    let iccInfo = this.iccInfo;
-    let iccInfoPriv = this.iccInfoPrivate;
-    let iccSpn = iccInfoPriv.SPN;
-    let origIsDisplayNetworkNameRequired = iccInfo.isDisplayNetworkNameRequired;
-    let origIsDisplaySPNRequired = iccInfo.isDisplaySpnRequired;
-
-    if (!iccSpn) {
-      iccInfo.isDisplayNetworkNameRequired = true;
-      iccInfo.isDisplaySpnRequired = false;
-    } else {
-      let operatorMnc = this.operator.mnc;
-      let operatorMcc = this.operator.mcc;
-
-      // First detect if we are on HPLMN or one of the PLMN
-      // specified by the SIM card.
-      let isOnMatchingPlmn = false;
-
-      // If the current network is the one defined as mcc/mnc
-      // in SIM card, it's okay.
-      if (iccInfo.mcc == operatorMcc && iccInfo.mnc == operatorMnc) {
-        isOnMatchingPlmn = true;
-      }
-
-      // Test to see if operator's mcc/mnc match mcc/mnc of PLMN.
-      if (!isOnMatchingPlmn && iccInfoPriv.PLMN) {
-        let iccPlmn = iccInfoPriv.PLMN; // PLMN list
-        for (let plmn in iccPlmn) {
-          let plmnMcc = iccPlmn[plmn].mcc;
-          let plmnMnc = iccPlmn[plmn].mnc;
-          isOnMatchingPlmn = (plmnMcc == operatorMcc) && (plmnMnc == operatorMnc);
-          if (isOnMatchingPlmn) {
-            break;
-          }
-        }
-      }
-
-      if (isOnMatchingPlmn) {
-        // The first bit of display condition tells us if we should display
-        // registered PLMN.
-        if (DEBUG) debug("updateDisplayCondition: PLMN is HPLMN or PLMN is in PLMN list");
-        if (iccSpn.spnDisplayCondition & 0x01) {
-          iccInfo.isDisplayNetworkNameRequired = true;
-          iccInfo.isDisplaySpnRequired = false;
-        } else {
-          iccInfo.isDisplayNetworkNameRequired = false;
-          iccInfo.isDisplaySpnRequired = false;
-        }
-      } else {
-        // The second bit of display condition tells us if we should display
-        // registered PLMN.
-        if (DEBUG) debug("updateICCDisplayName: PLMN isn't HPLMN and PLMN isn't in PLMN list");
-        if (iccSpn.spnDisplayCondition & 0x02) {
-          iccInfo.isDisplayNetworkNameRequired = false;
-          iccInfo.isDisplaySpnRequired = false;
-        } else {
-          iccInfo.isDisplayNetworkNameRequired = false;
-          iccInfo.isDisplaySpnRequired = true;
-        }
-      }
-    }
-
-    if (DEBUG) {
-      debug("updateDisplayCondition: isDisplayNetworkNameRequired = " + iccInfo.isDisplayNetworkNameRequired);
-      debug("updateDisplayCondition: isDisplaySpnRequired = " + iccInfo.isDisplaySpnRequired);
-    }
-
-    return ((origIsDisplayNetworkNameRequired !== iccInfo.isDisplayNetworkNameRequired) ||
-            (origIsDisplaySPNRequired !== iccInfo.isDisplaySpnRequired));
-  },
-
   /**
    * Get EF_phase.
    * This EF is only available in SIM.
@@ -1429,20 +1345,12 @@ let RIL = {
       // Minus 1 because first is used to store display condition
       let len = (length / 2) - 1;
       let spnDisplayCondition = GsmPDUHelper.readHexOctet();
-      let spn = GsmPDUHelper.readAlphaIdentifier(len);
+      this.iccInfo.spn = GsmPDUHelper.readAlphaIdentifier(len);
       Buf.readStringDelimiter(length);
 
       if (DEBUG) {
-        debug("SPN: spn = " + spn +
-              ", spnDisplayCondition = " + spnDisplayCondition);
+        debug("SPN: spn=" + this.iccInfo.spn + ", spnDisplayCondition=" + spnDisplayCondition);
       }
-
-      this.iccInfoPrivate.SPN = {
-        spn : spn,
-        spnDisplayCondition : spnDisplayCondition,
-      };
-      this.iccInfo.spn = spn;
-      this.updateDisplayCondition();
       this._handleICCInfoChange();
     }
 
@@ -1460,104 +1368,6 @@ let RIL = {
     });
   },
 
-  /**
-   * Read the PLMNsel (Public Land Mobile Network) from the ICC.
-   *
-   * See ETSI TS 100.977 section 10.3.4 EF_PLMNsel
-   */
-  getPLMNSelector: function getPLMNSelector() {
-    function callback() {
-      if (DEBUG) debug("PLMN: [PLMN Selector] Process PLMN Selector");
-
-      let length = Buf.readUint32();
-      this.iccInfoPrivate.PLMN = this.readPLMNEntries(length/6);
-      Buf.readStringDelimiter(length);
-
-      if (DEBUG) debug("PLMN: [PLMN Selector] " + JSON.stringify(this.iccInfoPrivate.PLMN));
-
-      if (this.updateDisplayCondition()) {
-        this._handleICCInfoChange();
-      }
-    }
-
-    // PLMN List is Service 7 in SIM, EF_PLMNsel
-    this.iccIO({
-      command:   ICC_COMMAND_GET_RESPONSE,
-      fileId:    ICC_EF_PLMNsel,
-      pathId:    this._getPathIdForICCRecord(ICC_EF_PLMNsel),
-      p1:        0, // For GET_RESPONSE, p1 = 0
-      p2:        0, // For GET_RESPONSE, p2 = 0
-      p3:        GET_RESPONSE_EF_SIZE_BYTES,
-      data:      null,
-      pin2:      null,
-      type:      EF_TYPE_TRANSPARENT,
-      callback:  callback,
-    });
-  },
-
-  /**
-   * Read the SPDI (Service Provider Display Information) from the ICC.
-   *
-   * See TS 131.102 section 4.2.66
-   */
-  getSPDI: function getSPDI() {
-    function callback() {
-      if (DEBUG) debug("PLMN: [SPDI] Process SPDI callback");
-      let length = Buf.readUint32();
-      let tlvTag;
-      let tlvLen;
-      let readLen = 0;
-      let endLoop = false;
-      this.iccInfoPrivate.PLMN = null;
-      while ((readLen < length) && !endLoop) {
-        tlvTag = GsmPDUHelper.readHexOctet();
-        tlvLen = GsmPDUHelper.readHexOctet();
-        readLen += 2; // For tag and length.
-        switch (tlvTag) {
-        case SPDI_TAG_SPDI:
-          // The value part itself is a TLV.
-          continue;
-        case SPDI_TAG_PLMN_LIST:
-          // This PLMN list is what we want.
-          this.iccInfoPrivate.PLMN = readPLMNEntries(tlvLen/6);
-          readLen += tlvLen;
-          endLoop = true;
-          break;
-        default:
-          // We don't care about its content if its tag is not SPDI nor
-          // PLMN_LIST.
-          GsmPDUHelper.readHexOctetArray(tlvLen);
-          readLen += tlvLen;
-        }
-      }
-
-      // Consume unread octets.
-      if (length - readLen > 0) {
-        GsmPDUHelper.readHexOctetArray(length - readLen);
-      }
-      Buf.readStringDelimiter(length);
-
-      if (DEBUG) debug("PLMN: [SPDI] " + JSON.stringify(this.iccInfoPrivate.PLMN));
-      if (this.updateDisplayCondition()) {
-        this._handleICCInfoChange();
-      }
-    }
-
-    // PLMN List is Servive 51 in USIM, EF_SPDI
-    this.iccIO({
-      command:   ICC_COMMAND_GET_RESPONSE,
-      fileId:    ICC_EF_SPDI,
-      pathId:    this._getPathIdForICCRecord(ICC_EF_SPDI),
-      p1:        0, // For GET_RESPONSE, p1 = 0
-      p2:        0, // For GET_RESPONSE, p2 = 0
-      p3:        GET_RESPONSE_EF_SIZE_BYTES,
-      data:      null,
-      pin2:      null,
-      type:      EF_TYPE_TRANSPARENT,
-      callback:  callback,
-    });
-  },
-
   /**
    * Get whether specificed (U)SIM service is available.
    *
@@ -1638,24 +1448,6 @@ let RIL = {
         }
         debug("SST: " + str);
       }
-
-      // Fetch SPN and PLMN list, if some of them are available.
-      if (this.isICCServiceAvailable("SPN")) {
-        if (DEBUG) debug("SPN: SPN is available");
-        this.getSPN();
-      } else {
-        if (DEBUG) debug("SPN: SPN service is not available");
-      }
-
-      if (this.isICCServiceAvailable("PLMNSEL")) {
-        if (DEBUG) debug("PLMN: PLMNSEL available.");
-        this.getPLMNSelector();
-      } else if (this.isICCServiceAvailable("SPDI")) {
-        if (DEBUG) debug("PLMN: SPDI available.");
-        this.getSPDI();
-      } else {
-        if (DEBUG) debug("PLMN: Both PLMNSEL/SPDI not available");
-      }
     }
 
     // ICC_EF_UST has the same value with ICC_EF_SST.
@@ -1893,73 +1685,6 @@ let RIL = {
     return null;
   },
 
-  /**
-   *  Read the list of PLMN (Public Land Mobile Network) entries
-   *  We cannot directly rely on readSwappedNibbleBcdToString(),
-   *  since it will no correctly handle some corner-cases that are
-   *  not a problem in our case (0xFF 0xFF 0xFF).
-   *
-   *  @param length The number of PLMN records.
-   *  @return An array of string corresponding to the PLMNs.
-   */
-  readPLMNEntries: function readPLMNEntries(length) {
-    let plmnList = [];
-    // each PLMN entry has 3 byte
-    debug("readPLMNEntries: PLMN entries length = " + length);
-    let index = 0;
-    while (index < length) {
-      // Unused entries will be 0xFFFFFF, according to EF_SPDI
-      // specs (TS 131 102, section 4.2.66)
-      try {
-        let plmn = [GsmPDUHelper.readHexOctet(),
-                    GsmPDUHelper.readHexOctet(),
-                    GsmPDUHelper.readHexOctet()];
-        if (DEBUG) debug("readPLMNEntries: Reading PLMN entry: [" + index +
-                         "]: '" + plmn + "'");
-        if (plmn[0] != 0xFF &&
-            plmn[1] != 0xFF &&
-            plmn[2] != 0xFF) {
-          let semiOctets = [];
-          for (let i = 0; i < plmn.length; i++) {
-            semiOctets.push((plmn[idx] & 0xF0) >> 4);
-            semiOctets.push(plmn[idx] & 0x0F);
-          }
-
-          // According to TS 24.301, 9.9.3.12, the semi octets is arranged
-          // in format:
-          // Byte 1: MCC[2] | MCC[1]
-          // Byte 2: MNC[3] | MCC[3]
-          // Byte 3: MNC[2] | MNC[1]
-          // Therefore, we need to rearrage them.
-          let reformat = [semiOctets[1], semiOctets[0], semiOctets[3],
-                          semiOctets[5], semiOctets[4], semiOctets[2]];
-          let buf = "";
-          let plmnEntry = {};
-          for (let i = 0; i < reformat.length; i++) {
-            if (reformat[i] != 0xF) {
-              buf += GsmPDUHelper.semiOctetToBcdChar(reformat[i]);
-            }
-            if (i === 2) {
-              // 0-2: MCC
-              plmnEntry.mcc = parseInt(buf);
-              buf = "";
-            } else if (i === 5) {
-              // 3-5: MNC
-              plmnEntry.mnc = parseInt(buf);
-            }
-          }
-          if (DEBUG) debug("readPLMNEntries: PLMN = " + plmnEntry.mcc + ", " + plmnEntry.mnc);
-          plmnList.push(plmnEntry);
-        }
-      } catch (e) {
-        if (DEBUG) debug("readPLMNEntries: PLMN entry " + index + " is invalid.");
-        break;
-      }
-      index ++;
-    }
-    return plmnList;
-  },
-
   /**
    * Get UICC Phonebook.
    *
@@ -3357,7 +3082,6 @@ let RIL = {
 
           case ICC_EF_AD:
           case ICC_EF_MBDN:
-          case ICC_EF_PLMNsel:
           case ICC_EF_SPN:
           case ICC_EF_SST:
             return EF_PATH_MF_SIM + EF_PATH_DF_GSM;
@@ -3370,7 +3094,6 @@ let RIL = {
           case ICC_EF_UST:
           case ICC_EF_MSISDN:
           case ICC_EF_SPN:
-          case ICC_EF_SPDI:
             return EF_PATH_MF_SIM + EF_PATH_ADF_USIM;
 
           default:
@@ -3715,9 +3438,7 @@ let RIL = {
           debug("Error processing operator tuple: " + e);
         }
       }
-      if (this.updateDisplayCondition()) {
-        this._handleICCInfoChange();
-      }
+
       this._sendNetworkInfoMessage(NETWORK_INFO_OPERATOR, this.operator);
     }
   },
diff --git a/dom/system/gonk/tests/test_ril_worker_icc.js b/dom/system/gonk/tests/test_ril_worker_icc.js
index b33708d27b51..8bc3298394ef 100644
--- a/dom/system/gonk/tests/test_ril_worker_icc.js
+++ b/dom/system/gonk/tests/test_ril_worker_icc.js
@@ -468,58 +468,3 @@ add_test(function test_stk_proactive_command_event_list() {
 
   run_next_test();
 });
-
-add_test(function test_spn_display_condition() {
-  let RIL = newWorker({
-    postRILMessage: function fakePostRILMessage(data) {
-      // Do nothing
-    },
-    postMessage: function fakePostMessage(message) {
-      // Do nothing
-    }
-  }).RIL;
-
-  // Test updateDisplayCondition runs before any of SIM file is ready.
-  do_check_eq(RIL.updateDisplayCondition(), true);
-  do_check_eq(RIL.iccInfo.isDisplayNetworkNameRequired, true);
-  do_check_eq(RIL.iccInfo.isDisplaySpnRequired, false);
-
-  // Test with value.
-  function testDisplayCondition(iccDisplayCondition,
-                                iccMcc, iccMnc, plmnMcc, plmnMnc,
-                                expectedIsDisplayNetworkNameRequired,
-                                expectedIsDisplaySPNRequired,
-                                callback) {
-    RIL.iccInfoPrivate.SPN = {
-      spnDisplayCondition: iccDisplayCondition
-    };
-    RIL.iccInfo = {
-      mcc: iccMcc,
-      mnc: iccMnc
-    };
-    RIL.operator = {
-      mcc: plmnMcc,
-      mnc: plmnMnc
-    };
-
-    do_check_eq(RIL.updateDisplayCondition(), true);
-    do_check_eq(RIL.iccInfo.isDisplayNetworkNameRequired, expectedIsDisplayNetworkNameRequired);
-    do_check_eq(RIL.iccInfo.isDisplaySpnRequired, expectedIsDisplaySPNRequired);
-    do_timeout(0, callback);
-  };
-
-  function testDisplayConditions(func, caseArray, oncomplete) {
-    (function do_call(index) {
-      let next = index < (caseArray.length - 1) ? do_call.bind(null, index + 1) : oncomplete;
-      caseArray[index].push(next);
-      func.apply(null, caseArray[index]);
-    })(0);
-  }
-
-  testDisplayConditions(testDisplayCondition, [
-    [1, 123, 456, 123, 456, true, false],
-    [0, 123, 456, 123, 456, false, false],
-    [2, 123, 456, 123, 457, false, false],
-    [0, 123, 456, 123, 457, false, true],
-  ], run_next_test);
-});
\ No newline at end of file

From 1005290e2e83501f8e61ddbc8f156cb6d60eb357 Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahalberstadt@mozilla.com>
Date: Tue, 27 Nov 2012 11:04:46 -0500
Subject: [PATCH 141/160] Bug 797153 - Remote xpcshell tests shouldn't depend
 on running from within an objdir, r=jgriffin, DONTBUILD a=NPOTB

---
 testing/xpcshell/remotexpcshelltests.py | 74 +++++++++++++++----------
 testing/xpcshell/runtestsb2g.py         | 22 +++++---
 2 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/testing/xpcshell/remotexpcshelltests.py b/testing/xpcshell/remotexpcshelltests.py
index 939599531ec1..7fddb0432ef6 100644
--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -4,12 +4,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/.
 
-import re, sys, os
+import sys, os
 import subprocess
 import runxpcshelltests as xpcshell
 import tempfile
 from automationutils import *
-from mozdevice import devicemanager, devicemanagerADB, devicemanagerSUT
+from mozdevice import devicemanagerADB, devicemanagerSUT
+
+here = os.path.dirname(os.path.abspath(__file__))
 
 # A specialization of XPCShellTests that runs tests on an Android device
 # via devicemanager.
@@ -17,6 +19,8 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
 
     def __init__(self, devmgr, options, args):
         xpcshell.XPCShellTests.__init__(self)
+        self.localLib = None
+        self.localBin = None
         self.options = options
         self.device = devmgr
         self.pathMapping = []
@@ -35,6 +39,15 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         self.remoteDebugger = options.debugger
         self.remoteDebuggerArgs = options.debuggerArgs
         self.testingModulesDir = options.testingModulesDir
+
+        if self.options.objdir:
+          self.xpcDir = os.path.join(self.options.objdir, "_tests/xpcshell")
+        elif os.path.isdir(os.path.join(here, 'tests')):
+          self.xpcDir = os.path.join(here, 'tests')
+        else:
+          print >> sys.stderr, "Couldn't find local xpcshell test directory"
+          sys.exit(1)
+
         if options.setup:
           self.setupUtilities()
           self.setupModules()
@@ -85,55 +98,58 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         remoteFile = self.remoteJoin(self.remoteScriptsDir, "head.js")
         self.device.pushFile(local, remoteFile)
 
-        localBin = os.path.join(self.options.objdir, "dist/bin")
-        if not os.path.exists(localBin):
-          localBin = os.path.join(self.options.objdir, "bin")
-          if not os.path.exists(localBin):
-            print >>sys.stderr, "Error: could not find bin in objdir"
-            sys.exit(1)
+        if not self.localBin:
+          self.localBin = os.path.join(self.options.objdir, "dist/bin")
+          if not os.path.exists(self.localBin):
+            self.localBin = os.path.join(self.options.objdir, "bin")
+            if not os.path.exists(self.localBin):
+              print >>sys.stderr, "Error: could not find bin in objdir"
+              sys.exit(1)
 
-        local = os.path.join(localBin, "xpcshell")
+        local = os.path.join(self.localBin, "xpcshell")
         remoteFile = self.remoteJoin(self.remoteBinDir, "xpcshell")
         self.device.pushFile(local, remoteFile)
 
-        local = os.path.join(localBin, "components/httpd.js")
+        local = os.path.join(self.localBin, "components/httpd.js")
         remoteFile = self.remoteJoin(self.remoteComponentsDir, "httpd.js")
         self.device.pushFile(local, remoteFile)
 
-        local = os.path.join(localBin, "components/httpd.manifest")
+        local = os.path.join(self.localBin, "components/httpd.manifest")
         remoteFile = self.remoteJoin(self.remoteComponentsDir, "httpd.manifest")
         self.device.pushFile(local, remoteFile)
 
-        local = os.path.join(localBin, "components/test_necko.xpt")
+        local = os.path.join(self.localBin, "components/test_necko.xpt")
         remoteFile = self.remoteJoin(self.remoteComponentsDir, "test_necko.xpt")
         self.device.pushFile(local, remoteFile)
 
-        remoteFile = self.remoteJoin(self.remoteBinDir, os.path.basename(self.options.localAPK))
-        self.device.pushFile(self.options.localAPK, remoteFile)
+        if self.options.localAPK:
+          remoteFile = self.remoteJoin(self.remoteBinDir, os.path.basename(self.options.localAPK))
+          self.device.pushFile(self.options.localAPK, remoteFile)
 
         self.pushLibs()
 
     def pushLibs(self):
-        if self.options.localAPK:
-          localLib = os.path.join(self.options.objdir, "dist/fennec")
-          if not os.path.exists(localLib):
-            localLib = os.path.join(self.options.objdir, "fennec/lib")
-            if not os.path.exists(localLib):
-              print >>sys.stderr, "Error: could not find libs in objdir"
-              sys.exit(1)
-        else:
-          localLib = os.path.join(self.options.objdir, 'dist/bin')
+        if not self.localLib:
+          if self.options.localAPK:
+            self.localLib = os.path.join(self.options.objdir, "dist/fennec")
+            if not os.path.exists(self.localLib):
+              self.localLib = os.path.join(self.options.objdir, "fennec/lib")
+              if not os.path.exists(self.localLib):
+                print >>sys.stderr, "Error: could not find libs in objdir"
+                sys.exit(1)
+          else:
+            self.localLib = os.path.join(self.options.objdir, 'dist/bin')
 
-        for file in os.listdir(localLib):
+        for file in os.listdir(self.localLib):
           if (file.endswith(".so")):
             print >> sys.stderr, "Pushing %s.." % file
             if 'libxul' in file:
               print >> sys.stderr, "This is a big file, it could take a while."
             remoteFile = self.remoteJoin(self.remoteBinDir, file)
-            self.device.pushFile(os.path.join(localLib, file), remoteFile)
+            self.device.pushFile(os.path.join(self.localLib, file), remoteFile)
 
         # Additional libraries may be found in a sub-directory such as "lib/armeabi-v7a"
-        localArmLib = os.path.join(localLib, "lib")
+        localArmLib = os.path.join(self.localLib, "lib")
         if os.path.exists(localArmLib):
           for root, dirs, files in os.walk(localArmLib):
             for file in files:
@@ -146,8 +162,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
             self.device.pushDir(self.testingModulesDir, self.remoteModulesDir)
 
     def setupTestDir(self):
-        xpcDir = os.path.join(self.options.objdir, "_tests/xpcshell")
-        self.device.pushDir(xpcDir, self.remoteScriptsDir)
+        self.device.pushDir(self.xpcDir, self.remoteScriptsDir)
 
     def buildTestList(self):
         xpcshell.XPCShellTests.buildTestList(self)
@@ -155,8 +170,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         for test in self.alltests:
           uniqueTestPaths.add(test['here'])
         for testdir in uniqueTestPaths:
-          xpcDir = os.path.join(self.options.objdir, "_tests/xpcshell")
-          abbrevTestDir = os.path.relpath(testdir, xpcDir)
+          abbrevTestDir = os.path.relpath(testdir, self.xpcDir)
           remoteScriptDir = self.remoteJoin(self.remoteScriptsDir, abbrevTestDir)
           self.pathMapping.append(PathMapping(testdir, remoteScriptDir))
 
diff --git a/testing/xpcshell/runtestsb2g.py b/testing/xpcshell/runtestsb2g.py
index 4bab4db3249a..993960870b80 100644
--- a/testing/xpcshell/runtestsb2g.py
+++ b/testing/xpcshell/runtestsb2g.py
@@ -6,6 +6,8 @@
 
 import sys
 import os
+sys.path.insert(0, os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0]))))
+
 import traceback
 from remotexpcshelltests import XPCShellRemote, RemoteXPCShellOptions
 from automationutils import *
@@ -13,7 +15,6 @@ from mozdevice import devicemanagerADB
 
 DEVICE_TEST_ROOT = '/data/local/tests'
 
-sys.path.insert(0, os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0]))))
 
 from marionette import Marionette
 
@@ -22,6 +23,10 @@ class B2GXPCShellRemote(XPCShellRemote):
 
     # Overridden
     def setupUtilities(self):
+        if self.options.xrePath:
+            self.localLib = self.options.xrePath
+            self.localBin = self.options.xrePath
+
         if self.options.clean:
             # Ensure a fresh directory structure for our tests
             self.clean()
@@ -115,12 +120,11 @@ def main():
     parser = B2GOptions()
     options, args = parser.parse_args()
 
-    if options.objdir is None:
-        try:
-            options.objdir = os.path.join(options.b2g_path, 'objdir-gecko')
-        except:
-            print >> sys.stderr, "Need to specify a --b2gpath"
-            sys.exit(1)
+    if options.b2g_path is None:
+        parser.error("Need to specify a --b2gpath")
+
+    if options.xrePath is None:
+        parser.error("Need to specify a --xre-path")
 
     # Create the Marionette instance
     kwargs = {}
@@ -162,8 +166,8 @@ def main():
 
 
 # You usually run this like :
-# python runtestsb2g.py --emulator arm --b2gpath $B2GPATH --manifest $MANIFEST [--objdir $OBJDIR
-#                                                                               --adbpath $ADBPATH
+# python runtestsb2g.py --emulator arm --b2gpath $B2GPATH --manifest $MANIFEST [--xre-path $MOZ_HOST_BIN
+#                                                                               --adbpath $ADB_PATH
 #                                                                               ...]
 #
 # For xUnit output you should also pass in --tests-root-dir ..objdir-gecko/_tests

From 51bebb457c374d25f6a67b2b7f1d2cbabe3f01f0 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Tue, 27 Nov 2012 17:06:17 +0100
Subject: [PATCH 142/160] Bug 814264 - bug 795065 broke calling openUILink
 without an event parameter. r=gavin

---
 browser/base/content/test/Makefile.in         |  1 +
 .../content/test/browser_utilityOverlay.js    | 67 +++++++++++++------
 browser/base/content/utilityOverlay.js        |  9 ++-
 3 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index c8735d595d29..707368f5610b 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -272,6 +272,7 @@ _BROWSER_FILES = \
                  browser_bug812562.js \
                  blockPluginVulnerableUpdatable.xml \
                  blockPluginVulnerableNoUpdate.xml \
+                 browser_utilityOverlay.js \
                  browser_social.js \
                  browser_social_toolbar.js \
                  browser_social_shareButton.js \
diff --git a/browser/base/content/test/browser_utilityOverlay.js b/browser/base/content/test/browser_utilityOverlay.js
index fd426568ef8f..a3d909eb7745 100644
--- a/browser/base/content/test/browser_utilityOverlay.js
+++ b/browser/base/content/test/browser_utilityOverlay.js
@@ -1,35 +1,62 @@
-var gTestTab;
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ *  License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-function test() {
+const gTests = [
+  test_getTopWin,
+  test_getBoolPref,
+  test_openNewTabWith,
+  test_openUILink
+];
+
+function test () {
   waitForExplicitFinish();
+  executeSoon(runNextTest);
+}
 
+function runNextTest() {
+  if (gTests.length) {
+    let testFun = gTests.shift();
+    info("Running " + testFun.name);
+    testFun()
+  }
+  else {
+    finish();
+  }
+}
+
+function test_getTopWin() {
   is(getTopWin(), window, "got top window");
+  runNextTest();
+}
+
+
+function test_getBoolPref() {
   is(getBoolPref("browser.search.openintab", false), false, "getBoolPref");
   is(getBoolPref("this.pref.doesnt.exist", true), true, "getBoolPref fallback");
   is(getBoolPref("this.pref.doesnt.exist", false), false, "getBoolPref fallback #2");
+  runNextTest();
+}
 
-
-  gTestTab = openNewTabWith("http://example.com");
-  gBrowser.selectedTab = gTestTab;
-  gTestTab.linkedBrowser.addEventListener("load", function () {
-    gTestTab.linkedBrowser.removeEventListener("load", arguments.callee, true);
-
-    is(gTestTab.linkedBrowser.currentURI.spec, "http://example.com/", "example.com loaded");
-
-    test_openUILink();
+function test_openNewTabWith() {
+  openNewTabWith("http://example.com/");
+  let tab = gBrowser.selectedTab = gBrowser.tabs[1];
+  tab.linkedBrowser.addEventListener("load", function onLoad(event) {
+    tab.linkedBrowser.removeEventListener("load", onLoad, true);
+    is(tab.linkedBrowser.currentURI.spec, "http://example.com/", "example.com loaded");
+    gBrowser.removeCurrentTab();
+    runNextTest();
   }, true);
 }
 
 function test_openUILink() {
-  gTestTab.linkedBrowser.addEventListener("load", function () {
-    gTestTab.linkedBrowser.removeEventListener("load", arguments.callee, true);
-
-    is(gTestTab.linkedBrowser.currentURI.spec, "http://example.org/", "example.org loaded");
-
-    gBrowser.removeTab(gTestTab);
-    finish();
+  let tab = gBrowser.selectedTab = gBrowser.addTab("about:blank");
+  tab.linkedBrowser.addEventListener("load", function onLoad(event) {
+    tab.linkedBrowser.removeEventListener("load", onLoad, true);
+    is(tab.linkedBrowser.currentURI.spec, "http://example.org/", "example.org loaded");
+    gBrowser.removeCurrentTab();
+    runNextTest();
   }, true);
 
-  //openUILink(url, e, ignoreButton, ignoreAlt, allowKeywordFixup, postData, referrerUrl);
-  openUILink("http://example.org"); // defaults to "current"
+  openUILink("http://example.org/"); // defaults to "current"
 }
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index 44f8869b5189..47996aa98a22 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -106,7 +106,7 @@ function openUILink(url, event, aIgnoreButton, aIgnoreAlt, aAllowThirdPartyFixup
       allowThirdPartyFixup: aAllowThirdPartyFixup,
       postData: aPostData,
       referrerURI: aReferrerURI,
-      initiatingDoc: event.target.ownerDocument
+      initiatingDoc: event ? event.target.ownerDocument : null
     };
   }
 
@@ -224,6 +224,13 @@ function openLinkIn(url, where, params) {
   var aInitiatingDoc        = params.initiatingDoc;
 
   if (where == "save") {
+    if (!aInitiatingDoc) {
+      Components.utils.reportError(
+        "OpenLinkIn has been invoked without an initiating document.\n" +
+        "This may be caused by an add-on miscalling into it, or overriding " +
+        "some utilityOverlay.js methods.  See bug 814264 for details.");
+      return;
+    }
     saveURL(url, null, null, true, null, aReferrerURI, aInitiatingDoc);
     return;
   }

From b7e39ca5388f63309f7dee3b05440d95c610c5fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Tue, 27 Nov 2012 08:40:18 -0800
Subject: [PATCH 143/160] Bug 815561 - Limit Web Activities to the foreground
 application [r=sicking]

---
 dom/activities/src/Activity.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dom/activities/src/Activity.cpp b/dom/activities/src/Activity.cpp
index 240fc33e7cca..b4f2faa31651 100644
--- a/dom/activities/src/Activity.cpp
+++ b/dom/activities/src/Activity.cpp
@@ -6,7 +6,7 @@
 #include "nsDOMClassInfo.h"
 #include "nsContentUtils.h"
 #include "nsIDOMActivityOptions.h"
-#include "nsEventStateManager.h"
+#include "nsIDocShell.h"
 #include "nsIConsoleService.h"
 
 using namespace mozilla::dom;
@@ -53,9 +53,12 @@ Activity::Initialize(nsISupports* aOwner,
 
   Init(window);
 
-  nsCOMPtr<nsIDocument> document = do_QueryInterface(window->GetExtantDocument());
+  nsCOMPtr<nsIDocument> document = do_QueryInterface(window->GetExtantDoc());
 
-  if (!nsEventStateManager::IsHandlingUserInput() &&
+  bool isActive;
+  window->GetDocShell()->GetIsActive(&isActive);
+
+  if (!isActive &&
       !nsContentUtils::IsChromeDoc(document)) {
     nsCOMPtr<nsIDOMRequestService> rs =
       do_GetService("@mozilla.org/dom/dom-request-service;1");

From 747dd4e1aaa3ac93b00ef783210b4be70723a572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Tue, 27 Nov 2012 08:40:18 -0800
Subject: [PATCH 144/160] Bug 815198 - [Webapps] Webapps.download should call
 Webapps.applyDownload when installState is 'pending' [r=ferjm]

---
 dom/apps/src/Webapps.jsm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dom/apps/src/Webapps.jsm b/dom/apps/src/Webapps.jsm
index 36bff69b34cf..6a4f6368a2a5 100644
--- a/dom/apps/src/Webapps.jsm
+++ b/dom/apps/src/Webapps.jsm
@@ -20,7 +20,7 @@ Cu.import("resource://gre/modules/PermissionsInstaller.jsm");
 Cu.import("resource://gre/modules/OfflineCacheInstaller.jsm");
 
 function debug(aMsg) {
-  dump("-*-*- Webapps.jsm : " + aMsg + "\n");
+  //dump("-*-*- Webapps.jsm : " + aMsg + "\n");
 }
 
 const WEBAPP_RUNTIME = Services.appinfo.ID == "webapprt@mozilla.org";
@@ -840,6 +840,10 @@ this.DOMApplicationRegistry = {
                                                       manifestURL: aManifestURL,
                                                       app: app,
                                                       manifest: aManifest });
+            if (app.installState == "pending") {
+              // We restarted a failed download, apply it automatically.
+              DOMApplicationRegistry.applyDownload(aManifestURL);
+            }
           });
         });
     }).bind(this));

From 030637786285a71194ad84090f7f1070900a5276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Tue, 27 Nov 2012 08:40:18 -0800
Subject: [PATCH 145/160] bug 815145 - Remove the JS REPL from shell.js
 [r=vingtetun]

---
 b2g/app/b2g.js              |  4 ---
 b2g/chrome/content/shell.js | 51 -------------------------------------
 2 files changed, 55 deletions(-)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 26a06cee6e14..0d8e4f2f83a5 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -414,10 +414,6 @@ pref("dom.mozTCPSocket.enabled", true);
 // by bug 710563.
 pref("layout.frame_rate.precise", true);
 
-// Temporary remote js console hack
-pref("b2g.remote-js.enabled", true);
-pref("b2g.remote-js.port", 9999);
-
 // Handle hardware buttons in the b2g chrome package
 pref("b2g.keys.menu.enabled", true);
 
diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js
index 10af0c02a0d9..46e84d2ee763 100644
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -561,57 +561,6 @@ Services.obs.addObserver(function onBluetoothVolumeChange(subject, topic, data)
   });
 }, 'bluetooth-volume-change', false);
 
-(function Repl() {
-  if (!Services.prefs.getBoolPref('b2g.remote-js.enabled')) {
-    return;
-  }
-  const prompt = 'JS> ';
-  let output;
-  let reader = {
-    onInputStreamReady : function repl_readInput(input) {
-      let sin = Cc['@mozilla.org/scriptableinputstream;1']
-                  .createInstance(Ci.nsIScriptableInputStream);
-      sin.init(input);
-      try {
-        let val = eval(sin.read(sin.available()));
-        let ret = (typeof val === 'undefined') ? 'undefined\n' : val + '\n';
-        output.write(ret, ret.length);
-        // TODO: check if socket has been closed
-      } catch (e) {
-        if (e.result === Cr.NS_BASE_STREAM_CLOSED ||
-            (typeof e === 'object' && e.result === Cr.NS_BASE_STREAM_CLOSED)) {
-          return;
-        }
-        let message = (typeof e === 'object') ? e.message + '\n' : e + '\n';
-        output.write(message, message.length);
-      }
-      output.write(prompt, prompt.length);
-      input.asyncWait(reader, 0, 0, Services.tm.mainThread);
-    }
-  }
-  let listener = {
-    onSocketAccepted: function repl_acceptConnection(serverSocket, clientSocket) {
-      dump('Accepted connection on ' + clientSocket.host + '\n');
-      let input = clientSocket.openInputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0)
-                              .QueryInterface(Ci.nsIAsyncInputStream);
-      output = clientSocket.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0);
-      output.write(prompt, prompt.length);
-      input.asyncWait(reader, 0, 0, Services.tm.mainThread);
-    },
-    onStopListening: function repl_onStopListening() {
-      if (output) {
-        output.close();
-      }
-    }
-  }
-  let serverPort = Services.prefs.getIntPref('b2g.remote-js.port');
-  let serverSocket = Cc['@mozilla.org/network/server-socket;1']
-                       .createInstance(Ci.nsIServerSocket);
-  serverSocket.init(serverPort, true, -1);
-  dump('Opened socket on ' + serverSocket.port + '\n');
-  serverSocket.asyncListen(listener);
-})();
-
 var CustomEventManager = {
   init: function custevt_init() {
     window.addEventListener("ContentStart", (function(evt) {

From b20dd8a90e450a8ff3cb2c0502ad47d52f2f1d50 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Tue, 27 Nov 2012 17:34:42 +0000
Subject: [PATCH 146/160] Backout fae627fef335 (bug 795065) for browser-chrome
 failures

---
 browser/base/content/test/Makefile.in         |  1 -
 .../content/test/browser_utilityOverlay.js    | 67 ++++++-------------
 browser/base/content/utilityOverlay.js        |  9 +--
 3 files changed, 21 insertions(+), 56 deletions(-)

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 707368f5610b..c8735d595d29 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -272,7 +272,6 @@ _BROWSER_FILES = \
                  browser_bug812562.js \
                  blockPluginVulnerableUpdatable.xml \
                  blockPluginVulnerableNoUpdate.xml \
-                 browser_utilityOverlay.js \
                  browser_social.js \
                  browser_social_toolbar.js \
                  browser_social_shareButton.js \
diff --git a/browser/base/content/test/browser_utilityOverlay.js b/browser/base/content/test/browser_utilityOverlay.js
index a3d909eb7745..fd426568ef8f 100644
--- a/browser/base/content/test/browser_utilityOverlay.js
+++ b/browser/base/content/test/browser_utilityOverlay.js
@@ -1,62 +1,35 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- *  License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+var gTestTab;
 
-const gTests = [
-  test_getTopWin,
-  test_getBoolPref,
-  test_openNewTabWith,
-  test_openUILink
-];
-
-function test () {
+function test() {
   waitForExplicitFinish();
-  executeSoon(runNextTest);
-}
 
-function runNextTest() {
-  if (gTests.length) {
-    let testFun = gTests.shift();
-    info("Running " + testFun.name);
-    testFun()
-  }
-  else {
-    finish();
-  }
-}
-
-function test_getTopWin() {
   is(getTopWin(), window, "got top window");
-  runNextTest();
-}
-
-
-function test_getBoolPref() {
   is(getBoolPref("browser.search.openintab", false), false, "getBoolPref");
   is(getBoolPref("this.pref.doesnt.exist", true), true, "getBoolPref fallback");
   is(getBoolPref("this.pref.doesnt.exist", false), false, "getBoolPref fallback #2");
-  runNextTest();
-}
 
-function test_openNewTabWith() {
-  openNewTabWith("http://example.com/");
-  let tab = gBrowser.selectedTab = gBrowser.tabs[1];
-  tab.linkedBrowser.addEventListener("load", function onLoad(event) {
-    tab.linkedBrowser.removeEventListener("load", onLoad, true);
-    is(tab.linkedBrowser.currentURI.spec, "http://example.com/", "example.com loaded");
-    gBrowser.removeCurrentTab();
-    runNextTest();
+
+  gTestTab = openNewTabWith("http://example.com");
+  gBrowser.selectedTab = gTestTab;
+  gTestTab.linkedBrowser.addEventListener("load", function () {
+    gTestTab.linkedBrowser.removeEventListener("load", arguments.callee, true);
+
+    is(gTestTab.linkedBrowser.currentURI.spec, "http://example.com/", "example.com loaded");
+
+    test_openUILink();
   }, true);
 }
 
 function test_openUILink() {
-  let tab = gBrowser.selectedTab = gBrowser.addTab("about:blank");
-  tab.linkedBrowser.addEventListener("load", function onLoad(event) {
-    tab.linkedBrowser.removeEventListener("load", onLoad, true);
-    is(tab.linkedBrowser.currentURI.spec, "http://example.org/", "example.org loaded");
-    gBrowser.removeCurrentTab();
-    runNextTest();
+  gTestTab.linkedBrowser.addEventListener("load", function () {
+    gTestTab.linkedBrowser.removeEventListener("load", arguments.callee, true);
+
+    is(gTestTab.linkedBrowser.currentURI.spec, "http://example.org/", "example.org loaded");
+
+    gBrowser.removeTab(gTestTab);
+    finish();
   }, true);
 
-  openUILink("http://example.org/"); // defaults to "current"
+  //openUILink(url, e, ignoreButton, ignoreAlt, allowKeywordFixup, postData, referrerUrl);
+  openUILink("http://example.org"); // defaults to "current"
 }
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index 47996aa98a22..44f8869b5189 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -106,7 +106,7 @@ function openUILink(url, event, aIgnoreButton, aIgnoreAlt, aAllowThirdPartyFixup
       allowThirdPartyFixup: aAllowThirdPartyFixup,
       postData: aPostData,
       referrerURI: aReferrerURI,
-      initiatingDoc: event ? event.target.ownerDocument : null
+      initiatingDoc: event.target.ownerDocument
     };
   }
 
@@ -224,13 +224,6 @@ function openLinkIn(url, where, params) {
   var aInitiatingDoc        = params.initiatingDoc;
 
   if (where == "save") {
-    if (!aInitiatingDoc) {
-      Components.utils.reportError(
-        "OpenLinkIn has been invoked without an initiating document.\n" +
-        "This may be caused by an add-on miscalling into it, or overriding " +
-        "some utilityOverlay.js methods.  See bug 814264 for details.");
-      return;
-    }
     saveURL(url, null, null, true, null, aReferrerURI, aInitiatingDoc);
     return;
   }

From 60dbdd1f7f74b9a8b1d07f0ca1d59e922f788fd5 Mon Sep 17 00:00:00 2001
From: Marshall Culpepper <marshall@mozilla.com>
Date: Tue, 27 Nov 2012 11:53:17 -0600
Subject: [PATCH 147/160] Bug 809974: Set the last update installed time for
 B2G. r=fabrice

---
 b2g/components/UpdatePrompt.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/b2g/components/UpdatePrompt.js b/b2g/components/UpdatePrompt.js
index dec50c50bbf3..869af43af848 100644
--- a/b2g/components/UpdatePrompt.js
+++ b/b2g/components/UpdatePrompt.js
@@ -152,7 +152,10 @@ UpdatePrompt.prototype = {
   },
 
   showUpdateHistory: function UP_showUpdateHistory(aParent) { },
-  showUpdateInstalled: function UP_showUpdateInstalled() { },
+  showUpdateInstalled: function UP_showUpdateInstalled() {
+    let lock = Services.settings.createLock();
+    lock.set("deviceinfo.last_updated", Date.now(), null, null);
+  },
 
   // Custom functions
 

From df08f8d094b1db74bf4bd44fb78de865b5f7813e Mon Sep 17 00:00:00 2001
From: David Keeler <dkeeler@mozilla.com>
Date: Tue, 27 Nov 2012 10:09:10 -0800
Subject: [PATCH 148/160] bug 746374 - differentiate click-to-play plugin
 permissions by type and vulnerability status r=jaws r=joshmoz

---
 browser/base/content/browser-plugins.js       |  54 +++--
 .../test/browser_pluginnotification.js        | 188 +++++++++++++++++-
 content/base/src/nsObjectLoadingContent.cpp   |   5 +-
 dom/plugins/base/nsIPluginHost.idl            |   4 +-
 dom/plugins/base/nsPluginHost.cpp             |  25 +++
 5 files changed, 258 insertions(+), 18 deletions(-)

diff --git a/browser/base/content/browser-plugins.js b/browser/base/content/browser-plugins.js
index 0c5c0dc56ce8..2212f4096f52 100644
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -238,7 +238,16 @@ var gPluginHandler = {
   },
 
   canActivatePlugin: function PH_canActivatePlugin(objLoadingContent) {
+    let pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
+    let pluginPermission = Ci.nsIPermissionManager.UNKNOWN_ACTION;
+    if (objLoadingContent.actualType) {
+      let permissionString = pluginHost.getPermissionStringForType(objLoadingContent.actualType);
+      let browser = gBrowser.getBrowserForDocument(objLoadingContent.ownerDocument.defaultView.top.document);
+      pluginPermission = Services.perms.testPermission(browser.currentURI, permissionString);
+    }
+
     return !objLoadingContent.activated &&
+           pluginPermission != Ci.nsIPermissionManager.DENY_ACTION &&
            objLoadingContent.pluginFallbackType !== Ci.nsIObjectLoadingContent.PLUGIN_PLAY_PREVIEW;
   },
 
@@ -351,19 +360,26 @@ var gPluginHandler = {
   _handleClickToPlayEvent: function PH_handleClickToPlayEvent(aPlugin) {
     let doc = aPlugin.ownerDocument;
     let browser = gBrowser.getBrowserForDocument(doc.defaultView.top.document);
-    let pluginsPermission = Services.perms.testPermission(browser.currentURI, "plugins");
+    let pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
+    let pluginPermission = Ci.nsIPermissionManager.UNKNOWN_ACTION;
+    let objLoadingContent = aPlugin.QueryInterface(Ci.nsIObjectLoadingContent);
+    if (objLoadingContent.actualType) {
+      let permissionString = pluginHost.getPermissionStringForType(objLoadingContent.actualType);
+      pluginPermission = Services.perms.testPermission(browser.currentURI, permissionString);
+    }
     let overlay = doc.getAnonymousElementByAttribute(aPlugin, "class", "mainBox");
 
-    if (browser._clickToPlayPluginsActivated) {
-      let objLoadingContent = aPlugin.QueryInterface(Ci.nsIObjectLoadingContent);
-      objLoadingContent.playPlugin();
-      return;
-    } else if (pluginsPermission == Ci.nsIPermissionManager.DENY_ACTION) {
+    if (pluginPermission == Ci.nsIPermissionManager.DENY_ACTION) {
       if (overlay)
         overlay.style.visibility = "hidden";
       return;
     }
 
+    if (browser._clickToPlayPluginsActivated) {
+      objLoadingContent.playPlugin();
+      return;
+    }
+
     if (overlay) {
       overlay.addEventListener("click", function(aEvent) {
         // Have to check that the target is not the link to update the plugin
@@ -417,10 +433,6 @@ var gPluginHandler = {
 
   reshowClickToPlayNotification: function PH_reshowClickToPlayNotification() {
     let browser = gBrowser.selectedBrowser;
-    let pluginsPermission = Services.perms.testPermission(browser.currentURI, "plugins");
-    if (pluginsPermission == Ci.nsIPermissionManager.DENY_ACTION)
-      return;
-
     if (gPluginHandler._pluginNeedsActivationExceptThese([]))
       gPluginHandler._showClickToPlayNotification(browser);
   },
@@ -513,7 +525,19 @@ var gPluginHandler = {
     }
 
     return centerActions;
-   },
+  },
+
+  _setPermissionForPlugins: function PH_setPermissionForPlugins(aBrowser, aPermission, aPluginList) {
+    let pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
+    for (let plugin of aPluginList) {
+      let objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
+      if (gPluginHandler.canActivatePlugin(objLoadingContent) &&
+          objLoadingContent.actualType) {
+        let permissionString = pluginHost.getPermissionStringForType(objLoadingContent.actualType);
+        Services.perms.add(aBrowser.currentURI, permissionString, aPermission);
+      }
+    }
+  },
 
   _showClickToPlayNotification: function PH_showClickToPlayNotification(aBrowser) {
     aBrowser._clickToPlayDoorhangerShown = true;
@@ -541,14 +565,14 @@ var gPluginHandler = {
       label: gNavigatorBundle.getString("activatePluginsMessage.always"),
       accessKey: gNavigatorBundle.getString("activatePluginsMessage.always.accesskey"),
       callback: function () {
-        Services.perms.add(aBrowser.currentURI, "plugins", Ci.nsIPermissionManager.ALLOW_ACTION);
+        gPluginHandler._setPermissionForPlugins(aBrowser, Ci.nsIPermissionManager.ALLOW_ACTION, cwu.plugins);
         gPluginHandler.activatePlugins(contentWindow);
       }
     },{
       label: gNavigatorBundle.getString("activatePluginsMessage.never"),
       accessKey: gNavigatorBundle.getString("activatePluginsMessage.never.accesskey"),
       callback: function () {
-        Services.perms.add(aBrowser.currentURI, "plugins", Ci.nsIPermissionManager.DENY_ACTION);
+        gPluginHandler._setPermissionForPlugins(aBrowser, Ci.nsIPermissionManager.DENY_ACTION, cwu.plugins);
         let notification = PopupNotifications.getNotification("click-to-play-plugins", aBrowser);
         if (notification)
           notification.remove();
@@ -567,7 +591,9 @@ var gPluginHandler = {
                             .getInterface(Ci.nsIDOMWindowUtils);
     for (let plugin of cwu.plugins) {
       let overlay = doc.getAnonymousElementByAttribute(plugin, "class", "mainBox");
-      overlay.style.visibility = "hidden";
+      // for already activated plugins, there will be no overlay
+      if (overlay)
+        overlay.style.visibility = "hidden";
     }
   },
 
diff --git a/browser/base/content/test/browser_pluginnotification.js b/browser/base/content/test/browser_pluginnotification.js
index 1692218532cc..20ca10ec6d49 100644
--- a/browser/base/content/test/browser_pluginnotification.js
+++ b/browser/base/content/test/browser_pluginnotification.js
@@ -402,9 +402,26 @@ function test12c() {
   var objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
   ok(objLoadingContent.activated, "Test 12c, Plugin should be activated");
 
+  prepareTest(test12d, gHttpTestRoot + "plugin_two_types.html");
+}
+
+// Test that the "Always" permission, when set for just the Test plugin,
+// does not also allow the Second Test plugin.
+function test12d() {
+  var popupNotification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  ok(popupNotification, "Test 12d, Should have a click-to-play notification");
+  var test = gTestBrowser.contentDocument.getElementById("test");
+  var secondtestA = gTestBrowser.contentDocument.getElementById("secondtestA");
+  var secondtestB = gTestBrowser.contentDocument.getElementById("secondtestB");
+  var objLoadingContent = test.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(objLoadingContent.activated, "Test 12d, Test plugin should be activated");
+  var objLoadingContent = secondtestA.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(!objLoadingContent.activated, "Test 12d, Second Test plugin (A) should not be activated");
+  var objLoadingContent = secondtestB.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(!objLoadingContent.activated, "Test 12d, Second Test plugin (B) should not be activated");
+
   Services.perms.removeAll();
-  gNextTest = test13a;
-  gTestBrowser.reload();
+  prepareTest(test13a, gHttpTestRoot + "plugin_clickToPlayDeny.html");
 }
 
 // Tests that the "Deny Always" permission works for click-to-play plugins (part 1/3)
@@ -444,6 +461,55 @@ function test13c() {
   var overlay = gTestBrowser.contentDocument.getAnonymousElementByAttribute(plugin, "class", "mainBox");
   ok(overlay.style.visibility == "hidden", "Test 13c, Plugin should not have visible overlay");
 
+  prepareTest(test13d, gHttpTestRoot + "plugin_two_types.html");
+}
+
+// Test that the "Deny Always" permission, when set for just the Test plugin,
+// does not also block the Second Test plugin (i.e. it gets an overlay and
+// there's a notification and everything).
+function test13d() {
+  var popupNotification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  ok(popupNotification, "Test 13d, Should have a click-to-play notification");
+
+  var test = gTestBrowser.contentDocument.getElementById("test");
+  var objLoadingContent = test.QueryInterface(Ci.nsIObjectLoadingContent);
+  var overlay = gTestBrowser.contentDocument.getAnonymousElementByAttribute(test, "class", "mainBox");
+  ok(overlay.style.visibility == "hidden", "Test 13d, Test plugin should not have visible overlay");
+  ok(!objLoadingContent.activated, "Test 13d, Test plugin should not be activated");
+
+  var secondtestA = gTestBrowser.contentDocument.getElementById("secondtestA");
+  var objLoadingContent = secondtestA.QueryInterface(Ci.nsIObjectLoadingContent);
+  var overlay = gTestBrowser.contentDocument.getAnonymousElementByAttribute(secondtestA, "class", "mainBox");
+  ok(overlay.style.visibility != "hidden", "Test 13d, Test plugin should have visible overlay");
+  ok(!objLoadingContent.activated, "Test 13d, Second Test plugin (A) should not be activated");
+
+  var secondtestB = gTestBrowser.contentDocument.getElementById("secondtestB");
+  var objLoadingContent = secondtestB.QueryInterface(Ci.nsIObjectLoadingContent);
+  var overlay = gTestBrowser.contentDocument.getAnonymousElementByAttribute(secondtestB, "class", "mainBox");
+  ok(overlay.style.visibility != "hidden", "Test 13d, Test plugin should have visible overlay");
+  ok(!objLoadingContent.activated, "Test 13d, Second Test plugin (B) should not be activated");
+
+  var condition = function() objLoadingContent.activated;
+  // "click" "Activate All Plugins"
+  popupNotification.mainAction.callback();
+  waitForCondition(condition, test13e, "Test 13d, Waited too long for plugin to activate");
+}
+
+// Test that clicking "Activate All Plugins" won't activate plugins that
+// have previously been "Deny Always"-ed.
+function test13e() {
+  var test = gTestBrowser.contentDocument.getElementById("test");
+  var objLoadingContent = test.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(!objLoadingContent.activated, "Test 13e, Test plugin should not be activated");
+
+  var secondtestA = gTestBrowser.contentDocument.getElementById("secondtestA");
+  var objLoadingContent = secondtestA.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(objLoadingContent.activated, "Test 13e, Second Test plugin (A) should be activated");
+
+  var secondtestB = gTestBrowser.contentDocument.getElementById("secondtestB");
+  var objLoadingContent = secondtestB.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(objLoadingContent.activated, "Test 13e, Second Test plugin (B) should be activated");
+
   Services.perms.removeAll();
   Services.prefs.setBoolPref("plugins.click_to_play", false);
   prepareTest(test14, gTestRoot + "plugin_test2.html");
@@ -932,5 +998,123 @@ function test23() {
   is(objLoadingContent.pluginFallbackType, Ci.nsIObjectLoadingContent.PLUGIN_CLICK_TO_PLAY, "Test 23, Plugin should be click-to-play");
   ok(!pluginNode.activated, "Test 23, plugin node should not be activated");
 
+  prepareTest(test24a, gHttpTestRoot + "plugin_test.html");
+}
+
+// Test that "always allow"-ing a plugin will not allow it when it becomes
+// blocklisted.
+function test24a() {
+  var notification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  ok(notification, "Test 24a, Should have a click-to-play notification");
+  var plugin = gTestBrowser.contentDocument.getElementById("test");
+  ok(plugin, "Test 24a, Found plugin in page");
+  var objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
+  is(objLoadingContent.pluginFallbackType, Ci.nsIObjectLoadingContent.PLUGIN_CLICK_TO_PLAY, "Test 24a, Plugin should be click-to-play");
+  ok(!objLoadingContent.activated, "Test 24a, plugin should not be activated");
+
+  // simulate "always allow"
+  notification.secondaryActions[0].callback();
+  prepareTest(test24b, gHttpTestRoot + "plugin_test.html");
+}
+
+// did the "always allow" work as intended?
+function test24b() {
+  var notification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  ok(!notification, "Test 24b, Should not have a click-to-play notification");
+  var plugin = gTestBrowser.contentDocument.getElementById("test");
+  ok(plugin, "Test 24b, Found plugin in page");
+  var objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(objLoadingContent.activated, "Test 24b, plugin should be activated");
+  setAndUpdateBlocklist(gHttpTestRoot + "blockPluginVulnerableUpdatable.xml",
+  function() {
+    prepareTest(test24c, gHttpTestRoot + "plugin_test.html");
+  });
+}
+
+// the plugin is now blocklisted, so it should not automatically load
+function test24c() {
+  var notification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  ok(notification, "Test 24c, Should have a click-to-play notification");
+  var plugin = gTestBrowser.contentDocument.getElementById("test");
+  ok(plugin, "Test 24c, Found plugin in page");
+  var objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
+  is(objLoadingContent.pluginFallbackType, Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_UPDATABLE, "Test 24c, Plugin should be vulnerable/updatable");
+  ok(!objLoadingContent.activated, "Test 24c, plugin should not be activated");
+
+  // simulate "always allow"
+  notification.secondaryActions[0].callback();
+  prepareTest(test24d, gHttpTestRoot + "plugin_test.html");
+}
+
+// We should still be able to always allow a plugin after we've seen that it's
+// blocklisted.
+function test24d() {
+  var notification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  ok(!notification, "Test 24d, Should not have a click-to-play notification");
+  var plugin = gTestBrowser.contentDocument.getElementById("test");
+  ok(plugin, "Test 24d, Found plugin in page");
+  var objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(objLoadingContent.activated, "Test 24d, plugin should be activated");
+
+  Services.perms.removeAll();
+  resetBlocklist(function () {
+    prepareTest(test25a, gHttpTestRoot + "plugin_test.html");
+  });
+}
+
+// Test that clicking "always allow" or "always deny" doesn't affect plugins
+// that already have permission given to them
+function test25a() {
+  var notification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  ok(notification, "Test 25a, Should have a click-to-play notification");
+  var plugin = gTestBrowser.contentDocument.getElementById("test");
+  ok(plugin, "Test 25a, Found plugin in page");
+  var objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(!objLoadingContent.activated, "Test 25a, plugin should not be activated");
+
+  // simulate "always allow"
+  notification.secondaryActions[0].callback();
+  prepareTest(test25b, gHttpTestRoot + "plugin_two_types.html");
+}
+
+function test25b() {
+  var notification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  ok(notification, "Test 25b, Should have a click-to-play notification");
+
+  var test = gTestBrowser.contentDocument.getElementById("test");
+  ok(test, "Test 25b, Found test plugin in page");
+  var objLoadingContent = test.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(objLoadingContent.activated, "Test 25b, test plugin should be activated");
+
+  var secondtest = gTestBrowser.contentDocument.getElementById("secondtestA");
+  ok(secondtest, "Test 25b, Found second test plugin in page");
+  var objLoadingContent = secondtest.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(!objLoadingContent.activated, "Test 25b, second test plugin should not be activated");
+
+  // simulate "always deny"
+  notification.secondaryActions[1].callback();
+  prepareTest(test25c, gHttpTestRoot + "plugin_two_types.html");
+}
+
+// we should have one plugin allowed to activate and the other plugin(s) denied
+// (so it should have an invisible overlay)
+function test25c() {
+  var notification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+  ok(!notification, "Test 25c, Should not have a click-to-play notification");
+
+  var test = gTestBrowser.contentDocument.getElementById("test");
+  ok(test, "Test 25c, Found test plugin in page");
+  var objLoadingContent = test.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(objLoadingContent.activated, "Test 25c, test plugin should be activated");
+
+  var secondtest = gTestBrowser.contentDocument.getElementById("secondtestA");
+  ok(secondtest, "Test 25c, Found second test plugin in page");
+  var objLoadingContent = secondtest.QueryInterface(Ci.nsIObjectLoadingContent);
+  ok(!objLoadingContent.activated, "Test 25c, second test plugin should not be activated");
+  var overlay = gTestBrowser.contentDocument.getAnonymousElementByAttribute(secondtest, "class", "mainBox");
+  ok(overlay.style.visibility == "hidden", "Test 25c, second test plugin should not have visible overlay");
+
+  Services.perms.removeAll();
+
   finishTest();
 }
diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp
index 575d5ab485a9..aea9a94c39a8 100644
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -2561,9 +2561,12 @@ nsObjectLoadingContent::ShouldPlay(FallbackType &aReason)
   // the system principal, i.e. in chrome pages. That way the click-to-play
   // code here wouldn't matter at all. Bug 775301 is tracking this.
   if (!nsContentUtils::IsSystemPrincipal(topDoc->NodePrincipal())) {
+    nsAutoCString permissionString;
+    rv = pluginHost->GetPermissionStringForType(mContentType, permissionString);
+    NS_ENSURE_SUCCESS(rv, false);
     uint32_t permission;
     rv = permissionManager->TestPermissionFromPrincipal(topDoc->NodePrincipal(),
-                                                        "plugins",
+                                                        permissionString.Data(),
                                                         &permission);
     NS_ENSURE_SUCCESS(rv, false);
     allowPerm = permission == nsIPermissionManager::ALLOW_ACTION;
diff --git a/dom/plugins/base/nsIPluginHost.idl b/dom/plugins/base/nsIPluginHost.idl
index 7e1261fb1c46..4cbb6bdab134 100644
--- a/dom/plugins/base/nsIPluginHost.idl
+++ b/dom/plugins/base/nsIPluginHost.idl
@@ -12,7 +12,7 @@
   "@mozilla.org/plugin/host;1"
 %}
 
-[scriptable, uuid(d70af999-cb1f-4429-b85e-f18cdbabc43c)]
+[scriptable, uuid(3ac8fe33-c38c-4123-b2f0-0e8a2824b9c5)]
 interface nsIPluginHost : nsISupports
 {
   /**
@@ -82,6 +82,8 @@ interface nsIPluginHost : nsISupports
 
   void unregisterPlayPreviewMimeType(in AUTF8String mimeType);
 
+  ACString getPermissionStringForType(in AUTF8String mimeType);
+
   bool isPluginClickToPlayForType(in AUTF8String mimeType);
 };
 
diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
index aed61be8d7f6..9638fc4252b5 100644
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -1347,6 +1347,31 @@ nsPluginHost::GetBlocklistStateForType(const char *aMimeType, uint32_t *aState)
   return NS_ERROR_FAILURE;
 }
 
+NS_IMETHODIMP
+nsPluginHost::GetPermissionStringForType(const nsACString &aMimeType, nsACString &aPermissionString)
+{
+  aPermissionString.Truncate();
+  uint32_t blocklistState;
+  nsresult rv = GetBlocklistStateForType(aMimeType.Data(), &blocklistState);
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsPluginTag *tag = FindPluginForType(aMimeType.Data(), true);
+  if (!tag) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (blocklistState == nsIBlocklistService::STATE_VULNERABLE_UPDATE_AVAILABLE ||
+      blocklistState == nsIBlocklistService::STATE_VULNERABLE_NO_UPDATE) {
+    aPermissionString.AssignLiteral("plugin-vulnerable:");
+  }
+  else {
+    aPermissionString.AssignLiteral("plugin:");
+  }
+
+  aPermissionString.Append(tag->mFileName);
+
+  return NS_OK;
+}
+
 // check comma delimitered extensions
 static int CompareExtensions(const char *aExtensionList, const char *aExtension)
 {

From c2f183838c8e4f0fa577e4ff905a638dcf5d9c6f Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Tue, 27 Nov 2012 10:28:04 -0800
Subject: [PATCH 149/160] Bug 812223 - Take 2 - negative download times in stub
 installer pings. r=bbondy

---
 browser/installer/windows/nsis/defines.nsi.in |   2 +-
 browser/installer/windows/nsis/stub.nsi       | 151 ++++++++++--------
 .../mozapps/installer/windows/nsis/common.nsh |  43 +++++
 3 files changed, 124 insertions(+), 72 deletions(-)

diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
index 1019a21bfafa..54367764ffb3 100644
--- a/browser/installer/windows/nsis/defines.nsi.in
+++ b/browser/installer/windows/nsis/defines.nsi.in
@@ -35,7 +35,7 @@
 !define BETA_UPDATE_CHANNEL
 !endif
 
-!define BaseURLStubPing "http://download-stats.mozilla.org/stub/v3/"
+!define BaseURLStubPing "http://download-stats.mozilla.org/stub/v4/"
 
 # NO_INSTDIR_FROM_REG is defined for pre-releases which have a PreReleaseSuffix
 # (e.g. Alpha X, Beta X, etc.) to prevent finding a non-default installation
diff --git a/browser/installer/windows/nsis/stub.nsi b/browser/installer/windows/nsis/stub.nsi
index b2ab8eef3fc8..465c339988a4 100644
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -68,8 +68,10 @@ Var TmpVal
 Var InstallCounterStep
 
 Var ExitCode
-Var DownloadStartTime
-Var SecondsToDownload
+Var StartTickCount
+Var DownloadTickCount
+Var InstallTickCount
+Var FinishTickCount
 Var ExistingProfile
 Var ExistingInstall
 Var DownloadedAmount
@@ -289,11 +291,11 @@ Function .onInit
     Abort
   ${EndUnless}
 
-  SetShellVarContext all      ; Set SHCTX to HKLM
+  SetShellVarContext all ; Set SHCTX to HKLM
   ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
 
   ${If} "$R9" == "false"
-    SetShellVarContext current  ; Set SHCTX to HKCU
+    SetShellVarContext current ; Set SHCTX to HKCU
     ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
   ${EndIf}
 
@@ -317,8 +319,8 @@ Function .onInit
   ${EndIf}
 
   StrCpy $IsDownloadFinished ""
-  StrCpy $FirefoxLaunch 0
-  StrCpy $ExitCode ${ERR_UNKNOWN}
+  StrCpy $FirefoxLaunch "0"
+  StrCpy $ExitCode "${ERR_UNKNOWN}"
 
   CreateFont $FontBlurb "$(^Font)" "12" "500"
   CreateFont $FontNormal "$(^Font)" "11" "500"
@@ -350,23 +352,43 @@ FunctionEnd
 !endif
 
 Function .onGUIEnd
-  ; The value of $IsDownloadFinished will be false if the download was attempted
-  ; and wasn't completed. Get the seconds elapsed trying to download.
-  ${If} $IsDownloadFinished == "false"
-    Call GetSecondsToDownload
-  ${EndIf}
-
   ; Try to send a ping if a download was attempted
   ${If} $IsDownloadFinished != ""
   ${AndIf} $CheckboxSendPing == 1
     ${If} $IsDownloadFinished == "false"
+      ; When the value of $IsDownloadFinished is false the download was started
+      ; but didn't finish and GetTickCount needs to be called to determine how
+      ; long the download was in progress.
+      System::Call "kernel32::GetTickCount()l .s"
+      Pop $DownloadTickCount
+      StrCpy $1 "0"
+      StrCpy $2 "0"
+
       ; Cancel the download in progress
       InetBgDL::Get /RESET /END
+    ${Else}
+      ; Get the tick count for when the installer closes.
+      System::Call "kernel32::GetTickCount()l .s"
+      Pop $FinishTickCount
+      ; Get the time from the end of the install to close the installer.
+      ${GetSecondsElapsed} "$InstallTickCount" "$FinishTickCount" $2
+
+      ; Get the time from the end of the download to the completion of the
+      ; installation.
+      ${GetSecondsElapsed} "$DownloadTickCount" "$InstallTickCount" $1
     ${EndIf}
+
+    ; Get the time from the start of the download to the end of the download.
+    ${GetSecondsElapsed} "$StartTickCount" "$DownloadTickCount" $0
+
     System::Int64Op $DownloadedAmount / 1024
     Pop $DownloadedAmount
-    InetBgDL::Get "${BaseURLStubPing}${Channel}/${AB_CD}/$ExitCode/$FirefoxLaunch/$SecondsToDownload/$DownloadedAmount/$ExistingProfile/$ExistingInstall/" \
-      "$PLUGINSDIR\_temp" /END
+
+    InetBgDL::Get "${BaseURLStubPing}${Channel}/${AB_CD}/$ExitCode/$FirefoxLaunch/$DownloadedAmount/$0/$1/$2/$ExistingProfile/$ExistingInstall/" \
+                  "$PLUGINSDIR\_temp" /END
+  ${ElseIf} $IsDownloadFinished == "false"
+    ; Cancel the download in progress
+    InetBgDL::Get /RESET /END
   ${EndIf}
 
   ${UnloadUAC}
@@ -391,14 +413,14 @@ FunctionEnd
 Function createIntro
   ; If Back is clicked on the options page reset variables
   StrCpy $INSTDIR "$InitialInstallDir"
-  StrCpy $CheckboxShortcutOnBar 1
-  StrCpy $CheckboxShortcutInStartMenu 1
-  StrCpy $CheckboxShortcutOnDesktop 1
-  StrCpy $CheckboxSendPing 1
+  StrCpy $CheckboxShortcutOnBar "1"
+  StrCpy $CheckboxShortcutInStartMenu "1"
+  StrCpy $CheckboxShortcutOnDesktop "1"
+  StrCpy $CheckboxSendPing "1"
 !ifdef MOZ_MAINTENANCE_SERVICE
-  StrCpy $CheckboxInstallMaintSvc 1
+  StrCpy $CheckboxInstallMaintSvc "1"
 !else
-  StrCpy $CheckboxInstallMaintSvc 0
+  StrCpy $CheckboxInstallMaintSvc "0"
 !endif
 
   nsDialogs::Create /NOUNLOAD 1018
@@ -471,7 +493,7 @@ FunctionEnd
 
 Function leaveIntro
   LockWindow on
-  SetShellVarContext all      ; Set SHCTX to All Users
+  SetShellVarContext all ; Set SHCTX to All Users
   ; If the user doesn't have write access to the installation directory set
   ; the installation directory to a subdirectory of the All Users application
   ; directory and if the user can't write to that location set the installation
@@ -593,9 +615,9 @@ Function createOptions
   ${GetTextExtent} "$(SPACE_REQUIRED)" $FontItalic $0 $1
   ${GetTextExtent} "$(SPACE_AVAILABLE)" $FontItalic $2 $3
   ${If} $1 > $3
-    StrCpy $HEIGHT_PX $1
+    StrCpy $HEIGHT_PX "$1"
   ${Else}
-    StrCpy $HEIGHT_PX $3
+    StrCpy $HEIGHT_PX "$3"
   ${EndIf}
 
   IntOp $0 $0 + 8 ; Add padding to the control's width
@@ -613,7 +635,7 @@ Function createOptions
 
   ; Use the widest label for aligning the labels next to them
   ${If} $0 > $2
-    StrCpy $6 $5
+    StrCpy $6 "$5"
   ${EndIf}
   FindWindow $1 "#32770" "" $HWNDPARENT
   ${GetDlgItemEndPX} $6 $CTL_RIGHT_PX
@@ -874,26 +896,21 @@ Function createInstall
 
   StrCpy $IsDownloadFinished "false"
   StrCpy $DownloadReset "false"
-  StrCpy $ExitCode ${ERR_CANCEL_DOWNLOAD}
+  StrCpy $ExitCode "${ERR_CANCEL_DOWNLOAD}"
   ${If} ${FileExists} "$INSTDIR\${FileMainEXE}"
-    StrCpy $ExistingInstall 1
+    StrCpy $ExistingInstall "1"
   ${Else}
-    StrCpy $ExistingInstall 0
+    StrCpy $ExistingInstall "0"
   ${EndIf}
 
   ${If} ${FileExists} "$LOCALAPPDATA\Mozilla\Firefox"
-    StrCpy $ExistingProfile 1
+    StrCpy $ExistingProfile "1"
   ${Else}
-    StrCpy $ExistingProfile 0
+    StrCpy $ExistingProfile "0"
   ${EndIf}
 
-  GetTempFileName $2
-  GetFileTime $2 $1 $0
-  Delete $2
-  System::Int64Op $1 * 0x100000000
-  Pop $1
-  System::Int64Op $1 + $0
-  Pop $DownloadStartTime
+  System::Call "kernel32::GetTickCount()l .s"
+  Pop $StartTickCount
 
   ${NSD_CreateTimer} StartDownload ${DownloadIntervalMS}
 
@@ -911,22 +928,6 @@ Function leaveInstall
 # Need a ping?
 FunctionEnd
 
-; GetSecondsToDownload calculates the amount of time between $DownloadStartTime
-; and now, and stores the results into $SecondsToDownload.
-Function GetSecondsToDownload
-  GetTempFileName $2
-  GetFileTime $2 $1 $0
-  Delete $2
-  System::Int64Op $1 * 0x100000000
-  Pop $1
-  System::Int64Op $1 + $0
-  Pop $0
-  System::Int64Op $0 - $DownloadStartTime
-  Pop $4
-  System::Int64Op $4 / 10000000
-  Pop $SecondsToDownload
-FunctionEnd
-
 Function StartDownload
   ${NSD_KillTimer} StartDownload
   InetBgDL::Get "${URLStubDownload}" "$PLUGINSDIR\download.exe" \
@@ -950,7 +951,7 @@ Function OnDownload
   ${If} $0 > 299
     ${NSD_KillTimer} OnDownload
     ${If} "$DownloadReset" != "true"
-      StrCpy $DownloadedAmount 0
+      StrCpy $DownloadedAmount "0"
       ${NSD_AddStyle} $ProgressbarDownload ${PBS_MARQUEE}
       SendMessage $ProgressbarDownload ${PBM_SETMARQUEE} 1 10 ; start=1|stop=0 interval(ms)=+N
     ${EndIf}
@@ -967,7 +968,7 @@ Function OnDownload
 
   ${If} $DownloadSize == ""
   ${AndIf} $4 != ""
-    StrCpy $DownloadSize $4
+    StrCpy $DownloadSize "$4"
     System::Int64Op $4 / 2
     Pop $HalfOfDownload
     SendMessage $ProgressbarDownload ${PBM_SETMARQUEE} 0 0 ; start=1|stop=0 interval(ms)=+N
@@ -988,9 +989,10 @@ Function OnDownload
       ; The first step of the install progress bar is determined by the
       ; InstallProgressFirstStep define and provides the user with immediate
       ; feedback.
-      StrCpy $InstallCounterStep ${InstallProgressFirstStep}
-      Call GetSecondsToDownload
-      StrCpy $DownloadedAmount $DownloadSize
+      StrCpy $InstallCounterStep "${InstallProgressFirstStep}"
+      System::Call "kernel32::GetTickCount()l .s"
+      Pop $DownloadTickCount
+      StrCpy $DownloadedAmount "$DownloadSize"
       LockWindow on
       ; Update the progress bars first in the UI change so they take affect
       ; before other UI changes.
@@ -1018,7 +1020,7 @@ Function OnDownload
       StrCpy $HandleDownload "$R9"
 
       ${If} $HandleDownload == ${INVALID_HANDLE_VALUE}
-        StrCpy $ExitCode ${ERR_INVALID_HANDLE}
+        StrCpy $ExitCode "${ERR_INVALID_HANDLE}"
         StrCpy $0 "0"
         StrCpy $1 "0"
       ${Else}
@@ -1029,11 +1031,11 @@ Function OnDownload
         Pop $1
         ${If} $0 == 0
         ${AndIf} $1 == 0
-          StrCpy $ExitCode ${ERR_CERT_UNTRUSTED_AND_ATTRIBUTES}
+          StrCpy $ExitCode "${ERR_CERT_UNTRUSTED_AND_ATTRIBUTES}"
         ${ElseIf} $0 == 0
-          StrCpy $ExitCode ${ERR_CERT_UNTRUSTED}
+          StrCpy $ExitCode "${ERR_CERT_UNTRUSTED}"
         ${ElseIf}  $1 == 0
-          StrCpy $ExitCode ${ERR_CERT_ATTRIBUTES}
+          StrCpy $ExitCode "${ERR_CERT_ATTRIBUTES}"
         ${EndIf}
       ${EndIf}
 
@@ -1105,7 +1107,7 @@ Function OnDownload
         ShowWindow $BitmapBlurb2 ${SW_SHOW}
         LockWindow off
       ${EndIf}
-      StrCpy $DownloadedAmount $3
+      StrCpy $DownloadedAmount "$3"
       SendMessage $ProgressbarDownload ${PBM_SETPOS} $3 0
     ${EndIf}
   ${EndIf}
@@ -1129,7 +1131,7 @@ Function CheckInstall
     ${NSD_KillTimer} CheckInstall
     ; Close the handle that prevents modification of the full installer
     System::Call 'kernel32::CloseHandle(i $HandleDownload)'
-    StrCpy $ExitCode ${ERR_CHECK_INSTALL_TIMEOUT}
+    StrCpy $ExitCode "${ERR_CHECK_INSTALL_TIMEOUT}"
     ; Use a timer so the UI has a chance to update
     ${NSD_CreateTimer} DisplayDownloadError ${InstallIntervalMS}
     Return
@@ -1152,6 +1154,8 @@ Function CheckInstall
       Rename "$INSTDIR\install.tmp" "$INSTDIR\install.log"
       Delete "$PLUGINSDIR\download.exe"
       Delete "$PLUGINSDIR\${CONFIG_INI}"
+      System::Call "kernel32::GetTickCount()l .s"
+      Pop $InstallTickCount
       ${NSD_CreateTimer} FinishInstall ${InstallIntervalMS}
     ${EndUnless}
   ${EndIf}
@@ -1160,7 +1164,7 @@ FunctionEnd
 Function FinishInstall
   ; The full installer has complete but we still need to finish the progress
   ; bar so increase the size of the step
-  IntOp $InstallCounterStep $InstallCounterStep + 10
+  IntOp $InstallCounterStep $InstallCounterStep + 20
   ${If} ${InstallProgresSteps} < $InstallCounterStep
     StrCpy $InstallCounterStep "${InstallProgresSteps}"
   ${EndIf}
@@ -1204,19 +1208,19 @@ Function FinishInstall
     Rename "$INSTDIR\${FileMainEXE}.moz-upgrade" "$INSTDIR\${FileMainEXE}"
   ${EndIf}
 
-  StrCpy $ExitCode ${ERR_SUCCESS}
+  StrCpy $ExitCode "${ERR_SUCCESS}"
 
   Call LaunchApp
 
   ; The following will exit the installer
   SetAutoClose true
-  StrCpy $R9 2
+  StrCpy $R9 "2"
   Call RelativeGotoPage
 FunctionEnd
 
 Function OnBack
   StrCpy $WasOptionsButtonClicked "true"
-  StrCpy $R9 1 ; Goto the next page
+  StrCpy $R9 "1" ; Goto the next page
   Call RelativeGotoPage
   ; The call to Abort prevents NSIS from trying to move to the previous or the
   ; next page.
@@ -1296,7 +1300,7 @@ FunctionEnd
 Function OnChange_DirRequest
   Pop $0
   System::Call 'user32::GetWindowTextW(i $DirRequest, w .r0, i ${NSIS_MAX_STRLEN})'
-  StrCpy $INSTDIR $0
+  StrCpy $INSTDIR "$0"
   Call UpdateFreeSpaceLabel
 FunctionEnd
 
@@ -1420,13 +1424,15 @@ FunctionEnd
 Function LaunchApp
   FindWindow $0 "${WindowClass}"
   ${If} $0 <> 0 ; integer comparison
-    StrCpy $FirefoxLaunch 1
+    StrCpy $FirefoxLaunch "1"
     MessageBox MB_OK|MB_ICONQUESTION "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
     Return
   ${EndIf}
 
-  StrCpy $FirefoxLaunch 2
+  StrCpy $FirefoxLaunch "2"
 
+  ; Set the current working directory to the installation directory
+  SetOutPath "$INSTDIR"
   ClearErrors
   ${GetParameters} $0
   ${GetOptions} "$0" "/UAC:" $1
@@ -1444,6 +1450,9 @@ Function LaunchAppFromElevatedProcess
   ${StrFilter} "${FileMainEXE}" "+" "" "" $R9
   ReadRegStr $0 HKLM "Software\Clients\StartMenuInternet\$R9\DefaultIcon" ""
   ${GetPathFromString} "$0" $0
+  ; Set the current working directory to the installation directory
+  ${GetParent} "$0" $1
+  SetOutPath "$1"
   Exec "$\"$0$\""
 FunctionEnd
 
@@ -1466,7 +1475,7 @@ Function DisplayDownloadError
   ${EndIf}
 
   SetAutoClose true
-  StrCpy $R9 2
+  StrCpy $R9 "2"
   Call RelativeGotoPage
 FunctionEnd
 
diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh
index b51fcf348f7d..40fa76c21ed6 100755
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -7071,6 +7071,8 @@
 ################################################################################
 # Helpers for the new user interface
 
+!define MAXDWORD 0xffffffff
+
 !define DT_WORDBREAK 0x0010
 !define DT_SINGLELINE 0x0020
 !define DT_NOCLIP 0x0100
@@ -7470,6 +7472,47 @@
   !endif
 !macroend
 
+/**
+ * Gets the elapsed time in seconds between two values in milliseconds stored as
+ * an int64. The caller will typically get the millisecond values using
+ * GetTickCount with a long return value as follows.
+ * System::Call "kernel32::GetTickCount()l .s"
+ * Pop $varname
+ *
+ * _START_TICK_COUNT    
+ * _FINISH_TICK_COUNT   
+ * _RES_ELAPSED_SECONDS return value - elapsed time between _START_TICK_COUNT
+ *                      and _FINISH_TICK_COUNT in seconds.
+ */
+!macro GetSecondsElapsedCall _START_TICK_COUNT _FINISH_TICK_COUNT _RES_ELAPSED_SECONDS
+  Push "${_START_TICK_COUNT}"
+  Push "${_FINISH_TICK_COUNT}"
+  ${CallArtificialFunction} GetSecondsElapsed_
+  Pop ${_RES_ELAPSED_SECONDS}
+!macroend
+
+!define GetSecondsElapsed "!insertmacro GetSecondsElapsedCall"
+!define un.GetSecondsElapsed "!insertmacro GetSecondsElapsedCall"
+
+!macro GetSecondsElapsed_
+  Exch $0 ; finish tick count
+  Exch 1
+  Exch $1 ; start tick count
+
+  System::Int64Op $0 - $1
+  Pop $0
+  ; Discard the top bits of the int64 by bitmasking with MAXDWORD
+  System::Int64Op $0 & ${MAXDWORD}
+  Pop $0
+
+  ; Convert from milliseconds to seconds
+  System::Int64Op $0 / 1000
+  Pop $0
+
+  Pop $1
+  Exch $0 ; return elapsed seconds
+!macroend
+
 !ifdef MOZ_METRO
 ; Removes the CEH registration if it's set to our installation directory.
 ; If it's set to some other installation directory, then it should be removed

From cf6c8e845c53915d0389f59c68d80ef404d31fd3 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Tue, 27 Nov 2012 18:29:49 +0000
Subject: [PATCH 150/160] Bug 798446 - Attempt to fix startup crash in
 nsGlobalWindow ctor. r=bz

---
 dom/base/nsGlobalWindow.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 556dac6140ac..55400e161826 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -732,7 +732,10 @@ nsGlobalWindow::nsGlobalWindow(nsGlobalWindow *aOuterWindow)
   NS_ASSERTION(sWindowsById, "Windows hash table must be created!");
   NS_ASSERTION(!sWindowsById->Get(mWindowID),
                "This window shouldn't be in the hash table yet!");
-  sWindowsById->Put(mWindowID, this);
+  // We seem to see crashes in release builds because of null |sWindowsById|.
+  if (sWindowsById) {
+    sWindowsById->Put(mWindowID, this);
+  }
 
   mEventTargetObjects.Init();
 }

From 15e1e2274cd6d3ef1e13e84e54e3a38b3c92dd2e Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Tue, 27 Nov 2012 11:44:24 -0700
Subject: [PATCH 151/160] Bug 815699 - Check for null mGREDir in xpcshell dir
 provider; r=jimm

---
 js/xpconnect/shell/xpcshell.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/xpconnect/shell/xpcshell.cpp b/js/xpconnect/shell/xpcshell.cpp
index f4ce36132b39..9f7eb876fb68 100644
--- a/js/xpconnect/shell/xpcshell.cpp
+++ b/js/xpconnect/shell/xpcshell.cpp
@@ -2111,7 +2111,7 @@ XPCShellDirProvider::GetFiles(const char *prop, nsISimpleEnumerator* *result)
 
         dirs.AppendObject(file);
         return NS_NewArrayEnumerator(result, dirs);
-    } else if (!strcmp(prop, NS_APP_PLUGINS_DIR_LIST)) {
+    } else if (mGREDir && !strcmp(prop, NS_APP_PLUGINS_DIR_LIST)) {
         nsCOMPtr<nsIFile> file;
         mGREDir->Clone(getter_AddRefs(file));
         file->AppendNative(NS_LITERAL_CSTRING("plugins"));

From fd1ca44c78733122a299e444dfe821ef9b27755c Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 27 Nov 2012 14:02:08 -0500
Subject: [PATCH 152/160] Bug 814519 - Fix a typo in SimpleTest/setup.js; r=ted

---
 testing/mochitest/tests/SimpleTest/setup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mochitest/tests/SimpleTest/setup.js b/testing/mochitest/tests/SimpleTest/setup.js
index 13a4e6e43228..95fb3460df23 100644
--- a/testing/mochitest/tests/SimpleTest/setup.js
+++ b/testing/mochitest/tests/SimpleTest/setup.js
@@ -299,7 +299,7 @@ function isVisible(elem) {
 
 function toggleNonTests (e) {
   e.preventDefault();
-  var elems = document.getElementsClassName("non-test");
+  var elems = document.getElementsByClassName("non-test");
   for (var i="0"; i<elems.length; i++) {
     toggleVisible(elems[i]);
   }

From e8a67eefaf71b9c15e591ea671e4c82648499c3c Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Tue, 27 Nov 2012 11:14:04 -0800
Subject: [PATCH 153/160] Bug 813057 - Ensure suggestion view parameters are
 reset if view is removed during animation. r=lucasr

---
 mobile/android/base/AnimatedHeightLayout.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/AnimatedHeightLayout.java b/mobile/android/base/AnimatedHeightLayout.java
index 23175759c374..b6efe276d4f9 100644
--- a/mobile/android/base/AnimatedHeightLayout.java
+++ b/mobile/android/base/AnimatedHeightLayout.java
@@ -40,8 +40,7 @@ public class AnimatedHeightLayout extends RelativeLayout {
                 public void onAnimationEnd(Animation animation) {
                     post(new Runnable() {
                         public void run() {
-                            getLayoutParams().height = LayoutParams.WRAP_CONTENT;
-                            mAnimating = false;
+                            finishAnimation();
                         }
                     });
                 }
@@ -49,4 +48,17 @@ public class AnimatedHeightLayout extends RelativeLayout {
             startAnimation(anim);
         }
     }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        finishAnimation();
+    }
+
+    private void finishAnimation() {
+        if (mAnimating) {
+            getLayoutParams().height = LayoutParams.WRAP_CONTENT;
+            mAnimating = false;
+        }
+    }
 }

From 2e2a4d1a24fee7b6d69db25f2069d1b417d0a219 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Tue, 27 Nov 2012 11:28:56 -0800
Subject: [PATCH 154/160] Bug 811162 - After switching the language in the
 settings app, the entire gaia window is half as tall. r=kaze

---
 b2g/chrome/content/settings.js | 4 +++-
 b2g/chrome/content/shell.js    | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js
index ad52f129e32c..5d0e5be15e9d 100644
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -121,7 +121,9 @@ SettingsListener.observe('language.current', 'en-US', function(value) {
     Services.prefs.setCharPref(prefName, value + ', ' + intl);
   }
 
-  shell.start();
+  if (shell.hasStarted() == false) {
+    shell.start();
+  }
 });
 
 // =================== RIL ====================
diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js
index 46e84d2ee763..f87c57acd5cf 100644
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -152,9 +152,16 @@ var shell = {
 
   get manifestURL() {
     return Services.prefs.getCharPref('browser.manifestURL');
-   },
+  },
+
+  _started: false,
+  hasStarted: function shell_hasStarted() {
+    return this._started;
+  },
 
   start: function shell_start() {
+    this._started = true;
+
     // This forces the initialization of the cookie service before we hit the
     // network.
     // See bug 810209

From 0a6b2e8c8f78fdd2c7cc763a0ba455db635e602c Mon Sep 17 00:00:00 2001
From: Jason Smith <jsmith@mozilla.com>
Date: Mon, 26 Nov 2012 18:27:46 -0800
Subject: [PATCH 155/160] Bug 781534 - Create basic automated test coverage for
 the mozGetUserMedia for desktop. r=roc

---
 dom/media/tests/mochitest/Makefile.in         |   7 +-
 dom/media/tests/mochitest/head.js             |  31 +++-
 .../tests/mochitest/mediaStreamPlayback.js    | 167 ++++++++++++++++++
 .../test_getUserMedia_basicAudio.html         |  46 +++++
 .../test_getUserMedia_basicVideo.html         |  46 +++++
 .../test_getUserMedia_basicVideoAudio.html    |  48 +++++
 .../test_getUserMedia_exceptions.html         |   2 +-
 7 files changed, 339 insertions(+), 8 deletions(-)
 create mode 100644 dom/media/tests/mochitest/mediaStreamPlayback.js
 create mode 100644 dom/media/tests/mochitest/test_getUserMedia_basicAudio.html
 create mode 100644 dom/media/tests/mochitest/test_getUserMedia_basicVideo.html
 create mode 100644 dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html

diff --git a/dom/media/tests/mochitest/Makefile.in b/dom/media/tests/mochitest/Makefile.in
index eed2449124c3..c41a61211fc9 100644
--- a/dom/media/tests/mochitest/Makefile.in
+++ b/dom/media/tests/mochitest/Makefile.in
@@ -10,7 +10,12 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MOCHITEST_FILES	= \
+# TODO: When bug 814718 and bug 814721 are fixed, add the following files:
+#          test_getUserMedia_basicVideo.html
+#          test_getUserMedia_basicAudio.thml
+#          test_getUserMedia_basicVideoAudio.html
+#          mediaStreamPlayback.js
+MOCHITEST_FILES = \
   test_getUserMedia_exceptions.html \
   head.js \
   $(NULL)
diff --git a/dom/media/tests/mochitest/head.js b/dom/media/tests/mochitest/head.js
index 27155743ec8a..bd3fccf75432 100644
--- a/dom/media/tests/mochitest/head.js
+++ b/dom/media/tests/mochitest/head.js
@@ -1,4 +1,4 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
@@ -9,14 +9,33 @@ var Cr = SpecialPowers.Cr;
 /**
  * Setup any Mochitest for WebRTC by enabling the preference for
  * peer connections. As by bug 797979 it will also enable mozGetUserMedia().
- * Additionally, we disable the permissions prompt for these mochitests.
  *
  * @param {Function} aCallback Test method to execute after initialization
+ * @param {Boolean} desktopSupportedOnly specifies if the test currently
+ *                                       is known to work on desktop only
  */
-function runTest(aCallback) {
+function runTest(aCallback, desktopSupportedOnly) {
   SimpleTest.waitForExplicitFinish();
 
-  SpecialPowers.pushPrefEnv({'set': [['media.peerconnection.enabled', true],
-                            ['media.navigator.permission.disabled', true]]},
-                            aCallback);
+  // If this is a desktop supported test and we're on android or b2g,
+  // indicate that the test is not supported and skip the test
+  if(desktopSupportedOnly && (navigator.platform === 'Android' ||
+     navigator.platform === '')) {
+    ok(true, navigator.platform + ' currently not supported');
+    SimpleTest.finish();
+  } else {
+    SpecialPowers.pushPrefEnv({'set': [['media.peerconnection.enabled', true]]},
+      aCallback);
+  }
+}
+
+/**
+ * A callback function fired only under unexpected circumstances while
+ * running the tests. Kills off the test as well gracefully.
+ *
+ * @param {String} obj the object fired back from the callback
+ */
+function unexpectedCallbackAndFinish(obj) {
+  ok(false, "Unexpected error callback with " + obj);
+  SimpleTest.finish();
 }
diff --git a/dom/media/tests/mochitest/mediaStreamPlayback.js b/dom/media/tests/mochitest/mediaStreamPlayback.js
new file mode 100644
index 000000000000..1cae44e99c0c
--- /dev/null
+++ b/dom/media/tests/mochitest/mediaStreamPlayback.js
@@ -0,0 +1,167 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * This class manages playback of a HTMLMediaElement with a MediaStream.
+ * When constructed by a caller, an object instance is created with
+ * a media element and a media stream object.
+ *
+ * @param {HTMLMediaElement} mediaElement the media element for playback
+ * @param {LocalMediaStream} mediaStream the media stream used in
+ *                                       the mediaElement for playback
+ */
+function MediaStreamPlayback(mediaElement, mediaStream) {
+
+  /** The HTMLMediaElement used for media playback */
+  this.mediaElement = mediaElement;
+
+  /** The LocalMediaStream used with the HTMLMediaElement */
+  this.mediaStream = mediaStream;
+
+  /**
+   * Starts the media with the associated stream.
+   *
+   * @param {Integer} timeoutLength the timeout length to wait for
+   *                                canplaythrough to fire in milliseconds
+   * @param {Function} onSuccess the success function call back
+   *                             if media starts correctly
+   * @param {Function} onError the error function call back
+   *                           if media fails to start
+   */
+  this.startMedia = function(timeoutLength, onSuccess, onError) {
+    var self = this;
+    var canPlayThroughFired = false;
+
+    // Verifies we've received a correctly initialized LocalMediaStream
+    ok(this.mediaStream instanceof LocalMediaStream,
+      "Stream should be a LocalMediaStream");
+    is(this.mediaStream.currentTime, 0,
+      "Before starting the media element, currentTime = 0");
+
+    /**
+     * Callback fired when the canplaythrough event is fired. We only
+     * run the logic of this function once, as this event can fire
+     * multiple times while a HTMLMediaStream is playing content from
+     * a real-time MediaStream.
+     */
+    var canPlayThroughCallback = function() {
+      // Disable the canplaythrough event listener to prevent multiple calls
+      canPlayThroughFired = true;
+      self.mediaElement.removeEventListener('canplaythrough',
+        canPlayThroughCallback, false);
+
+      is(self.mediaElement.paused, false,
+        "Media element should be playing");
+      is(self.mediaElement.ended, false,
+        "Media element should not have ended");
+      is(self.mediaElement.duration, Number.POSITIVE_INFINITY,
+        "Duration should be infinity");
+
+      // When the media element is playing with a real-time stream, we
+      // constantly switch between having data to play vs. queuing up data,
+      // so we can only check that the ready state is one of those two values
+      ok(self.mediaElement.readyState === HTMLMediaElement.HAVE_ENOUGH_DATA ||
+         self.mediaElement.readyState === HTMLMediaElement.HAVE_CURRENT_DATA,
+         "Ready state shall be HAVE_ENOUGH_DATA or HAVE_CURRENT_DATA");
+
+      is(self.mediaElement.seekable.length, 0,
+         "Seekable length shall be zero");
+      is(self.mediaElement.buffered.length, 0,
+         "Buffered length shall be zero");
+      is(self.mediaElement.played.length, 1, "Played length shall be one");
+
+      if(self.mediaElement.played.length > 0) {
+        is(self.mediaElement.played.start(0), 0,
+          "Played start shall be zero");
+        is(self.mediaElement.played.end(0), self.mediaElement.currentTime,
+          "End shall be current time");
+      }
+
+      is(self.mediaElement.seeking, false,
+         "MediaElement is not seekable with MediaStream");
+      ok(isNaN(self.mediaElement.startOffsetTime),
+         "Start offset time shall not be a number");
+      is(self.mediaElement.loop, false, "Loop shall be false");
+      is(self.mediaElement.preload, "", "Preload should not exist");
+      is(self.mediaElement.src, "", "No src should be defined");
+      is(self.mediaElement.currentSrc, "",
+         "Current src should still be an empty string");
+
+      var timeUpdateFired = false;
+
+      var timeUpdateCallback = function() {
+        timeUpdateFired = true;
+        self.mediaElement.removeEventListener('timeupdate', timeUpdateCallback,
+          false);
+
+        ok(self.mediaStream.currentTime > 0,
+           "Stream's time should be greater than zero");
+        ok(self.mediaElement.currentTime > 0,
+           "MediaElement time shall be greater than zero");
+        onSuccess();
+      };
+
+      // When timeupdate fires, we validate time has passed and move
+      // onto the success condition
+      self.mediaElement.addEventListener('timeupdate', timeUpdateCallback,
+        false);
+
+      // If timeupdate doesn't fire in enough time, we fail the test
+      setTimeout(function() {
+        if(!timeUpdateFired) {
+          ok(false, "timeUpdate event never fired");
+          onError();
+        }
+      }, timeoutLength);
+    };
+
+    // Adds a listener intended to be fired when playback is available
+    // without further buffering.
+    this.mediaElement.addEventListener('canplaythrough', canPlayThroughCallback,
+      false);
+
+    // Hooks up the media stream to the media element and starts playing it
+    this.mediaElement.mozSrcObject = mediaStream;
+    this.mediaElement.play();
+
+    // If canplaythrough doesn't fire in enough time, we fail the test
+    setTimeout(function() {
+      if(!canPlayThroughFired) {
+        ok(false, "canplaythrough event never fired");
+        onError();
+      }
+    }, timeoutLength);
+  };
+
+  /**
+   * Stops the media with the associated stream.
+   *
+   * Precondition: The media stream and element should both be actively
+   *               being played.
+   */
+  this.stopMedia = function() {
+    this.mediaElement.pause();
+    this.mediaElement.mozSrcObject = null;
+  };
+
+  /**
+   * Starts media with a media stream, runs it until a canplaythrough and
+   * timeupdate event fires, and stops the media.
+   *
+   * @param {Integer} timeoutLength the length of time to wait for certain
+   *                                media events to fire
+   * @param {Function} onSuccess the success callback if the media playback
+   *                             start and stop cycle completes successfully
+   * @param {Function} onError the error callback if the media playback
+   *                           start and stop cycle fails
+   */
+  this.playMedia = function(timeoutLength, onSuccess, onError) {
+    var self = this;
+
+    this.startMedia(timeoutLength, function() {
+      self.stopMedia();
+      onSuccess();
+    }, onError);
+  };
+}
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html b/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html
new file mode 100644
index 000000000000..e455e574064b
--- /dev/null
+++ b/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=781534
+-->
+<head>
+  <meta charset="utf-8">
+  <title>mozGetUserMedia Basic Audio Test</title>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="head.js"></script>
+  <script type="application/javascript" src="mediaStreamPlayback.js"></script>
+</head>
+<body>
+<audio id="testAudio"></audio>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=781534">mozGetUserMedia Basic Audio Test</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/**
+ * Run a test to verify that we can complete a start and stop media playback
+ * cycle for an audio LocalMediaStream on an audio HTMLMediaElement.
+ */
+runTest(function () {
+  try {
+    navigator.mozGetUserMedia({audio: true, fake: true}, function(stream) {
+      var testAudio = document.getElementById('testAudio');
+      var audioStreamPlayback = new MediaStreamPlayback(testAudio, stream);
+      audioStreamPlayback.playMedia(5000, function() {
+				stream.stop();
+				SimpleTest.finish();
+			}, unexpectedCallbackAndFinish);
+    }, unexpectedCallbackAndFinish);
+  } catch (err) {
+    unexpectedCallbackAndFinish(err);
+  }
+}, true);
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html b/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html
new file mode 100644
index 000000000000..3ccd48a6ce44
--- /dev/null
+++ b/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=781534
+-->
+<head>
+  <meta charset="utf-8">
+  <title>mozGetUserMedia Basic Video Test</title>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="head.js"></script>
+  <script type="application/javascript" src="mediaStreamPlayback.js"></script>
+</head>
+<body>
+<video id="testVideo"></video>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=781534">mozGetUserMedia Basic Video Test</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/**
+ * Run a test to verify that we can complete a start and stop media playback
+ * cycle for an video LocalMediaStream on a video HTMLMediaElement.
+ */
+runTest(function () {
+  try {
+    navigator.mozGetUserMedia({video: true, fake: true}, function(stream) {
+      var testVideo = document.getElementById('testVideo');
+      var videoStreamPlayback = new MediaStreamPlayback(testVideo, stream);
+      videoStreamPlayback.playMedia(5000, function() {
+				stream.stop();
+				SimpleTest.finish();
+			}, unexpectedCallbackAndFinish);
+    }, unexpectedCallbackAndFinish);
+  } catch (err) {
+    unexpectedCallbackAndFinish(err);
+  }
+}, true);
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html b/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html
new file mode 100644
index 000000000000..9e736c26417e
--- /dev/null
+++ b/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=781534
+-->
+<head>
+  <meta charset="utf-8">
+  <title>mozGetUserMedia Basic Video & Audio Test</title>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="head.js"></script>
+  <script type="application/javascript" src="mediaStreamPlayback.js"></script>
+</head>
+<body>
+<video id="testVideoAudio"></video>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=781534">mozGetUserMedia Basic Video & Audio Test</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/**
+ * Run a test to verify that we can complete a start and stop media playback
+ * cycle for a video and audio LocalMediaStream on a video HTMLMediaElement.
+ */
+runTest(function () {
+  try {
+    navigator.mozGetUserMedia({video: true, audio: true, fake: true},
+      function(stream) {
+      var testVideoAudio = document.getElementById('testVideoAudio');
+      var videoAudioStreamPlayback = new MediaStreamPlayback(testVideoAudio,
+        stream);
+      videoAudioStreamPlayback.playMedia(5000, function() {
+				stream.stop();
+				SimpleTest.finish();
+			}, unexpectedCallbackAndFinish);
+    }, unexpectedCallbackAndFinish);
+  } catch (err) {
+    unexpectedCallbackAndFinish(err);
+  }
+}, true);
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/media/tests/mochitest/test_getUserMedia_exceptions.html b/dom/media/tests/mochitest/test_getUserMedia_exceptions.html
index 4648a5ac9c1b..faa552bca279 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_exceptions.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_exceptions.html
@@ -78,7 +78,7 @@ runTest(function () {
   });
 
   SimpleTest.finish();
-});
+}, false);
 
 </script>
 </pre>

From 445cd197e4afc21e5d27a440055d86c9ca07a050 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@redhat.com>
Date: Thu, 11 Oct 2012 23:19:40 +0200
Subject: [PATCH 156/160] Bug 800557 - Build shouldn't depend on simplejson.
 r=froydnj, r=ted

---
 .../telemetry/gen-histogram-bucket-ranges.py       | 14 ++++++++++----
 toolkit/components/telemetry/gen-histogram-enum.py |  2 --
 toolkit/components/telemetry/histogram_tools.py    | 14 ++++++++++----
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/toolkit/components/telemetry/gen-histogram-bucket-ranges.py b/toolkit/components/telemetry/gen-histogram-bucket-ranges.py
index 770c0b2c7f93..6db1dd668eb2 100644
--- a/toolkit/components/telemetry/gen-histogram-bucket-ranges.py
+++ b/toolkit/components/telemetry/gen-histogram-bucket-ranges.py
@@ -9,18 +9,24 @@
 import sys
 import re
 import histogram_tools
-import simplejson as json
+import json
+
+# For compatibility with python 2.6
+try:
+    from collections import OrderedDict
+except ImportError:
+    from simplejson import OrderedDict
 
 # Keep this in sync with TelemetryPing.
 startup_histogram_re = re.compile("SQLITE|HTTP|SPDY|CACHE|DNS")
 
 def main(argv):
     filename = argv[0]
-    all_histograms = json.OrderedDict()
+    all_histograms = OrderedDict()
 
     for histogram in histogram_tools.from_file(filename):
         name = histogram.name()
-        parameters = json.OrderedDict()
+        parameters = OrderedDict()
         table = {
             'boolean': '2',
             'flag': '3',
@@ -43,7 +49,7 @@ def main(argv):
             parameters['bucket_count'] = len(buckets)
         except histogram_tools.DefinitionException:
             continue
-        
+
         all_histograms.update({ name: parameters });
 
         if startup_histogram_re.search(name) is not None:
diff --git a/toolkit/components/telemetry/gen-histogram-enum.py b/toolkit/components/telemetry/gen-histogram-enum.py
index 16bdb4b72164..9a473ca03266 100644
--- a/toolkit/components/telemetry/gen-histogram-enum.py
+++ b/toolkit/components/telemetry/gen-histogram-enum.py
@@ -6,8 +6,6 @@
 # histograms.  The histograms are defined in a file provided as a
 # command-line argument.
 
-from __future__ import with_statement
-
 import sys
 import histogram_tools
 
diff --git a/toolkit/components/telemetry/histogram_tools.py b/toolkit/components/telemetry/histogram_tools.py
index 41cc075958e2..2ec70d2b845d 100644
--- a/toolkit/components/telemetry/histogram_tools.py
+++ b/toolkit/components/telemetry/histogram_tools.py
@@ -2,10 +2,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import with_statement
-
 import math
-import simplejson as json
+
+# For compatibility with Python 2.6
+try:
+    from collections import OrderedDict
+except ImportError:
+    from simplejson import OrderedDict
+    import simplejson as json
+else:
+    import json
 
 def table_dispatch(kind, table, body):
     """Call body with table[kind] if it exists.  Raise an error otherwise."""
@@ -198,6 +204,6 @@ def from_file(filename):
 the histograms defined in filename.
     """
     with open(filename, 'r') as f:
-        histograms = json.load(f, object_pairs_hook=json.OrderedDict)
+        histograms = json.load(f, object_pairs_hook=OrderedDict)
         for (name, definition) in histograms.iteritems():
             yield Histogram(name, definition)

From e0d26ab43764376412b716fd2a3c1427ae7156bb Mon Sep 17 00:00:00 2001
From: vliu <vliu@mozilla.com>
Date: Tue, 27 Nov 2012 11:13:19 +0800
Subject: [PATCH 157/160] Bug 813823 - AudioManager reports unknown status when
 inserting headphone or headset. r=mwu

---
 dom/system/gonk/AudioManager.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dom/system/gonk/AudioManager.cpp b/dom/system/gonk/AudioManager.cpp
index 9d96483cff0b..1c1d91f8bfd8 100644
--- a/dom/system/gonk/AudioManager.cpp
+++ b/dom/system/gonk/AudioManager.cpp
@@ -29,9 +29,10 @@ using namespace mozilla;
 #define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "AudioManager" , ## args)
 
 #define HEADPHONES_STATUS_CHANGED "headphones-status-changed"
-#define HEADPHONES_STATUS_ON      NS_LITERAL_STRING("on").get()
-#define HEADPHONES_STATUS_OFF     NS_LITERAL_STRING("off").get()
-#define HEADPHONES_STATUS_UNKNOWN NS_LITERAL_STRING("unknown").get()
+#define HEADPHONES_STATUS_HEADSET   NS_LITERAL_STRING("headset").get()
+#define HEADPHONES_STATUS_HEADPHONE NS_LITERAL_STRING("headphone").get()
+#define HEADPHONES_STATUS_OFF       NS_LITERAL_STRING("off").get()
+#define HEADPHONES_STATUS_UNKNOWN   NS_LITERAL_STRING("unknown").get()
 #define BLUETOOTH_SCO_STATUS_CHANGED "bluetooth-sco-status-changed"
 
 // Refer AudioService.java from Android
@@ -170,8 +171,10 @@ NotifyHeadphonesStatus(SwitchState aState)
 {
   nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
   if (obs) {
-    if (aState == SWITCH_STATE_ON) {
-      obs->NotifyObservers(nullptr, HEADPHONES_STATUS_CHANGED, HEADPHONES_STATUS_ON);
+    if (aState == SWITCH_STATE_HEADSET) {
+      obs->NotifyObservers(nullptr, HEADPHONES_STATUS_CHANGED, HEADPHONES_STATUS_HEADSET);
+    } else if (aState == SWITCH_STATE_HEADPHONE) {
+      obs->NotifyObservers(nullptr, HEADPHONES_STATUS_CHANGED, HEADPHONES_STATUS_HEADPHONE);
     } else if (aState == SWITCH_STATE_OFF) {
       obs->NotifyObservers(nullptr, HEADPHONES_STATUS_CHANGED, HEADPHONES_STATUS_OFF);
     } else {

From ffca6c1146450558dda23b6b764d2a2a09748640 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Tue, 27 Nov 2012 14:52:54 -0500
Subject: [PATCH 158/160] Bug 814470 - Fix a leak when channel setup in
 AsyncFetchAndSetIconFromNetwork fails by not tracking the channel in the
 first place and thus avoiding a circular references. r=mak

---
 .../components/places/AsyncFaviconHelpers.cpp | 24 ++++++++-----------
 .../components/places/AsyncFaviconHelpers.h   |  1 -
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/toolkit/components/places/AsyncFaviconHelpers.cpp b/toolkit/components/places/AsyncFaviconHelpers.cpp
index 2eb2d9dc254c..ea76a1990034 100644
--- a/toolkit/components/places/AsyncFaviconHelpers.cpp
+++ b/toolkit/components/places/AsyncFaviconHelpers.cpp
@@ -548,11 +548,6 @@ AsyncFetchAndSetIconFromNetwork::AsyncFetchAndSetIconFromNetwork(
 
 AsyncFetchAndSetIconFromNetwork::~AsyncFetchAndSetIconFromNetwork()
 {
-  nsCOMPtr<nsIThread> thread;
-  (void)NS_GetMainThread(getter_AddRefs(thread));
-  if (mChannel) {
-    (void)NS_ProxyRelease(thread, mChannel, true);
-  }
 }
 
 NS_IMETHODIMP
@@ -570,22 +565,20 @@ AsyncFetchAndSetIconFromNetwork::Run()
   nsCOMPtr<nsIURI> iconURI;
   nsresult rv = NS_NewURI(getter_AddRefs(iconURI), mIcon.spec);
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = NS_NewChannel(getter_AddRefs(mChannel), iconURI);
+  nsCOMPtr<nsIChannel> channel;
+  rv = NS_NewChannel(getter_AddRefs(channel), iconURI);
   NS_ENSURE_SUCCESS(rv, rv);
   nsCOMPtr<nsIInterfaceRequestor> listenerRequestor =
     do_QueryInterface(reinterpret_cast<nsISupports*>(this));
   NS_ENSURE_STATE(listenerRequestor);
-  rv = mChannel->SetNotificationCallbacks(listenerRequestor);
+  rv = channel->SetNotificationCallbacks(listenerRequestor);
   NS_ENSURE_SUCCESS(rv, rv);
-  nsCOMPtr<nsIPrivateBrowsingChannel> pbChannel = do_QueryInterface(mChannel);
+  nsCOMPtr<nsIPrivateBrowsingChannel> pbChannel = do_QueryInterface(channel);
   if (pbChannel) {
     rv = pbChannel->SetPrivate(mFaviconLoadPrivate);
     NS_ENSURE_SUCCESS(rv, rv);
   }
-  rv = mChannel->AsyncOpen(this, nullptr);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
+  return channel->AsyncOpen(this, nullptr);
 }
 
 NS_IMETHODIMP
@@ -629,7 +622,6 @@ AsyncFetchAndSetIconFromNetwork::AsyncOnChannelRedirect(
 , nsIAsyncVerifyRedirectCallback *cb
 )
 {
-  mChannel = newChannel;
   (void)cb->OnRedirectVerifyCallback(NS_OK);
   return NS_OK;
 }
@@ -670,7 +662,11 @@ AsyncFetchAndSetIconFromNetwork::OnStopRequest(nsIRequest* aRequest,
     return NS_OK;
   }
 
-  mIcon.expiration = GetExpirationTimeFromChannel(mChannel);
+  nsCOMPtr<nsIChannel> channel = do_QueryInterface(aRequest);
+  // aRequest should always QI to nsIChannel.
+  // See AsyncFetchAndSetIconFromNetwork::Run()
+  MOZ_ASSERT(channel);
+  mIcon.expiration = GetExpirationTimeFromChannel(channel);
 
   rv = OptimizeIconSize(mIcon, favicons);
   NS_ENSURE_SUCCESS(rv, rv);
diff --git a/toolkit/components/places/AsyncFaviconHelpers.h b/toolkit/components/places/AsyncFaviconHelpers.h
index 1f9abbc46985..338453428000 100644
--- a/toolkit/components/places/AsyncFaviconHelpers.h
+++ b/toolkit/components/places/AsyncFaviconHelpers.h
@@ -197,7 +197,6 @@ public:
 protected:
   IconData mIcon;
   PageData mPage;
-  nsCOMPtr<nsIChannel> mChannel;
   const bool mFaviconLoadPrivate;
 };
 

From 6674dad4a2c2615dcba7066fe7708cb37ecfdd41 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <tdz@users.sourceforge.net>
Date: Tue, 27 Nov 2012 14:52:54 -0500
Subject: [PATCH 159/160] Bug 814723 - Don't warn about missing
 'browser.newtab.url' in nsDocShell. r=jlebar

The preference key 'browser.newtab.url' is only supported for the browser,
and undefined on all other targets; such as mobile or b2g. For those targets
the function 'nsDocShell::ShouldAddToSessionHistory' warns about the missing
key.

This patch silences this warning by making Gecko return a default value of
'true' if the key is not present in the preferences.
---
 docshell/base/nsDocShell.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index d096fa0f3783..ce6a4fe33826 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -10316,10 +10316,13 @@ nsDocShell::ShouldAddToSessionHistory(nsIURI * aURI)
         }
     }
 
-    rv = aURI->GetSpec(buf);
-    NS_ENSURE_SUCCESS(rv, true);
-
     rv = Preferences::GetDefaultCString("browser.newtab.url", &pref);
+
+    if (NS_FAILED(rv)) {
+        return true;
+    }
+
+    rv = aURI->GetSpec(buf);
     NS_ENSURE_SUCCESS(rv, true);
 
     return !buf.Equals(pref);

From de8060e941a835894714804de5fa11db89f92896 Mon Sep 17 00:00:00 2001
From: Jason Duell <jduell.mcbugs@gmail.com>
Date: Tue, 27 Nov 2012 11:54:58 -0800
Subject: [PATCH 160/160] Bug 800799 - http-on-modify-request now called after
 JS that started the load is no longer on the stack. r=bz

---
 netwerk/protocol/http/nsHttpChannel.cpp        |  5 +++++
 netwerk/protocol/http/nsHttpHandler.h          |  6 ++++++
 .../protocol/http/nsIHttpProtocolHandler.idl   | 18 ++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 33e9f227d1bf..08005dee875d 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -4294,6 +4294,11 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context)
 
     AddCookiesToRequest();
 
+    // notify "http-on-opening-request" observers, but not if this is a redirect
+    if (!(mLoadFlags & LOAD_REPLACE)) {
+        gHttpHandler->OnOpeningRequest(this);
+    }
+
     mIsPending = true;
     mWasOpened = true;
 
diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h
index d34ad3a2fe9c..103079a01717 100644
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@@ -177,6 +177,12 @@ public:
     // callable from socket thread only
     uint32_t Get32BitsOfPseudoRandom();
 
+    // Called by the channel synchronously during asyncOpen
+    void OnOpeningRequest(nsIHttpChannel *chan)
+    {
+        NotifyObservers(chan, NS_HTTP_ON_OPENING_REQUEST_TOPIC);
+    }
+
     // Called by the channel before writing a request
     void OnModifyRequest(nsIHttpChannel *chan)
     {
diff --git a/netwerk/protocol/http/nsIHttpProtocolHandler.idl b/netwerk/protocol/http/nsIHttpProtocolHandler.idl
index d1243f5e3383..e491e2fa49d5 100644
--- a/netwerk/protocol/http/nsIHttpProtocolHandler.idl
+++ b/netwerk/protocol/http/nsIHttpProtocolHandler.idl
@@ -66,6 +66,24 @@ interface nsIHttpProtocolHandler : nsIProxiedProtocolHandler
  */
 #define NS_HTTP_STARTUP_TOPIC "http-startup"
 
+/**
+ * This observer topic is notified when an HTTP channel is opened.
+ * It is similar to http-on-modify-request, except that
+ * 1) The notification is guaranteed to occur before on-modify-request, during
+ *    the AsyncOpen call itself.
+ * 2) It only occurs for the initial open of a channel, not for internal
+ *    asyncOpens that happen during redirects, etc.
+ * 3) Some information (most notably nsIProxiedChannel.proxyInfo) may not be set
+ *    on the channel object yet.
+ *
+ * The "subject" of the notification is the nsIHttpChannel instance.
+ *
+ * Generally the 'http-on-modify-request' notification is preferred unless the
+ * synchronous, during-asyncOpen behavior that this notification provides is
+ * required.
+ */
+#define NS_HTTP_ON_OPENING_REQUEST_TOPIC "http-on-opening-request"
+
 /**
  * Before an HTTP request is sent to the server, this observer topic is
  * notified.  The observer of this topic can then choose to set any additional