From 93677ce05043ef28454aae6d276518f007049d3f Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 15 Oct 2010 11:45:31 +0200
Subject: [PATCH 01/57] Bug 583209 - Use ctypes.libraryName and don't use a
 full path to load libnss3 from weavecrypto. [r=dwitte]

---
 services/crypto/modules/WeaveCrypto.js | 39 +++++++++-----------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/services/crypto/modules/WeaveCrypto.js b/services/crypto/modules/WeaveCrypto.js
index ae7dbf819f8..de16f36437b 100644
--- a/services/crypto/modules/WeaveCrypto.js
+++ b/services/crypto/modules/WeaveCrypto.js
@@ -108,34 +108,21 @@ WeaveCrypto.prototype = {
         Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports);
 
         // Open the NSS library.
-        let nssfile = Services.dirsvc.get("GreD", Ci.nsILocalFile);
-        let os = Services.appinfo.OS;
-        switch (os) {
-          case "WINNT":
-          case "WINMO":
-          case "WINCE":
-            nssfile.append("nss3.dll");
-            break;
-          case "Darwin":
-            nssfile.append("libnss3.dylib");
-            break;
-          case "Linux":
-          case "SunOS":
-          case "WebOS": // Palm Pre
-            nssfile.append("libnss3.so");
-            break;
-          case "Android":
-            // Android uses a $GREDIR/lib/ subdir.
-            nssfile.append("lib");
-            nssfile.append("libnss3.so");
-            break;
-          default:
-            throw this.makeException("unsupported platform: " + os, Cr.NS_ERROR_UNEXPECTED);
-        }
-        this.log("Using NSS library " + nssfile.path);
+        let path = ctypes.libraryName("nss3");
 
         // XXX really want to be able to pass specific dlopen flags here.
-        let nsslib = ctypes.open(nssfile.path);
+        var nsslib;
+        try {
+            this.log("Trying NSS library without path");
+            nsslib = ctypes.open(path);
+        } catch(e) {
+            // In case opening the library without a full path fails,
+            // try again with a full path.
+            let file = Services.dirsvc.get("GreD", Ci.nsILocalFile);
+            file.append(path);
+            this.log("Trying again with path " + file.path);
+            nsslib = ctypes.open(file.path);
+        }
 
         this.log("Initializing NSS types and function declarations...");
 

From 4ecbe2537766ef94807bf4f002017f43952d41ec Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Tue, 19 Oct 2010 00:10:22 +0200
Subject: [PATCH 02/57] Bug 604565 - Attempt to make tests hang less on OS X.
 [r=mconnor]

Reduce amount of pointless network calls by not registering any engines for tests that provide their own fake engine implementations anyway.
---
 .../sync/tests/unit/test_service_sync_checkServerError.js   | 4 +++-
 .../tests/unit/test_service_sync_updateEnabledEngines.js    | 6 +++++-
 services/sync/tests/unit/test_service_wipeClient.js         | 5 ++++-
 services/sync/tests/unit/test_service_wipeServer.js         | 4 +++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/services/sync/tests/unit/test_service_sync_checkServerError.js b/services/sync/tests/unit/test_service_sync_checkServerError.js
index dc1459380f6..f05e7b97824 100644
--- a/services/sync/tests/unit/test_service_sync_checkServerError.js
+++ b/services/sync/tests/unit/test_service_sync_checkServerError.js
@@ -1,9 +1,11 @@
-Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/engines.js");
 Cu.import("resource://services-sync/status.js");
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/util.js");
 
+Svc.DefaultPrefs.set("registerEngines", "");
+Cu.import("resource://services-sync/service.js");
+
 initTestLogging();
 
 function CatapultEngine() {
diff --git a/services/sync/tests/unit/test_service_sync_updateEnabledEngines.js b/services/sync/tests/unit/test_service_sync_updateEnabledEngines.js
index 92f960f1d09..50b506f2a27 100644
--- a/services/sync/tests/unit/test_service_sync_updateEnabledEngines.js
+++ b/services/sync/tests/unit/test_service_sync_updateEnabledEngines.js
@@ -1,4 +1,3 @@
-Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/engines.js");
 Cu.import("resource://services-sync/util.js");
 Cu.import("resource://services-sync/constants.js");
@@ -6,6 +5,11 @@ Cu.import("resource://services-sync/base_records/crypto.js");
 Cu.import("resource://services-sync/base_records/keys.js");
 Cu.import("resource://services-sync/base_records/wbo.js");
 
+Svc.DefaultPrefs.set("registerEngines", "");
+Cu.import("resource://services-sync/service.js");
+
+initTestLogging();
+
 function SteamEngine() {
   SyncEngine.call(this, "Steam");
 }
diff --git a/services/sync/tests/unit/test_service_wipeClient.js b/services/sync/tests/unit/test_service_wipeClient.js
index 0859f380ebf..1f4af871883 100644
--- a/services/sync/tests/unit/test_service_wipeClient.js
+++ b/services/sync/tests/unit/test_service_wipeClient.js
@@ -1,5 +1,8 @@
-Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/engines.js");
+Cu.import("resource://services-sync/util.js");
+
+Svc.DefaultPrefs.set("registerEngines", "");
+Cu.import("resource://services-sync/service.js");
 
 
 function CanDecryptEngine() {
diff --git a/services/sync/tests/unit/test_service_wipeServer.js b/services/sync/tests/unit/test_service_wipeServer.js
index 906560f6226..9d65409c549 100644
--- a/services/sync/tests/unit/test_service_wipeServer.js
+++ b/services/sync/tests/unit/test_service_wipeServer.js
@@ -1,9 +1,11 @@
 Cu.import("resource://services-sync/util.js");
-Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/base_records/crypto.js");
 Cu.import("resource://services-sync/base_records/keys.js");
 Cu.import("resource://services-sync/resource.js");
 
+Svc.DefaultPrefs.set("registerEngines", "");
+Cu.import("resource://services-sync/service.js");
+
 function FakeCollection() {
   this.deleted = false;
 }

From fa6d8f23241df9f74f9be42de291a815420e7591 Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Thu, 21 Oct 2010 13:47:47 +0200
Subject: [PATCH 03/57] Bug 604565 - Disable intermittently failing xpcshell
 tests on OSX debug builds. [r=mconnor]

--HG--
rename : services/sync/tests/unit/head_appinfo.js => services/sync/tests/unit/head_appinfo.js.in
---
 .../tests/unit/{head_appinfo.js => head_appinfo.js.in}   | 9 +++++++++
 .../tests/unit/test_service_sync_checkServerError.js     | 3 +++
 .../tests/unit/test_service_sync_updateEnabledEngines.js | 3 +++
 services/sync/tests/unit/test_syncengine_sync.js         | 3 +++
 4 files changed, 18 insertions(+)
 rename services/sync/tests/unit/{head_appinfo.js => head_appinfo.js.in} (91%)

diff --git a/services/sync/tests/unit/head_appinfo.js b/services/sync/tests/unit/head_appinfo.js.in
similarity index 91%
rename from services/sync/tests/unit/head_appinfo.js
rename to services/sync/tests/unit/head_appinfo.js.in
index 278ee6dc0a1..8fa133ae0e8 100644
--- a/services/sync/tests/unit/head_appinfo.js
+++ b/services/sync/tests/unit/head_appinfo.js.in
@@ -62,3 +62,12 @@ registrar.registerFactory(Components.ID("{fbfae60b-64a4-44ef-a911-08ceb70b9f31}"
 // Provide resource://services-sync if it isn't already available
 let weaveService = Cc["@mozilla.org/weave/service;1"].getService();
 weaveService.wrappedJSObject.addResourceAlias();
+
+
+// Some tests hang on OSX debug builds. See bug 604565.
+let DISABLE_TESTS_BUG_604565 = false;
+#ifdef XP_MACOSX
+#ifdef MOZ_DEBUG_SYMBOLS
+DISABLE_TESTS_BUG_604565 = true;
+#endif
+#endif
diff --git a/services/sync/tests/unit/test_service_sync_checkServerError.js b/services/sync/tests/unit/test_service_sync_checkServerError.js
index f05e7b97824..5f69a1a9134 100644
--- a/services/sync/tests/unit/test_service_sync_checkServerError.js
+++ b/services/sync/tests/unit/test_service_sync_checkServerError.js
@@ -132,6 +132,9 @@ function test_overQuota() {
 }
 
 function run_test() {
+  if (DISABLE_TESTS_BUG_604565)
+    return;
+
   test_backoff500();
   test_backoff503();
   test_overQuota();
diff --git a/services/sync/tests/unit/test_service_sync_updateEnabledEngines.js b/services/sync/tests/unit/test_service_sync_updateEnabledEngines.js
index 50b506f2a27..b6e7b89f220 100644
--- a/services/sync/tests/unit/test_service_sync_updateEnabledEngines.js
+++ b/services/sync/tests/unit/test_service_sync_updateEnabledEngines.js
@@ -342,6 +342,9 @@ function test_dependentEnginesDisabledLocally() {
 }
 
 function run_test() {
+  if (DISABLE_TESTS_BUG_604565)
+    return;
+
   test_newAccount();
   test_enabledLocally();
   test_disabledLocally();
diff --git a/services/sync/tests/unit/test_syncengine_sync.js b/services/sync/tests/unit/test_syncengine_sync.js
index 257ddee3772..6aeb566311c 100644
--- a/services/sync/tests/unit/test_syncengine_sync.js
+++ b/services/sync/tests/unit/test_syncengine_sync.js
@@ -1150,6 +1150,9 @@ function test_canDecrypt_true() {
 
 
 function run_test() {
+  if (DISABLE_TESTS_BUG_604565)
+    return;
+
   test_syncStartup_emptyOrOutdatedGlobalsResetsSync();
   test_syncStartup_metaGet404();
   test_syncStartup_failedMetaGet();

From c4f254556d38e9272e23852a649e054f6d1bf933 Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Wed, 27 Oct 2010 11:57:21 -0500
Subject: [PATCH 04/57] Bug 607512: Destroy document-viewer widgetry to avoid
 keeping native widgets and layers alive longer than necessary. r=roc
 a=blocking-fennec

---
 layout/base/nsDocumentViewer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 6e74fb6f38b..9907a5bc899 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -1624,6 +1624,8 @@ DocumentViewerImpl::Destroy()
     mPresContext = nsnull;
   }
 
+  mWindow = nsnull;
+  mViewManager = nsnull;
   mContainer = nsnull;
 
   return NS_OK;

From 2087ffb672de8e891a026b244224cc1e73d3b6e8 Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Mon, 25 Oct 2010 20:40:55 +0200
Subject: [PATCH 05/57] Bug 527667 - DOM Storage (localStorage, sessionStorage)
 data is not cleared when 'Clear Recent History' is used with Time range not
 'Everything', r+sr=jst, a=blocking2.0:betaN

---
 browser/base/content/sanitize.js              |  5 +
 .../storage/nsIDOMStorageManager.idl          | 11 ++-
 dom/src/storage/nsDOMStorage.cpp              | 94 ++++++++++++++++--
 dom/src/storage/nsDOMStorage.h                | 16 ++-
 dom/src/storage/nsDOMStorageDBWrapper.cpp     | 19 ++++
 dom/src/storage/nsDOMStorageDBWrapper.h       |  7 ++
 dom/src/storage/nsDOMStorageMemoryDB.cpp      | 29 ++++++
 dom/src/storage/nsDOMStorageMemoryDB.h        |  9 ++
 dom/src/storage/nsDOMStoragePersistentDB.cpp  | 97 ++++++++++++++++---
 dom/src/storage/nsDOMStoragePersistentDB.h    |  9 ++
 dom/tests/mochitest/Makefile.in               |  1 +
 dom/tests/mochitest/globalstorage/Makefile.in | 54 +++++++++++
 .../test_globalStorageDeleteSinceAPI.html     | 73 ++++++++++++++
 dom/tests/mochitest/localstorage/Makefile.in  |  2 +
 .../test_localStorageDeleteSinceAPI.html      | 70 +++++++++++++
 ...lStorageDeleteSinceAPIPrivateBrowsing.html | 85 ++++++++++++++++
 .../mochitest/sessionstorage/Makefile.in      |  1 +
 .../test_sessionStorageDeleteSinceAPI.html    | 67 +++++++++++++
 18 files changed, 627 insertions(+), 22 deletions(-)
 create mode 100644 dom/tests/mochitest/globalstorage/Makefile.in
 create mode 100644 dom/tests/mochitest/globalstorage/test_globalStorageDeleteSinceAPI.html
 create mode 100644 dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPI.html
 create mode 100644 dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPIPrivateBrowsing.html
 create mode 100644 dom/tests/mochitest/sessionstorage/test_sessionStorageDeleteSinceAPI.html

diff --git a/browser/base/content/sanitize.js b/browser/base/content/sanitize.js
index 3834c697e11..8c6d9a7dd91 100644
--- a/browser/base/content/sanitize.js
+++ b/browser/base/content/sanitize.js
@@ -152,6 +152,11 @@ Sanitizer.prototype = {
               // This cookie was created after our cutoff, clear it
               cookieMgr.remove(cookie.host, cookie.name, cookie.path, false);
           }
+
+          // Also handle all DOM storage data created after the cutoff.
+          var domStorageManager = Components.classes["@mozilla.org/dom/storagemanager;1"]
+                                            .getService(Ci.nsIDOMStorageManager);
+          domStorageManager.clearStorageDataSince(this.range[0]);
         }
         else {
           // Remove everything
diff --git a/dom/interfaces/storage/nsIDOMStorageManager.idl b/dom/interfaces/storage/nsIDOMStorageManager.idl
index 7df2efa3470..13ef2b207af 100644
--- a/dom/interfaces/storage/nsIDOMStorageManager.idl
+++ b/dom/interfaces/storage/nsIDOMStorageManager.idl
@@ -40,7 +40,7 @@
 interface nsIDOMStorage;
 interface nsIPrincipal;
 
-[scriptable, uuid(fd91ec36-7da8-43bb-b8f2-4b57a862a467)]
+[scriptable, uuid(9b729267-00ed-4e5c-a3d2-b5572ca0934d)]
 interface nsIDOMStorageManager : nsISupports
 {
   /**
@@ -59,6 +59,15 @@ interface nsIDOMStorageManager : nsISupports
    */
   void clearOfflineApps();
 
+  /**
+   * Clears any data stored in DOM storage since the provided time
+   * @param since
+   *    Any storage value that has been inserted after the time specified
+   *    with 'since' will be deleted.  The time is in microseconds, defined
+   *    as PR_Now() function result.
+   */
+  void clearStorageDataSince(in PRInt64 since);
+
   /**
    * Returns instance of localStorage object for aURI's origin.
    * This method ensures there is always only a single instance
diff --git a/dom/src/storage/nsDOMStorage.cpp b/dom/src/storage/nsDOMStorage.cpp
index acd3bfc1e24..e443970f1a0 100644
--- a/dom/src/storage/nsDOMStorage.cpp
+++ b/dom/src/storage/nsDOMStorage.cpp
@@ -65,6 +65,7 @@
 #include "nsDOMString.h"
 #include "nsNetCID.h"
 #include "nsIProxyObjectManager.h"
+#include "nsISupportsPrimitives.h"
 
 static const PRUint32 ASK_BEFORE_ACCEPT = 1;
 static const PRUint32 ACCEPT_SESSION = 2;
@@ -402,10 +403,13 @@ nsDOMStorageManager::Observe(nsISupports *aSubject,
 
       PRUint32 cap = 0;
       perm->GetCapability(&cap);
-      if (!(cap & nsICookiePermission::ACCESS_SESSION) ||
-          nsDependentString(aData) != NS_LITERAL_STRING("deleted"))
+      if (!(cap & nsICookiePermission::ACCESS_SESSION))
         return NS_OK;
 
+      // In any change to ACCESS_SESSION, like add or delete, drop the session
+      // only storage in-memory database.  This ensures that it will always be
+      // newly created and therefor preloaded with data from the persistent
+      // database after we switched to ACCESS_SESSION.
       nsCAutoString host;
       perm->GetHost(host);
       if (host.IsEmpty())
@@ -438,6 +442,33 @@ nsDOMStorageManager::GetUsage(const nsAString& aDomain,
                                             PR_FALSE, aUsage);
 }
 
+NS_IMETHODIMP
+nsDOMStorageManager::ClearStorageDataSince(PRInt64 aSince)
+{
+  nsresult rv;
+
+  rv = nsDOMStorage::InitDB();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = nsDOMStorage::gStorageDB->RemoveTimeRange(aSince);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIObserverService> obsserv = mozilla::services::GetObserverService();
+  if (obsserv) {
+    nsCOMPtr<nsISupportsPRTime> time = do_CreateInstance(
+          "@mozilla.org/supports-PRTime;1", &rv);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = time->SetData(aSince);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = obsserv->NotifyObservers(time, NS_DOMSTORAGE_CUTOFF_OBSERVER, nsnull);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsDOMStorageManager::ClearOfflineApps()
 {
@@ -660,6 +691,8 @@ nsDOMStorage::InitAsSessionStorage(nsIPrincipal *aPrincipal, const nsSubstring &
   mQuotaDomainDBKey.Truncate();
 #endif
 
+  RegisterObservers(false);
+
   mStorageType = SessionStorage;
   return NS_OK;
 }
@@ -703,7 +736,7 @@ nsDOMStorage::InitAsLocalStorage(nsIPrincipal *aPrincipal, const nsSubstring &aD
     mCanUseChromePersist = URICanUseChromePersist(URI);
   }
 
-  RegisterObservers();
+  RegisterObservers(true);
 
   return NS_OK;
 }
@@ -731,7 +764,7 @@ nsDOMStorage::InitAsGlobalStorage(const nsACString &aDomainDemanded)
   mStorageType = GlobalStorage;
   mEventBroadcaster = this;
 
-  RegisterObservers();
+  RegisterObservers(true);
 
   return NS_OK;
 }
@@ -1091,6 +1124,12 @@ nsDOMStorage::SetItem(const nsAString& aKey, const nsAString& aData)
     entry->mItem = newitem;
   }
 
+  if (!UseDB()) {
+    // This is used only for sessionStorage, no need to setup the time also when
+    // loading items from the database etc.
+    entry->mItem->SetInsertTimeToNow();
+  }
+
   if ((oldValue != aData || mStorageType == GlobalStorage) && mEventBroadcaster)
     mEventBroadcaster->BroadcastChangeNotification(aKey, oldValue, aData);
 
@@ -1532,13 +1571,16 @@ nsDOMStorage::MaybeCommitTemporaryTable(bool force)
 }
 
 nsresult
-nsDOMStorage::RegisterObservers()
+nsDOMStorage::RegisterObservers(bool persistent)
 {
   nsCOMPtr<nsIObserverService> obsserv = mozilla::services::GetObserverService();
   if (obsserv) {
-    obsserv->AddObserver(this, "profile-before-change", PR_TRUE);
-    obsserv->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
-    obsserv->AddObserver(this, NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER, PR_TRUE);
+    if (persistent) {
+      obsserv->AddObserver(this, "profile-before-change", PR_TRUE);
+      obsserv->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
+      obsserv->AddObserver(this, NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER, PR_TRUE);
+    }
+    obsserv->AddObserver(this, NS_DOMSTORAGE_CUTOFF_OBSERVER, PR_TRUE);
   }
   return NS_OK;
 }
@@ -1561,6 +1603,17 @@ nsDOMStorage::SetTemporaryTableLoaded(bool loaded)
   mLoadedTemporaryTable = loaded;
 }
 
+static PLDHashOperator
+StorageCutOffEnum(nsSessionStorageEntry* aEntry, void* userArg)
+{
+  PRInt64 since = *(PRInt64*)userArg;
+
+  if (aEntry->mItem->ShouldBeCutOff(since))
+    return PL_DHASH_REMOVE;
+
+  return PL_DHASH_NEXT;
+}
+
 NS_IMETHODIMP
 nsDOMStorage::Observe(nsISupports *subject,
                       const char *topic,
@@ -1579,6 +1632,30 @@ nsDOMStorage::Observe(nsISupports *subject,
     return NS_OK;
   }
 
+  if (!strcmp(topic, NS_DOMSTORAGE_CUTOFF_OBSERVER)) {
+    if (UseDB()) {
+      // If this storage is using the database (localStorage, globalStorage)
+      // then just re-cache the items from the database, database is now up to
+      // date.
+      mItemsCached = PR_FALSE;
+      CacheKeysFromDB();
+    }
+    else {
+      // This is sessionStorage. In that case we need to prune the mItems hash
+      // table. Insert times are properly set in nsDOMStorage::SetItem.
+      nsresult rv;
+      nsCOMPtr<nsISupportsPRTime> time = do_QueryInterface(subject, &rv);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      PRInt64 since;
+      rv = time->GetData(&since);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      mItems.EnumerateEntries(StorageCutOffEnum, &since);
+    }
+    return NS_OK;
+  }
+
   NS_WARNING("Unrecognized topic in nsDOMStorage::Observe");
   return NS_OK;
 }
@@ -2031,6 +2108,7 @@ nsDOMStorageItem::nsDOMStorageItem(nsDOMStorage* aStorage,
   : mSecure(aSecure),
     mKey(aKey),
     mValue(aValue),
+    mInsertTime(0),
     mStorage(aStorage)
 {
 }
diff --git a/dom/src/storage/nsDOMStorage.h b/dom/src/storage/nsDOMStorage.h
index 4aad4f6c428..d8cbab687f0 100644
--- a/dom/src/storage/nsDOMStorage.h
+++ b/dom/src/storage/nsDOMStorage.h
@@ -64,6 +64,7 @@
 #include "mozilla/TimeStamp.h"
 
 #define NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER "domstorage-flush-timer"
+#define NS_DOMSTORAGE_CUTOFF_OBSERVER "domstorage-cutoff"
 
 #ifdef MOZ_STORAGE
 #include "nsDOMStorageDBWrapper.h"
@@ -242,7 +243,7 @@ public:
     return static_cast<nsDOMStorage*>(static_cast<nsIDOMStorageObsolete*>(aSupports));
   }
 
-  nsresult RegisterObservers();
+  nsresult RegisterObservers(bool persistent);
   nsresult MaybeCommitTemporaryTable(bool force);
 
   bool WasTemporaryTableLoaded();
@@ -464,6 +465,16 @@ public:
     mValue.Truncate();
   }
 
+  void SetInsertTimeToNow()
+  {
+    mInsertTime = PR_Now();
+  }
+
+  bool ShouldBeCutOff(PRInt64 since)
+  {
+    return mInsertTime > since;
+  }
+
 protected:
 
   // true if this value is for secure sites only
@@ -475,6 +486,9 @@ protected:
   // value of the item
   nsString mValue;
 
+  // insertion/update time
+  PRInt64 mInsertTime;
+
   // If this item came from the db, mStorage points to the storage
   // object where this item came from.
   nsRefPtr<nsDOMStorage> mStorage;
diff --git a/dom/src/storage/nsDOMStorageDBWrapper.cpp b/dom/src/storage/nsDOMStorageDBWrapper.cpp
index 80679f25091..28cbe1b8180 100644
--- a/dom/src/storage/nsDOMStorageDBWrapper.cpp
+++ b/dom/src/storage/nsDOMStorageDBWrapper.cpp
@@ -263,6 +263,25 @@ nsDOMStorageDBWrapper::RemoveOwner(const nsACString& aOwner,
   return rv;
 }
 
+nsresult
+nsDOMStorageDBWrapper::RemoveTimeRange(PRInt64 aSince)
+{
+  nsresult rv;
+
+  rv = mPrivateBrowsingDB.RemoveTimeRange(aSince);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (nsDOMStorageManager::gStorageManager->InPrivateBrowsingMode())
+    return NS_OK;
+
+  rv = mSessionOnlyDB.RemoveTimeRange(aSince);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = mPersistentDB.RemoveTimeRange(aSince);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return rv;
+}
 
 nsresult
 nsDOMStorageDBWrapper::RemoveOwners(const nsTArray<nsString> &aOwners,
diff --git a/dom/src/storage/nsDOMStorageDBWrapper.h b/dom/src/storage/nsDOMStorageDBWrapper.h
index ee641454c86..bb7a4bf6ff8 100644
--- a/dom/src/storage/nsDOMStorageDBWrapper.h
+++ b/dom/src/storage/nsDOMStorageDBWrapper.h
@@ -177,6 +177,13 @@ public:
   RemoveOwners(const nsTArray<nsString>& aOwners,
                PRBool aIncludeSubDomains, PRBool aMatch);
 
+  /**
+   * Removes all keys that were created after the time specified by 'aSince'.
+   * 'aSince' value is compatible with PR_Now() function.
+   */
+  nsresult
+  RemoveTimeRange(PRInt64 aSince);
+
   /**
    * Removes all keys from storage. Used when clearing storage.
    */
diff --git a/dom/src/storage/nsDOMStorageMemoryDB.cpp b/dom/src/storage/nsDOMStorageMemoryDB.cpp
index 220ba527f2a..5cbed5bb23a 100644
--- a/dom/src/storage/nsDOMStorageMemoryDB.cpp
+++ b/dom/src/storage/nsDOMStorageMemoryDB.cpp
@@ -230,6 +230,7 @@ nsDOMStorageMemoryDB::SetKey(nsDOMStorage* aStorage,
 
   item->mValue = aValue;
   item->mSecure = aSecure;
+  item->mInsertTime = PR_Now();
 
   *aNewUsage = usage;
 
@@ -379,6 +380,34 @@ nsDOMStorageMemoryDB::RemoveOwners(const nsTArray<nsString> &aOwners,
   return NS_OK;
 }
 
+static PLDHashOperator
+RemoveTimeRangeEnum(const nsAString& keyname,
+               nsAutoPtr<nsDOMStorageMemoryDB::nsInMemoryItem>& item,
+               void *closure)
+{
+  if (item->mInsertTime > *(PRInt64*)closure)
+    return PL_DHASH_REMOVE;
+
+  return PL_DHASH_NEXT;
+}
+
+static PLDHashOperator
+RemoveTimeRangeStoragesEnum(const nsACString& key,
+                 nsAutoPtr<nsDOMStorageMemoryDB::nsInMemoryStorage>& storage,
+                 void *closure)
+{
+  storage->mTable.Enumerate(RemoveTimeRangeEnum, closure);
+  return PL_DHASH_NEXT;
+}
+
+nsresult
+nsDOMStorageMemoryDB::RemoveTimeRange(PRInt64 since)
+{
+  mData.Enumerate(RemoveTimeRangeStoragesEnum, &since);
+
+  return NS_OK;
+}
+
 nsresult
 nsDOMStorageMemoryDB::RemoveAll()
 {
diff --git a/dom/src/storage/nsDOMStorageMemoryDB.h b/dom/src/storage/nsDOMStorageMemoryDB.h
index c88fd38fb20..2f0f7fd6140 100644
--- a/dom/src/storage/nsDOMStorageMemoryDB.h
+++ b/dom/src/storage/nsDOMStorageMemoryDB.h
@@ -56,6 +56,7 @@ public:
   public:
     PRBool mSecure;
     nsString mValue;
+    PRInt64 mInsertTime;
   };
 
   typedef nsClassHashtable<nsStringHashKey, nsInMemoryItem> nsStorageItemsTable;
@@ -159,6 +160,14 @@ public:
   RemoveOwners(const nsTArray<nsString>& aOwners,
                PRBool aIncludeSubDomains, PRBool aMatch);
 
+  /**
+   * Remove all values from all scopes not marked as offline that has been
+   * created after the time specified with 'aSince'.  Used by the Clear Private
+   * Data dialog.  'aSince' value is compatible with PR_Now() function.
+   */
+  nsresult
+  RemoveTimeRange(PRInt64 aSince);
+
   /**
    * Removes all keys from storage. Used when clearing storage.
    */
diff --git a/dom/src/storage/nsDOMStoragePersistentDB.cpp b/dom/src/storage/nsDOMStoragePersistentDB.cpp
index 0de77b00a95..ae89d27e93e 100644
--- a/dom/src/storage/nsDOMStoragePersistentDB.cpp
+++ b/dom/src/storage/nsDOMStoragePersistentDB.cpp
@@ -205,30 +205,63 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName)
         "PRAGMA temp_store = MEMORY"));
   NS_ENSURE_SUCCESS(rv, rv);
 
+  PRInt32 schemaVersion;
+  rv = mConnection->GetSchemaVersion(&schemaVersion);
+  NS_ENSURE_SUCCESS(rv, rv);
+
   mozStorageTransaction transaction(mConnection, PR_FALSE);
 
   // Ensure Gecko 1.9.1 storage table
-  rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-         "CREATE TABLE IF NOT EXISTS webappsstore2 ("
-         "scope TEXT, "
-         "key TEXT, "
-         "value TEXT, "
-         "secure INTEGER, "
-         "owner TEXT)"));
+  PRBool exists;
+
+  rv = mConnection->TableExists(NS_LITERAL_CSTRING("webappsstore2"),
+                                &exists);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  if (!exists) {
+    rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+           "CREATE TABLE webappsstore2 ("
+           "scope TEXT, "
+           "key TEXT, "
+           "value TEXT, "
+           "secure INTEGER, "
+           "owner TEXT, "
+           "inserttime BIGINT DEFAULT 0)"));
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+  else {
+    if (schemaVersion == 0) {
+      rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+           "ALTER TABLE webappsstore2 "
+           "ADD COLUMN inserttime BIGINT DEFAULT 0"));
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+  }
+
+  if (schemaVersion == 0) {
+    rv = mConnection->SetSchemaVersion(1);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
   rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
         "CREATE UNIQUE INDEX IF NOT EXISTS scope_key_index"
         " ON webappsstore2(scope, key)"));
   NS_ENSURE_SUCCESS(rv, rv);
 
+  rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+        "CREATE INDEX IF NOT EXISTS inserttime_index"
+        " ON webappsstore2(inserttime)"));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+
   rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
          "CREATE TEMPORARY TABLE webappsstore2_temp ("
          "scope TEXT, "
          "key TEXT, "
          "value TEXT, "
          "secure INTEGER, "
-         "owner TEXT)"));
+         "owner TEXT, "
+         "inserttime BIGINT DEFAULT 0)"));
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
@@ -236,6 +269,11 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName)
         " ON webappsstore2_temp(scope, key)"));
   NS_ENSURE_SUCCESS(rv, rv);
 
+  rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+        "CREATE INDEX IF NOT EXISTS inserttime_index_temp"
+        " ON webappsstore2_temp(inserttime)"));
+  NS_ENSURE_SUCCESS(rv, rv);
+
 
   rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
         "CREATE TEMPORARY VIEW webappsstore2_view AS "
@@ -271,8 +309,6 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName)
   rv = mConnection->CreateFunction(NS_LITERAL_CSTRING("ISOFFLINE"), 1, function2);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PRBool exists;
-
   // Check if there is storage of Gecko 1.9.0 and if so, upgrade that storage
   // to actual webappsstore2 table and drop the obsolete table. First process
   // this newer table upgrade to priority potential duplicates from older
@@ -355,8 +391,8 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName)
   // insert a new key
   rv = mConnection->CreateStatement(NS_LITERAL_CSTRING(
          "INSERT OR REPLACE INTO "
-         "webappsstore2_temp(scope, key, value, secure) "
-         "VALUES (:scope, :key, :value, :secure)"),
+         "webappsstore2_temp(scope, key, value, secure, inserttime) "
+         "VALUES (:scope, :key, :value, :secure, :inserttime)"),
          getter_AddRefs(mInsertKeyStatement));
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -391,6 +427,14 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName)
          getter_AddRefs(mRemoveStorageStatement));
   NS_ENSURE_SUCCESS(rv, rv);
 
+  // remove keys that are junger then a specific time
+  rv = mConnection->CreateStatement(NS_LITERAL_CSTRING(
+         "DELETE FROM webappsstore2_view "
+         "WHERE inserttime > :time "
+         "AND NOT ISOFFLINE(scope)"),
+         getter_AddRefs(mRemoveTimeRangeStatement));
+  NS_ENSURE_SUCCESS(rv, rv);
+
   // remove all keys
   rv = mConnection->CreateStatement(NS_LITERAL_CSTRING(
          "DELETE FROM webappsstore2_view"),
@@ -689,6 +733,9 @@ nsDOMStoragePersistentDB::SetKey(nsDOMStorage* aStorage,
   rv = binder->BindInt32ByName(NS_LITERAL_CSTRING("secure"),
                                aSecure ? 1 : 0);
   NS_ENSURE_SUCCESS(rv, rv);
+  rv = binder->BindInt64ByName(NS_LITERAL_CSTRING("inserttime"),
+                               PR_Now());
+  NS_ENSURE_SUCCESS(rv, rv);
 
   rv = binder.Add();
   NS_ENSURE_SUCCESS(rv, rv);
@@ -805,6 +852,32 @@ nsDOMStoragePersistentDB::ClearStorage(nsDOMStorage* aStorage)
   return NS_OK;
 }
 
+nsresult
+nsDOMStoragePersistentDB::RemoveTimeRange(PRInt64 since)
+{
+  nsresult rv;
+
+  rv = MaybeCommitInsertTransaction();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mozStorageStatementScoper scope(mRemoveTimeRangeStatement);
+
+  Binder binder(mRemoveTimeRangeStatement, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = binder->BindInt64ByName(NS_LITERAL_CSTRING("time"),
+                                    since);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = binder.Add();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = mRemoveTimeRangeStatement->Execute();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
 nsresult
 nsDOMStoragePersistentDB::RemoveOwner(const nsACString& aOwner,
                                       PRBool aIncludeSubDomains)
diff --git a/dom/src/storage/nsDOMStoragePersistentDB.h b/dom/src/storage/nsDOMStoragePersistentDB.h
index af7cfe6a308..b0034cfde9d 100644
--- a/dom/src/storage/nsDOMStoragePersistentDB.h
+++ b/dom/src/storage/nsDOMStoragePersistentDB.h
@@ -128,6 +128,14 @@ public:
   RemoveOwners(const nsTArray<nsString>& aOwners,
                PRBool aIncludeSubDomains, PRBool aMatch);
 
+  /**
+   * Remove all values from all scopes not marked as offline that has been
+   * created after the time specified with 'aSince'.  Used by the Clear Private
+   * Data dialog.  'aSince' value is compatible with PR_Now() function.
+   */
+  nsresult
+  RemoveTimeRange(PRInt64 aSince);
+
   /**
    * Removes all keys from storage. Used when clearing storage.
    */
@@ -176,6 +184,7 @@ protected:
   nsCOMPtr<mozIStorageStatement> mRemoveKeyStatement;
   nsCOMPtr<mozIStorageStatement> mRemoveOwnerStatement;
   nsCOMPtr<mozIStorageStatement> mRemoveStorageStatement;
+  nsCOMPtr<mozIStorageStatement> mRemoveTimeRangeStatement;
   nsCOMPtr<mozIStorageStatement> mRemoveAllStatement;
   nsCOMPtr<mozIStorageStatement> mGetOfflineExcludedUsageStatement;
   nsCOMPtr<mozIStorageStatement> mGetFullUsageStatement;
diff --git a/dom/tests/mochitest/Makefile.in b/dom/tests/mochitest/Makefile.in
index d13e7c90ce9..93b078be639 100644
--- a/dom/tests/mochitest/Makefile.in
+++ b/dom/tests/mochitest/Makefile.in
@@ -54,6 +54,7 @@ DIRS	+= \
 	whatwg \
 	geolocation \
 	localstorage \
+	globalstorage \
 	sessionstorage \
 	storageevent \
 	$(NULL)
diff --git a/dom/tests/mochitest/globalstorage/Makefile.in b/dom/tests/mochitest/globalstorage/Makefile.in
new file mode 100644
index 00000000000..06492a9e158
--- /dev/null
+++ b/dom/tests/mochitest/globalstorage/Makefile.in
@@ -0,0 +1,54 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2008
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Jan Bambas <honzab@firemni.cz>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+relativesrcdir	= dom/tests/mochitest/globalstorage
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+
+_TEST_FILES	= \
+    test_globalStorageDeleteSinceAPI.html \
+    $(NULL)
+
+libs::	$(_TEST_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
diff --git a/dom/tests/mochitest/globalstorage/test_globalStorageDeleteSinceAPI.html b/dom/tests/mochitest/globalstorage/test_globalStorageDeleteSinceAPI.html
new file mode 100644
index 00000000000..9c22bf4c587
--- /dev/null
+++ b/dom/tests/mochitest/globalstorage/test_globalStorageDeleteSinceAPI.html
@@ -0,0 +1,73 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>globalStorage delete since API test</title>
+
+<script type="text/javascript" src="/MochiKit/packed.js"></script>
+<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+
+<script type="text/javascript">
+
+function cleanup()
+{
+  globalStorage[window.location.hostname].removeItem("key1");
+  globalStorage[window.location.hostname].removeItem("key2");
+  globalStorage[window.location.hostname].removeItem("key3");
+  globalStorage[window.location.hostname].removeItem("key4");
+  SimpleTest.finish();
+}
+
+function doTest()
+{
+  var since = 0;
+
+  setTimeout('globalStorage[window.location.hostname].key1 = "value1"',     0);
+  setTimeout('globalStorage[window.location.hostname].key2 = "value2"',   100);
+  setTimeout('globalStorage[window.location.hostname].key3 = "value3"',   200);
+
+  // Since now, all added/changed items will be deleted
+  setTimeout(function() {
+    // Now in microseconds...
+    since = (new Date()).getTime() * 1000;
+  }, 300);
+
+  // Rather give the timer chance to move forward, on some systems the
+  // granularity may be too grainy.
+
+  setTimeout('globalStorage[window.location.hostname].key4 = "value4"',   500);
+  setTimeout('globalStorage[window.location.hostname].key1 = "value1-2"', 600);
+
+  setTimeout(function() {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+    is(globalStorage[window.location.hostname].length, 4, "Expected 4 items before delete");
+
+    try {
+      var domStorageManager = Components.classes["@mozilla.org/dom/storagemanager;1"]
+                                        .getService(Components.interfaces.nsIDOMStorageManager);
+      domStorageManager.clearStorageDataSince(since);
+    }
+    catch(ex) {
+      ok(false, ex);
+    }
+
+    todo(globalStorage[window.location.hostname].key1 == null, "key1 deleted (Bug 600366)");
+    is(globalStorage[window.location.hostname].key2, "value2", "key2 left");
+    is(globalStorage[window.location.hostname].key3, "value3", "key3 left");
+    todo(globalStorage[window.location.hostname].key4 == null, "key4 deleted (Bug 600366)");
+    is(globalStorage[window.location.hostname].length, 2, "Expected 2 items after delete");
+
+    cleanup();
+  }, 700);
+}
+
+SimpleTest.waitForExplicitFinish();
+
+</script>
+
+</head>
+
+<body onload="doTest();">
+
+</body>
+</html>
diff --git a/dom/tests/mochitest/localstorage/Makefile.in b/dom/tests/mochitest/localstorage/Makefile.in
index d6f8499345c..1572d88eeaa 100644
--- a/dom/tests/mochitest/localstorage/Makefile.in
+++ b/dom/tests/mochitest/localstorage/Makefile.in
@@ -68,6 +68,8 @@ _TEST_FILES	= \
     test_localStorageBase.html \
     test_localStorageBasePrivateBrowsing.html \
     test_localStorageBaseSessionOnly.html \
+    test_localStorageDeleteSinceAPI.html \
+    test_localStorageDeleteSinceAPIPrivateBrowsing.html \
     test_localStorageCookieSettings.html \
     test_localStorageEnablePref.html \
     test_localStorageOriginsEquals.html \
diff --git a/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPI.html b/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPI.html
new file mode 100644
index 00000000000..e40bb9d91eb
--- /dev/null
+++ b/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPI.html
@@ -0,0 +1,70 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>localStorage delete since API test</title>
+
+<script type="text/javascript" src="/MochiKit/packed.js"></script>
+<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+
+<script type="text/javascript">
+
+function cleanup()
+{
+  localStorage.clear();
+  SimpleTest.finish();
+}
+
+function doTest()
+{
+  var since = 0;
+
+  setTimeout('localStorage.key1 = "value1"',     0);
+  setTimeout('localStorage.key2 = "value2"',   100);
+  setTimeout('localStorage.key3 = "value3"',   200);
+
+  // Since now, all added/changed items will be deleted
+  setTimeout(function() {
+    // Now in microseconds...
+    since = (new Date()).getTime() * 1000;
+  }, 300);
+
+  // Rather give the timer chance to move forward, on some systems the
+  // granularity may be too grainy.
+
+  setTimeout('localStorage.key4 = "value4"',   500);
+  setTimeout('localStorage.key1 = "value1-2"', 600);
+
+  setTimeout(function() {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+    is(localStorage.length, 4, "Expected 4 items before delete in localStorage");
+
+    try {
+      var domStorageManager = Components.classes["@mozilla.org/dom/storagemanager;1"]
+                                        .getService(Components.interfaces.nsIDOMStorageManager);
+      domStorageManager.clearStorageDataSince(since);
+    }
+    catch(ex) {
+      ok(false, ex);
+    }
+
+    is(localStorage.key1, null, "key1 deleted (if this fails see bug 600366 first)");
+    is(localStorage.key2, "value2", "key2 left");
+    is(localStorage.key3, "value3", "key3 left");
+    is(localStorage.key4, null, "key4 deleted (if this fails see bug 600366 first)");
+    is(localStorage.length, 2, "Expected 2 items after delete in localStorage");
+
+    cleanup();
+  }, 700);
+}
+
+SimpleTest.waitForExplicitFinish();
+
+</script>
+
+</head>
+
+<body onload="doTest();">
+
+</body>
+</html>
diff --git a/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPIPrivateBrowsing.html b/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPIPrivateBrowsing.html
new file mode 100644
index 00000000000..f470c3de739
--- /dev/null
+++ b/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPIPrivateBrowsing.html
@@ -0,0 +1,85 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>localStorage delete since API test in Private Browsing</title>
+
+<script type="text/javascript" src="/MochiKit/packed.js"></script>
+<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+<script type="text/javascript" src="pbSwitch.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+
+<script type="text/javascript">
+
+function cleanup()
+{
+  localStorage.clear();
+  leavePrivateBrowsing();
+
+  SimpleTest.finish();
+}
+
+function startTest()
+{
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+  if (get_PBSvc())
+    doTest();
+  else
+    ok(true, "No private browsing service, test could not be performed");
+}
+
+function doTest()
+{
+  var since = 0;
+
+  enterPrivateBrowsing();
+
+  setTimeout('localStorage.key1 = "value1"',     0);
+  setTimeout('localStorage.key2 = "value2"',   100);
+  setTimeout('localStorage.key3 = "value3"',   200);
+
+  // Since now, all added/changed items will be deleted
+  setTimeout(function() {
+    // Now in microseconds...
+    since = (new Date()).getTime() * 1000;
+  }, 300);
+
+  // Rather give the timer chance to move forward, on some systems the
+  // granularity may be too grainy.
+
+  setTimeout('localStorage.key4 = "value4"',   500);
+  setTimeout('localStorage.key1 = "value1-2"', 600);
+
+  setTimeout(function() {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+    is(localStorage.length, 4, "Expected 4 items before delete in localStorage");
+
+    try {
+      var domStorageManager = Components.classes["@mozilla.org/dom/storagemanager;1"]
+                                        .getService(Components.interfaces.nsIDOMStorageManager);
+      domStorageManager.clearStorageDataSince(since);
+    }
+    catch(ex) {
+      ok(false, ex);
+    }
+
+    is(localStorage.key1, null, "key1 deleted (if this fails see bug 600366 first)");
+    is(localStorage.key2, "value2", "key2 left");
+    is(localStorage.key3, "value3", "key3 left");
+    is(localStorage.key4, null, "key4 deleted (if this fails see bug 600366 first)");
+    is(localStorage.length, 2, "Expected 2 items after delete in localStorage");
+
+    cleanup();
+  }, 700);
+}
+
+SimpleTest.waitForExplicitFinish();
+
+</script>
+
+</head>
+
+<body onload="startTest();">
+
+</body>
+</html>
diff --git a/dom/tests/mochitest/sessionstorage/Makefile.in b/dom/tests/mochitest/sessionstorage/Makefile.in
index 3036cbb703d..8c40ca95a1d 100644
--- a/dom/tests/mochitest/sessionstorage/Makefile.in
+++ b/dom/tests/mochitest/sessionstorage/Makefile.in
@@ -53,6 +53,7 @@ _TEST_FILES	= \
     file_https.html \
     test_sessionStorageBase.html \
     test_sessionStorageClone.html \
+    test_sessionStorageDeleteSinceAPI.html \
     test_sessionStorageReplace.html \
     test_sessionStorageHttpHttps.html \
     interOriginSlave.js \
diff --git a/dom/tests/mochitest/sessionstorage/test_sessionStorageDeleteSinceAPI.html b/dom/tests/mochitest/sessionstorage/test_sessionStorageDeleteSinceAPI.html
new file mode 100644
index 00000000000..ce47c62b396
--- /dev/null
+++ b/dom/tests/mochitest/sessionstorage/test_sessionStorageDeleteSinceAPI.html
@@ -0,0 +1,67 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>sessionStorage delete since API test</title>
+
+<script type="text/javascript" src="/MochiKit/packed.js"></script>
+<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+
+<script type="text/javascript">
+
+function cleanup()
+{
+  sessionStorage.clear();
+  SimpleTest.finish();
+}
+
+function doTest()
+{
+  var since = 0;
+
+  setTimeout('sessionStorage.key1 = "value1"',     0);
+  setTimeout('sessionStorage.key2 = "value2"',   100);
+  setTimeout('sessionStorage.key3 = "value3"',   200);
+
+  // Since now, all added/changed items will be deleted
+  setTimeout(function() {
+    // Now in microseconds...
+    since = (new Date()).getTime() * 1000;
+  }, 300);
+
+  setTimeout('sessionStorage.key4 = "value4"',   500);
+  setTimeout('sessionStorage.key1 = "value1-2"', 600);
+
+  setTimeout(function() {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+    is(sessionStorage.length, 4, "Expected 4 items before delete in sessionStorage");
+
+    try {
+      var domStorageManager = Components.classes["@mozilla.org/dom/storagemanager;1"]
+                                        .getService(Components.interfaces.nsIDOMStorageManager);
+      domStorageManager.clearStorageDataSince(since);
+    }
+    catch(ex) {
+      ok(false, ex);
+    }
+
+    is(sessionStorage.length, 2, "Expected 2 items after delete in sessionStorage");
+    is(sessionStorage.key1, null, "key1 deleted");
+    is(sessionStorage.key2, "value2", "key2 left");
+    is(sessionStorage.key3, "value3", "key3 left");
+    is(sessionStorage.key4, null, "key4 deleted");
+
+    cleanup();
+  }, 700);
+}
+
+SimpleTest.waitForExplicitFinish();
+
+</script>
+
+</head>
+
+<body onload="doTest();">
+
+</body>
+</html>

From 35d0416872295c9d70bb30be1f0a4b2823820c5b Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Wed, 27 Oct 2010 07:56:31 +0300
Subject: [PATCH 06/57] Bug 606910 - RENDER_DIRECT mode for Qt widget
 (xshmPutImage). r=dougt a=blocking-fennec

--HG--
extra : rebase_source : 6ea776ea7e0b282d6b61d5e5fa570460e84f90be
---
 gfx/thebes/gfxQtPlatform.cpp     |   9 +-
 gfx/thebes/gfxQtPlatform.h       |   2 +
 widget/src/gtk2/nsWindow.cpp     | 178 ++--------------------------
 widget/src/qt/Makefile.in        |   3 +
 widget/src/qt/mozqwidget.cpp     |   2 +-
 widget/src/qt/nsWindow.cpp       | 108 +++++++++++++++--
 widget/src/qt/nsWindow.h         |   2 +-
 widget/src/shared/Makefile.in    |   2 +
 widget/src/shared/nsShmImage.cpp | 197 +++++++++++++++++++++++++++++++
 widget/src/shared/nsShmImage.h   | 122 +++++++++++++++++++
 10 files changed, 444 insertions(+), 181 deletions(-)
 create mode 100644 widget/src/shared/nsShmImage.cpp
 create mode 100644 widget/src/shared/nsShmImage.h

diff --git a/gfx/thebes/gfxQtPlatform.cpp b/gfx/thebes/gfxQtPlatform.cpp
index 746e3dd21df..fda8382a9dc 100644
--- a/gfx/thebes/gfxQtPlatform.cpp
+++ b/gfx/thebes/gfxQtPlatform.cpp
@@ -81,7 +81,11 @@
 
 // Because the QPainter backend has some problems with glyphs rendering
 // it is better to use image or xlib cairo backends by default
+#if (MOZ_PLATFORM_MAEMO == 6)
 #define DEFAULT_RENDER_MODE RENDER_BUFFERED
+#else
+#define DEFAULT_RENDER_MODE RENDER_DIRECT
+#endif
 
 static QPaintEngine::Type sDefaultQtPaintEngineType = QPaintEngine::X11;
 gfxFontconfigUtils *gfxQtPlatform::sFontconfigUtils = nsnull;
@@ -146,6 +150,9 @@ gfxQtPlatform::gfxQtPlatform()
         case 1:
             mRenderMode = RENDER_BUFFERED;
             break;
+        case 2:
+            mRenderMode = RENDER_DIRECT;
+            break;
         default:
             mRenderMode = RENDER_QPAINTER;
     }
@@ -207,7 +214,7 @@ gfxQtPlatform::CreateOffscreenSurface(const gfxIntSize& size,
     }
 #endif
 
-    if (mRenderMode == RENDER_BUFFERED &&
+    if ((mRenderMode == RENDER_BUFFERED || mRenderMode == RENDER_DIRECT) &&
         sDefaultQtPaintEngineType != QPaintEngine::X11) {
       newSurface = new gfxImageSurface(size, imageFormat);
       return newSurface.forget();
diff --git a/gfx/thebes/gfxQtPlatform.h b/gfx/thebes/gfxQtPlatform.h
index 584f1797664..994f71fe3ee 100644
--- a/gfx/thebes/gfxQtPlatform.h
+++ b/gfx/thebes/gfxQtPlatform.h
@@ -60,6 +60,8 @@ public:
         RENDER_QPAINTER = 0,
         /* Use offscreen buffer for rendering with image or xlib gfx backend */
         RENDER_BUFFERED,
+        /* Direct rendering to Widget surface */
+        RENDER_DIRECT,
         /* max */
         RENDER_MODE_MAX
     };
diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
index 1656e615d9d..bdffbc01806 100644
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -135,6 +135,8 @@ extern "C" {
 #include "gfxXlibSurface.h"
 #endif
 
+#include "nsShmImage.h"
+
 #ifdef MOZ_DFB
 extern "C" {
 #ifdef MOZ_DIRECT_DEBUG
@@ -286,16 +288,6 @@ UpdateLastInputEventTime()
   }
 }
 
-#ifdef MOZ_HAVE_SHMIMAGE
-// If XShm isn't available to our client, we'll try XShm once, fail,
-// set this to false and then never try again.
-static PRBool gShmAvailable = PR_TRUE;
-static PRBool UseShm()
-{
-    return gfxPlatformGtk::UseClientSideRendering() && gShmAvailable;
-}
-#endif
-
 // this is the last window that had a drag event happen on it.
 nsWindow *nsWindow::mLastDragMotionWindow = NULL;
 PRBool nsWindow::sIsDraggingOutOf = PR_FALSE;
@@ -389,159 +381,6 @@ protected:
     pixman_region32& get() { return *this; }
 };
 
-
-#ifdef MOZ_HAVE_SHMIMAGE
-
-using mozilla::ipc::SharedMemorySysV;
-
-class nsShmImage {
-    NS_INLINE_DECL_REFCOUNTING(nsShmImage)
-
-public:
-    typedef gfxASurface::gfxImageFormat Format;
-
-    static already_AddRefed<nsShmImage>
-    Create(const gfxIntSize& aSize, Visual* aVisual, unsigned int aDepth);
-
-    ~nsShmImage() {
-        if (mImage) {
-            if (mXAttached) {
-                XShmDetach(gdk_x11_get_default_xdisplay(), &mInfo);
-            }
-            XDestroyImage(mImage);
-        }
-    }
-
-    already_AddRefed<gfxASurface> AsSurface();
-
-    void Put(GdkWindow* aWindow, GdkRectangle* aRects, GdkRectangle* aEnd);
-
-    gfxIntSize Size() const { return mSize; }
-
-private:
-    nsShmImage()
-        : mImage(nsnull)
-        , mXAttached(PR_FALSE)
-    { mInfo.shmid = SharedMemorySysV::NULLHandle(); }
-
-    nsRefPtr<SharedMemorySysV>   mSegment;
-    XImage*                      mImage;
-    XShmSegmentInfo              mInfo;
-    gfxIntSize                   mSize;
-    Format                       mFormat;
-    PRPackedBool                 mXAttached;
-};
-
-already_AddRefed<nsShmImage>
-nsShmImage::Create(const gfxIntSize& aSize,
-                   Visual* aVisual, unsigned int aDepth)
-{
-    Display* dpy = gdk_x11_get_default_xdisplay();
-
-    nsRefPtr<nsShmImage> shm = new nsShmImage();
-    shm->mImage = XShmCreateImage(dpy, aVisual, aDepth,
-                                  ZPixmap, nsnull,
-                                  &(shm->mInfo),
-                                  aSize.width, aSize.height);
-    if (!shm->mImage) {
-        return nsnull;
-    }
-
-    size_t size = shm->mImage->bytes_per_line * shm->mImage->height;
-    shm->mSegment = new SharedMemorySysV();
-    if (!shm->mSegment->Create(size) || !shm->mSegment->Map(size)) {
-        return nsnull;
-    }
-
-    shm->mInfo.shmid = shm->mSegment->GetHandle();
-    shm->mInfo.shmaddr =
-        shm->mImage->data = static_cast<char*>(shm->mSegment->memory());
-    shm->mInfo.readOnly = False;
-
-    gdk_error_trap_push();
-    Status attachOk = XShmAttach(dpy, &shm->mInfo);
-    gint xerror = gdk_error_trap_pop();
-
-    if (!attachOk || xerror) {
-        // Assume XShm isn't available, and don't attempt to use it
-        // again.
-        gShmAvailable = PR_FALSE;
-        return nsnull;
-    }
-
-    shm->mXAttached = PR_TRUE;
-    shm->mSize = aSize;
-    switch (shm->mImage->depth) {
-    case 24:
-        shm->mFormat = gfxASurface::ImageFormatRGB24; break;
-    case 16:
-        shm->mFormat = gfxASurface::ImageFormatRGB16_565; break;
-    default:
-        NS_WARNING("Unsupported XShm Image depth!");
-        gShmAvailable = PR_FALSE;
-        return nsnull;
-    }
-    return shm.forget();
-}
-
-already_AddRefed<gfxASurface>
-nsShmImage::AsSurface()
-{
-    return nsRefPtr<gfxASurface>(
-        new gfxImageSurface(static_cast<unsigned char*>(mSegment->memory()),
-                            mSize,
-                            mImage->bytes_per_line,
-                            mFormat)
-        ).forget();
-}
-
-void
-nsShmImage::Put(GdkWindow* aWindow, GdkRectangle* aRects, GdkRectangle* aEnd)
-{
-    GdkDrawable* gd;
-    gint dx, dy;
-    gdk_window_get_internal_paint_info(aWindow, &gd, &dx, &dy);
-
-    Display* dpy = gdk_x11_get_default_xdisplay();
-    Drawable d = GDK_DRAWABLE_XID(gd);
-
-    GC gc = XCreateGC(dpy, d, 0, nsnull);
-    for (GdkRectangle* r = aRects; r < aEnd; r++) {
-        XShmPutImage(dpy, d, gc, mImage,
-                     r->x, r->y,
-                     r->x - dx, r->y - dy,
-                     r->width, r->height,
-                     False);
-    }
-    XFreeGC(dpy, gc);
-
-    // FIXME/bug 597336: we need to ensure that the shm image isn't
-    // scribbled over before all its pending XShmPutImage()s complete.
-    // However, XSync() is an unnecessarily heavyweight
-    // synchronization mechanism; other options are possible.  If this
-    // XSync is shown to hurt responsiveness, we need to explore the
-    // other options.
-    XSync(dpy, False);
-}
-
-static already_AddRefed<gfxASurface>
-EnsureShmImage(const gfxIntSize& aSize, Visual* aVisual, unsigned int aDepth,
-               nsRefPtr<nsShmImage>& aImage)
-{
-    if (!aImage || aImage->Size() != aSize) {
-        // Because we XSync() after XShmAttach() to trap errors, we
-        // know that the X server has the old image's memory mapped
-        // into its address space, so it's OK to destroy the old image
-        // here even if there are outstanding Puts.  The Detach is
-        // ordered after the Puts.
-        aImage = nsShmImage::Create(aSize, aVisual, aDepth);
-    }
-    return !aImage ? nsnull : aImage->AsSurface();
-}
-
-#endif  // defined(MOZ_X11) && defined(MOZ_HAVE_SHAREDMEMORYSYSV)
-
-
 nsWindow::nsWindow()
 {
     mIsTopLevel       = PR_FALSE;
@@ -2346,7 +2185,7 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
         layerBuffering = BasicLayerManager::BUFFER_NONE;
         ctx->PushGroup(gfxASurface::CONTENT_COLOR_ALPHA);
 #ifdef MOZ_HAVE_SHMIMAGE
-    } else if (UseShm()) {
+    } else if (nsShmImage::UseShm()) {
         // We're using an xshm mapping as a back buffer.
         layerBuffering = BasicLayerManager::BUFFER_NONE;
 #endif // MOZ_HAVE_SHMIMAGE
@@ -2405,7 +2244,7 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
         }
     }
 #  ifdef MOZ_HAVE_SHMIMAGE
-    if (UseShm() && NS_LIKELY(!mIsDestroyed)) {
+    if (nsShmImage::UseShm() && NS_LIKELY(!mIsDestroyed)) {
         mShmImage->Put(mGdkWindow, rects, r_end);
     }
 #  endif  // MOZ_HAVE_SHMIMAGE
@@ -6706,13 +6545,14 @@ nsWindow::GetThebesSurface()
 
 #  ifdef MOZ_HAVE_SHMIMAGE
     PRBool usingShm = PR_FALSE;
-    if (UseShm()) {
+    if (nsShmImage::UseShm()) {
         // EnsureShmImage() is a dangerous interface, but we guarantee
         // that the thebes surface and the shmimage have the same
         // lifetime
-        mThebesSurface = EnsureShmImage(size,
-                                        visual, gdk_drawable_get_depth(d),
-                                        mShmImage);
+        mThebesSurface =
+            nsShmImage::EnsureShmImage(size,
+                                       visual, gdk_drawable_get_depth(d),
+                                       mShmImage);
         usingShm = mThebesSurface != nsnull;
     }
     if (!usingShm)
diff --git a/widget/src/qt/Makefile.in b/widget/src/qt/Makefile.in
index 4aca0cf957c..de7403af097 100644
--- a/widget/src/qt/Makefile.in
+++ b/widget/src/qt/Makefile.in
@@ -103,6 +103,8 @@ ifneq (qt,$(MOZ_WIDGET_TOOLKIT))
 INACTIVE_COMPONENT = 1
 endif
 
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS	+= $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS)
@@ -131,4 +133,5 @@ LOCAL_INCLUDES	+= \
 		   $(NULL)
 ifdef MOZ_X11
 INCLUDES   	+= -I$(srcdir)/../shared/x11
+INCLUDES   	+= -I$(srcdir)/../shared
 endif
diff --git a/widget/src/qt/mozqwidget.cpp b/widget/src/qt/mozqwidget.cpp
index 1daea9ab89a..b66959cab89 100644
--- a/widget/src/qt/mozqwidget.cpp
+++ b/widget/src/qt/mozqwidget.cpp
@@ -92,7 +92,7 @@ MozQWidget::~MozQWidget()
 
 void MozQWidget::paint(QPainter* aPainter, const QStyleOptionGraphicsItem* aOption, QWidget* aWidget /*= 0*/)
 {
-    mReceiver->DoPaint(aPainter, aOption);
+    mReceiver->DoPaint(aPainter, aOption, aWidget);
 }
 
 void MozQWidget::activate()
diff --git a/widget/src/qt/nsWindow.cpp b/widget/src/qt/nsWindow.cpp
index 3d96219f2ea..698f7964fda 100644
--- a/widget/src/qt/nsWindow.cpp
+++ b/widget/src/qt/nsWindow.cpp
@@ -128,11 +128,22 @@ static const float GESTURES_BLOCK_MOUSE_FOR = 200;
 #include "Layers.h"
 #include "LayerManagerOGL.h"
 
+#include "nsShmImage.h"
+extern "C" {
+#include "pixman.h"
+}
+
+using namespace mozilla;
+
 // imported in nsWidgetFactory.cpp
 PRBool gDisableNativeTheme = PR_FALSE;
 
 // Cached offscreen surface
 static nsRefPtr<gfxASurface> gBufferSurface;
+#ifdef MOZ_HAVE_SHMIMAGE
+// If we're using xshm rendering, mThebesSurface wraps gShmImage
+nsRefPtr<nsShmImage> gShmImage;
+#endif
 
 static int gBufferPixmapUsageCount = 0;
 static gfxIntSize gBufferMaxSize(0, 0);
@@ -268,7 +279,7 @@ _gfximage_to_qformat(gfxASurface::gfxImageFormat aFormat)
 }
 
 static bool
-UpdateOffScreenBuffers(int aDepth, QSize aSize)
+UpdateOffScreenBuffers(int aDepth, QSize aSize, QWidget* aWidget = nsnull)
 {
     gfxIntSize size(aSize.width(), aSize.height());
     if (gBufferSurface) {
@@ -290,8 +301,22 @@ UpdateOffScreenBuffers(int aDepth, QSize aSize)
     if (format == gfxASurface::ImageFormatUnknown)
         format = gfxASurface::ImageFormatRGB24;
 
+#ifdef MOZ_HAVE_SHMIMAGE
+    if (aWidget) {
+        if (gfxPlatform::GetPlatform()->ScreenReferenceSurface()->GetType() ==
+            gfxASurface::SurfaceTypeImage) {
+            gShmImage = nsShmImage::Create(gBufferMaxSize,
+                                           (Visual*)aWidget->x11Info().visual(),
+                                           aDepth);
+            gBufferSurface = gShmImage->AsSurface();
+            return true;
+        }
+    }
+#endif
+
     gBufferSurface = gfxPlatform::GetPlatform()->
         CreateOffscreenSurface(gBufferMaxSize, gfxASurface::ContentFromFormat(format));
+
     return true;
 }
 
@@ -343,6 +368,9 @@ nsWindow::Destroy(void)
         --gBufferPixmapUsageCount == 0) {
 
         gBufferSurface = nsnull;
+#ifdef MOZ_HAVE_SHMIMAGE
+        gShmImage = nsnull;
+#endif
     }
 
     nsCOMPtr<nsIWidget> rollupWidget = do_QueryReferent(gRollupWindow);
@@ -941,8 +969,23 @@ nsWindow::GetAttention(PRInt32 aCycleCount)
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+#ifdef MOZ_X11
+static already_AddRefed<gfxASurface>
+GetSurfaceForQWidget(QWidget* aDrawable)
+{
+    gfxASurface* result =
+        new gfxXlibSurface(aDrawable->x11Info().display(),
+                           aDrawable->handle(),
+                           (Visual*)aDrawable->x11Info().visual(),
+                           gfxIntSize(aDrawable->size().width(),
+                           aDrawable->size().height()));
+    NS_IF_ADDREF(result);
+    return result;
+}
+#endif
+
 nsEventStatus
-nsWindow::DoPaint(QPainter* aPainter, const QStyleOptionGraphicsItem* aOption)
+nsWindow::DoPaint(QPainter* aPainter, const QStyleOptionGraphicsItem* aOption, QWidget* aWidget)
 {
     if (mIsDestroyed) {
         LOG(("Expose event on destroyed window [%p] window %p\n",
@@ -993,6 +1036,11 @@ nsWindow::DoPaint(QPainter* aPainter, const QStyleOptionGraphicsItem* aOption)
     } else if (renderMode == gfxQtPlatform::RENDER_QPAINTER) {
         targetSurface = new gfxQPainterSurface(aPainter);
 #endif
+    } else if (renderMode == gfxQtPlatform::RENDER_DIRECT) {
+        if (!UpdateOffScreenBuffers(depth, aWidget->size(), aWidget)) {
+            return nsEventStatus_eIgnore;
+        }
+        targetSurface = gBufferSurface;
     }
 
     if (NS_UNLIKELY(!targetSurface))
@@ -1001,17 +1049,30 @@ nsWindow::DoPaint(QPainter* aPainter, const QStyleOptionGraphicsItem* aOption)
     nsRefPtr<gfxContext> ctx = new gfxContext(targetSurface);
 
     // We will paint to 0, 0 position in offscrenn buffer
-    if (renderMode == gfxQtPlatform::RENDER_BUFFERED)
+    if (renderMode == gfxQtPlatform::RENDER_BUFFERED) {
         ctx->Translate(gfxPoint(-r.x(), -r.y()));
+    }
+    else if (renderMode == gfxQtPlatform::RENDER_DIRECT) {
+        // This is needed for rotate transformation on Meego
+        // This will work very slow if pixman does not handle rotation very well
+        gfxMatrix matr(aPainter->transform().m11(),
+                       aPainter->transform().m12(),
+                       aPainter->transform().m21(),
+                       aPainter->transform().m22(),
+                       aPainter->transform().dx(),
+                       aPainter->transform().dy());
+        ctx->SetMatrix(matr);
+        NS_ASSERTION(PIXMAN_VERSION < PIXMAN_VERSION_ENCODE(0, 21, 2) && aPainter->transform().isRotating(), "Old pixman and rotate transform, it is going to be slow");
+    }
 
     nsPaintEvent event(PR_TRUE, NS_PAINT, this);
-    event.refPoint.x = r.x();
-    event.refPoint.y = r.y();
+    event.refPoint.x = rect.x;
+    event.refPoint.y = rect.y;
     event.region = nsIntRegion(rect);
     {
-      AutoLayerManagerSetup
-          setupLayerManager(this, ctx, BasicLayerManager::BUFFER_NONE);
-      status = DispatchEvent(&event);
+        AutoLayerManagerSetup
+            setupLayerManager(this, ctx, BasicLayerManager::BUFFER_NONE);
+        status = DispatchEvent(&event);
     }
 
     // DispatchEvent can Destroy us (bug 378273), avoid doing any paint
@@ -1047,6 +1108,30 @@ nsWindow::DoPaint(QPainter* aPainter, const QStyleOptionGraphicsItem* aOption)
             aPainter->drawImage(QPoint(rect.x, rect.y), img,
                                 QRect(0, 0, rect.width, rect.height));
         }
+    } else if (renderMode == gfxQtPlatform::RENDER_DIRECT) {
+        QRect trans = aPainter->transform().mapRect(r).toRect();
+        if (gBufferSurface->GetType() == gfxASurface::SurfaceTypeXlib) {
+            nsRefPtr<gfxASurface> widgetSurface = GetSurfaceForQWidget(aWidget);
+            nsRefPtr<gfxContext> ctx = new gfxContext(widgetSurface);
+            ctx->SetSource(gBufferSurface);
+            ctx->Rectangle(gfxRect(trans.x(), trans.y(), trans.width(), trans.height()), PR_TRUE);
+            ctx->Clip();
+            ctx->Fill();
+        } else if (gBufferSurface->GetType() == gfxASurface::SurfaceTypeImage) {
+#ifdef MOZ_HAVE_SHMIMAGE
+            if (gShmImage) {
+                gShmImage->Put(aWidget, trans);
+            } else
+#endif
+            if (gBufferSurface) {
+                nsRefPtr<gfxASurface> widgetSurface = GetSurfaceForQWidget(aWidget);
+                nsRefPtr<gfxContext> ctx = new gfxContext(widgetSurface);
+                ctx->SetSource(gBufferSurface);
+                ctx->Rectangle(gfxRect(trans.x(), trans.y(), trans.width(), trans.height()), PR_TRUE);
+                ctx->Clip();
+                ctx->Fill();
+            }
+        }
     }
 
     ctx = nsnull;
@@ -2475,6 +2560,11 @@ nsWindow::createQWidget(MozQWidget *parent, nsWidgetInitData *aInitData)
             newView->setViewport(new QGLWidget());
         }
 
+        if (gfxQtPlatform::GetPlatform()->GetRenderMode() == gfxQtPlatform::RENDER_DIRECT) {
+            // Disable double buffer and system background rendering
+            newView->viewport()->setAttribute(Qt::WA_PaintOnScreen, true);
+            newView->viewport()->setAttribute(Qt::WA_NoSystemBackground, true);
+        }
         // Enable gestures:
 #if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 0))
         newView->viewport()->grabGesture(Qt::PinchGesture);
@@ -2528,8 +2618,8 @@ nsWindow::GetThebesSurface()
     if (mThebesSurface)
         return mThebesSurface;
 
-    gfxQtPlatform::RenderMode renderMode = gfxQtPlatform::GetPlatform()->GetRenderMode();
 #ifdef CAIRO_HAS_QT_SURFACE
+    gfxQtPlatform::RenderMode renderMode = gfxQtPlatform::GetPlatform()->GetRenderMode();
     if (renderMode == gfxQtPlatform::RENDER_QPAINTER) {
         mThebesSurface = new gfxQPainterSurface(gfxIntSize(1, 1), gfxASurface::CONTENT_COLOR);
     }
diff --git a/widget/src/qt/nsWindow.h b/widget/src/qt/nsWindow.h
index 6d3b340bad7..9cddee5807b 100644
--- a/widget/src/qt/nsWindow.h
+++ b/widget/src/qt/nsWindow.h
@@ -111,7 +111,7 @@ public:
     nsWindow();
     virtual ~nsWindow();
 
-    nsEventStatus DoPaint( QPainter* aPainter, const QStyleOptionGraphicsItem * aOption );
+    nsEventStatus DoPaint( QPainter* aPainter, const QStyleOptionGraphicsItem * aOption, QWidget* aWidget);
 
     static void ReleaseGlobals();
 
diff --git a/widget/src/shared/Makefile.in b/widget/src/shared/Makefile.in
index 52a52f645af..a111ac124ff 100644
--- a/widget/src/shared/Makefile.in
+++ b/widget/src/shared/Makefile.in
@@ -57,12 +57,14 @@ endif
 
 CPPSRCS		= \
 		WidgetUtils.cpp \
+		nsShmImage.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)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS	+= $(TK_CFLAGS)
diff --git a/widget/src/shared/nsShmImage.cpp b/widget/src/shared/nsShmImage.cpp
new file mode 100644
index 00000000000..bf9b7e3bb81
--- /dev/null
+++ b/widget/src/shared/nsShmImage.cpp
@@ -0,0 +1,197 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla browser.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Chris Jones <jones.chris.g@gmail.com>
+ *   Oleg Romashin <romaxa@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#if defined(MOZ_WIDGET_GTK2)
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#elif defined(MOZ_WIDGET_QT)
+#include <QWidget>
+#endif
+
+#include "nsShmImage.h"
+#include "gfxPlatform.h"
+#include "gfxImageSurface.h"
+
+#ifdef MOZ_HAVE_SHMIMAGE
+
+// If XShm isn't available to our client, we'll try XShm once, fail,
+// set this to false and then never try again.
+static PRBool gShmAvailable = PR_TRUE;
+PRBool nsShmImage::UseShm()
+{
+    return gfxPlatform::GetPlatform()->
+        ScreenReferenceSurface()->GetType() == gfxASurface::SurfaceTypeImage
+        && gShmAvailable;
+}
+
+already_AddRefed<nsShmImage>
+nsShmImage::Create(const gfxIntSize& aSize,
+                   Visual* aVisual, unsigned int aDepth)
+{
+    Display* dpy = DISPLAY();
+
+    nsRefPtr<nsShmImage> shm = new nsShmImage();
+    shm->mImage = XShmCreateImage(dpy, aVisual, aDepth,
+                                  ZPixmap, nsnull,
+                                  &(shm->mInfo),
+                                  aSize.width, aSize.height);
+    if (!shm->mImage) {
+        return nsnull;
+    }
+
+    size_t size = shm->mImage->bytes_per_line * shm->mImage->height;
+    shm->mSegment = new SharedMemorySysV();
+    if (!shm->mSegment->Create(size) || !shm->mSegment->Map(size)) {
+        return nsnull;
+    }
+
+    shm->mInfo.shmid = shm->mSegment->GetHandle();
+    shm->mInfo.shmaddr =
+        shm->mImage->data = static_cast<char*>(shm->mSegment->memory());
+    shm->mInfo.readOnly = False;
+
+    int xerror = 0;
+#if defined(MOZ_WIDGET_GTK2)
+    gdk_error_trap_push();
+    Status attachOk = XShmAttach(dpy, &shm->mInfo);
+    xerror = gdk_error_trap_pop();
+#elif defined(MOZ_WIDGET_QT)
+    Status attachOk = XShmAttach(dpy, &shm->mInfo);
+#endif
+
+    if (!attachOk || xerror) {
+        // Assume XShm isn't available, and don't attempt to use it
+        // again.
+        gShmAvailable = PR_FALSE;
+        return nsnull;
+    }
+
+    shm->mXAttached = PR_TRUE;
+    shm->mSize = aSize;
+    switch (shm->mImage->depth) {
+    case 24:
+        shm->mFormat = gfxASurface::ImageFormatRGB24; break;
+    case 16:
+        shm->mFormat = gfxASurface::ImageFormatRGB16_565; break;
+    default:
+        NS_WARNING("Unsupported XShm Image depth!");
+        gShmAvailable = PR_FALSE;
+        return nsnull;
+    }
+    return shm.forget();
+}
+
+already_AddRefed<gfxASurface>
+nsShmImage::AsSurface()
+{
+    return nsRefPtr<gfxASurface>(
+        new gfxImageSurface(static_cast<unsigned char*>(mSegment->memory()),
+                            mSize,
+                            mImage->bytes_per_line,
+                            mFormat)
+        ).forget();
+}
+
+#if defined(MOZ_WIDGET_GTK2)
+void
+nsShmImage::Put(GdkWindow* aWindow, GdkRectangle* aRects, GdkRectangle* aEnd)
+{
+    GdkDrawable* gd;
+    gint dx, dy;
+    gdk_window_get_internal_paint_info(aWindow, &gd, &dx, &dy);
+
+    Display* dpy = gdk_x11_get_default_xdisplay();
+    Drawable d = GDK_DRAWABLE_XID(gd);
+
+    GC gc = XCreateGC(dpy, d, 0, nsnull);
+    for (GdkRectangle* r = aRects; r < aEnd; r++) {
+        XShmPutImage(dpy, d, gc, mImage,
+                     r->x, r->y,
+                     r->x - dx, r->y - dy,
+                     r->width, r->height,
+                     False);
+    }
+    XFreeGC(dpy, gc);
+
+#ifdef MOZ_WIDGET_GTK2
+    // FIXME/bug 597336: we need to ensure that the shm image isn't
+    // scribbled over before all its pending XShmPutImage()s complete.
+    // However, XSync() is an unnecessarily heavyweight
+    // synchronization mechanism; other options are possible.  If this
+    // XSync is shown to hurt responsiveness, we need to explore the
+    // other options.
+    XSync(dpy, False);
+#endif
+}
+#elif defined(MOZ_WIDGET_QT)
+void
+nsShmImage::Put(QWidget* aWindow, QRect& aRect)
+{
+    Display* dpy = aWindow->x11Info().display();
+    Drawable d = aWindow->handle();
+
+    GC gc = XCreateGC(dpy, d, 0, nsnull);
+    // Avoid out of bounds painting
+    QRect inter = aRect.intersected(aWindow->rect());
+    XShmPutImage(dpy, d, gc, mImage,
+                 inter.x(), inter.y(),
+                 inter.x(), inter.y(),
+                 inter.width(), inter.height(),
+                 False);
+    XFreeGC(dpy, gc);
+}
+#endif
+
+already_AddRefed<gfxASurface>
+nsShmImage::EnsureShmImage(const gfxIntSize& aSize, Visual* aVisual, unsigned int aDepth,
+               nsRefPtr<nsShmImage>& aImage)
+{
+    if (!aImage || aImage->Size() != aSize) {
+        // Because we XSync() after XShmAttach() to trap errors, we
+        // know that the X server has the old image's memory mapped
+        // into its address space, so it's OK to destroy the old image
+        // here even if there are outstanding Puts.  The Detach is
+        // ordered after the Puts.
+        aImage = nsShmImage::Create(aSize, aVisual, aDepth);
+    }
+    return !aImage ? nsnull : aImage->AsSurface();
+}
+
+#endif  // defined(MOZ_X11) && defined(MOZ_HAVE_SHAREDMEMORYSYSV)
diff --git a/widget/src/shared/nsShmImage.h b/widget/src/shared/nsShmImage.h
new file mode 100644
index 00000000000..52e1ae32612
--- /dev/null
+++ b/widget/src/shared/nsShmImage.h
@@ -0,0 +1,122 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla browser.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Chris Jones <jones.chris.g@gmail.com>
+ *   Oleg Romashin <romaxa@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef __mozilla_widget_nsShmImage_h__
+#define __mozilla_widget_nsShmImage_h__
+
+#ifdef MOZ_IPC
+#  include "mozilla/ipc/SharedMemorySysV.h"
+#endif
+
+#if defined(MOZ_X11) && defined(MOZ_HAVE_SHAREDMEMORYSYSV)
+#  define MOZ_HAVE_SHMIMAGE
+#endif
+
+#ifdef MOZ_HAVE_SHMIMAGE
+
+#include "nsIWidget.h"
+#include "gfxASurface.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XShm.h>
+
+#if defined(MOZ_WIDGET_GTK2)
+#define DISPLAY gdk_x11_get_default_xdisplay
+#elif defined(MOZ_WIDGET_QT)
+#include "QX11Info"
+#define DISPLAY QX11Info().display
+#endif
+
+class QRect;
+class QWidget;
+
+using mozilla::ipc::SharedMemorySysV;
+
+class nsShmImage {
+    NS_INLINE_DECL_REFCOUNTING(nsShmImage)
+
+public:
+    typedef gfxASurface::gfxImageFormat Format;
+
+    static PRBool UseShm();
+    static already_AddRefed<nsShmImage>
+        Create(const gfxIntSize& aSize, Visual* aVisual, unsigned int aDepth);
+    static already_AddRefed<gfxASurface>
+        EnsureShmImage(const gfxIntSize& aSize, Visual* aVisual, unsigned int aDepth,
+                       nsRefPtr<nsShmImage>& aImage);
+
+    ~nsShmImage() {
+        if (mImage) {
+            XSync(DISPLAY(), False);
+            if (mXAttached) {
+                XShmDetach(DISPLAY(), &mInfo);
+            }
+            XDestroyImage(mImage);
+        }
+    }
+
+    already_AddRefed<gfxASurface> AsSurface();
+
+#if defined(MOZ_WIDGET_GTK2)
+    void Put(GdkWindow* aWindow, GdkRectangle* aRects, GdkRectangle* aEnd);
+#elif defined(MOZ_WIDGET_QT)
+    void Put(QWidget* aWindow, QRect& aRect);
+#endif
+
+    gfxIntSize Size() const { return mSize; }
+
+private:
+    nsShmImage()
+        : mImage(nsnull)
+        , mXAttached(PR_FALSE)
+    { mInfo.shmid = SharedMemorySysV::NULLHandle(); }
+
+    nsRefPtr<SharedMemorySysV>   mSegment;
+    XImage*                      mImage;
+    XShmSegmentInfo              mInfo;
+    gfxIntSize                   mSize;
+    Format                       mFormat;
+    PRPackedBool                 mXAttached;
+};
+
+#endif // MOZ_HAVE_SHMIMAGE
+
+#endif

From b2a9fa398f3af26fc56ff91148fac06a69f8a56b Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Wed, 27 Oct 2010 13:32:45 -0500
Subject: [PATCH 07/57] No bug, remove left over printf debug statement from
 PluginInstanceChild. r=me, a=nobug.

---
 dom/plugins/PluginInstanceChild.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dom/plugins/PluginInstanceChild.cpp b/dom/plugins/PluginInstanceChild.cpp
index 7d1f49734f1..a4d5bb66ced 100644
--- a/dom/plugins/PluginInstanceChild.cpp
+++ b/dom/plugins/PluginInstanceChild.cpp
@@ -1052,7 +1052,6 @@ PluginInstanceChild::CreatePluginWindow()
         return false;
 
     // Apparently some plugins require an ASCII WndProc.
-    printf("setting DefWindowProcA\n");
     SetWindowLongPtrA(mPluginWindowHWND, GWLP_WNDPROC,
                       reinterpret_cast<LONG_PTR>(DefWindowProcA));
 

From 71451b41fef8bf891c4063886e6e62cf7abdcb6f Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Wed, 27 Oct 2010 20:41:23 +0200
Subject: [PATCH 08/57] Backout bug 527667, a=orange-fix

---
 browser/base/content/sanitize.js              |  5 -
 .../storage/nsIDOMStorageManager.idl          | 11 +--
 dom/src/storage/nsDOMStorage.cpp              | 94 ++----------------
 dom/src/storage/nsDOMStorage.h                | 16 +--
 dom/src/storage/nsDOMStorageDBWrapper.cpp     | 19 ----
 dom/src/storage/nsDOMStorageDBWrapper.h       |  7 --
 dom/src/storage/nsDOMStorageMemoryDB.cpp      | 29 ------
 dom/src/storage/nsDOMStorageMemoryDB.h        |  9 --
 dom/src/storage/nsDOMStoragePersistentDB.cpp  | 97 +++----------------
 dom/src/storage/nsDOMStoragePersistentDB.h    |  9 --
 dom/tests/mochitest/Makefile.in               |  1 -
 dom/tests/mochitest/globalstorage/Makefile.in | 54 -----------
 .../test_globalStorageDeleteSinceAPI.html     | 73 --------------
 dom/tests/mochitest/localstorage/Makefile.in  |  2 -
 .../test_localStorageDeleteSinceAPI.html      | 70 -------------
 ...lStorageDeleteSinceAPIPrivateBrowsing.html | 85 ----------------
 .../mochitest/sessionstorage/Makefile.in      |  1 -
 .../test_sessionStorageDeleteSinceAPI.html    | 67 -------------
 18 files changed, 22 insertions(+), 627 deletions(-)
 delete mode 100644 dom/tests/mochitest/globalstorage/Makefile.in
 delete mode 100644 dom/tests/mochitest/globalstorage/test_globalStorageDeleteSinceAPI.html
 delete mode 100644 dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPI.html
 delete mode 100644 dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPIPrivateBrowsing.html
 delete mode 100644 dom/tests/mochitest/sessionstorage/test_sessionStorageDeleteSinceAPI.html

diff --git a/browser/base/content/sanitize.js b/browser/base/content/sanitize.js
index 8c6d9a7dd91..3834c697e11 100644
--- a/browser/base/content/sanitize.js
+++ b/browser/base/content/sanitize.js
@@ -152,11 +152,6 @@ Sanitizer.prototype = {
               // This cookie was created after our cutoff, clear it
               cookieMgr.remove(cookie.host, cookie.name, cookie.path, false);
           }
-
-          // Also handle all DOM storage data created after the cutoff.
-          var domStorageManager = Components.classes["@mozilla.org/dom/storagemanager;1"]
-                                            .getService(Ci.nsIDOMStorageManager);
-          domStorageManager.clearStorageDataSince(this.range[0]);
         }
         else {
           // Remove everything
diff --git a/dom/interfaces/storage/nsIDOMStorageManager.idl b/dom/interfaces/storage/nsIDOMStorageManager.idl
index 13ef2b207af..7df2efa3470 100644
--- a/dom/interfaces/storage/nsIDOMStorageManager.idl
+++ b/dom/interfaces/storage/nsIDOMStorageManager.idl
@@ -40,7 +40,7 @@
 interface nsIDOMStorage;
 interface nsIPrincipal;
 
-[scriptable, uuid(9b729267-00ed-4e5c-a3d2-b5572ca0934d)]
+[scriptable, uuid(fd91ec36-7da8-43bb-b8f2-4b57a862a467)]
 interface nsIDOMStorageManager : nsISupports
 {
   /**
@@ -59,15 +59,6 @@ interface nsIDOMStorageManager : nsISupports
    */
   void clearOfflineApps();
 
-  /**
-   * Clears any data stored in DOM storage since the provided time
-   * @param since
-   *    Any storage value that has been inserted after the time specified
-   *    with 'since' will be deleted.  The time is in microseconds, defined
-   *    as PR_Now() function result.
-   */
-  void clearStorageDataSince(in PRInt64 since);
-
   /**
    * Returns instance of localStorage object for aURI's origin.
    * This method ensures there is always only a single instance
diff --git a/dom/src/storage/nsDOMStorage.cpp b/dom/src/storage/nsDOMStorage.cpp
index e443970f1a0..acd3bfc1e24 100644
--- a/dom/src/storage/nsDOMStorage.cpp
+++ b/dom/src/storage/nsDOMStorage.cpp
@@ -65,7 +65,6 @@
 #include "nsDOMString.h"
 #include "nsNetCID.h"
 #include "nsIProxyObjectManager.h"
-#include "nsISupportsPrimitives.h"
 
 static const PRUint32 ASK_BEFORE_ACCEPT = 1;
 static const PRUint32 ACCEPT_SESSION = 2;
@@ -403,13 +402,10 @@ nsDOMStorageManager::Observe(nsISupports *aSubject,
 
       PRUint32 cap = 0;
       perm->GetCapability(&cap);
-      if (!(cap & nsICookiePermission::ACCESS_SESSION))
+      if (!(cap & nsICookiePermission::ACCESS_SESSION) ||
+          nsDependentString(aData) != NS_LITERAL_STRING("deleted"))
         return NS_OK;
 
-      // In any change to ACCESS_SESSION, like add or delete, drop the session
-      // only storage in-memory database.  This ensures that it will always be
-      // newly created and therefor preloaded with data from the persistent
-      // database after we switched to ACCESS_SESSION.
       nsCAutoString host;
       perm->GetHost(host);
       if (host.IsEmpty())
@@ -442,33 +438,6 @@ nsDOMStorageManager::GetUsage(const nsAString& aDomain,
                                             PR_FALSE, aUsage);
 }
 
-NS_IMETHODIMP
-nsDOMStorageManager::ClearStorageDataSince(PRInt64 aSince)
-{
-  nsresult rv;
-
-  rv = nsDOMStorage::InitDB();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = nsDOMStorage::gStorageDB->RemoveTimeRange(aSince);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<nsIObserverService> obsserv = mozilla::services::GetObserverService();
-  if (obsserv) {
-    nsCOMPtr<nsISupportsPRTime> time = do_CreateInstance(
-          "@mozilla.org/supports-PRTime;1", &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = time->SetData(aSince);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = obsserv->NotifyObservers(time, NS_DOMSTORAGE_CUTOFF_OBSERVER, nsnull);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDOMStorageManager::ClearOfflineApps()
 {
@@ -691,8 +660,6 @@ nsDOMStorage::InitAsSessionStorage(nsIPrincipal *aPrincipal, const nsSubstring &
   mQuotaDomainDBKey.Truncate();
 #endif
 
-  RegisterObservers(false);
-
   mStorageType = SessionStorage;
   return NS_OK;
 }
@@ -736,7 +703,7 @@ nsDOMStorage::InitAsLocalStorage(nsIPrincipal *aPrincipal, const nsSubstring &aD
     mCanUseChromePersist = URICanUseChromePersist(URI);
   }
 
-  RegisterObservers(true);
+  RegisterObservers();
 
   return NS_OK;
 }
@@ -764,7 +731,7 @@ nsDOMStorage::InitAsGlobalStorage(const nsACString &aDomainDemanded)
   mStorageType = GlobalStorage;
   mEventBroadcaster = this;
 
-  RegisterObservers(true);
+  RegisterObservers();
 
   return NS_OK;
 }
@@ -1124,12 +1091,6 @@ nsDOMStorage::SetItem(const nsAString& aKey, const nsAString& aData)
     entry->mItem = newitem;
   }
 
-  if (!UseDB()) {
-    // This is used only for sessionStorage, no need to setup the time also when
-    // loading items from the database etc.
-    entry->mItem->SetInsertTimeToNow();
-  }
-
   if ((oldValue != aData || mStorageType == GlobalStorage) && mEventBroadcaster)
     mEventBroadcaster->BroadcastChangeNotification(aKey, oldValue, aData);
 
@@ -1571,16 +1532,13 @@ nsDOMStorage::MaybeCommitTemporaryTable(bool force)
 }
 
 nsresult
-nsDOMStorage::RegisterObservers(bool persistent)
+nsDOMStorage::RegisterObservers()
 {
   nsCOMPtr<nsIObserverService> obsserv = mozilla::services::GetObserverService();
   if (obsserv) {
-    if (persistent) {
-      obsserv->AddObserver(this, "profile-before-change", PR_TRUE);
-      obsserv->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
-      obsserv->AddObserver(this, NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER, PR_TRUE);
-    }
-    obsserv->AddObserver(this, NS_DOMSTORAGE_CUTOFF_OBSERVER, PR_TRUE);
+    obsserv->AddObserver(this, "profile-before-change", PR_TRUE);
+    obsserv->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
+    obsserv->AddObserver(this, NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER, PR_TRUE);
   }
   return NS_OK;
 }
@@ -1603,17 +1561,6 @@ nsDOMStorage::SetTemporaryTableLoaded(bool loaded)
   mLoadedTemporaryTable = loaded;
 }
 
-static PLDHashOperator
-StorageCutOffEnum(nsSessionStorageEntry* aEntry, void* userArg)
-{
-  PRInt64 since = *(PRInt64*)userArg;
-
-  if (aEntry->mItem->ShouldBeCutOff(since))
-    return PL_DHASH_REMOVE;
-
-  return PL_DHASH_NEXT;
-}
-
 NS_IMETHODIMP
 nsDOMStorage::Observe(nsISupports *subject,
                       const char *topic,
@@ -1632,30 +1579,6 @@ nsDOMStorage::Observe(nsISupports *subject,
     return NS_OK;
   }
 
-  if (!strcmp(topic, NS_DOMSTORAGE_CUTOFF_OBSERVER)) {
-    if (UseDB()) {
-      // If this storage is using the database (localStorage, globalStorage)
-      // then just re-cache the items from the database, database is now up to
-      // date.
-      mItemsCached = PR_FALSE;
-      CacheKeysFromDB();
-    }
-    else {
-      // This is sessionStorage. In that case we need to prune the mItems hash
-      // table. Insert times are properly set in nsDOMStorage::SetItem.
-      nsresult rv;
-      nsCOMPtr<nsISupportsPRTime> time = do_QueryInterface(subject, &rv);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      PRInt64 since;
-      rv = time->GetData(&since);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      mItems.EnumerateEntries(StorageCutOffEnum, &since);
-    }
-    return NS_OK;
-  }
-
   NS_WARNING("Unrecognized topic in nsDOMStorage::Observe");
   return NS_OK;
 }
@@ -2108,7 +2031,6 @@ nsDOMStorageItem::nsDOMStorageItem(nsDOMStorage* aStorage,
   : mSecure(aSecure),
     mKey(aKey),
     mValue(aValue),
-    mInsertTime(0),
     mStorage(aStorage)
 {
 }
diff --git a/dom/src/storage/nsDOMStorage.h b/dom/src/storage/nsDOMStorage.h
index d8cbab687f0..4aad4f6c428 100644
--- a/dom/src/storage/nsDOMStorage.h
+++ b/dom/src/storage/nsDOMStorage.h
@@ -64,7 +64,6 @@
 #include "mozilla/TimeStamp.h"
 
 #define NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER "domstorage-flush-timer"
-#define NS_DOMSTORAGE_CUTOFF_OBSERVER "domstorage-cutoff"
 
 #ifdef MOZ_STORAGE
 #include "nsDOMStorageDBWrapper.h"
@@ -243,7 +242,7 @@ public:
     return static_cast<nsDOMStorage*>(static_cast<nsIDOMStorageObsolete*>(aSupports));
   }
 
-  nsresult RegisterObservers(bool persistent);
+  nsresult RegisterObservers();
   nsresult MaybeCommitTemporaryTable(bool force);
 
   bool WasTemporaryTableLoaded();
@@ -465,16 +464,6 @@ public:
     mValue.Truncate();
   }
 
-  void SetInsertTimeToNow()
-  {
-    mInsertTime = PR_Now();
-  }
-
-  bool ShouldBeCutOff(PRInt64 since)
-  {
-    return mInsertTime > since;
-  }
-
 protected:
 
   // true if this value is for secure sites only
@@ -486,9 +475,6 @@ protected:
   // value of the item
   nsString mValue;
 
-  // insertion/update time
-  PRInt64 mInsertTime;
-
   // If this item came from the db, mStorage points to the storage
   // object where this item came from.
   nsRefPtr<nsDOMStorage> mStorage;
diff --git a/dom/src/storage/nsDOMStorageDBWrapper.cpp b/dom/src/storage/nsDOMStorageDBWrapper.cpp
index 28cbe1b8180..80679f25091 100644
--- a/dom/src/storage/nsDOMStorageDBWrapper.cpp
+++ b/dom/src/storage/nsDOMStorageDBWrapper.cpp
@@ -263,25 +263,6 @@ nsDOMStorageDBWrapper::RemoveOwner(const nsACString& aOwner,
   return rv;
 }
 
-nsresult
-nsDOMStorageDBWrapper::RemoveTimeRange(PRInt64 aSince)
-{
-  nsresult rv;
-
-  rv = mPrivateBrowsingDB.RemoveTimeRange(aSince);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (nsDOMStorageManager::gStorageManager->InPrivateBrowsingMode())
-    return NS_OK;
-
-  rv = mSessionOnlyDB.RemoveTimeRange(aSince);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mPersistentDB.RemoveTimeRange(aSince);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return rv;
-}
 
 nsresult
 nsDOMStorageDBWrapper::RemoveOwners(const nsTArray<nsString> &aOwners,
diff --git a/dom/src/storage/nsDOMStorageDBWrapper.h b/dom/src/storage/nsDOMStorageDBWrapper.h
index bb7a4bf6ff8..ee641454c86 100644
--- a/dom/src/storage/nsDOMStorageDBWrapper.h
+++ b/dom/src/storage/nsDOMStorageDBWrapper.h
@@ -177,13 +177,6 @@ public:
   RemoveOwners(const nsTArray<nsString>& aOwners,
                PRBool aIncludeSubDomains, PRBool aMatch);
 
-  /**
-   * Removes all keys that were created after the time specified by 'aSince'.
-   * 'aSince' value is compatible with PR_Now() function.
-   */
-  nsresult
-  RemoveTimeRange(PRInt64 aSince);
-
   /**
    * Removes all keys from storage. Used when clearing storage.
    */
diff --git a/dom/src/storage/nsDOMStorageMemoryDB.cpp b/dom/src/storage/nsDOMStorageMemoryDB.cpp
index 5cbed5bb23a..220ba527f2a 100644
--- a/dom/src/storage/nsDOMStorageMemoryDB.cpp
+++ b/dom/src/storage/nsDOMStorageMemoryDB.cpp
@@ -230,7 +230,6 @@ nsDOMStorageMemoryDB::SetKey(nsDOMStorage* aStorage,
 
   item->mValue = aValue;
   item->mSecure = aSecure;
-  item->mInsertTime = PR_Now();
 
   *aNewUsage = usage;
 
@@ -380,34 +379,6 @@ nsDOMStorageMemoryDB::RemoveOwners(const nsTArray<nsString> &aOwners,
   return NS_OK;
 }
 
-static PLDHashOperator
-RemoveTimeRangeEnum(const nsAString& keyname,
-               nsAutoPtr<nsDOMStorageMemoryDB::nsInMemoryItem>& item,
-               void *closure)
-{
-  if (item->mInsertTime > *(PRInt64*)closure)
-    return PL_DHASH_REMOVE;
-
-  return PL_DHASH_NEXT;
-}
-
-static PLDHashOperator
-RemoveTimeRangeStoragesEnum(const nsACString& key,
-                 nsAutoPtr<nsDOMStorageMemoryDB::nsInMemoryStorage>& storage,
-                 void *closure)
-{
-  storage->mTable.Enumerate(RemoveTimeRangeEnum, closure);
-  return PL_DHASH_NEXT;
-}
-
-nsresult
-nsDOMStorageMemoryDB::RemoveTimeRange(PRInt64 since)
-{
-  mData.Enumerate(RemoveTimeRangeStoragesEnum, &since);
-
-  return NS_OK;
-}
-
 nsresult
 nsDOMStorageMemoryDB::RemoveAll()
 {
diff --git a/dom/src/storage/nsDOMStorageMemoryDB.h b/dom/src/storage/nsDOMStorageMemoryDB.h
index 2f0f7fd6140..c88fd38fb20 100644
--- a/dom/src/storage/nsDOMStorageMemoryDB.h
+++ b/dom/src/storage/nsDOMStorageMemoryDB.h
@@ -56,7 +56,6 @@ public:
   public:
     PRBool mSecure;
     nsString mValue;
-    PRInt64 mInsertTime;
   };
 
   typedef nsClassHashtable<nsStringHashKey, nsInMemoryItem> nsStorageItemsTable;
@@ -160,14 +159,6 @@ public:
   RemoveOwners(const nsTArray<nsString>& aOwners,
                PRBool aIncludeSubDomains, PRBool aMatch);
 
-  /**
-   * Remove all values from all scopes not marked as offline that has been
-   * created after the time specified with 'aSince'.  Used by the Clear Private
-   * Data dialog.  'aSince' value is compatible with PR_Now() function.
-   */
-  nsresult
-  RemoveTimeRange(PRInt64 aSince);
-
   /**
    * Removes all keys from storage. Used when clearing storage.
    */
diff --git a/dom/src/storage/nsDOMStoragePersistentDB.cpp b/dom/src/storage/nsDOMStoragePersistentDB.cpp
index ae89d27e93e..0de77b00a95 100644
--- a/dom/src/storage/nsDOMStoragePersistentDB.cpp
+++ b/dom/src/storage/nsDOMStoragePersistentDB.cpp
@@ -205,63 +205,30 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName)
         "PRAGMA temp_store = MEMORY"));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PRInt32 schemaVersion;
-  rv = mConnection->GetSchemaVersion(&schemaVersion);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   mozStorageTransaction transaction(mConnection, PR_FALSE);
 
   // Ensure Gecko 1.9.1 storage table
-  PRBool exists;
-
-  rv = mConnection->TableExists(NS_LITERAL_CSTRING("webappsstore2"),
-                                &exists);
+  rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+         "CREATE TABLE IF NOT EXISTS webappsstore2 ("
+         "scope TEXT, "
+         "key TEXT, "
+         "value TEXT, "
+         "secure INTEGER, "
+         "owner TEXT)"));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (!exists) {
-    rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-           "CREATE TABLE webappsstore2 ("
-           "scope TEXT, "
-           "key TEXT, "
-           "value TEXT, "
-           "secure INTEGER, "
-           "owner TEXT, "
-           "inserttime BIGINT DEFAULT 0)"));
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  else {
-    if (schemaVersion == 0) {
-      rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-           "ALTER TABLE webappsstore2 "
-           "ADD COLUMN inserttime BIGINT DEFAULT 0"));
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-  }
-
-  if (schemaVersion == 0) {
-    rv = mConnection->SetSchemaVersion(1);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
   rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
         "CREATE UNIQUE INDEX IF NOT EXISTS scope_key_index"
         " ON webappsstore2(scope, key)"));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-        "CREATE INDEX IF NOT EXISTS inserttime_index"
-        " ON webappsstore2(inserttime)"));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-
   rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
          "CREATE TEMPORARY TABLE webappsstore2_temp ("
          "scope TEXT, "
          "key TEXT, "
          "value TEXT, "
          "secure INTEGER, "
-         "owner TEXT, "
-         "inserttime BIGINT DEFAULT 0)"));
+         "owner TEXT)"));
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
@@ -269,11 +236,6 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName)
         " ON webappsstore2_temp(scope, key)"));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-        "CREATE INDEX IF NOT EXISTS inserttime_index_temp"
-        " ON webappsstore2_temp(inserttime)"));
-  NS_ENSURE_SUCCESS(rv, rv);
-
 
   rv = mConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
         "CREATE TEMPORARY VIEW webappsstore2_view AS "
@@ -309,6 +271,8 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName)
   rv = mConnection->CreateFunction(NS_LITERAL_CSTRING("ISOFFLINE"), 1, function2);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  PRBool exists;
+
   // Check if there is storage of Gecko 1.9.0 and if so, upgrade that storage
   // to actual webappsstore2 table and drop the obsolete table. First process
   // this newer table upgrade to priority potential duplicates from older
@@ -391,8 +355,8 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName)
   // insert a new key
   rv = mConnection->CreateStatement(NS_LITERAL_CSTRING(
          "INSERT OR REPLACE INTO "
-         "webappsstore2_temp(scope, key, value, secure, inserttime) "
-         "VALUES (:scope, :key, :value, :secure, :inserttime)"),
+         "webappsstore2_temp(scope, key, value, secure) "
+         "VALUES (:scope, :key, :value, :secure)"),
          getter_AddRefs(mInsertKeyStatement));
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -427,14 +391,6 @@ nsDOMStoragePersistentDB::Init(const nsString& aDatabaseName)
          getter_AddRefs(mRemoveStorageStatement));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // remove keys that are junger then a specific time
-  rv = mConnection->CreateStatement(NS_LITERAL_CSTRING(
-         "DELETE FROM webappsstore2_view "
-         "WHERE inserttime > :time "
-         "AND NOT ISOFFLINE(scope)"),
-         getter_AddRefs(mRemoveTimeRangeStatement));
-  NS_ENSURE_SUCCESS(rv, rv);
-
   // remove all keys
   rv = mConnection->CreateStatement(NS_LITERAL_CSTRING(
          "DELETE FROM webappsstore2_view"),
@@ -733,9 +689,6 @@ nsDOMStoragePersistentDB::SetKey(nsDOMStorage* aStorage,
   rv = binder->BindInt32ByName(NS_LITERAL_CSTRING("secure"),
                                aSecure ? 1 : 0);
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = binder->BindInt64ByName(NS_LITERAL_CSTRING("inserttime"),
-                               PR_Now());
-  NS_ENSURE_SUCCESS(rv, rv);
 
   rv = binder.Add();
   NS_ENSURE_SUCCESS(rv, rv);
@@ -852,32 +805,6 @@ nsDOMStoragePersistentDB::ClearStorage(nsDOMStorage* aStorage)
   return NS_OK;
 }
 
-nsresult
-nsDOMStoragePersistentDB::RemoveTimeRange(PRInt64 since)
-{
-  nsresult rv;
-
-  rv = MaybeCommitInsertTransaction();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mozStorageStatementScoper scope(mRemoveTimeRangeStatement);
-
-  Binder binder(mRemoveTimeRangeStatement, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = binder->BindInt64ByName(NS_LITERAL_CSTRING("time"),
-                                    since);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = binder.Add();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mRemoveTimeRangeStatement->Execute();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
 nsresult
 nsDOMStoragePersistentDB::RemoveOwner(const nsACString& aOwner,
                                       PRBool aIncludeSubDomains)
diff --git a/dom/src/storage/nsDOMStoragePersistentDB.h b/dom/src/storage/nsDOMStoragePersistentDB.h
index b0034cfde9d..af7cfe6a308 100644
--- a/dom/src/storage/nsDOMStoragePersistentDB.h
+++ b/dom/src/storage/nsDOMStoragePersistentDB.h
@@ -128,14 +128,6 @@ public:
   RemoveOwners(const nsTArray<nsString>& aOwners,
                PRBool aIncludeSubDomains, PRBool aMatch);
 
-  /**
-   * Remove all values from all scopes not marked as offline that has been
-   * created after the time specified with 'aSince'.  Used by the Clear Private
-   * Data dialog.  'aSince' value is compatible with PR_Now() function.
-   */
-  nsresult
-  RemoveTimeRange(PRInt64 aSince);
-
   /**
    * Removes all keys from storage. Used when clearing storage.
    */
@@ -184,7 +176,6 @@ protected:
   nsCOMPtr<mozIStorageStatement> mRemoveKeyStatement;
   nsCOMPtr<mozIStorageStatement> mRemoveOwnerStatement;
   nsCOMPtr<mozIStorageStatement> mRemoveStorageStatement;
-  nsCOMPtr<mozIStorageStatement> mRemoveTimeRangeStatement;
   nsCOMPtr<mozIStorageStatement> mRemoveAllStatement;
   nsCOMPtr<mozIStorageStatement> mGetOfflineExcludedUsageStatement;
   nsCOMPtr<mozIStorageStatement> mGetFullUsageStatement;
diff --git a/dom/tests/mochitest/Makefile.in b/dom/tests/mochitest/Makefile.in
index 93b078be639..d13e7c90ce9 100644
--- a/dom/tests/mochitest/Makefile.in
+++ b/dom/tests/mochitest/Makefile.in
@@ -54,7 +54,6 @@ DIRS	+= \
 	whatwg \
 	geolocation \
 	localstorage \
-	globalstorage \
 	sessionstorage \
 	storageevent \
 	$(NULL)
diff --git a/dom/tests/mochitest/globalstorage/Makefile.in b/dom/tests/mochitest/globalstorage/Makefile.in
deleted file mode 100644
index 06492a9e158..00000000000
--- a/dom/tests/mochitest/globalstorage/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2008
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Jan Bambas <honzab@firemni.cz>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir	= dom/tests/mochitest/globalstorage
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
-_TEST_FILES	= \
-    test_globalStorageDeleteSinceAPI.html \
-    $(NULL)
-
-libs::	$(_TEST_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
diff --git a/dom/tests/mochitest/globalstorage/test_globalStorageDeleteSinceAPI.html b/dom/tests/mochitest/globalstorage/test_globalStorageDeleteSinceAPI.html
deleted file mode 100644
index 9c22bf4c587..00000000000
--- a/dom/tests/mochitest/globalstorage/test_globalStorageDeleteSinceAPI.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>globalStorage delete since API test</title>
-
-<script type="text/javascript" src="/MochiKit/packed.js"></script>
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-
-<script type="text/javascript">
-
-function cleanup()
-{
-  globalStorage[window.location.hostname].removeItem("key1");
-  globalStorage[window.location.hostname].removeItem("key2");
-  globalStorage[window.location.hostname].removeItem("key3");
-  globalStorage[window.location.hostname].removeItem("key4");
-  SimpleTest.finish();
-}
-
-function doTest()
-{
-  var since = 0;
-
-  setTimeout('globalStorage[window.location.hostname].key1 = "value1"',     0);
-  setTimeout('globalStorage[window.location.hostname].key2 = "value2"',   100);
-  setTimeout('globalStorage[window.location.hostname].key3 = "value3"',   200);
-
-  // Since now, all added/changed items will be deleted
-  setTimeout(function() {
-    // Now in microseconds...
-    since = (new Date()).getTime() * 1000;
-  }, 300);
-
-  // Rather give the timer chance to move forward, on some systems the
-  // granularity may be too grainy.
-
-  setTimeout('globalStorage[window.location.hostname].key4 = "value4"',   500);
-  setTimeout('globalStorage[window.location.hostname].key1 = "value1-2"', 600);
-
-  setTimeout(function() {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    is(globalStorage[window.location.hostname].length, 4, "Expected 4 items before delete");
-
-    try {
-      var domStorageManager = Components.classes["@mozilla.org/dom/storagemanager;1"]
-                                        .getService(Components.interfaces.nsIDOMStorageManager);
-      domStorageManager.clearStorageDataSince(since);
-    }
-    catch(ex) {
-      ok(false, ex);
-    }
-
-    todo(globalStorage[window.location.hostname].key1 == null, "key1 deleted (Bug 600366)");
-    is(globalStorage[window.location.hostname].key2, "value2", "key2 left");
-    is(globalStorage[window.location.hostname].key3, "value3", "key3 left");
-    todo(globalStorage[window.location.hostname].key4 == null, "key4 deleted (Bug 600366)");
-    is(globalStorage[window.location.hostname].length, 2, "Expected 2 items after delete");
-
-    cleanup();
-  }, 700);
-}
-
-SimpleTest.waitForExplicitFinish();
-
-</script>
-
-</head>
-
-<body onload="doTest();">
-
-</body>
-</html>
diff --git a/dom/tests/mochitest/localstorage/Makefile.in b/dom/tests/mochitest/localstorage/Makefile.in
index 1572d88eeaa..d6f8499345c 100644
--- a/dom/tests/mochitest/localstorage/Makefile.in
+++ b/dom/tests/mochitest/localstorage/Makefile.in
@@ -68,8 +68,6 @@ _TEST_FILES	= \
     test_localStorageBase.html \
     test_localStorageBasePrivateBrowsing.html \
     test_localStorageBaseSessionOnly.html \
-    test_localStorageDeleteSinceAPI.html \
-    test_localStorageDeleteSinceAPIPrivateBrowsing.html \
     test_localStorageCookieSettings.html \
     test_localStorageEnablePref.html \
     test_localStorageOriginsEquals.html \
diff --git a/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPI.html b/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPI.html
deleted file mode 100644
index e40bb9d91eb..00000000000
--- a/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPI.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>localStorage delete since API test</title>
-
-<script type="text/javascript" src="/MochiKit/packed.js"></script>
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-
-<script type="text/javascript">
-
-function cleanup()
-{
-  localStorage.clear();
-  SimpleTest.finish();
-}
-
-function doTest()
-{
-  var since = 0;
-
-  setTimeout('localStorage.key1 = "value1"',     0);
-  setTimeout('localStorage.key2 = "value2"',   100);
-  setTimeout('localStorage.key3 = "value3"',   200);
-
-  // Since now, all added/changed items will be deleted
-  setTimeout(function() {
-    // Now in microseconds...
-    since = (new Date()).getTime() * 1000;
-  }, 300);
-
-  // Rather give the timer chance to move forward, on some systems the
-  // granularity may be too grainy.
-
-  setTimeout('localStorage.key4 = "value4"',   500);
-  setTimeout('localStorage.key1 = "value1-2"', 600);
-
-  setTimeout(function() {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    is(localStorage.length, 4, "Expected 4 items before delete in localStorage");
-
-    try {
-      var domStorageManager = Components.classes["@mozilla.org/dom/storagemanager;1"]
-                                        .getService(Components.interfaces.nsIDOMStorageManager);
-      domStorageManager.clearStorageDataSince(since);
-    }
-    catch(ex) {
-      ok(false, ex);
-    }
-
-    is(localStorage.key1, null, "key1 deleted (if this fails see bug 600366 first)");
-    is(localStorage.key2, "value2", "key2 left");
-    is(localStorage.key3, "value3", "key3 left");
-    is(localStorage.key4, null, "key4 deleted (if this fails see bug 600366 first)");
-    is(localStorage.length, 2, "Expected 2 items after delete in localStorage");
-
-    cleanup();
-  }, 700);
-}
-
-SimpleTest.waitForExplicitFinish();
-
-</script>
-
-</head>
-
-<body onload="doTest();">
-
-</body>
-</html>
diff --git a/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPIPrivateBrowsing.html b/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPIPrivateBrowsing.html
deleted file mode 100644
index f470c3de739..00000000000
--- a/dom/tests/mochitest/localstorage/test_localStorageDeleteSinceAPIPrivateBrowsing.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>localStorage delete since API test in Private Browsing</title>
-
-<script type="text/javascript" src="/MochiKit/packed.js"></script>
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<script type="text/javascript" src="pbSwitch.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-
-<script type="text/javascript">
-
-function cleanup()
-{
-  localStorage.clear();
-  leavePrivateBrowsing();
-
-  SimpleTest.finish();
-}
-
-function startTest()
-{
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-  if (get_PBSvc())
-    doTest();
-  else
-    ok(true, "No private browsing service, test could not be performed");
-}
-
-function doTest()
-{
-  var since = 0;
-
-  enterPrivateBrowsing();
-
-  setTimeout('localStorage.key1 = "value1"',     0);
-  setTimeout('localStorage.key2 = "value2"',   100);
-  setTimeout('localStorage.key3 = "value3"',   200);
-
-  // Since now, all added/changed items will be deleted
-  setTimeout(function() {
-    // Now in microseconds...
-    since = (new Date()).getTime() * 1000;
-  }, 300);
-
-  // Rather give the timer chance to move forward, on some systems the
-  // granularity may be too grainy.
-
-  setTimeout('localStorage.key4 = "value4"',   500);
-  setTimeout('localStorage.key1 = "value1-2"', 600);
-
-  setTimeout(function() {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    is(localStorage.length, 4, "Expected 4 items before delete in localStorage");
-
-    try {
-      var domStorageManager = Components.classes["@mozilla.org/dom/storagemanager;1"]
-                                        .getService(Components.interfaces.nsIDOMStorageManager);
-      domStorageManager.clearStorageDataSince(since);
-    }
-    catch(ex) {
-      ok(false, ex);
-    }
-
-    is(localStorage.key1, null, "key1 deleted (if this fails see bug 600366 first)");
-    is(localStorage.key2, "value2", "key2 left");
-    is(localStorage.key3, "value3", "key3 left");
-    is(localStorage.key4, null, "key4 deleted (if this fails see bug 600366 first)");
-    is(localStorage.length, 2, "Expected 2 items after delete in localStorage");
-
-    cleanup();
-  }, 700);
-}
-
-SimpleTest.waitForExplicitFinish();
-
-</script>
-
-</head>
-
-<body onload="startTest();">
-
-</body>
-</html>
diff --git a/dom/tests/mochitest/sessionstorage/Makefile.in b/dom/tests/mochitest/sessionstorage/Makefile.in
index 8c40ca95a1d..3036cbb703d 100644
--- a/dom/tests/mochitest/sessionstorage/Makefile.in
+++ b/dom/tests/mochitest/sessionstorage/Makefile.in
@@ -53,7 +53,6 @@ _TEST_FILES	= \
     file_https.html \
     test_sessionStorageBase.html \
     test_sessionStorageClone.html \
-    test_sessionStorageDeleteSinceAPI.html \
     test_sessionStorageReplace.html \
     test_sessionStorageHttpHttps.html \
     interOriginSlave.js \
diff --git a/dom/tests/mochitest/sessionstorage/test_sessionStorageDeleteSinceAPI.html b/dom/tests/mochitest/sessionstorage/test_sessionStorageDeleteSinceAPI.html
deleted file mode 100644
index ce47c62b396..00000000000
--- a/dom/tests/mochitest/sessionstorage/test_sessionStorageDeleteSinceAPI.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>sessionStorage delete since API test</title>
-
-<script type="text/javascript" src="/MochiKit/packed.js"></script>
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-
-<script type="text/javascript">
-
-function cleanup()
-{
-  sessionStorage.clear();
-  SimpleTest.finish();
-}
-
-function doTest()
-{
-  var since = 0;
-
-  setTimeout('sessionStorage.key1 = "value1"',     0);
-  setTimeout('sessionStorage.key2 = "value2"',   100);
-  setTimeout('sessionStorage.key3 = "value3"',   200);
-
-  // Since now, all added/changed items will be deleted
-  setTimeout(function() {
-    // Now in microseconds...
-    since = (new Date()).getTime() * 1000;
-  }, 300);
-
-  setTimeout('sessionStorage.key4 = "value4"',   500);
-  setTimeout('sessionStorage.key1 = "value1-2"', 600);
-
-  setTimeout(function() {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-    is(sessionStorage.length, 4, "Expected 4 items before delete in sessionStorage");
-
-    try {
-      var domStorageManager = Components.classes["@mozilla.org/dom/storagemanager;1"]
-                                        .getService(Components.interfaces.nsIDOMStorageManager);
-      domStorageManager.clearStorageDataSince(since);
-    }
-    catch(ex) {
-      ok(false, ex);
-    }
-
-    is(sessionStorage.length, 2, "Expected 2 items after delete in sessionStorage");
-    is(sessionStorage.key1, null, "key1 deleted");
-    is(sessionStorage.key2, "value2", "key2 left");
-    is(sessionStorage.key3, "value3", "key3 left");
-    is(sessionStorage.key4, null, "key4 deleted");
-
-    cleanup();
-  }, 700);
-}
-
-SimpleTest.waitForExplicitFinish();
-
-</script>
-
-</head>
-
-<body onload="doTest();">
-
-</body>
-</html>

From 67f65ad8ca64fa5c35af5f50e0748fef0f6e3213 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Wed, 27 Oct 2010 11:16:03 -0400
Subject: [PATCH 09/57] bug 601268 - Add canary-in-the-mine instrumentation to
 detect when the browser process spends too long outside its main-thread event
 loop(s) r=cjones a=beltzner

---
 xpcom/threads/nsThread.cpp | 62 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/xpcom/threads/nsThread.cpp b/xpcom/threads/nsThread.cpp
index e5ed574d0fb..e7c81cfb3c5 100644
--- a/xpcom/threads/nsThread.cpp
+++ b/xpcom/threads/nsThread.cpp
@@ -46,6 +46,20 @@
 #include "prlog.h"
 #include "nsThreadUtilsInternal.h"
 
+#define HAVE_UALARM _BSD_SOURCE || (_XOPEN_SOURCE >= 500 ||                 \
+                      _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) &&           \
+                      !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
+
+#if defined(XP_UNIX) && !defined(ANDROID) && !defined(DEBUG) && HAVE_UALARM \
+  && defined(_GNU_SOURCE)
+# define MOZ_CANARY
+# include <unistd.h>
+# include <execinfo.h>
+# include <signal.h>
+# include <fcntl.h>
+# include "nsXULAppAPI.h"
+#endif
+
 #include "mozilla/FunctionTimer.h"
 #if defined(NS_FUNCTION_TIMER) && defined(_MSC_VER)
 #include "nsTimerImpl.h"
@@ -500,6 +514,51 @@ nsThread::HasPendingEvents(PRBool *result)
   return NS_OK;
 }
 
+#ifdef MOZ_CANARY
+void canary_alarm_handler (int signum);
+
+class Canary {
+//XXX ToDo: support nested loops
+public:
+  Canary() {
+    if (sOutputFD != 0 && NS_IsMainThread() && 
+        XRE_GetProcessType() == GeckoProcessType_Default) {
+      if (sOutputFD == -1) {
+        const int flags = O_WRONLY | O_APPEND | O_CREAT | O_NONBLOCK;
+        const mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
+        char* env_var_flag = getenv("MOZ_KILL_CANARIES");
+        sOutputFD = env_var_flag ? (env_var_flag[0] ?
+                                    open(env_var_flag, flags, mode) :
+                                    STDERR_FILENO) : 0;
+        if (sOutputFD == 0)
+          return;
+      }
+      signal(SIGALRM, canary_alarm_handler);
+      ualarm(15000, 0);      
+    }
+  }
+
+  ~Canary() {
+    if (sOutputFD != 0 && NS_IsMainThread() && 
+        XRE_GetProcessType() == GeckoProcessType_Default)
+      ualarm(0, 0);
+  }
+  static int sOutputFD;
+};
+
+int Canary::sOutputFD = -1;
+
+void canary_alarm_handler (int signum)
+{
+  void *array[30];
+  const char msg[29] = "event took too long to run:\n";
+  // use write to be safe in the signal handler
+  write(Canary::sOutputFD, msg, sizeof(msg)); 
+  backtrace_symbols_fd(array, backtrace(array, 30), Canary::sOutputFD);
+}
+
+#endif
+
 NS_IMETHODIMP
 nsThread::ProcessNextEvent(PRBool mayWait, PRBool *result)
 {
@@ -518,6 +577,9 @@ nsThread::ProcessNextEvent(PRBool mayWait, PRBool *result)
 
   ++mRunningEvent;
 
+#ifdef MOZ_CANARY
+  Canary canary;
+#endif
   nsresult rv = NS_OK;
 
   {

From 43df45dbb14b4941031fc954357ec5418632e93b Mon Sep 17 00:00:00 2001
From: Patrick Walton <pwalton@mozilla.com>
Date: Wed, 27 Oct 2010 14:20:26 -0500
Subject: [PATCH 10/57] Bug 601667 - Web Console toolbar styling - part 0
 strings r=l10n a=beta7+

---
 .../chrome/global/headsUpDisplay.properties    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/toolkit/locales/en-US/chrome/global/headsUpDisplay.properties b/toolkit/locales/en-US/chrome/global/headsUpDisplay.properties
index b8f07eb976d..06418ca50d9 100644
--- a/toolkit/locales/en-US/chrome/global/headsUpDisplay.properties
+++ b/toolkit/locales/en-US/chrome/global/headsUpDisplay.properties
@@ -22,6 +22,19 @@ btnPageCSS=CSS
 tipPageCSS=Log CSS parsing errors
 btnPageJS=JS
 tipPageJS=Log JavaScript exceptions
+# LOCALIZATION NOTE (btnPageWebDeveloper):
+#
+# This is used as the text of the "Web Developer" button on the toolbar. It
+# shows or hides messages that the web developer inserted on the page for
+# debugging purposes, using calls such console.log() and console.error(). You
+# may wish to localize this as "Page" if that is clearer in your locale. See
+# bug 601667 for more information.
+btnPageWebDeveloper=Web Developer
+# LOCALIZATION NOTE (tipPageWebDeveloper):
+#
+# This is used as the text of the tool tip for the "Web Developer" button on
+# the toolbar.
+tipPageWebDeveloper=Log messages sent to the "console" object
 btnConsoleErrors=Errors
 tipConsoleErrors=Log calls to console.error()
 btnConsoleInfo=Info
@@ -35,6 +48,11 @@ tipGlobal=Toggle Global Message logging
 localConsole=Local Console
 clearConsoleCmd.label=Clear Console
 clearConsoleCmd.accesskey=e
+# LOCALIZATION NOTE (btnClear):
+#
+# This is used as the text of the "Clear" button for the toolbar. It clears the
+# contents of the console.
+btnClear=Clear
 stringFilter=Filter
 close.button=Close
 close.accesskey=C

From 6d4b7edaf483c4bd703ece41d8c049ad24028ed9 Mon Sep 17 00:00:00 2001
From: Siarhei Siamashka <siarhei.siamashka@gmail.com>
Date: Wed, 27 Oct 2010 08:15:08 +0300
Subject: [PATCH 11/57] Bug 601914 - XPCOM does not work with ARM hardfp ABI.
 r=Jacob.Bramley a=blocking-fennec

--HG--
extra : rebase_source : a9d44cf330e338abf041c6755dbdeba54cfd9b6e
---
 js/src/jit-test/README                        |  74 ---
 js/src/jit-test/lib/prolog.js                 |  48 --
 js/src/jit-test/tests/arguments/args6.js      |  22 -
 js/src/jit-test/tests/arguments/args8.js      |  14 -
 js/src/jit-test/tests/arguments/argsx-4.js    |  23 -
 js/src/jit-test/tests/basic/arith.js          |  11 -
 js/src/jit-test/tests/basic/bug520498.js      |   9 -
 js/src/jit-test/tests/basic/bug522136.js      |  10 -
 js/src/jit-test/tests/basic/bug528644.js      |  16 -
 js/src/jit-test/tests/basic/bug557841.js      |   1 -
 js/src/jit-test/tests/basic/bug578041.js      |   3 -
 js/src/jit-test/tests/basic/bug579740.js      |   7 -
 js/src/jit-test/tests/basic/bug584499-1.js    |   6 -
 js/src/jit-test/tests/basic/bug584499-2.js    |  12 -
 js/src/jit-test/tests/basic/bug584565.js      |  10 -
 js/src/jit-test/tests/basic/call2.js          |  13 -
 .../tests/basic/delete-named-names.js         |  17 -
 .../jit-test/tests/basic/jitstatsArchFlags.js |  14 -
 js/src/jit-test/tests/basic/parseIntTests.js  |  23 -
 .../tests/basic/strictParseIntOctal.js        |  16 -
 .../testAssignmentThatIgnoresSetterRetval.js  |  10 -
 js/src/jit-test/tests/basic/testBug458838.js  |  19 -
 js/src/jit-test/tests/basic/testBug504520.js  |  11 -
 .../tests/basic/testBug504520Harder.js        |  33 --
 js/src/jit-test/tests/basic/testBug552248.js  |  36 --
 js/src/jit-test/tests/basic/testBug579602.js  |  21 -
 js/src/jit-test/tests/basic/testBug579646.js  |  22 -
 js/src/jit-test/tests/basic/testBug584650.js  |   9 -
 js/src/jit-test/tests/basic/testBug597736.js  |  32 --
 .../basic/testEliminatedGuardWithinAnchor.js  |  12 -
 .../tests/basic/testHoleInDenseArray.js       |  18 -
 .../jit-test/tests/basic/testIntOverflow.js   |  15 -
 .../tests/basic/testMethodInitSafety.js       |  14 -
 .../tests/basic/testNativeArgsRooting.js      |  14 -
 .../tests/basic/testNestedDeepBail.js         |  20 -
 .../tests/basic/testNestedExitStackOuter.js   |  29 --
 .../jit-test/tests/basic/testNewArrayCount.js |  12 -
 .../tests/basic/testNewArrayCount2.js         |   8 -
 .../tests/basic/testProxyConstructors.js      |   9 -
 .../tests/basic/testPutOnEmptyArgsObject.js   |  16 -
 .../jit-test/tests/basic/testRebranding2.js   |  21 -
 .../basic/testReconstructImacroPCStack.js     |  28 --
 js/src/jit-test/tests/basic/testRegExpTest.js |  10 -
 .../basic/testScriptGetter_JSOP_CALLPROP.js   |  11 -
 js/src/jit-test/tests/basic/testShiftLeft.js  |  38 --
 .../tests/basic/testShiftRightArithmetic.js   |  44 --
 .../tests/basic/testSideExitInConstructor.js  |  39 --
 .../tests/basic/testSlowNativeBail.js         |  10 -
 .../tests/basic/testStackQuotaExhausted.js    |  29 --
 js/src/jit-test/tests/closures/bug540136.js   |  17 -
 js/src/jit-test/tests/closures/bug540242.js   |  17 -
 js/src/jit-test/tests/closures/bug540243.js   |  10 -
 js/src/jit-test/tests/closures/bug541239.js   |  16 -
 js/src/jit-test/tests/closures/lambda.js      |  27 --
 .../tests/closures/setname-inner-heavy.js     |  18 -
 js/src/jit-test/tests/jaeger/bug554580-5.js   |  20 -
 js/src/jit-test/tests/jaeger/bug555155.js     |  12 -
 js/src/jit-test/tests/jaeger/bug555543.js     |   8 -
 js/src/jit-test/tests/jaeger/bug556525.js     |   5 -
 .../tests/jaeger/bug563000/eif-trap-newvar.js |   9 -
 .../jaeger/bug563000/eif-trap-typechange.js   |  10 -
 .../tests/jaeger/bug563000/eif-trap.js        |  10 -
 .../tests/jaeger/bug563000/simple-trap-1.js   |   9 -
 .../tests/jaeger/bug563000/simple-trap-2.js   |  10 -
 .../tests/jaeger/bug563000/simple-untrap.js   |  11 -
 .../jaeger/bug563000/trap-force-return-1.js   |   7 -
 .../jaeger/bug563000/trap-force-return-2.js   |   7 -
 .../jaeger/bug563000/trap-own-callsite.js     |  15 -
 .../jaeger/bug563000/trap-parent-from-trap.js |  21 -
 .../tests/jaeger/bug563000/trap-parent.js     |  16 -
 .../jaeger/bug563000/trap-self-as-parent.js   |  18 -
 .../jaeger/bug563000/trap-self-from-trap.js   |  23 -
 .../tests/jaeger/bug563000/trap-self.js       |  11 -
 .../jaeger/bug563000/untrap-own-trapsite.js   |  15 -
 .../tests/jaeger/bug563000/untrap-self.js     |  13 -
 js/src/jit-test/tests/jaeger/bug573433.js     |   7 -
 js/src/jit-test/tests/jaeger/bug580884.js     |   8 -
 js/src/jit-test/tests/jaeger/bug582286.js     |   3 -
 js/src/jit-test/tests/jaeger/bug583158.js     |   9 -
 js/src/jit-test/tests/jaeger/bug585341.js     |   6 -
 js/src/jit-test/tests/jaeger/bug588338.js     |  14 -
 js/src/jit-test/tests/jaeger/bug588363-2.js   |   7 -
 .../jit-test/tests/jaeger/crash-on-compare.js |   1 -
 js/src/jit-test/tests/jaeger/fused-eq-ifeq.js |   6 -
 js/src/jit-test/tests/pic/bug558099.js        |  60 ---
 .../tests/sunspider/check-3d-morph.js         |  59 ---
 .../tests/sunspider/check-3d-raytrace.js      | 443 ------------------
 .../sunspider/check-access-binary-trees.js    |  52 --
 .../tests/sunspider/check-access-fannkuch.js  |  66 ---
 .../tests/sunspider/check-access-nbody.js     | 171 -------
 .../tests/sunspider/check-access-nsieve.js    |  40 --
 .../check-bitops-3bit-bits-in-byte.js         |  35 --
 .../sunspider/check-bitops-bits-in-byte.js    |  24 -
 .../sunspider/check-bitops-bitwise-and.js     |  29 --
 .../sunspider/check-bitops-nsieve-bits.js     |  40 --
 .../sunspider/check-controlflow-recursive.js  |  27 --
 .../sunspider/check-date-format-tofte.js      | 302 ------------
 .../sunspider/check-date-format-xparb.js      | 422 -----------------
 .../sunspider/check-math-partial-sums.js      |  41 --
 js/src/jit-test/tests/sunspider/check-mont.js | 119 -----
 .../tests/sunspider/check-string-tagcloud.js  | 270 -----------
 js/src/tests/js1_8_1/jit/browser.js           |   0
 js/src/tests/js1_8_1/jit/jstests.list         |  24 -
 js/src/tests/js1_8_1/jit/regress-451673.js    | 115 -----
 js/src/tests/js1_8_1/jit/regress-451974-01.js |  86 ----
 js/src/tests/js1_8_1/jit/regress-451974-02.js |  97 ----
 js/src/tests/js1_8_1/jit/regress-452498-01.js | 105 -----
 js/src/tests/js1_8_1/jit/regress-458838.js    |  97 ----
 js/src/tests/js1_8_1/jit/regress-462459-01.js | 107 -----
 js/src/tests/js1_8_1/jit/regress-462459-02.js | 106 -----
 js/src/tests/js1_8_1/jit/regress-462459-03.js | 107 -----
 js/src/tests/js1_8_1/jit/regress-462459-04.js | 107 -----
 js/src/tests/js1_8_1/jit/regress-462459-05.js | 107 -----
 js/src/tests/js1_8_1/jit/regress-462459-06.js | 107 -----
 js/src/tests/js1_8_1/jit/regress-462459-07.js | 107 -----
 js/src/tests/js1_8_1/jit/regress-462459-08.js | 107 -----
 js/src/tests/js1_8_1/jit/regress-462459-09.js | 107 -----
 js/src/tests/js1_8_1/jit/regress-462459-10.js | 107 -----
 js/src/tests/js1_8_1/jit/regress-462459-11.js | 107 -----
 js/src/tests/js1_8_1/jit/regress-462459-12.js | 107 -----
 js/src/tests/js1_8_1/jit/regress-469927.js    |  78 ---
 js/src/tests/js1_8_1/jit/regress-470739.js    |  80 ----
 js/src/tests/js1_8_1/jit/regress-471635.js    |  90 ----
 js/src/tests/js1_8_1/jit/regress-489682.js    |  65 ---
 js/src/tests/js1_8_1/jit/shell.js             |   4 -
 .../xptcall/src/md/unix/xptcinvoke_arm.cpp    | 257 ++++++++++
 126 files changed, 257 insertions(+), 5679 deletions(-)
 delete mode 100644 js/src/jit-test/README
 delete mode 100644 js/src/jit-test/lib/prolog.js
 delete mode 100644 js/src/jit-test/tests/arguments/args6.js
 delete mode 100644 js/src/jit-test/tests/arguments/args8.js
 delete mode 100644 js/src/jit-test/tests/arguments/argsx-4.js
 delete mode 100644 js/src/jit-test/tests/basic/arith.js
 delete mode 100644 js/src/jit-test/tests/basic/bug520498.js
 delete mode 100644 js/src/jit-test/tests/basic/bug522136.js
 delete mode 100644 js/src/jit-test/tests/basic/bug528644.js
 delete mode 100644 js/src/jit-test/tests/basic/bug557841.js
 delete mode 100644 js/src/jit-test/tests/basic/bug578041.js
 delete mode 100644 js/src/jit-test/tests/basic/bug579740.js
 delete mode 100644 js/src/jit-test/tests/basic/bug584499-1.js
 delete mode 100644 js/src/jit-test/tests/basic/bug584499-2.js
 delete mode 100644 js/src/jit-test/tests/basic/bug584565.js
 delete mode 100644 js/src/jit-test/tests/basic/call2.js
 delete mode 100644 js/src/jit-test/tests/basic/delete-named-names.js
 delete mode 100644 js/src/jit-test/tests/basic/jitstatsArchFlags.js
 delete mode 100644 js/src/jit-test/tests/basic/parseIntTests.js
 delete mode 100644 js/src/jit-test/tests/basic/strictParseIntOctal.js
 delete mode 100644 js/src/jit-test/tests/basic/testAssignmentThatIgnoresSetterRetval.js
 delete mode 100644 js/src/jit-test/tests/basic/testBug458838.js
 delete mode 100644 js/src/jit-test/tests/basic/testBug504520.js
 delete mode 100644 js/src/jit-test/tests/basic/testBug504520Harder.js
 delete mode 100644 js/src/jit-test/tests/basic/testBug552248.js
 delete mode 100644 js/src/jit-test/tests/basic/testBug579602.js
 delete mode 100644 js/src/jit-test/tests/basic/testBug579646.js
 delete mode 100644 js/src/jit-test/tests/basic/testBug584650.js
 delete mode 100644 js/src/jit-test/tests/basic/testBug597736.js
 delete mode 100644 js/src/jit-test/tests/basic/testEliminatedGuardWithinAnchor.js
 delete mode 100644 js/src/jit-test/tests/basic/testHoleInDenseArray.js
 delete mode 100644 js/src/jit-test/tests/basic/testIntOverflow.js
 delete mode 100644 js/src/jit-test/tests/basic/testMethodInitSafety.js
 delete mode 100644 js/src/jit-test/tests/basic/testNativeArgsRooting.js
 delete mode 100644 js/src/jit-test/tests/basic/testNestedDeepBail.js
 delete mode 100644 js/src/jit-test/tests/basic/testNestedExitStackOuter.js
 delete mode 100644 js/src/jit-test/tests/basic/testNewArrayCount.js
 delete mode 100644 js/src/jit-test/tests/basic/testNewArrayCount2.js
 delete mode 100644 js/src/jit-test/tests/basic/testProxyConstructors.js
 delete mode 100644 js/src/jit-test/tests/basic/testPutOnEmptyArgsObject.js
 delete mode 100644 js/src/jit-test/tests/basic/testRebranding2.js
 delete mode 100644 js/src/jit-test/tests/basic/testReconstructImacroPCStack.js
 delete mode 100644 js/src/jit-test/tests/basic/testRegExpTest.js
 delete mode 100644 js/src/jit-test/tests/basic/testScriptGetter_JSOP_CALLPROP.js
 delete mode 100644 js/src/jit-test/tests/basic/testShiftLeft.js
 delete mode 100644 js/src/jit-test/tests/basic/testShiftRightArithmetic.js
 delete mode 100644 js/src/jit-test/tests/basic/testSideExitInConstructor.js
 delete mode 100644 js/src/jit-test/tests/basic/testSlowNativeBail.js
 delete mode 100644 js/src/jit-test/tests/basic/testStackQuotaExhausted.js
 delete mode 100644 js/src/jit-test/tests/closures/bug540136.js
 delete mode 100644 js/src/jit-test/tests/closures/bug540242.js
 delete mode 100644 js/src/jit-test/tests/closures/bug540243.js
 delete mode 100644 js/src/jit-test/tests/closures/bug541239.js
 delete mode 100644 js/src/jit-test/tests/closures/lambda.js
 delete mode 100644 js/src/jit-test/tests/closures/setname-inner-heavy.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug554580-5.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug555155.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug555543.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug556525.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/eif-trap-newvar.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/eif-trap-typechange.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/eif-trap.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/simple-trap-1.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/simple-trap-2.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/simple-untrap.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-force-return-1.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-force-return-2.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-own-callsite.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-parent-from-trap.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-parent.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-self-as-parent.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-self-from-trap.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-self.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/untrap-own-trapsite.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug563000/untrap-self.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug573433.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug580884.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug582286.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug583158.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug585341.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug588338.js
 delete mode 100644 js/src/jit-test/tests/jaeger/bug588363-2.js
 delete mode 100644 js/src/jit-test/tests/jaeger/crash-on-compare.js
 delete mode 100644 js/src/jit-test/tests/jaeger/fused-eq-ifeq.js
 delete mode 100644 js/src/jit-test/tests/pic/bug558099.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-3d-morph.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-3d-raytrace.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-access-binary-trees.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-access-fannkuch.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-access-nbody.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-access-nsieve.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-bitops-3bit-bits-in-byte.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-bitops-bits-in-byte.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-bitops-bitwise-and.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-bitops-nsieve-bits.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-controlflow-recursive.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-date-format-tofte.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-date-format-xparb.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-math-partial-sums.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-mont.js
 delete mode 100644 js/src/jit-test/tests/sunspider/check-string-tagcloud.js
 delete mode 100644 js/src/tests/js1_8_1/jit/browser.js
 delete mode 100644 js/src/tests/js1_8_1/jit/jstests.list
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-451673.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-451974-01.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-451974-02.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-452498-01.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-458838.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-462459-01.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-462459-02.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-462459-03.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-462459-04.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-462459-05.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-462459-06.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-462459-07.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-462459-08.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-462459-09.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-462459-10.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-462459-11.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-462459-12.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-469927.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-470739.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-471635.js
 delete mode 100644 js/src/tests/js1_8_1/jit/regress-489682.js
 delete mode 100644 js/src/tests/js1_8_1/jit/shell.js

diff --git a/js/src/jit-test/README b/js/src/jit-test/README
deleted file mode 100644
index ddde38dc962..00000000000
--- a/js/src/jit-test/README
+++ /dev/null
@@ -1,74 +0,0 @@
-JS Trace Test Suite
-
-* PURPOSE
-
-This is a test suite for testing TraceMonkey. All tests are run in the JS shell
-with tracing enabled (-j).
-
-* REQUIREMENTS
-
-Python 2.5. This is already a standard requirement for building our tree.
-
-* RUNNING THE TESTS
-
-Basic usage:
-
-    python jit_test.py <path-to-js-shell>
-
-The progress bar shows [#tests passed, #tests failed, #tests run] at the left.
-If all tests pass, the output is 'PASSED ALL'. The test suite can be interrupted
-at any time with Ctrl+C and partial results will be printed.
-
-To run only the basic tests, not including the slow tests:
-
-    python jit_test.py <path-to-js-shell> basic
-
-For more options:
-
-    python jit_test.py -h
-
-* CREATING NEW TESTS
-
-Simply create a JS file under the 'tests/' directory. Most tests should go in
-'tests/basic/'.
-
-All tests are run with 'lib/prolog.js' included first on the command line. The
-command line also creates a global variable 'libdir' that is set to the path
-of the 'lib' directory. To include a file 'foo.js' from the lib directory in a 
-test case:
-
-    load(libdir + 'foo.js')
-
-* TEST METALINES
-
-The first line of a test case can contain a special comment controlling how the
-test is run. For example:
-
-    // |jit-test| allow-oom;
-
-The general format in EBNF is:
-
-    metaline  ::= cookie { item ";" }
-    cookie    ::= "|jit-test|"
-    item      ::= flag | attribute
-
-    flag      ::= "slow" | "allow-oom"
-
-    attribute ::= name ":" value
-    name      ::= "TMFLAGS" | "error"
-    value     ::= <string>
-
-The metaline may appear anywhere in the first line of the file: this allows it
-to be placed inside any kind of comment.
-
-The meaning of the items:
-
-    slow         Test runs slowly. Do not run if the --no-slow option is given.
-    allow-oom    If the test runs out of memory, it counts as passing.
-    valgrind     Run test under valgrind.
-
-    error        The test should be considered to pass iff it throws the
-                 given JS exception.
-    TMFLAGS      Set the environment variable TMFLAGS to the given value.
-
-* END
diff --git a/js/src/jit-test/lib/prolog.js b/js/src/jit-test/lib/prolog.js
deleted file mode 100644
index 5d577b39bda..00000000000
--- a/js/src/jit-test/lib/prolog.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-
-const HAVE_TM = 'tracemonkey' in this;
-
-const HOTLOOP = HAVE_TM ? tracemonkey.HOTLOOP : 8;
-const RECORDLOOP = HOTLOOP;
-const RUNLOOP = HOTLOOP + 1;
-
-var checkStats;
-if (HAVE_TM) {
-    checkStats = function(stats)
-    {
-        // Temporarily disabled while we work on heuristics.
-        return;
-        function jit(on)
-        {
-          if (on && !options().match(/tracejit/))
-          {
-            options('tracejit');
-          }
-          else if (!on && options().match(/tracejit/))
-          {
-            options('tracejit');
-          }
-        }
-
-        jit(false);
-        for (var name in stats) {
-            var expected = stats[name];
-            var actual = tracemonkey[name];
-            if (expected != actual) {
-                print('Trace stats check failed: got ' + actual + ', expected ' + expected + ' for ' + name);
-            }
-        }
-        jit(true);
-    };
-} else {
-    checkStats = function() {};
-}
-
-var appendToActual = function(s) {
-    actual += s + ',';
-}
-
-if (!("gczeal" in this)) {
-  gczeal = function() { }
-}
-
diff --git a/js/src/jit-test/tests/arguments/args6.js b/js/src/jit-test/tests/arguments/args6.js
deleted file mode 100644
index a2fc60d36a8..00000000000
--- a/js/src/jit-test/tests/arguments/args6.js
+++ /dev/null
@@ -1,22 +0,0 @@
-actual = '';
-expected = '6,';
-
-// tracing length
-
-var g = 0;
-
-function h(args) {
-  g = args.length;
-}
-
-function f() {
-  h(arguments);
-}
-
-for (var i = 0; i < 5; ++i) {
-  f(10, 20, 30, 40, 50, 60);
-}
-appendToActual(g);
-
-
-assertEq(actual, expected)
diff --git a/js/src/jit-test/tests/arguments/args8.js b/js/src/jit-test/tests/arguments/args8.js
deleted file mode 100644
index 57938d9e231..00000000000
--- a/js/src/jit-test/tests/arguments/args8.js
+++ /dev/null
@@ -1,14 +0,0 @@
-actual = '';
-expected = '[object Arguments],[object Arguments],[object Arguments],[object Arguments],[object Arguments],';
-
-function h() {
-  return arguments;
-}
-
-for (var i = 0; i < 5; ++i) {
-  var p = h(i, i*2);
-  appendToActual(p);
-}
-
-
-assertEq(actual, expected)
diff --git a/js/src/jit-test/tests/arguments/argsx-4.js b/js/src/jit-test/tests/arguments/argsx-4.js
deleted file mode 100644
index b52b14853cf..00000000000
--- a/js/src/jit-test/tests/arguments/argsx-4.js
+++ /dev/null
@@ -1,23 +0,0 @@
-actual = '';
-expected = '[object Arguments] undefined undefined,[object Arguments] undefined undefined,';
-
-function f() {
-  g(arguments);
-}
-
-function g(a, b, c) {
-  h(arguments);
-  a = 1;
-  b = 2;
-  c = 3;
-  h(arguments);
-}
-
-function h(a, b, c) {
-  appendToActual(a + ' ' + b + ' ' + c);
-}
-
-f(4, 5, 6);
-
-
-assertEq(actual, expected)
diff --git a/js/src/jit-test/tests/basic/arith.js b/js/src/jit-test/tests/basic/arith.js
deleted file mode 100644
index b7f551dccd0..00000000000
--- a/js/src/jit-test/tests/basic/arith.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// |jit-test| TMFLAGS: full,fragprofile,treevis
-
-function arith()
-{
-  var accum = 0;
-  for (var i = 0; i < 100; i++) {
-    accum += (i * 2) - 1;
-  }
-  return accum;
-}
-assertEq(arith(), 9800);
diff --git a/js/src/jit-test/tests/basic/bug520498.js b/js/src/jit-test/tests/basic/bug520498.js
deleted file mode 100644
index 55324f6f30d..00000000000
--- a/js/src/jit-test/tests/basic/bug520498.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var Q = 0;
-try {
-   (function f(i) { Q = i; if (i == 100000) return; f(i+1); })(1)
-} catch (e) {
-}
-
-if (Q == 100000)
-   assertEq(Q, "fail");
-
diff --git a/js/src/jit-test/tests/basic/bug522136.js b/js/src/jit-test/tests/basic/bug522136.js
deleted file mode 100644
index 9267c99ccfa..00000000000
--- a/js/src/jit-test/tests/basic/bug522136.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var Q = 0;
-try {
-   (function f(i) { Q = i; if (i == 100000) return; f(i+1); })(1)
-} catch (e) {
-}
-
-// Exact behavior of recursion check depends on which JIT we use.
-var ok = (Q == 3000 || Q == 3001);
-assertEq(ok, true);
-
diff --git a/js/src/jit-test/tests/basic/bug528644.js b/js/src/jit-test/tests/basic/bug528644.js
deleted file mode 100644
index 260e0d99590..00000000000
--- a/js/src/jit-test/tests/basic/bug528644.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Don't crash
-
-function g(foo) {
-  for (a in foo) {
-  }
-}
-
-var makegen = eval("\n\
-  (function(b) {\n\
-      var h = \n\
-        eval(\"new function() { yield print(b) }\" ); \n\
-    return h\n\
-  })\n\
-");
-
-g(makegen());
diff --git a/js/src/jit-test/tests/basic/bug557841.js b/js/src/jit-test/tests/basic/bug557841.js
deleted file mode 100644
index 903490e6edc..00000000000
--- a/js/src/jit-test/tests/basic/bug557841.js
+++ /dev/null
@@ -1 +0,0 @@
-eval("for(a = 0; a < 4; a++) x = 1;", []);
diff --git a/js/src/jit-test/tests/basic/bug578041.js b/js/src/jit-test/tests/basic/bug578041.js
deleted file mode 100644
index 7a81feb1800..00000000000
--- a/js/src/jit-test/tests/basic/bug578041.js
+++ /dev/null
@@ -1,3 +0,0 @@
-__defineGetter__('x', Float32Array);
-with(this)
-    x;
diff --git a/js/src/jit-test/tests/basic/bug579740.js b/js/src/jit-test/tests/basic/bug579740.js
deleted file mode 100644
index 83ee967bfd8..00000000000
--- a/js/src/jit-test/tests/basic/bug579740.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-for (a = 0; a < 4; a++) {
-    new Math.round(0).t
-}
-
-/* Don't assert. */
-
diff --git a/js/src/jit-test/tests/basic/bug584499-1.js b/js/src/jit-test/tests/basic/bug584499-1.js
deleted file mode 100644
index bc989537994..00000000000
--- a/js/src/jit-test/tests/basic/bug584499-1.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// |jit-test| error: TypeError
-var s = "12345";
-for(var i=0; i<7; i++) {
-    print(s[i].length);
-}
-
diff --git a/js/src/jit-test/tests/basic/bug584499-2.js b/js/src/jit-test/tests/basic/bug584499-2.js
deleted file mode 100644
index bd8b0ab26f5..00000000000
--- a/js/src/jit-test/tests/basic/bug584499-2.js
+++ /dev/null
@@ -1,12 +0,0 @@
-function f(x) {
-    var s = "a";
-    var last = "";
-    for (var i = 0; i < HOTLOOP + 2; i++) {
-        last = s[x];
-    }
-    return last;
-}
-
-f(0);
-
-assertEq(f(1), undefined);
diff --git a/js/src/jit-test/tests/basic/bug584565.js b/js/src/jit-test/tests/basic/bug584565.js
deleted file mode 100644
index ad7d4b47577..00000000000
--- a/js/src/jit-test/tests/basic/bug584565.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Any copyright is dedicated to the Public Domain.
-// http://creativecommons.org/licenses/publicdomain/
-// Contributor: Luke Wagner <lw@mozilla.com>
-
-var x, f;
-for (var i = 0; i < 100; i++) {
-    f = function() {};
-    f.foo;
-    x = f.length;
-}
diff --git a/js/src/jit-test/tests/basic/call2.js b/js/src/jit-test/tests/basic/call2.js
deleted file mode 100644
index 9e68bb20ae1..00000000000
--- a/js/src/jit-test/tests/basic/call2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function g(x) {
-    if ((x & 1) == 1) return 1;
-    return 2;
-}
-
-function f(n) {
-    var q = 0;
-    for (var i = 0; i < n; i++)
-        q += g(i);
-    return q;
-}
-
-assertEq(f(1000), 1500);
diff --git a/js/src/jit-test/tests/basic/delete-named-names.js b/js/src/jit-test/tests/basic/delete-named-names.js
deleted file mode 100644
index 1e0ac407321..00000000000
--- a/js/src/jit-test/tests/basic/delete-named-names.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var a = ['p', 'q', 'r', 's', 't'];
-var o = {p:1, q:2, r:3, s:4, t:5};
-for (var i in o) {
-    delete o.p;
-    delete o.q;
-    delete o.r;
-    delete o.s;
-    delete o.t;
-}
-for each (var i in a)
-    assertEq(o.hasOwnProperty(i), false);
-
-checkStats({
-    recorderAborted:0,
-    traceCompleted:1,
-    sideExitIntoInterpreter:1
-});
diff --git a/js/src/jit-test/tests/basic/jitstatsArchFlags.js b/js/src/jit-test/tests/basic/jitstatsArchFlags.js
deleted file mode 100644
index a4ec0c4ee4b..00000000000
--- a/js/src/jit-test/tests/basic/jitstatsArchFlags.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Make sure the arch flags are valid on startup, even if nothing has
-// been traced yet. We don't know what arch the user is building on,
-// but presumably we want at least 1 flag to be set on all supported
-// platforms.
-
-if (HAVE_TM) {
-  assertEq(jitstats.archIsIA32 ||
-	   jitstats.archIs64BIT ||
-	   jitstats.archIsARM ||
-	   jitstats.archIsSPARC ||
-	   jitstats.archIsPPC ||
-	   jitstats.archIsAMD64,
-	   1);
- }
diff --git a/js/src/jit-test/tests/basic/parseIntTests.js b/js/src/jit-test/tests/basic/parseIntTests.js
deleted file mode 100644
index c8ecb366556..00000000000
--- a/js/src/jit-test/tests/basic/parseIntTests.js
+++ /dev/null
@@ -1,23 +0,0 @@
-function parseIntHelper(n) {
-    var a;
-    for (var i = 0; i < 5; i++)
-      a = parseInt(n);
-    return a;
-}
-function doParseIntTests() {
-    var inputs = [0, -0, .1, -.1, .7, -.7, 1.3, -1.3];
-    var outputs = new Array(8);
-    //avoid jit, unrolled
-    outputs[0] = outputs[1] = outputs[2] = outputs[4] = 0;
-    outputs[3] = outputs[5] = -0;
-    outputs[6] = 1;
-    outputs[7] = -1;
-    for (var i = 0; i < 8; i++) {
-        var testfn = new Function('return parseIntHelper(' + uneval(inputs[i]) + ');');
-        assertEq(testfn(), outputs[i]);
-    }
-}
-doParseIntTests();
-
-assertEq(parseInt("08"), 0);
-assertEq(parseInt("09"), 0);
diff --git a/js/src/jit-test/tests/basic/strictParseIntOctal.js b/js/src/jit-test/tests/basic/strictParseIntOctal.js
deleted file mode 100644
index 536d2d7dd0c..00000000000
--- a/js/src/jit-test/tests/basic/strictParseIntOctal.js
+++ /dev/null
@@ -1,16 +0,0 @@
-"use strict";
-
-assertEq(parseInt("08"), 0);
-assertEq(parseInt("09"), 0);
-assertEq(parseInt("014"), 12);
-assertEq(parseInt("0xA"), 10);
-assertEq(parseInt("00123"), 83);
-
-for (var i = 0; i < 5; i++)
-{
-  assertEq(parseInt("08"), 0);
-  assertEq(parseInt("09"), 0);
-  assertEq(parseInt("014"), 12);
-  assertEq(parseInt("0xA"), 10);
-  assertEq(parseInt("00123"), 83);
-}
diff --git a/js/src/jit-test/tests/basic/testAssignmentThatIgnoresSetterRetval.js b/js/src/jit-test/tests/basic/testAssignmentThatIgnoresSetterRetval.js
deleted file mode 100644
index 1c59113482d..00000000000
--- a/js/src/jit-test/tests/basic/testAssignmentThatIgnoresSetterRetval.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var o = {
-    set x(v) {
-        return 42;
-    }
-};
-
-for (var i = 0; i < 10; ++i) {
-    var z = o.x = "choose me";
-    assertEq(z, "choose me");
-}
diff --git a/js/src/jit-test/tests/basic/testBug458838.js b/js/src/jit-test/tests/basic/testBug458838.js
deleted file mode 100644
index cd1e05cf77b..00000000000
--- a/js/src/jit-test/tests/basic/testBug458838.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var escape;
-function testBug458838() {
-    var a = 1;
-    function g() {
-        var b = 0
-            for (var i = 0; i < 10; ++i) {
-                b += a;
-            }
-        return b;
-    }
-
-    return g();
-}
-assertEq(testBug458838(), 10);
-checkStats({
-  recorderStarted: 1,
-  recorderAborted: 0,
-  traceCompleted: 1
-});
diff --git a/js/src/jit-test/tests/basic/testBug504520.js b/js/src/jit-test/tests/basic/testBug504520.js
deleted file mode 100644
index 73e2e3013fb..00000000000
--- a/js/src/jit-test/tests/basic/testBug504520.js
+++ /dev/null
@@ -1,11 +0,0 @@
-function testBug504520() {
-    // A bug involving comparisons.
-    var arr = [1/0, 1/0, 1/0, 1/0, 1/0, 1/0, 1/0, 1/0, 1/0, 0];
-    assertEq(arr.length > RUNLOOP, true);
-
-    var s = '';
-    for (var i = 0; i < arr.length; i++)
-        arr[i] >= 1/0 ? null : (s += i);
-    assertEq(s, '9');
-}
-testBug504520();
diff --git a/js/src/jit-test/tests/basic/testBug504520Harder.js b/js/src/jit-test/tests/basic/testBug504520Harder.js
deleted file mode 100644
index 0a63ebf4075..00000000000
--- a/js/src/jit-test/tests/basic/testBug504520Harder.js
+++ /dev/null
@@ -1,33 +0,0 @@
-function testBug504520Harder() {
-    // test 1024 similar cases
-    var vals = [1/0, -1/0, 0, 0/0];
-    var ops = ["===", "!==", "==", "!=", "<", ">", "<=", ">="];
-    for each (var x in vals) {
-        for each (var y in vals) {
-            for each (var op in ops) {
-                for each (var z in vals) {
-                    // Assume eval is correct. This depends on the global
-                    // Infinity property not having been reassigned.
-                    var xz = eval(x + op + z);
-                    var yz = eval(y + op + z);
-
-                    var arr = [x, x, x, x, x, x, x, x, x, y];
-                    assertEq(arr.length > RUNLOOP, true);
-                    var expected = [xz, xz, xz, xz, xz, xz, xz, xz, xz, yz];
-
-                    // ?: looks superfluous but that's what we're testing here
-                    var fun = eval(
-                        '(function (arr, results) {\n' +
-                        '    for (let i = 0; i < arr.length; i++)\n' +
-                        '        results.push(arr[i]' + op + z + ' ? "true" : "false");\n' +
-                        '});\n');
-                    var actual = [];
-                    fun(arr, actual);
-		    print(x, y, op, z);
-                    assertEq("" + actual, "" + expected);
-                }
-            }
-        }
-    }
-}
-testBug504520Harder();
diff --git a/js/src/jit-test/tests/basic/testBug552248.js b/js/src/jit-test/tests/basic/testBug552248.js
deleted file mode 100644
index 28782b665bb..00000000000
--- a/js/src/jit-test/tests/basic/testBug552248.js
+++ /dev/null
@@ -1,36 +0,0 @@
-setDebug(true);
-var a = new Array();
-
-function i(save) {
-    var x = 9;
-    evalInFrame(0, "a.push(x)", save);
-    evalInFrame(1, "a.push(z)", save);
-    evalInFrame(2, "a.push(z)", save);
-    evalInFrame(3, "a.push(y)", save);
-    evalInFrame(4, "a.push(x)", save);
-}
-
-function h() {
-    var z = 5;
-    evalInFrame(0, "a.push(z)");
-    evalInFrame(1, "a.push(y)");
-    evalInFrame(2, "a.push(x)");
-    evalInFrame(0, "i(false)");
-    evalInFrame(0, "a.push(z)", true);
-    evalInFrame(1, "a.push(y)", true);
-    evalInFrame(2, "a.push(x)", true);
-    evalInFrame(0, "i(true)", true);
-}
-
-function g() {
-    var y = 4;
-    h();
-}
-
-function f() {
-    var x = 3;
-    g();
-}
-
-f();
-assertEq(a+'', [5, 4, 3, 9, 5, 5, 4, 3, 5, 4, 3, 9, 5, 5, 4, 3]+'');
diff --git a/js/src/jit-test/tests/basic/testBug579602.js b/js/src/jit-test/tests/basic/testBug579602.js
deleted file mode 100644
index 5871c24d46e..00000000000
--- a/js/src/jit-test/tests/basic/testBug579602.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// don't panic
-
-f = function() {
-  x = yield
-}
-rv = f()
-for (a in rv) (function() {})
-x = Proxy.create((function() {
-  return {
-    defineProperty: gc
-  }
-})(), x)
-with({
-  d: (({
-    x: Object.defineProperty(x, "", ({
-      set: Array.e
-    }))
-  }))
-}) {}
-
-// don't crash
diff --git a/js/src/jit-test/tests/basic/testBug579646.js b/js/src/jit-test/tests/basic/testBug579646.js
deleted file mode 100644
index d034410f9cc..00000000000
--- a/js/src/jit-test/tests/basic/testBug579646.js
+++ /dev/null
@@ -1,22 +0,0 @@
-if (typeof gczeal != "function")
-    gczeal = function() {}
-
-for (a = 0; a < 9; a++)
-    for (b = 0; b < 1; b++)
-        for (c = 0; c < 2; c++)
-            gczeal();
-
-for each(e in [NaN])
-    for (d = 0; d < 1; d++)
-        z = 0;
-
-for (w in [0, 0])
-    {}
-
-x = 0;
-
-for (e = 0; e < 3; e++)
-    for (f = 0; f < 4; f++)
-        x = -x
-
-// don't crash
diff --git a/js/src/jit-test/tests/basic/testBug584650.js b/js/src/jit-test/tests/basic/testBug584650.js
deleted file mode 100644
index b6c9d8ab7fd..00000000000
--- a/js/src/jit-test/tests/basic/testBug584650.js
+++ /dev/null
@@ -1,9 +0,0 @@
-if (typeof gczeal != "function")
-    gczeal = function() {}
-
-// don't crash
-x = (evalcx('lazy'))
-x.watch("", function () {})
-gczeal(1)
-for (w in x) {}
-
diff --git a/js/src/jit-test/tests/basic/testBug597736.js b/js/src/jit-test/tests/basic/testBug597736.js
deleted file mode 100644
index ded33842776..00000000000
--- a/js/src/jit-test/tests/basic/testBug597736.js
+++ /dev/null
@@ -1,32 +0,0 @@
-function leak_test() {
-    // Create a reference loop function->script->traceFragment->object->function
-    // that GC must be able to break. To embedd object into the fragment the
-    // code use prototype chain of depth 2 which caches obj.__proto__.__proto__
-    // into the fragment.
-
-    // To make sure that we have no references to the function f after this
-    // function returns due via the conservative scan of the native stack we
-    // loop here multiple times overwriting the stack and registers with new garabge.
-    for (var j = 0; j != 8; ++j) {
-	var f = Function("a", "var s = 0; for (var i = 0; i != 100; ++i) s += a.b; return s;");
-	var c = {b: 1, f: f, leakDetection: makeFinalizeObserver()};
-	f({ __proto__: { __proto__: c}});
-	f = c = a = null;
-	gc();
-    }
-}
-
-function test()
-{
-    if (typeof finalizeCount != "function")
-	return;
-
-    var base = finalizeCount();
-    leak_test();
-    gc();
-    gc();
-    var n = finalizeCount();
-    assertEq(base + 4 < finalizeCount(), true, "Some finalizations must happen");
-}
-
-test();
diff --git a/js/src/jit-test/tests/basic/testEliminatedGuardWithinAnchor.js b/js/src/jit-test/tests/basic/testEliminatedGuardWithinAnchor.js
deleted file mode 100644
index cc80e779c37..00000000000
--- a/js/src/jit-test/tests/basic/testEliminatedGuardWithinAnchor.js
+++ /dev/null
@@ -1,12 +0,0 @@
-function testEliminatedGuardWithinAnchor() {
-    for (let i = 0; i < 5; ++i) { i / (i * i); }
-    return "ok";
-}
-
-assertEq(testEliminatedGuardWithinAnchor(), "ok");
-
-if (HAVE_TM) {
-    checkStats({
-        sideExitIntoInterpreter: (jitstats.archIsARM ? 1 : 3)
-    });
-}
diff --git a/js/src/jit-test/tests/basic/testHoleInDenseArray.js b/js/src/jit-test/tests/basic/testHoleInDenseArray.js
deleted file mode 100644
index ba7a2c01e16..00000000000
--- a/js/src/jit-test/tests/basic/testHoleInDenseArray.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var s;
-
-function f(i) {
-    if (i > 4) /* side exit when arr[i] changes from bool to undefined (via a hole) */
-        assertEq(s, undefined);
-    else
-        assertEq(s, false);
-    return 1;
-}
-
-/* trailing 'true' ensures array has capacity >= 10 */
-var arr = [ false, false, false, false, false, , , , , , true ];
-
-for (var i = 0; i < 10; ++i) {
-    (s = arr[i]) + f(i);
-}
-
-checkStats({ traceTriggered: 2, sideExitIntoInterpreter: 2 })
diff --git a/js/src/jit-test/tests/basic/testIntOverflow.js b/js/src/jit-test/tests/basic/testIntOverflow.js
deleted file mode 100644
index 712ef0c6529..00000000000
--- a/js/src/jit-test/tests/basic/testIntOverflow.js
+++ /dev/null
@@ -1,15 +0,0 @@
-function testIntOverflow() {
-    // int32_max - 7
-    var ival = 2147483647 - 7;
-    for (var i = 0; i < 30; i++) {
-        ival += 30;
-    }
-    return (ival < 2147483647);
-}
-assertEq(testIntOverflow(), false);
-checkStats({
-    recorderStarted: 1,
-    recorderAborted: 0,
-    traceCompleted: 1,
-    traceTriggered: 1,
-});
diff --git a/js/src/jit-test/tests/basic/testMethodInitSafety.js b/js/src/jit-test/tests/basic/testMethodInitSafety.js
deleted file mode 100644
index ebd6309bdf9..00000000000
--- a/js/src/jit-test/tests/basic/testMethodInitSafety.js
+++ /dev/null
@@ -1,14 +0,0 @@
-function testMethodInitSafety() {
-    function f() { return 'fail'; }
-    function g() { return 'ok'; }
-
-    var s;
-    var arr = [f, f, f, f, g];
-    //assertEq(arr.length > RUNLOOP, true);
-    for (var i = 0; i < arr.length; i++) {
-        var x = {m: arr[i]};
-        s = x.m();
-    }
-    return s;
-}
-assertEq(testMethodInitSafety(), "ok");
diff --git a/js/src/jit-test/tests/basic/testNativeArgsRooting.js b/js/src/jit-test/tests/basic/testNativeArgsRooting.js
deleted file mode 100644
index 1ce8259f2d4..00000000000
--- a/js/src/jit-test/tests/basic/testNativeArgsRooting.js
+++ /dev/null
@@ -1,14 +0,0 @@
-if ('gczeal' in this)
-(function () {
-   (eval("\
-       (function () {\
-           for (var y = 0; y < 16; ++y) {\
-               if (y % 3 == 2) {\
-                   gczeal(1);\
-               } else {\
-                   print(0 / 0);\
-               }\
-           }\
-       });\
-   "))()
-})();
diff --git a/js/src/jit-test/tests/basic/testNestedDeepBail.js b/js/src/jit-test/tests/basic/testNestedDeepBail.js
deleted file mode 100644
index 8e59b04cdaa..00000000000
--- a/js/src/jit-test/tests/basic/testNestedDeepBail.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var _quit;
-function testNestedDeepBail()
-{
-    _quit = false;
-    function loop() {
-        for (var i = 0; i < 4; i++)
-            ;
-    }
-    loop();
-
-    function f() {
-        loop();
-        _quit = true;
-    }
-
-    var stk = [[1], [], [], [], []];
-    while (!_quit)
-        stk.pop().forEach(f);
-}
-testNestedDeepBail();
diff --git a/js/src/jit-test/tests/basic/testNestedExitStackOuter.js b/js/src/jit-test/tests/basic/testNestedExitStackOuter.js
deleted file mode 100644
index 88b795e7cbc..00000000000
--- a/js/src/jit-test/tests/basic/testNestedExitStackOuter.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Test stack reconstruction after a nested exit
-function testNestedExitStackInner(j, counter) {
-  ++counter;
-  var b = 0;
-  for (var i = 1; i <= RUNLOOP; i++) {
-    ++b;
-    var a;
-    // Make sure that once everything has been traced we suddenly switch to
-    // a different control flow the first time we run the outermost tree,
-    // triggering a side exit.
-    if (j < RUNLOOP)
-      a = 1;
-    else
-      a = 0;
-    ++b;
-    b += a;
-  }
-  return counter + b;
-}
-function testNestedExitStackOuter() {
-  var counter = 0;
-  for (var j = 1; j <= RUNLOOP; ++j) {
-    for (var k = 1; k <= RUNLOOP; ++k) {
-      counter = testNestedExitStackInner(j, counter);
-    }
-  }
-  return counter;
-}
-//assertEq(testNestedExitStackOuter(), 81);
diff --git a/js/src/jit-test/tests/basic/testNewArrayCount.js b/js/src/jit-test/tests/basic/testNewArrayCount.js
deleted file mode 100644
index cb7e6d9843c..00000000000
--- a/js/src/jit-test/tests/basic/testNewArrayCount.js
+++ /dev/null
@@ -1,12 +0,0 @@
-function testNewArrayCount()
-{
-  function count(a) { var n = 0; for (var p in a) n++; return n; }
-  var a = [];
-  for (var i = 0; i < 5; i++)
-    a = [0];
-  assertEq(count(a), 1);
-  for (var i = 0; i < 5; i++)
-    a = [0, , 2];
-  assertEq(count(a), 2);
-}
-testNewArrayCount();
diff --git a/js/src/jit-test/tests/basic/testNewArrayCount2.js b/js/src/jit-test/tests/basic/testNewArrayCount2.js
deleted file mode 100644
index 6318e4c25f3..00000000000
--- a/js/src/jit-test/tests/basic/testNewArrayCount2.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function testNewArrayCount2() {
-    function count(a) { var n = 0; for (var p in a) n++; return n; }
-    var x = 0;
-    for (var i = 0; i < 10; ++i)
-        x = count(new Array(1,2,3));
-    return x;
-}
-assertEq(testNewArrayCount2(), 3);
diff --git a/js/src/jit-test/tests/basic/testProxyConstructors.js b/js/src/jit-test/tests/basic/testProxyConstructors.js
deleted file mode 100644
index e716b361ef0..00000000000
--- a/js/src/jit-test/tests/basic/testProxyConstructors.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// proxies can return primitives
-assertEq(new (Proxy.createFunction({}, function(){}, function(){})), undefined);
-
-x = Proxy.createFunction((function () {}), Uint16Array, wrap)
-new(wrap(x))
-
-// proxies can return the callee
-var x = Proxy.createFunction({}, function (q) { return q; });
-new x(x);
diff --git a/js/src/jit-test/tests/basic/testPutOnEmptyArgsObject.js b/js/src/jit-test/tests/basic/testPutOnEmptyArgsObject.js
deleted file mode 100644
index b230897857e..00000000000
--- a/js/src/jit-test/tests/basic/testPutOnEmptyArgsObject.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var g;
-
-function h() {
-    return arguments.length;
-}
-
-function f() {
-    var args = arguments;
-    g = function() { return h.apply(this, args); }
-}
-
-for (var i = 0; i < 10; ++i) {
-    f();
-}
-
-assertEq(g(), 0);
diff --git a/js/src/jit-test/tests/basic/testRebranding2.js b/js/src/jit-test/tests/basic/testRebranding2.js
deleted file mode 100644
index 2bf26eeaff5..00000000000
--- a/js/src/jit-test/tests/basic/testRebranding2.js
+++ /dev/null
@@ -1,21 +0,0 @@
-delete q;
-delete g;
-delete h;
-delete a;
-delete f;
-
-function testRebranding2() {
-    // Same as testRebranding, but the object to be rebranded isn't the global.
-    var x = "FAIL";
-    function g(){}
-    function h(){ x = "ok"; }
-    var obj = {m: g};
-    var arr = [g, g, g, g, h];
-    //assertEq(arr.length > RUNLOOP, true);
-    for (var i = 0; i < 5; i++) {
-        obj.m = arr[i];
-        obj.m();
-    }
-    return x;
-}
-assertEq(testRebranding2(), "ok");
diff --git a/js/src/jit-test/tests/basic/testReconstructImacroPCStack.js b/js/src/jit-test/tests/basic/testReconstructImacroPCStack.js
deleted file mode 100644
index 2dc51508d4f..00000000000
--- a/js/src/jit-test/tests/basic/testReconstructImacroPCStack.js
+++ /dev/null
@@ -1,28 +0,0 @@
-x = Proxy.create((function () {
-    return {
-        get: function () {}
-    }
-}()), Object.e)
-
-var hit = false;
-
-try {
-    Function("\
-      for(var a = 0; a < 2; ++a) {\
-        if (a == 0) {}\
-        else {\
-          x > x\
-        }\
-      }\
-    ")()
-} catch (e) {
-    hit = true;
-
-    var str = String(e);
-    var match = (str == "TypeError: x is not a function" ||
-                 str == "TypeError: can't convert x to number");
-
-    assertEq(match, true);
-}
-
-assertEq(hit, true);
diff --git a/js/src/jit-test/tests/basic/testRegExpTest.js b/js/src/jit-test/tests/basic/testRegExpTest.js
deleted file mode 100644
index 78917ba9be3..00000000000
--- a/js/src/jit-test/tests/basic/testRegExpTest.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// |jit-test| TMFLAGS: full,fragprofile,treevis; valgrind
-
-function testRegExpTest() {
-    var r = /abc/;
-    var flag = false;
-    for (var i = 0; i < 10; ++i)
-        flag = r.test("abc");
-    return flag;
-}
-assertEq(testRegExpTest(), true);
diff --git a/js/src/jit-test/tests/basic/testScriptGetter_JSOP_CALLPROP.js b/js/src/jit-test/tests/basic/testScriptGetter_JSOP_CALLPROP.js
deleted file mode 100644
index 14574b146bf..00000000000
--- a/js/src/jit-test/tests/basic/testScriptGetter_JSOP_CALLPROP.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var a = {_val: 'q',
-	 get p() { return f; }};
-
-function f() { return this._val; }
-
-var g = '';
-for (var i = 0; i < 9; i++)
-    g += a.p();
-assertEq(g, 'qqqqqqqqq');
-
-checkStats({recorderStarted: 1, recorderAborted: 0, traceCompleted: 1, traceTriggered: 1});
diff --git a/js/src/jit-test/tests/basic/testShiftLeft.js b/js/src/jit-test/tests/basic/testShiftLeft.js
deleted file mode 100644
index 4a7f5d98289..00000000000
--- a/js/src/jit-test/tests/basic/testShiftLeft.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// |jit-test| TMFLAGS: full,fragprofile,treevis; valgrind
-
-/* Test the proper operation of the left shift operator. This is especially
- * important on ARM as an explicit mask is required at the native instruction
- * level. */
-
-load(libdir + 'range.js');
-
-function testShiftLeft()
-{
-    var r = [];
-    var i = 0;
-    var j = 0;
-
-    var shifts = [0,1,7,8,15,16,23,24,31];
-
-    /* Samples from the simple shift range. */
-    for (i = 0; i < shifts.length; i++)
-        r[j++] = 1 << shifts[i];
-
-    /* Samples outside the normal shift range. */
-    for (i = 0; i < shifts.length; i++)
-        r[j++] = 1 << (shifts[i] + 32);
-
-    /* Samples far outside the normal shift range. */
-    for (i = 0; i < shifts.length; i++)
-        r[j++] = 1 << (shifts[i] + 224);
-    for (i = 0; i < shifts.length; i++)
-        r[j++] = 1 << (shifts[i] + 256);
-
-    return r.join(",");
-}
-
-assertEq(testShiftLeft(), 
-	 "1,2,128,256,32768,65536,8388608,16777216,-2147483648,"+
-	 "1,2,128,256,32768,65536,8388608,16777216,-2147483648,"+
-	 "1,2,128,256,32768,65536,8388608,16777216,-2147483648,"+
-	 "1,2,128,256,32768,65536,8388608,16777216,-2147483648");
diff --git a/js/src/jit-test/tests/basic/testShiftRightArithmetic.js b/js/src/jit-test/tests/basic/testShiftRightArithmetic.js
deleted file mode 100644
index 7268dc0bad3..00000000000
--- a/js/src/jit-test/tests/basic/testShiftRightArithmetic.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Test the proper operation of the arithmetic right shift operator. This is
- * especially important on ARM as an explicit mask is required at the native
- * instruction level. */
-
-load(libdir + 'range.js');
-
-/* Test different combinations of literals/variables. */
-var s = 4;
-var t = 100;
-assertEq(42 >> s, 2);
-assertEq(s >> 1, 2);
-assertEq(23 >> 3, 2);
-assertEq(t >> s, 6);
-
-
-function testShiftRightArithmetic()
-{
-    var r = [];
-    var i = 0;
-    var j = 0;
-
-    var shifts = [0,1,7,8,15,16,23,24,31];
-
-    /* Samples from the simple shift range. */
-    for (i = 0; i < shifts.length; i++)
-        r[j++] = -2147483648 >> shifts[i];
-
-    /* Samples outside the normal shift range. */
-    for (i = 0; i < shifts.length; i++)
-        r[j++] = -2147483648 >> (shifts[i] + 32);
-
-    /* Samples far outside the normal shift range. */
-    for (i = 0; i < shifts.length; i++)
-        r[j++] = -2147483648 >> (shifts[i] + 224);
-    for (i = 0; i < shifts.length; i++)
-        r[j++] = -2147483648 >> (shifts[i] + 256);
-
-    return r.join(",");
-}
-assertEq(testShiftRightArithmetic(), 
-	 "-2147483648,-1073741824,-16777216,-8388608,-65536,-32768,-256,-128,-1,"+
-	 "-2147483648,-1073741824,-16777216,-8388608,-65536,-32768,-256,-128,-1,"+
-	 "-2147483648,-1073741824,-16777216,-8388608,-65536,-32768,-256,-128,-1,"+
-	 "-2147483648,-1073741824,-16777216,-8388608,-65536,-32768,-256,-128,-1");
diff --git a/js/src/jit-test/tests/basic/testSideExitInConstructor.js b/js/src/jit-test/tests/basic/testSideExitInConstructor.js
deleted file mode 100644
index d46543ef7bd..00000000000
--- a/js/src/jit-test/tests/basic/testSideExitInConstructor.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// |jit-test| TMFLAGS: full,fragprofile,treevis; valgrind
-
-function testSideExitInConstructor() {
-    var FCKConfig = {};
-    FCKConfig.CoreStyles =
-    {
-        'Bold': { },
-        'Italic': { },
-        'FontFace': { },
-        'Size' :
-        {
-        Overrides: [ ]
-        },
-
-        'Color' :
-        {
-        Element: '',
-        Styles: {  },
-        Overrides: [  ]
-        },
-        'BackColor': {
-        Element : '',
-        Styles : { 'background-color' : '' }
-        },
-
-    };
-    var FCKStyle = function(A) {
-        A.Element;
-    };
-
-    var pass = true;
-    for (var s in FCKConfig.CoreStyles) {
-        var x = new FCKStyle(FCKConfig.CoreStyles[s]);
-        if (!x)
-            pass = false;
-    }
-    return pass;
-}
-assertEq(testSideExitInConstructor(), true);
diff --git a/js/src/jit-test/tests/basic/testSlowNativeBail.js b/js/src/jit-test/tests/basic/testSlowNativeBail.js
deleted file mode 100644
index f7a1443a71a..00000000000
--- a/js/src/jit-test/tests/basic/testSlowNativeBail.js
+++ /dev/null
@@ -1,10 +0,0 @@
-function testSlowNativeBail() {
-    var a = ['0', '1', '2', '3', '+'];
-    try {
-	for (var i = 0; i < a.length; i++)
-	    new RegExp(a[i]);
-    } catch (exc) {
-        assertEq(""+exc, "SyntaxError: invalid quantifier");
-    }
-}
-testSlowNativeBail();
diff --git a/js/src/jit-test/tests/basic/testStackQuotaExhausted.js b/js/src/jit-test/tests/basic/testStackQuotaExhausted.js
deleted file mode 100644
index f65957a74b7..00000000000
--- a/js/src/jit-test/tests/basic/testStackQuotaExhausted.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const numFatArgs = Math.pow(2,19) - 1024;
-
-function fun(x) {
-    if (x <= 0)
-        return 0;
-    return fun(x-1);
-}
-
-function fatStack() {
-    return fun(10000);
-}
-
-function assertRightFailure(e) {
-    assertEq(e.toString() == "InternalError: script stack space quota is exhausted" ||
-             e.toString() == "InternalError: too much recursion",
-	     true);
-}
-
-exception = false;
-try {
-    fatStack.apply(null, new Array(numFatArgs));
-} catch (e) {
-    assertRightFailure(e);
-    exception = true;
-}
-assertEq(exception, true);
-
-// No more trace recursion w/ JM
-checkStats({traceCompleted:0});
diff --git a/js/src/jit-test/tests/closures/bug540136.js b/js/src/jit-test/tests/closures/bug540136.js
deleted file mode 100644
index 54b57713a7f..00000000000
--- a/js/src/jit-test/tests/closures/bug540136.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// |jit-test| error: TypeError
-
-(eval("\
- (function () {\
-   for (var[x] = function(){} in \
-     (function m(a) {\
-       if (a < 1) {\
-         x;\
-         return\
-       }\
-       return m(a - 1) + m(a - 2)\
-     })(7)\
-     (eval(\"\"))\
-   )\
-   ([])\
- })\
-"))()
diff --git a/js/src/jit-test/tests/closures/bug540242.js b/js/src/jit-test/tests/closures/bug540242.js
deleted file mode 100644
index 56c1a5a3143..00000000000
--- a/js/src/jit-test/tests/closures/bug540242.js
+++ /dev/null
@@ -1,17 +0,0 @@
-for (j = 0; j < 1; j++) {
- var f = eval("\
-   (function() {\
-     for (var a = 0; a < 8; ++a) {\
-       if (a % 3 == 2) {\
-         eval(\"\
-           for(b in[0,0,0,0]) {\
-             print()\
-           }\
-         \")\
-       }\
-       gc()\
-     }\
-   })\
- ");
- f()
-}
diff --git a/js/src/jit-test/tests/closures/bug540243.js b/js/src/jit-test/tests/closures/bug540243.js
deleted file mode 100644
index 07faa26b6e7..00000000000
--- a/js/src/jit-test/tests/closures/bug540243.js
+++ /dev/null
@@ -1,10 +0,0 @@
-for (a in (eval("\
-  (function() {\
-    return function() {\
-      yield ((function() {\
-        return d\
-      })())\
-    } ();\
-  var d = []\
-  })\
-"))());
diff --git a/js/src/jit-test/tests/closures/bug541239.js b/js/src/jit-test/tests/closures/bug541239.js
deleted file mode 100644
index 32e3af1565b..00000000000
--- a/js/src/jit-test/tests/closures/bug541239.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function m() {
- var d = 73;
-
- return (eval("\n\
-   (function() {\n\
-     return function() {\n\
-       yield ((function() {\n\
-         print(d);\n\
-         return d\n\
-       })())\n\
-     } ();\n\
-   })\n\
- "))();
-}
-
-m().next();
diff --git a/js/src/jit-test/tests/closures/lambda.js b/js/src/jit-test/tests/closures/lambda.js
deleted file mode 100644
index fd7cbd16ed7..00000000000
--- a/js/src/jit-test/tests/closures/lambda.js
+++ /dev/null
@@ -1,27 +0,0 @@
-function f() {
-  var k = 0;
-  
-  var g = function() {
-    return ++k;
-  }
-
-  return g;
-}
-
-function h() {
-  for (var i = 0; i < 10; ++i) {
-    var vf = f();
-    assertEq(vf(), 1);
-    assertEq(vf(), 2);
-    for (var j = 0; j < 10; ++j) {
-      assertEq(vf(), j + 3);
-    }
-  }
-}
-
-h();
-
-checkStats({
-  recorderAborted: 8,      // Inner tree is trying to grow
-});
-
diff --git a/js/src/jit-test/tests/closures/setname-inner-heavy.js b/js/src/jit-test/tests/closures/setname-inner-heavy.js
deleted file mode 100644
index 9c1919dc2f3..00000000000
--- a/js/src/jit-test/tests/closures/setname-inner-heavy.js
+++ /dev/null
@@ -1,18 +0,0 @@
-actual = '';
-expected = 'undefined,';
-
-function f() { 
-    (eval("\
-        (function () {\
-            for (var z = 0; z < 2; ++z) {\
-                x = ''\
-            }\
-        })\
-    "))();
-}
-__defineSetter__("x", eval)
-f()
-appendToActual(x);
-
-
-assertEq(actual, expected)
diff --git a/js/src/jit-test/tests/jaeger/bug554580-5.js b/js/src/jit-test/tests/jaeger/bug554580-5.js
deleted file mode 100644
index 1d3ee522b07..00000000000
--- a/js/src/jit-test/tests/jaeger/bug554580-5.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function() {
-  (function g(m, n) {
-    if (m = n) {
-      return eval("x=this")
-    }
-    g(m, 1)[[]]
-  })()
-})()
-Function("\
-  for (let b in [0]) {\
-    for (var k = 0; k < 6; ++k) {\
-      if (k == 1) {\
-        print(x)\
-      }\
-    }\
-  }\
-")()
-
-/* Don't crash/assert. */
-
diff --git a/js/src/jit-test/tests/jaeger/bug555155.js b/js/src/jit-test/tests/jaeger/bug555155.js
deleted file mode 100644
index db7b57aa1bc..00000000000
--- a/js/src/jit-test/tests/jaeger/bug555155.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// |jit-test| error: undefined
-(function() {
-  throw (function f(a, b) {
-    if (a.h == b) {
-      return eval("((function(){return 1})())!=this")
-    }
-    f(b)
-  })([], 0)
-})()
-
-/* Don't assert/crash. */
-
diff --git a/js/src/jit-test/tests/jaeger/bug555543.js b/js/src/jit-test/tests/jaeger/bug555543.js
deleted file mode 100644
index b641c1b5832..00000000000
--- a/js/src/jit-test/tests/jaeger/bug555543.js
+++ /dev/null
@@ -1,8 +0,0 @@
-(function() {
-  for each(let z in [new String(''), new String('q'), new String('')]) {
-    if (uneval() < z) (function(){})
-  }
-})()
-
-/* Don't assert/crash. */
-
diff --git a/js/src/jit-test/tests/jaeger/bug556525.js b/js/src/jit-test/tests/jaeger/bug556525.js
deleted file mode 100644
index 0b59f3274b0..00000000000
--- a/js/src/jit-test/tests/jaeger/bug556525.js
+++ /dev/null
@@ -1,5 +0,0 @@
-for each(x in [new Number])
-    x.__proto__ = []
-++x[x]
-
-// don't assert
diff --git a/js/src/jit-test/tests/jaeger/bug563000/eif-trap-newvar.js b/js/src/jit-test/tests/jaeger/bug563000/eif-trap-newvar.js
deleted file mode 100644
index 2cde4fde8a9..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/eif-trap-newvar.js
+++ /dev/null
@@ -1,9 +0,0 @@
-setDebug(true);
-
-function nop(){}
-function caller(obj) {
-  assertJit();
-  return x;
-}
-trap(caller, 7, "var x = 'success'; nop()");
-assertEq(caller(this), "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/eif-trap-typechange.js b/js/src/jit-test/tests/jaeger/bug563000/eif-trap-typechange.js
deleted file mode 100644
index 11f2ff0a659..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/eif-trap-typechange.js
+++ /dev/null
@@ -1,10 +0,0 @@
-setDebug(true);
-
-function nop(){}
-function caller(obj) {
-  assertJit();
-  var x = ({ dana : "zuul" });
-  return x;
-}
-trap(caller, 23, "x = 'success'; nop()");
-assertEq(caller(this), "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/eif-trap.js b/js/src/jit-test/tests/jaeger/bug563000/eif-trap.js
deleted file mode 100644
index 9eeb76d07eb..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/eif-trap.js
+++ /dev/null
@@ -1,10 +0,0 @@
-setDebug(true);
-
-function nop(){}
-function caller(obj) {
-  assertJit();
-  var x = "failure";
-  return x;
-}
-trap(caller, 14, "x = 'success'; nop()");
-assertEq(caller(this), "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/simple-trap-1.js b/js/src/jit-test/tests/jaeger/bug563000/simple-trap-1.js
deleted file mode 100644
index 266db65090d..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/simple-trap-1.js
+++ /dev/null
@@ -1,9 +0,0 @@
-setDebug(true);
-var x = "failure";
-function main() { x = "success"; }
-
-/* The JSOP_STOP in a. */
-trap(main, 8, "");
-main();
-
-assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/simple-trap-2.js b/js/src/jit-test/tests/jaeger/bug563000/simple-trap-2.js
deleted file mode 100644
index db7e4b82b2a..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/simple-trap-2.js
+++ /dev/null
@@ -1,10 +0,0 @@
-setDebug(true);
-var x = "notset";
-function main() { x = "failure"; }
-function success() { x = "success"; }
-
-/* The JSOP_STOP in a. */
-trap(main, 7, "success()");
-main();
-
-assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/simple-untrap.js b/js/src/jit-test/tests/jaeger/bug563000/simple-untrap.js
deleted file mode 100644
index 2f89f58bc3d..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/simple-untrap.js
+++ /dev/null
@@ -1,11 +0,0 @@
-setDebug(true);
-var x = "notset";
-function main() { x = "success"; }
-function failure() { x = "failure"; }
-
-/* The JSOP_STOP in a. */
-trap(main, 8, "failure()");
-untrap(main, 8);
-main();
-
-assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-force-return-1.js b/js/src/jit-test/tests/jaeger/bug563000/trap-force-return-1.js
deleted file mode 100644
index 1d19aeebeb1..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/trap-force-return-1.js
+++ /dev/null
@@ -1,7 +0,0 @@
-setDebug(true);
-function main() {
-  return "failure";
-}
-/* JSOP_RETURN in main. */
-trap(main, 3, "'success'");
-assertEq(main(), "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-force-return-2.js b/js/src/jit-test/tests/jaeger/bug563000/trap-force-return-2.js
deleted file mode 100644
index b2b516826a9..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/trap-force-return-2.js
+++ /dev/null
@@ -1,7 +0,0 @@
-setDebug(true);
-function main() {
-  return 1;
-}
-/* JSOP_RETURN in main. */
-trap(main, 1, "0");
-assertEq(main(), 0);
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-own-callsite.js b/js/src/jit-test/tests/jaeger/bug563000/trap-own-callsite.js
deleted file mode 100644
index 18378b7808f..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/trap-own-callsite.js
+++ /dev/null
@@ -1,15 +0,0 @@
-setDebug(true);
-x = "notset";
-function myparent(nested) {
-  if (nested) {
-    /* myparent call in myparent. */
-    trap(myparent, 39, "failure()");
-  } else {
-    x = "success";   
-    myparent(true);
-  }
-}
-function failure() { x = "failure"; }
-
-myparent(false);
-assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-parent-from-trap.js b/js/src/jit-test/tests/jaeger/bug563000/trap-parent-from-trap.js
deleted file mode 100644
index d6ded288128..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/trap-parent-from-trap.js
+++ /dev/null
@@ -1,21 +0,0 @@
-setDebug(true);
-x = "notset";
-
-function child() {
-  x = "failure1";
-  /* JSOP_STOP in parent. */
-  trap(parent, 10, "success()");
-}
-
-function parent() {
-  x = "failure2";
-}
-/* First op in parent. */
-trap(parent, 0, "child()");
-
-function success() {
-  x = "success";
-}
-
-parent();
-assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-parent.js b/js/src/jit-test/tests/jaeger/bug563000/trap-parent.js
deleted file mode 100644
index 2209f946af9..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/trap-parent.js
+++ /dev/null
@@ -1,16 +0,0 @@
-setDebug(true);
-x = "notset";
-function child() {
-  /* JSOP_STOP in parent. */
-  trap(parent, 17, "success()");
-}
-function parent() {
-  child();
-  x = "failure";
-}
-function success() {
-  x = "success";
-}
-
-parent()
-assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-self-as-parent.js b/js/src/jit-test/tests/jaeger/bug563000/trap-self-as-parent.js
deleted file mode 100644
index 65d3e73135e..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/trap-self-as-parent.js
+++ /dev/null
@@ -1,18 +0,0 @@
-setDebug(true);
-x = "notset";
-
-function myparent(nested) {
-  if (nested) {
-    /* noop call in myparent */
-    trap(myparent, 50, "success()");
-  } else {
-    myparent(true);
-    x = "failure";
-    noop();
-  }
-}
-function noop() { }
-function success() { x = "success"; }
-
-myparent();
-assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-self-from-trap.js b/js/src/jit-test/tests/jaeger/bug563000/trap-self-from-trap.js
deleted file mode 100644
index 8a9caaaafda..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/trap-self-from-trap.js
+++ /dev/null
@@ -1,23 +0,0 @@
-setDebug(true);
-x = "notset";
-
-function doNothing() { }
-
-function myparent(nested) {
-  if (nested) {
-    /* JSOP_CALL to doNothing in myparent with nested = true. */
-    trap(myparent, 24, "success()");
-    doNothing();
-  } else {
-    doNothing();
-  }
-}
-/* JSOP_CALL to doNothing in myparent with nested = false. */
-trap(myparent, 35, "myparent(true)");
-
-function success() {
-  x = "success";
-}
-
-myparent(false);
-assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-self.js b/js/src/jit-test/tests/jaeger/bug563000/trap-self.js
deleted file mode 100644
index 9b94fd1c8cc..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/trap-self.js
+++ /dev/null
@@ -1,11 +0,0 @@
-setDebug(true);
-x = "notset";
-function main() {
-  /* The JSOP_STOP in a. */
-  trap(main, 25, "success()");
-  x = "failure";
-}
-function success() { x = "success"; }
-
-main();
-assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/untrap-own-trapsite.js b/js/src/jit-test/tests/jaeger/bug563000/untrap-own-trapsite.js
deleted file mode 100644
index e4dd9d7dc97..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/untrap-own-trapsite.js
+++ /dev/null
@@ -1,15 +0,0 @@
-setDebug(true);
-x = "notset";
-function child() {
-  /* JSOP_STOP in parent */
-  untrap(parent, 10);
-  x = "success";
-}
-function parent() {
-  x = "failure";
-}
-/* JSOP_STOP in parent */
-trap(parent, 10, "child()");
-
-parent();
-assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/untrap-self.js b/js/src/jit-test/tests/jaeger/bug563000/untrap-self.js
deleted file mode 100644
index 4c18db52e8e..00000000000
--- a/js/src/jit-test/tests/jaeger/bug563000/untrap-self.js
+++ /dev/null
@@ -1,13 +0,0 @@
-setDebug(true);
-x = "notset";
-function main() {
-  /* JSOP_STOP in main. */
-  untrap(main, 23);
-  x = "success";
-}
-function failure() { x = "failure"; }
-
-/* JSOP_STOP in main. */
-trap(main, 23, "failure()");
-main();
-assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug573433.js b/js/src/jit-test/tests/jaeger/bug573433.js
deleted file mode 100644
index aa39022bb74..00000000000
--- a/js/src/jit-test/tests/jaeger/bug573433.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// |jit-test| error: TypeError
-function f() {
-  eval("(function() \n{\nfor(x in[])\n{}\n})");
-  ("")()
-}
-f()
-
diff --git a/js/src/jit-test/tests/jaeger/bug580884.js b/js/src/jit-test/tests/jaeger/bug580884.js
deleted file mode 100644
index b7a26f70566..00000000000
--- a/js/src/jit-test/tests/jaeger/bug580884.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// |jit-test| error: ReferenceError
-for (let a in [0])
-a = e
-for (let a in [0])
-(function () {
-    a
-})
-
diff --git a/js/src/jit-test/tests/jaeger/bug582286.js b/js/src/jit-test/tests/jaeger/bug582286.js
deleted file mode 100644
index 094366a3c79..00000000000
--- a/js/src/jit-test/tests/jaeger/bug582286.js
+++ /dev/null
@@ -1,3 +0,0 @@
-evalcx("function s(){}",evalcx('lazy'))
-
-
diff --git a/js/src/jit-test/tests/jaeger/bug583158.js b/js/src/jit-test/tests/jaeger/bug583158.js
deleted file mode 100644
index 6d8c124487d..00000000000
--- a/js/src/jit-test/tests/jaeger/bug583158.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// |jit-test| error: ReferenceError
-function g() {
-  var rv = (function() {
-    this << 1
-  })()
-  if (a) (function() {})
-}
-g()
-
diff --git a/js/src/jit-test/tests/jaeger/bug585341.js b/js/src/jit-test/tests/jaeger/bug585341.js
deleted file mode 100644
index fb96b92c3c3..00000000000
--- a/js/src/jit-test/tests/jaeger/bug585341.js
+++ /dev/null
@@ -1,6 +0,0 @@
-__defineGetter__("x", Float64Array)
-Function("\
-  with(this) {\
-    eval(\"x\")\
-  }\
-")()
diff --git a/js/src/jit-test/tests/jaeger/bug588338.js b/js/src/jit-test/tests/jaeger/bug588338.js
deleted file mode 100644
index 65c30952077..00000000000
--- a/js/src/jit-test/tests/jaeger/bug588338.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// |jit-test| error: <x/> is not a function
-function f() { (e)
-} (x = Proxy.createFunction((function(x) {
-  return {
-    get: function(r, b) {
-      return x[b]
-    }
-  }
-})(/x/), wrap))
-for (z = 0; z < 100; x.unwatch(), z++)
-for (e in [0]) {
-  gczeal(2)
-} ( <x/>)("")
-
diff --git a/js/src/jit-test/tests/jaeger/bug588363-2.js b/js/src/jit-test/tests/jaeger/bug588363-2.js
deleted file mode 100644
index 5550be3ea8d..00000000000
--- a/js/src/jit-test/tests/jaeger/bug588363-2.js
+++ /dev/null
@@ -1,7 +0,0 @@
-with(evalcx('')) {
-    delete eval;
-    eval("x", this.__defineGetter__("x", Function));
-}
-
-/* Don't assert or crash. */
-
diff --git a/js/src/jit-test/tests/jaeger/crash-on-compare.js b/js/src/jit-test/tests/jaeger/crash-on-compare.js
deleted file mode 100644
index 5abd7aa045e..00000000000
--- a/js/src/jit-test/tests/jaeger/crash-on-compare.js
+++ /dev/null
@@ -1 +0,0 @@
-assertEq(Infinity >= Infinity ? true : false, true);
diff --git a/js/src/jit-test/tests/jaeger/fused-eq-ifeq.js b/js/src/jit-test/tests/jaeger/fused-eq-ifeq.js
deleted file mode 100644
index b5d2bf2f61b..00000000000
--- a/js/src/jit-test/tests/jaeger/fused-eq-ifeq.js
+++ /dev/null
@@ -1,6 +0,0 @@
-function ack(m,n){
-   if (m==0) { return n+1; }
-   if (n==0) { return ack(m-1,1); }
-   return ack(m-1, ack(m,n-1) );
-}
-assertEq(ack(3, 3), 61);
diff --git a/js/src/jit-test/tests/pic/bug558099.js b/js/src/jit-test/tests/pic/bug558099.js
deleted file mode 100644
index 5d8c68fa590..00000000000
--- a/js/src/jit-test/tests/pic/bug558099.js
+++ /dev/null
@@ -1,60 +0,0 @@
-(function()[function() function() function() function() function() function() {}]);
-foo = [{
-  text: "(function(){if(d){(1)}})",
-  s: function() {},
-  test: function() {
-    try {
-      f
-    } catch(e) {}
-  }
-},
-{
-  text: "(function(){t})",
-  s: function() {},
-  test: function() {}
-},
-{
-  text: "(function(){if(0){}})",
-  s: function() {},
-  test: function() {}
-},
-{
-  text: "(function(){if(1){}(2)})",
-  s: function() {},
-  test: function() {}
-},
-{
-  text: "(function(){g})",
-  b: function() {},
-  test: function() {}
-},
-{
-  text: "(function(){})",
-  s: function() {},
-  test: function() {}
-},
-{
-  text: "(function(){1})",
-  s: function() {},
-  test: function() {}
-}]; (function() {
-  for (i = 0; i < foo.length; ++i) {
-    a = foo[i]
-    text = a.text
-    eval(text.replace(/@/, ""));
-    if (a.test()) {}
-  }
-} ());
-s = [function() function() function() function() function() function() {}]
-[function() function() function() function() {}];
-(function() { [function() function() {}] });
-(function() {});
-(eval("\
-  (function(){\
-    for each(d in[\
-      0,0,0,0,0,0,0,0,0,0,0,0,0,null,NaN,1,Boolean(false),Boolean(false)\
-    ]){\
-      [].filter(new Function,gczeal(2))\
-    }\
-  })\
-"))();
diff --git a/js/src/jit-test/tests/sunspider/check-3d-morph.js b/js/src/jit-test/tests/sunspider/check-3d-morph.js
deleted file mode 100644
index 3fabdc70f61..00000000000
--- a/js/src/jit-test/tests/sunspider/check-3d-morph.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-var loops = 15
-var nx = 120
-var nz = 120
-
-function morph(a, f) {
-    var PI2nx = Math.PI * 8/nx
-    var sin = Math.sin
-    var f30 = -(50 * sin(f*Math.PI*2))
-    
-    for (var i = 0; i < nz; ++i) {
-        for (var j = 0; j < nx; ++j) {
-            a[3*(i*nx+j)+1]    = sin((j-1) * PI2nx ) * -f30
-        }
-    }
-}
-
-    
-var a = Array()
-for (var i=0; i < nx*nz*3; ++i) 
-    a[i] = 0
-
-for (var i = 0; i < loops; ++i) {
-    morph(a, i/loops)
-}
-
-testOutput = 0;
-for (var i = 0; i < nx; i++)
-    testOutput += a[3*(i*nx+i)+1];
-a = null;
-
-/* not based on any mathematical error calculation.*/
-acceptableDelta = 4e-15
-
-assertEq((testOutput - 6.394884621840902e-14) < acceptableDelta, true);
diff --git a/js/src/jit-test/tests/sunspider/check-3d-raytrace.js b/js/src/jit-test/tests/sunspider/check-3d-raytrace.js
deleted file mode 100644
index 5e020608c0e..00000000000
--- a/js/src/jit-test/tests/sunspider/check-3d-raytrace.js
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-function createVector(x,y,z) {
-    return new Array(x,y,z);
-}
-
-function sqrLengthVector(self) {
-    return self[0] * self[0] + self[1] * self[1] + self[2] * self[2];
-}
-
-function lengthVector(self) {
-    return Math.sqrt(self[0] * self[0] + self[1] * self[1] + self[2] * self[2]);
-}
-
-function addVector(self, v) {
-    self[0] += v[0];
-    self[1] += v[1];
-    self[2] += v[2];
-    return self;
-}
-
-function subVector(self, v) {
-    self[0] -= v[0];
-    self[1] -= v[1];
-    self[2] -= v[2];
-    return self;
-}
-
-function scaleVector(self, scale) {
-    self[0] *= scale;
-    self[1] *= scale;
-    self[2] *= scale;
-    return self;
-}
-
-function normaliseVector(self) {
-    var len = Math.sqrt(self[0] * self[0] + self[1] * self[1] + self[2] * self[2]);
-    self[0] /= len;
-    self[1] /= len;
-    self[2] /= len;
-    return self;
-}
-
-function add(v1, v2) {
-    return new Array(v1[0] + v2[0], v1[1] + v2[1], v1[2] + v2[2]);
-}
-
-function sub(v1, v2) {
-    return new Array(v1[0] - v2[0], v1[1] - v2[1], v1[2] - v2[2]);
-}
-
-function scalev(v1, v2) {
-    return new Array(v1[0] * v2[0], v1[1] * v2[1], v1[2] * v2[2]);
-}
-
-function dot(v1, v2) {
-    return v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2];
-}
-
-function scale(v, scale) {
-    return [v[0] * scale, v[1] * scale, v[2] * scale];
-}
-
-function cross(v1, v2) {
-    return [v1[1] * v2[2] - v1[2] * v2[1], 
-            v1[2] * v2[0] - v1[0] * v2[2],
-            v1[0] * v2[1] - v1[1] * v2[0]];
-
-}
-
-function normalise(v) {
-    var len = lengthVector(v);
-    return [v[0] / len, v[1] / len, v[2] / len];
-}
-
-function transformMatrix(self, v) {
-    var vals = self;
-    var x  = vals[0] * v[0] + vals[1] * v[1] + vals[2] * v[2] + vals[3];
-    var y  = vals[4] * v[0] + vals[5] * v[1] + vals[6] * v[2] + vals[7];
-    var z  = vals[8] * v[0] + vals[9] * v[1] + vals[10] * v[2] + vals[11];
-    return [x, y, z];
-}
-
-function invertMatrix(self) {
-    var temp = new Array(16);
-    var tx = -self[3];
-    var ty = -self[7];
-    var tz = -self[11];
-    for (h = 0; h < 3; h++) 
-        for (v = 0; v < 3; v++) 
-            temp[h + v * 4] = self[v + h * 4];
-    for (i = 0; i < 11; i++)
-        self[i] = temp[i];
-    self[3] = tx * self[0] + ty * self[1] + tz * self[2];
-    self[7] = tx * self[4] + ty * self[5] + tz * self[6];
-    self[11] = tx * self[8] + ty * self[9] + tz * self[10];
-    return self;
-}
-
-
-// Triangle intersection using barycentric coord method
-function Triangle(p1, p2, p3) {
-    var edge1 = sub(p3, p1);
-    var edge2 = sub(p2, p1);
-    var normal = cross(edge1, edge2);
-    if (Math.abs(normal[0]) > Math.abs(normal[1]))
-        if (Math.abs(normal[0]) > Math.abs(normal[2]))
-            this.axis = 0; 
-        else 
-            this.axis = 2;
-    else
-        if (Math.abs(normal[1]) > Math.abs(normal[2])) 
-            this.axis = 1;
-        else 
-            this.axis = 2;
-    var u = (this.axis + 1) % 3;
-    var v = (this.axis + 2) % 3;
-    var u1 = edge1[u];
-    var v1 = edge1[v];
-    
-    var u2 = edge2[u];
-    var v2 = edge2[v];
-    this.normal = normalise(normal);
-    this.nu = normal[u] / normal[this.axis];
-    this.nv = normal[v] / normal[this.axis];
-    this.nd = dot(normal, p1) / normal[this.axis];
-    var det = u1 * v2 - v1 * u2;
-    this.eu = p1[u];
-    this.ev = p1[v]; 
-    this.nu1 = u1 / det;
-    this.nv1 = -v1 / det;
-    this.nu2 = v2 / det;
-    this.nv2 = -u2 / det; 
-    this.material = [0.7, 0.7, 0.7];
-}
-
-Triangle.prototype.intersect = function(orig, dir, near, far) {
-    var u = (this.axis + 1) % 3;
-    var v = (this.axis + 2) % 3;
-    var d = dir[this.axis] + this.nu * dir[u] + this.nv * dir[v];
-    var t = (this.nd - orig[this.axis] - this.nu * orig[u] - this.nv * orig[v]) / d;
-    if (t < near || t > far)
-        return null;
-    var Pu = orig[u] + t * dir[u] - this.eu;
-    var Pv = orig[v] + t * dir[v] - this.ev;
-    var a2 = Pv * this.nu1 + Pu * this.nv1;
-    if (a2 < 0) 
-        return null;
-    var a3 = Pu * this.nu2 + Pv * this.nv2;
-    if (a3 < 0) 
-        return null;
-
-    if ((a2 + a3) > 1) 
-        return null;
-    return t;
-}
-
-function Scene(a_triangles) {
-    this.triangles = a_triangles;
-    this.lights = [];
-    this.ambient = [0,0,0];
-    this.background = [0.8,0.8,1];
-}
-var zero = new Array(0,0,0);
-
-Scene.prototype.intersect = function(origin, dir, near, far) {
-    var closest = null;
-    for (i = 0; i < this.triangles.length; i++) {
-        var triangle = this.triangles[i];   
-        var d = triangle.intersect(origin, dir, near, far);
-        if (d == null || d > far || d < near)
-            continue;
-        far = d;
-        closest = triangle;
-    }
-    
-    if (!closest)
-        return [this.background[0],this.background[1],this.background[2]];
-        
-    var normal = closest.normal;
-    var hit = add(origin, scale(dir, far)); 
-    if (dot(dir, normal) > 0)
-        normal = [-normal[0], -normal[1], -normal[2]];
-    
-    var colour = null;
-    if (closest.shader) {
-        colour = closest.shader(closest, hit, dir);
-    } else {
-        colour = closest.material;
-    }
-    
-    // do reflection
-    var reflected = null;
-    if (colour.reflection > 0.001) {
-        var reflection = addVector(scale(normal, -2*dot(dir, normal)), dir);
-        reflected = this.intersect(hit, reflection, 0.0001, 1000000);
-        if (colour.reflection >= 0.999999)
-            return reflected;
-    }
-    
-    var l = [this.ambient[0], this.ambient[1], this.ambient[2]];
-    for (var i = 0; i < this.lights.length; i++) {
-        var light = this.lights[i];
-        var toLight = sub(light, hit);
-        var distance = lengthVector(toLight);
-        scaleVector(toLight, 1.0/distance);
-        distance -= 0.0001;
-        if (this.blocked(hit, toLight, distance))
-            continue;
-        var nl = dot(normal, toLight);
-        if (nl > 0)
-            addVector(l, scale(light.colour, nl));
-    }
-    l = scalev(l, colour);
-    if (reflected) {
-        l = addVector(scaleVector(l, 1 - colour.reflection), scaleVector(reflected, colour.reflection));
-    }
-    return l;
-}
-
-Scene.prototype.blocked = function(O, D, far) {
-    var near = 0.0001;
-    var closest = null;
-    for (i = 0; i < this.triangles.length; i++) {
-        var triangle = this.triangles[i];   
-        var d = triangle.intersect(O, D, near, far);
-        if (d == null || d > far || d < near)
-            continue;
-        return true;
-    }
-    
-    return false;
-}
-
-
-// this camera code is from notes i made ages ago, it is from *somewhere* -- i cannot remember where
-// that somewhere is
-function Camera(origin, lookat, up) {
-    var zaxis = normaliseVector(subVector(lookat, origin));
-    var xaxis = normaliseVector(cross(up, zaxis));
-    var yaxis = normaliseVector(cross(xaxis, subVector([0,0,0], zaxis)));
-    var m = new Array(16);
-    m[0] = xaxis[0]; m[1] = xaxis[1]; m[2] = xaxis[2];
-    m[4] = yaxis[0]; m[5] = yaxis[1]; m[6] = yaxis[2];
-    m[8] = zaxis[0]; m[9] = zaxis[1]; m[10] = zaxis[2];
-    invertMatrix(m);
-    m[3] = 0; m[7] = 0; m[11] = 0;
-    this.origin = origin;
-    this.directions = new Array(4);
-    this.directions[0] = normalise([-0.7,  0.7, 1]);
-    this.directions[1] = normalise([ 0.7,  0.7, 1]);
-    this.directions[2] = normalise([ 0.7, -0.7, 1]);
-    this.directions[3] = normalise([-0.7, -0.7, 1]);
-    this.directions[0] = transformMatrix(m, this.directions[0]);
-    this.directions[1] = transformMatrix(m, this.directions[1]);
-    this.directions[2] = transformMatrix(m, this.directions[2]);
-    this.directions[3] = transformMatrix(m, this.directions[3]);
-}
-
-Camera.prototype.generateRayPair = function(y) {
-    rays = new Array(new Object(), new Object());
-    rays[0].origin = this.origin;
-    rays[1].origin = this.origin;
-    rays[0].dir = addVector(scale(this.directions[0], y), scale(this.directions[3], 1 - y));
-    rays[1].dir = addVector(scale(this.directions[1], y), scale(this.directions[2], 1 - y));
-    return rays;
-}
-
-function renderRows(camera, scene, pixels, width, height, starty, stopy) {
-    for (var y = starty; y < stopy; y++) {
-        var rays = camera.generateRayPair(y / height);
-        for (var x = 0; x < width; x++) {
-            var xp = x / width;
-            var origin = addVector(scale(rays[0].origin, xp), scale(rays[1].origin, 1 - xp));
-            var dir = normaliseVector(addVector(scale(rays[0].dir, xp), scale(rays[1].dir, 1 - xp)));
-            var l = scene.intersect(origin, dir);
-            pixels[y][x] = l;
-        }
-    }
-}
-
-Camera.prototype.render = function(scene, pixels, width, height) {
-    var cam = this;
-    var row = 0;
-    renderRows(cam, scene, pixels, width, height, 0, height);
-}
-
-
-
-function raytraceScene()
-{
-    var startDate = new Date().getTime();
-    var numTriangles = 2 * 6;
-    var triangles = new Array();//numTriangles);
-    var tfl = createVector(-10,  10, -10);
-    var tfr = createVector( 10,  10, -10);
-    var tbl = createVector(-10,  10,  10);
-    var tbr = createVector( 10,  10,  10);
-    var bfl = createVector(-10, -10, -10);
-    var bfr = createVector( 10, -10, -10);
-    var bbl = createVector(-10, -10,  10);
-    var bbr = createVector( 10, -10,  10);
-    
-    // cube!!!
-    // front
-    var i = 0;
-    
-    triangles[i++] = new Triangle(tfl, tfr, bfr);
-    triangles[i++] = new Triangle(tfl, bfr, bfl);
-    // back
-    triangles[i++] = new Triangle(tbl, tbr, bbr);
-    triangles[i++] = new Triangle(tbl, bbr, bbl);
-    //        triangles[i-1].material = [0.7,0.2,0.2];
-    //            triangles[i-1].material.reflection = 0.8;
-    // left
-    triangles[i++] = new Triangle(tbl, tfl, bbl);
-    //            triangles[i-1].reflection = 0.6;
-    triangles[i++] = new Triangle(tfl, bfl, bbl);
-    //            triangles[i-1].reflection = 0.6;
-    // right
-    triangles[i++] = new Triangle(tbr, tfr, bbr);
-    triangles[i++] = new Triangle(tfr, bfr, bbr);
-    // top
-    triangles[i++] = new Triangle(tbl, tbr, tfr);
-    triangles[i++] = new Triangle(tbl, tfr, tfl);
-    // bottom
-    triangles[i++] = new Triangle(bbl, bbr, bfr);
-    triangles[i++] = new Triangle(bbl, bfr, bfl);
-    
-    //Floor!!!!
-    var green = createVector(0.0, 0.4, 0.0);
-    var grey = createVector(0.4, 0.4, 0.4);
-    grey.reflection = 1.0;
-    var floorShader = function(tri, pos, view) {
-        var x = ((pos[0]/32) % 2 + 2) % 2;
-        var z = ((pos[2]/32 + 0.3) % 2 + 2) % 2;
-        if (x < 1 != z < 1) {
-            //in the real world we use the fresnel term...
-            //    var angle = 1-dot(view, tri.normal);
-            //   angle *= angle;
-            //  angle *= angle;
-            // angle *= angle;
-            //grey.reflection = angle;
-            return grey;
-        } else 
-            return green;
-    }
-    var ffl = createVector(-1000, -30, -1000);
-    var ffr = createVector( 1000, -30, -1000);
-    var fbl = createVector(-1000, -30,  1000);
-    var fbr = createVector( 1000, -30,  1000);
-    triangles[i++] = new Triangle(fbl, fbr, ffr);
-    triangles[i-1].shader = floorShader;
-    triangles[i++] = new Triangle(fbl, ffr, ffl);
-    triangles[i-1].shader = floorShader;
-    
-    var _scene = new Scene(triangles);
-    _scene.lights[0] = createVector(20, 38, -22);
-    _scene.lights[0].colour = createVector(0.7, 0.3, 0.3);
-    _scene.lights[1] = createVector(-23, 40, 17);
-    _scene.lights[1].colour = createVector(0.7, 0.3, 0.3);
-    _scene.lights[2] = createVector(23, 20, 17);
-    _scene.lights[2].colour = createVector(0.7, 0.7, 0.7);
-    _scene.ambient = createVector(0.1, 0.1, 0.1);
-    //  _scene.background = createVector(0.7, 0.7, 1.0);
-    
-    var size = 30;
-    var pixels = new Array();
-    for (var y = 0; y < size; y++) {
-        pixels[y] = new Array();
-        for (var x = 0; x < size; x++) {
-            pixels[y][x] = 0;
-        }
-    }
-
-    var _camera = new Camera(createVector(-40, 40, 40), createVector(0, 0, 0), createVector(0, 1, 0));
-    _camera.render(_scene, pixels, size, size);
-
-    return pixels;
-}
-
-function arrayToCanvasCommands(pixels)
-{
-    var s = '<canvas id="renderCanvas" width="30px" height="30px"></canvas><scr' + 'ipt>\nvar pixels = [';
-    var size = 30;
-    for (var y = 0; y < size; y++) {
-        s += "[";
-        for (var x = 0; x < size; x++) {
-            s += "[" + pixels[y][x] + "],";
-        }
-        s+= "],";
-    }
-    s += '];\n    var canvas = document.getElementById("renderCanvas").getContext("2d");\n\
-\n\
-\n\
-    var size = 30;\n\
-    canvas.fillStyle = "red";\n\
-    canvas.fillRect(0, 0, size, size);\n\
-    canvas.scale(1, -1);\n\
-    canvas.translate(0, -size);\n\
-\n\
-    if (!canvas.setFillColor)\n\
-        canvas.setFillColor = function(r, g, b, a) {\n\
-            this.fillStyle = "rgb("+[Math.floor(r * 255), Math.floor(g * 255), Math.floor(b * 255)]+")";\n\
-    }\n\
-\n\
-for (var y = 0; y < size; y++) {\n\
-  for (var x = 0; x < size; x++) {\n\
-    var l = pixels[y][x];\n\
-    canvas.setFillColor(l[0], l[1], l[2], 1);\n\
-    canvas.fillRect(x, y, 1, 1);\n\
-  }\n\
-}</scr' + 'ipt>';
-
-    return s;
-}
-
-testOutput = arrayToCanvasCommands(raytraceScene());
-expected = '<canvas id="renderCanvas" width="30px" height="30px"></canvas><script>\nvar pixels = [[[0,0.22646733835486615,0],[0,0.22917348499592718,0],[0,0.23178836719862694,0],[0,0.23429286876882874,0],[0,0.23666708243914814,0],[0,0.2388906159889881,0],[0,0.3260187640505792,0],[0,0.33121005205394954,0],[0,0.3363076586511704,0],[0,0.3412818000213254,0],[0,0.34610095331648705,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.369829536245317,0],[0,0.3725822614817006,0],[0,0.37489560357280544,0],[0,0.37673658797290227,0],[0,0.3780753374916205,0],[0,0.378886188721004,0],[0,0.3791488586269958,0],[0,0.3788495731470844,0],[0,0.3779820527845238,0],[0,0.37654824729910663,0],[0,0.4585834760044105,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0,0.22925665044954321,0],[0,0.2320573979410493,0],[0,0.23474822091583247,0],[0,0.2373069549209832,0],[0,0.2397107002896524,0],[0,0.15436982463108695,0],[0,0.15568628300351414,0],[0,0.33780762567168454,0],[0,0.3431766295062631,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.24744701364085558,0.14604872013179526,0.14604872013179526],[0,0.3743786742105677,0],[0,0.37742123153478285,0],[0,0.3799794006700716,0],[0,0.38201209682126785,0],[0,0.38348180518082586,0],[0,0.384356168843629,0],[0,0.3846096564538848,0],[0,0.3842251672467923,0],[0,0.3831954061706588,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0,0.23215413887706876,0],[0,0.2350440502458203,0],[0,0.23780113739316563,0],[0,0.24039973450409946,0],[0,0.24281359296637,0],[0,0.15528082901621987,0],[0,0.15653052853852803,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.24335890550700673,0.1442966737887172,0.1442966737887172],[0.21191595684264103,0.13082112436113186,0.13082112436113186],[0.27664813175852776,0.2248217713585563,0.2248217713585563],[0,0.3823836235518836,0],[0,0.3852234408034573,0],[0,0.38747642030616,0],[0,0.3890951276817348,0],[0,0.39003853152190077,0],[0,0.39027440447223904,0],[0,0.3897816153712006,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.23811367607569112,0],[0,0.240922314629212,0],[0,0.2435404294800615,0],[0,0.24593811382698388,0],[0,0.1559883317159253,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.233189785862315,0.13993847965527784,0.13993847965527784],[0.2095470195339134,0.1298058655145343,0.1298058655145343],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.2414541261336147,0.19927150247084813,0.19927150247084813],[0.30463716829842996,0.25698429422662805,0.25698429422662805],[0,0.39057010876231657,0],[0,0.39307456071571556,0],[0,0.394860705064173,0],[0,0.3958762994996104,0],[0,0.3960806578453934,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.24123643784061885,0],[0,0.24407545031211067,0],[0,0.24668523203085055,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.20428988349740462,0.1275528072131734,0.1275528072131734],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.2553534506258493,0.21540752629099336,0.21540752629099336],[0.8,0.8,1],[0,0.39871352471166227,0],[0,0.40068391900131317,0],[0,0.4017699848209471,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.24436322334505386,0],[0,0.24745253188899904,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0,0.40943101981787544,0],[0,0.41179341435345673,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.24398601063610253,0],[0,0.24734388131046534,0],[0,0.2504039497369661,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.8,0.8,1],[0,0.41015054936419404,0],[0,0.4139256751539831,0],[0,0.5176011801301246,0],[0,0.5175400296826781,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.23925831942915582,0],[0,0.2431514340750372,0],[0,0.24679679895694717,0],[0,0.25013656179204347,0],[0,0.25311244537612027,0],[0,0.2556680399787405,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.8,0.8,1],[0,0.4078259849771481,0],[0,0.4131357292874544,0],[0,0.5218814714518779,0],[0,0.5233124012306586,0],[0,0.522962771547786,0],[0,0.5207522057325761,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.47311372545546515,0],[0,0.4614041416827006,0],],[[0,0.21490764011046362,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.2331842261176049,0],[0,0.23755980367223836,0],[0,0.24175353358196602,0],[0,0.24570333061205787,0],[0,0.24934343472275186,0],[0,0.252606535195386,0],[0,0.25542647135913205,0],[0,0.25774138056580276,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.04000000000000001,0],[0,0.2913399551219817,0],[0,0.40821549181429595,0],[0,0.5226526471916983,0],[0,0.5257809891986108,0],[0,0.5270304637173788,0],[0,0.5262436797403963,0],[0,0.5233412343635394,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.48095949311801045,0],[0,0.46869626187306984,0],[0,0.4558873544509206,0],],[[0,0.21129537920439745,0],[0,0.2160838834157171,0],[0,0.22090682198375836,0],[0.8,0.8,1],[0,0.23049540839949767,0],[0,0.23516114626695328,0],[0,0.23966144813312718,0],[0,0.24392754707957162,0],[0,0.24788516106908107,0],[0,0.25145680804980497,0],[0,0.2545649373510444,0],[0,0.2571357591990073,0],[0,0.2591035093142245,0],[0,0.15255606913369724,0],[0,0.15301134862115395,0],[0.19736821241316202,0.12458637674849803,0.12458637674849803],[0,0.40504494009802183,0],[0,0.4123372862951718,0],[0,0.4183003766375901,0],[0,0.5268338036458257,0],[0,0.5277169309488912,0],[0,0.5263102439245335,0],[0,0.5225497158196737,0],[0,0.5164937589802646,0],[0.8,0.8,1],[0,0.49832248210805585,0],[0,0.4868414893043067,0],[0,0.47425805574715646,0],[0,0.46093994347307254,0],[0,0.4472184699099014,0],],[[0,0.20695133260602822,0],[0,0.21189973891969208,0],[0,0.21691233850171843,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.23191357418198488,0],[0,0.23671451069678634,0],[0,0.24129830018648707,0],[0,0.24558190818576656,0],[0,0.24947677854650704,0],[0,0.2528923625850763,0],[0,0.1528305739035691,0],[0,0.1542326299051252,0],[0.8,0.8,1],[0.19785925315493239,0.12479682278068532,0.12479682278068532],[0.2081375194488818,0.12920179404952076,0.12920179404952076],[0.2240887656214228,0.18514359742568504,0.18514359742568504],[0,0.4135020430625767,0],[0,0.4192949763868133,0],[0,0.42324582463394744,0],[0,0.524175088930771,0],[0,0.5219574826556216,0],[0,0.5172050501700545,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.4895533585416516,0],[0,0.4770140400123619,0],[0,0.4635030619052592,0],[0,0.44941365075166806,0],[0,0.43508467272477774,0],],[[0,0.20179362237895174,0],[0,0.20685458951965674,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.23760464753632676,0],[0,0.24220528986272394,0],[0,0.2464227921634767,0],[0,0.2501524694953926,0],[0,0.15461153696054686,0],[0.18550977568907606,0.11950418958103261,0.11950418958103261],[0.1973204644052136,0.12456591331652012,0.12456591331652012],[0.2088287796802108,0.12949804843437607,0.12949804843437607],[0.21976471724250635,0.134184878818217,0.134184878818217],[0.23568458491329167,0.19345433251780333,0.19345433251780333],[0.23236149715622312,0.19397984285078584,0.19397984285078584],[0.22707008733584053,0.19247800386744748,0.19247800386744748],[0,0.41921793505330557,0],[0,0.42018199893505187,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.4624620672233052,0],[0,0.4484080186022647,0],[0,0.43394937018864516,0],[0,0.4194117002954933,0],],[[0,0.195751560483372,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.4179362030887152,0],[0.8,0.8,1],[0.18284994643317204,0.11836426275707375,0.11836426275707375],[0.19559717882822145,0.12382736235495205,0.12382736235495205],[0.20829587479733996,0.1292696606274314,0.1292696606274314],[0.22064479825066774,0.13456205639314334,0.13456205639314334],[0.2323223325492669,0.13956671394968584,0.13956671394968584],[0.24724443467900797,0.20148878770701636,0.20148878770701636],[0.24548491352821342,0.20390487818440434,0.20390487818440434],[0.24239083545814452,0.20490715724849212,0.20490715724849212],[0.23580267356471662,0.2022853173521094,0.2022853173521094],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.42907468966717865,0],[0,0.4147140942539032,0],[0.8,0.8,1],],[[0.8,0.8,1],[0,0.19385093619429258,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.40369350610660937,0],[0,0.4158360873491173,0],[0.19261301561109398,0.12254843526189743,0.12254843526189743],[0.20636000368544563,0.1284400015794767,0.1284400015794767],[0.22006309132254379,0.13431275342394736,0.13431275342394736],[0.23336548922639505,0.14001378109702645,0.14001378109702645],[0.24588206119264946,0.1453780262254212,0.1453780262254212],[0.2585904923823373,0.20905557193769056,0.20905557193769056],[0.2583880059856603,0.21340384806404408,0.21340384806404408],[0.2579257731612357,0.21738553706566144,0.21738553706566144],[0.25469196497831764,0.21843261169087974,0.21843261169087974],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.4196956387047621,0],[0,0.40600233966188104,0],[0.8,0.8,1],[0.8,0.8,1],],[[0,0.18086678377768206,0],[0,0.29820732165845826,0],[0,0.3078671511008362,0],[0,0.31797632104786633,0],[0,0.3285185113204014,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.3740646417282967,0],[0,0.38583856211873363,0],[0,0.39747405235976174,0],[0.2029477686069114,0.12697761511724776,0.12697761511724776],[0.21781735307317274,0.1333502941742169,0.1333502941742169],[0.2326566051026994,0.13970997361544257,0.13970997361544257],[0.2470420370437997,0.145875158733057,0.145875158733057],[0.9125534455486627,0.5106731929990184,0.5106731929990184],[0.26957187383368114,0.21599310805975738,0.21599310805975738],[0.2707166126603939,0.2221190287629908,0.2221190287629908],[0.2730659500911373,0.22930539474084957,0.22930539474084957],[0.27432898752113144,0.23520013372187343,0.23520013372187343],[0,0.370913970040732,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.41728826192115065,0],[0,0.4053708259838642,0],[0,0.39282677897301016,0],[0,0.37998757881530154,0],[0,0.3671261088322657,0],[0.8,0.8,1],],[[0,0.2734507658091365,0],[0,0.28211354268150884,0],[0,0.29120495530846624,0],[0,0.3007197072254542,0],[0,0.31064069882287787,0],[0,0.32093517914620384,0],[0,0.3315502317284035,0],[0,0.34240777559380986,0],[0,0.35339949423457706,0],[0,0.3643824114196257,0],[0,0.3751761555363945,0],[0.21384735597314658,0.13164886684563426,0.13164886684563426],[0.2299739346154931,0.1385602576923542,0.1385602576923542],[0.24609657496992726,0.1454699607013974,0.1454699607013974],[0.9085781768104235,0.508698320758555,0.508698320758555],[0.9154549906081679,0.5170357163338555,0.5170357163338555],[0.9205088622142807,0.5252164494222175,0.5252164494222175],[0.28215745535360465,0.22973861951523428,0.22973861951523428],[0.2871003088909314,0.23996159648606105,0.23996159648606105],[0.29363706106359355,0.2515193872815144,0.2515193872815144],[0,0.41902122210815307,0],[0,0.41310298499553366,0],[0,0.40544274823125576,0],[0,0.396335311262737,0],[0,0.3861118369914827,0],[0,0.37510764377615097,0],[0,0.3636351145776063,0],[0,0.35196551120236436,0],[0,0.3403202703614798,0],[0,0.32887008288221503,0],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.28175542273932297,0],[0,0.29085225965171946,0],[0,0.3002718747152153,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.3493460616221397,0],[0.22528651843925174,0.1365513650453936,0.1365513650453936],[0.884020287542635,0.49068080880618953,0.49068080880618953],[0.8974534722142382,0.5016001274737849,0.5016001274737849],[0.9089511260291274,0.5124192313516149,0.5124192313516149],[0.918724776273931,0.5233733004162796,0.5233733004162796],[0.9271769325614658,0.5348099989058438,0.5348099989058438],[0.9348913571357613,0.5471866228466732,0.5471866228466732],[0.9425953513779031,0.5610467455399599,0.5610467455399599],[0.31111289810529186,0.2659003418574735,0.2659003418574735],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.36238100335464446,0],[0,0.353165370752559,0],[0,0.3433460721377995,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.269553510147819,0],[0,0.2779247384646558,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.862863795871991,0.4769708653359615,0.4769708653359615],[0.8809280461363547,0.48977541774660666,0.48977541774660666],[0.8970168973464191,0.5025218831442017,0.5025218831442017],[0.911183718592768,0.5154210174684783,0.5154210174684783],[0.923749369873305,0.5288572912288372,0.5288572912288372],[0.9353543113230034,0.5434323975814477,0.5434323975814477],[0.9469976115499875,0.5600089248350288,0.5600089248350288],[0.9600573266066551,0.5797476044207045,0.5797476044207045],[0.976264515309917,0.6041064704498702,0.6041064704498702],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.31964250752889856,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0,0.22050019052313752,0],[0,0.22681553981028935,0],[0,0.23339203717763343,0],[0,0.240214496679792,0],[0,0.24725746972595297,0],[0,0.25448250911433834,0],[0,0.26183515020613984,0],[0,0.26924183890499,0],[0,0.27660721846944913,0],[0,0.2838124066288337,0],[0,0.290715098224911,0],[0,0.2971524154784058,0],[0,0.3029472623689724,0],[0,0.3079184123129743,0],[0.9166547694971252,0.5166323224598249,0.5166323224598249],[0.9306991201883348,0.5311982918579957,0.5311982918579957],[0.942986803591991,0.5467760342781277,0.5467760342781277],[0,0.3165578521241011,0],[0,0.31548839579667104,0],[0,0.3131368632708015,0],[0.8,0.8,1],[0,0.30500137342777356,0],[0,0.29951030523776406,0],[0,0.29329773299429385,0],[0,0.28653936257609475,0],[0,0.27940222592749825,0],[0.8,0.8,1],[0,0.26457440761040923,0],[0,0.2571216942588568,0],[0,0.24976474642245705,0],],[[0.8,0.8,1],[0,0.20714814874471174,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.23670584867979186,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.2653456430194066,0],[0,0.2698801253354915,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.2797697633705014,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.2652596644585568,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.23044738434960232,0],[0.8,0.8,1],],[[0.8,0.8,1],[0,0.1874620478256095,0],[0,0.19215316230371715,0],[0,0.19696169224108015,0],[0,0.20186087426658073,0],[0,0.20681514030842463,0],[0,0.2117788084075138,0],[0,0.21669500719585458,0],[0,0.22149508562026893,0],[0,0.22609882383824634,0],[0,0.23041578943560334,0],[0,0.23434813805418903,0],[0,0.23779500435424242,0],[0,0.240658357082728,0],[0.8,0.8,1],[0,0.24429776275232565,0],[0,0.24495325891611666,0],[0,0.24479455500778916,0],[0,0.24382873003864916,0],[0.8,0.8,1],[0,0.23963973129383997,0],[0,0.23655408649128906,0],[0,0.23292473874860314,0],[0,0.2288489260033022,0],[0.8,0.8,1],[0,0.21974417921637143,0],[0,0.21489400490094954,0],[0,0.20994923454342304,0],[0,0.20497430079270745,0],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.1797204574749079,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.19516287408734248,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.2074862652007326,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.20573701126457444,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.19259287153244908,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.17697513874785395,0],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.1614935034375082,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.17936757268974335,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.17026872079690972,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0,0.12879641411423945,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.1358377385211167,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.1546643297719027,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.1559650385862031,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.14211514071040432,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.13513052327523242,0],],[[0,0.11212384156112787,0],[0.8,0.8,1],[0,0.11564325792725064,0],[0,0.1174011949544484,0],[0.8,0.8,1],[0,0.12084571295779206,0],[0,0.12249918688067803,0],[0,0.1240816293005488,0],[0,0.12557222890553357,0],[0.8,0.8,1],[0,0.12819024296879525,0],[0,0.12927368617900967,0],[0.8,0.8,1],[0,0.13088813449481448,0],[0,0.13138603838942955,0],[0.8,0.8,1],[0,0.13170953912018962,0],[0.8,0.8,1],[0,0.13112114069722186,0],[0,0.13049815823500216,0],[0.8,0.8,1],[0,0.12866048872503766,0],[0,0.1274822855623644,0],[0.8,0.8,1],[0,0.1247126669400825,0],[0,0.12316534788101306,0],[0,0.12153830315457151,0],[0,0.11985151859147432,0],[0.8,0.8,1],[0,0.11637011656642021,0],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.104782462250846,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.1094376687357348,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0,0.0830756783895465,0],[0.8,0.8,1],[0,0.08474229354589341,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.08702004690763979,0],[0.8,0.8,1],[0,0.08829471061229066,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.0896722795161435,0],[0.8,0.8,1],[0,0.0901512080809384,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.09012955842093213,0],[0.8,0.8,1],[0,0.08962319641070081,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.08821080590025861,0],[0.8,0.8,1],[0,0.08691857775431859,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.08462346811430875,0],[0.8,0.8,1],[0,0.08295071578903558,0],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.06935458357760912,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.07223735845162484,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.07191875490542338,0],[0,0.07163456254931609,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],];\n    var canvas = document.getElementById("renderCanvas").getContext("2d");\n\n\n    var size = 30;\n    canvas.fillStyle = "red";\n    canvas.fillRect(0, 0, size, size);\n    canvas.scale(1, -1);\n    canvas.translate(0, -size);\n\n    if (!canvas.setFillColor)\n        canvas.setFillColor = function(r, g, b, a) {\n            this.fillStyle = "rgb("+[Math.floor(r * 255), Math.floor(g * 255), Math.floor(b * 255)]+")";\n    }\n\nfor (var y = 0; y < size; y++) {\n  for (var x = 0; x < size; x++) {\n    var l = pixels[y][x];\n    canvas.setFillColor(l[0], l[1], l[2], 1);\n    canvas.fillRect(x, y, 1, 1);\n  }\n}</script>';
-assertEq(testOutput, expected)
diff --git a/js/src/jit-test/tests/sunspider/check-access-binary-trees.js b/js/src/jit-test/tests/sunspider/check-access-binary-trees.js
deleted file mode 100644
index e10961a010c..00000000000
--- a/js/src/jit-test/tests/sunspider/check-access-binary-trees.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/* The Great Computer Language Shootout
-   http://shootout.alioth.debian.org/
-   contributed by Isaac Gouy */
-
-function TreeNode(left,right,item){
-   this.left = left;
-   this.right = right;
-   this.item = item;
-}
-
-TreeNode.prototype.itemCheck = function(){
-   if (this.left==null) return this.item;
-   else return this.item + this.left.itemCheck() - this.right.itemCheck();
-}
-
-function bottomUpTree(item,depth){
-   if (depth>0){
-      return new TreeNode(
-          bottomUpTree(2*item-1, depth-1)
-         ,bottomUpTree(2*item, depth-1)
-         ,item
-      );
-   }
-   else {
-      return new TreeNode(null,null,item);
-   }
-}
-
-var ret;
-
-for ( var n = 4; n <= 7; n += 1 ) {
-    var minDepth = 4;
-    var maxDepth = Math.max(minDepth + 2, n);
-    var stretchDepth = maxDepth + 1;
-    
-    var check = bottomUpTree(0,stretchDepth).itemCheck();
-    
-    var longLivedTree = bottomUpTree(0,maxDepth);
-    for (var depth=minDepth; depth<=maxDepth; depth+=2){
-        var iterations = 1 << (maxDepth - depth + minDepth);
-
-        check = 0;
-        for (var i=1; i<=iterations; i++){
-            check += bottomUpTree(i,depth).itemCheck();
-            check += bottomUpTree(-i,depth).itemCheck();
-        }
-    }
-
-    ret = longLivedTree.itemCheck();
-}
-
-assertEq(ret, -1)
diff --git a/js/src/jit-test/tests/sunspider/check-access-fannkuch.js b/js/src/jit-test/tests/sunspider/check-access-fannkuch.js
deleted file mode 100644
index d2bb98dcc3e..00000000000
--- a/js/src/jit-test/tests/sunspider/check-access-fannkuch.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/* The Great Computer Language Shootout
-   http://shootout.alioth.debian.org/
-   contributed by Isaac Gouy */
-
-function fannkuch(n) {
-   var check = 0;
-   var perm = Array(n);
-   var perm1 = Array(n);
-   var count = Array(n);
-   var maxPerm = Array(n);
-   var maxFlipsCount = 0;
-   var m = n - 1;
-
-   for (var i = 0; i < n; i++) perm1[i] = i;
-   var r = n;
-
-   while (true) {
-      // write-out the first 30 permutations
-      if (check < 30){
-         var s = "";
-         for(var i=0; i<n; i++) s += (perm1[i]+1).toString();
-         check++;
-      }
-
-      while (r != 1) { count[r - 1] = r; r--; }
-      if (!(perm1[0] == 0 || perm1[m] == m)) {
-         for (var i = 0; i < n; i++) perm[i] = perm1[i];
-
-         var flipsCount = 0;
-         var k;
-
-         while (!((k = perm[0]) == 0)) {
-            var k2 = (k + 1) >> 1;
-            for (var i = 0; i < k2; i++) {
-               var temp = perm[i]; perm[i] = perm[k - i]; perm[k - i] = temp;
-            }
-            flipsCount++;
-         }
-
-         if (flipsCount > maxFlipsCount) {
-            maxFlipsCount = flipsCount;
-            for (var i = 0; i < n; i++) maxPerm[i] = perm1[i];
-         }
-      }
-
-      while (true) {
-         if (r == n) return maxFlipsCount;
-         var perm0 = perm1[0];
-         var i = 0;
-         while (i < r) {
-            var j = i + 1;
-            perm1[i] = perm1[j];
-            i = j;
-         }
-         perm1[r] = perm0;
-
-         count[r] = count[r] - 1;
-         if (count[r] > 0) break;
-         r++;
-      }
-   }
-}
-
-var n = 8;
-var ret = fannkuch(n);
-assertEq(ret, 22)
diff --git a/js/src/jit-test/tests/sunspider/check-access-nbody.js b/js/src/jit-test/tests/sunspider/check-access-nbody.js
deleted file mode 100644
index 5bcfd59a406..00000000000
--- a/js/src/jit-test/tests/sunspider/check-access-nbody.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/* The Great Computer Language Shootout
-   http://shootout.alioth.debian.org/
-   contributed by Isaac Gouy */
-
-var PI = 3.141592653589793;
-var SOLAR_MASS = 4 * PI * PI;
-var DAYS_PER_YEAR = 365.24;
-
-function Body(x,y,z,vx,vy,vz,mass){
-   this.x = x;
-   this.y = y;
-   this.z = z;
-   this.vx = vx;
-   this.vy = vy;
-   this.vz = vz;
-   this.mass = mass;
-}
-
-Body.prototype.offsetMomentum = function(px,py,pz) {
-   this.vx = -px / SOLAR_MASS;
-   this.vy = -py / SOLAR_MASS;
-   this.vz = -pz / SOLAR_MASS;
-   return this;
-}
-
-function Jupiter(){
-   return new Body(
-      4.84143144246472090e+00,
-      -1.16032004402742839e+00,
-      -1.03622044471123109e-01,
-      1.66007664274403694e-03 * DAYS_PER_YEAR,
-      7.69901118419740425e-03 * DAYS_PER_YEAR,
-      -6.90460016972063023e-05 * DAYS_PER_YEAR,
-      9.54791938424326609e-04 * SOLAR_MASS
-   );
-}
-
-function Saturn(){
-   return new Body(
-      8.34336671824457987e+00,
-      4.12479856412430479e+00,
-      -4.03523417114321381e-01,
-      -2.76742510726862411e-03 * DAYS_PER_YEAR,
-      4.99852801234917238e-03 * DAYS_PER_YEAR,
-      2.30417297573763929e-05 * DAYS_PER_YEAR,
-      2.85885980666130812e-04 * SOLAR_MASS
-   );
-}
-
-function Uranus(){
-   return new Body(
-      1.28943695621391310e+01,
-      -1.51111514016986312e+01,
-      -2.23307578892655734e-01,
-      2.96460137564761618e-03 * DAYS_PER_YEAR,
-      2.37847173959480950e-03 * DAYS_PER_YEAR,
-      -2.96589568540237556e-05 * DAYS_PER_YEAR,
-      4.36624404335156298e-05 * SOLAR_MASS
-   );
-}
-
-function Neptune(){
-   return new Body(
-      1.53796971148509165e+01,
-      -2.59193146099879641e+01,
-      1.79258772950371181e-01,
-      2.68067772490389322e-03 * DAYS_PER_YEAR,
-      1.62824170038242295e-03 * DAYS_PER_YEAR,
-      -9.51592254519715870e-05 * DAYS_PER_YEAR,
-      5.15138902046611451e-05 * SOLAR_MASS
-   );
-}
-
-function Sun(){
-   return new Body(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, SOLAR_MASS);
-}
-
-
-function NBodySystem(bodies){
-   this.bodies = bodies;
-   var px = 0.0;
-   var py = 0.0;
-   var pz = 0.0;
-   var size = this.bodies.length;
-   for (var i=0; i<size; i++){
-      var b = this.bodies[i];
-      var m = b.mass;
-      px += b.vx * m;
-      py += b.vy * m;
-      pz += b.vz * m;
-   }
-   this.bodies[0].offsetMomentum(px,py,pz);
-}
-
-NBodySystem.prototype.advance = function(dt){
-   var dx, dy, dz, distance, mag;
-   var size = this.bodies.length;
-
-   for (var i=0; i<size; i++) {
-      var bodyi = this.bodies[i];
-      for (var j=i+1; j<size; j++) {
-         var bodyj = this.bodies[j];
-         dx = bodyi.x - bodyj.x;
-         dy = bodyi.y - bodyj.y;
-         dz = bodyi.z - bodyj.z;
-
-         distance = Math.sqrt(dx*dx + dy*dy + dz*dz);
-         mag = dt / (distance * distance * distance);
-
-         bodyi.vx -= dx * bodyj.mass * mag;
-         bodyi.vy -= dy * bodyj.mass * mag;
-         bodyi.vz -= dz * bodyj.mass * mag;
-
-         bodyj.vx += dx * bodyi.mass * mag;
-         bodyj.vy += dy * bodyi.mass * mag;
-         bodyj.vz += dz * bodyi.mass * mag;
-      }
-   }
-
-   for (var i=0; i<size; i++) {
-      var body = this.bodies[i];
-      body.x += dt * body.vx;
-      body.y += dt * body.vy;
-      body.z += dt * body.vz;
-   }
-}
-
-NBodySystem.prototype.energy = function(){
-   var dx, dy, dz, distance;
-   var e = 0.0;
-   var size = this.bodies.length;
-
-   for (var i=0; i<size; i++) {
-      var bodyi = this.bodies[i];
-
-      e += 0.5 * bodyi.mass *
-         ( bodyi.vx * bodyi.vx
-         + bodyi.vy * bodyi.vy
-         + bodyi.vz * bodyi.vz );
-
-      for (var j=i+1; j<size; j++) {
-         var bodyj = this.bodies[j];
-         dx = bodyi.x - bodyj.x;
-         dy = bodyi.y - bodyj.y;
-         dz = bodyi.z - bodyj.z;
-
-         distance = Math.sqrt(dx*dx + dy*dy + dz*dz);
-         e -= (bodyi.mass * bodyj.mass) / distance;
-      }
-   }
-   return e;
-}
-
-var ret;
-
-for ( var n = 3; n <= 24; n *= 2 ) {
-    (function(){
-        var bodies = new NBodySystem( Array(
-           Sun(),Jupiter(),Saturn(),Uranus(),Neptune()
-        ));
-        var max = n * 100;
-        
-        ret = bodies.energy();
-        for (var i=0; i<max; i++){
-            bodies.advance(0.01);
-        }
-        ret = bodies.energy();
-    })();
-}
-
-assertEq(ret, -0.16906933525822856)
diff --git a/js/src/jit-test/tests/sunspider/check-access-nsieve.js b/js/src/jit-test/tests/sunspider/check-access-nsieve.js
deleted file mode 100644
index f8b6f693df9..00000000000
--- a/js/src/jit-test/tests/sunspider/check-access-nsieve.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// The Great Computer Language Shootout
-// http://shootout.alioth.debian.org/
-//
-// modified by Isaac Gouy
-
-function pad(number,width){
-   var s = number.toString();
-   var prefixWidth = width - s.length;
-   if (prefixWidth>0){
-      for (var i=1; i<=prefixWidth; i++) s = " " + s;
-   }
-   return s;
-}
-
-function nsieve(m, isPrime){
-   var i, k, count;
-
-   for (i=2; i<=m; i++) { isPrime[i] = true; }
-   count = 0;
-
-   for (i=2; i<=m; i++){
-      if (isPrime[i]) {
-         for (k=i+i; k<=m; k+=i) isPrime[k] = false;
-         count++;
-      }
-   }
-   return count;
-}
-
-var ret = 0;
-function sieve() {
-    for (var i = 1; i <= 3; i++ ) {
-        var m = (1<<i)*10000;
-        var flags = Array(m+1);
-        ret += nsieve(m, flags);
-    }
-}
-
-sieve();
-assertEq(ret, 14302)
diff --git a/js/src/jit-test/tests/sunspider/check-bitops-3bit-bits-in-byte.js b/js/src/jit-test/tests/sunspider/check-bitops-3bit-bits-in-byte.js
deleted file mode 100644
index 39bf060d02c..00000000000
--- a/js/src/jit-test/tests/sunspider/check-bitops-3bit-bits-in-byte.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2004 by Arthur Langereis (arthur_ext at domain xfinitegames, tld com
-
-// 1 op = 6 ANDs, 3 SHRs, 3 SHLs, 4 assigns, 2 ADDs
-// O(1)
-function fast3bitlookup(b) {
-var c, bi3b = 0xE994; // 0b1110 1001 1001 0100; // 3 2 2 1  2 1 1 0
-c  = 3 & (bi3b >> ((b << 1) & 14));
-c += 3 & (bi3b >> ((b >> 2) & 14));
-c += 3 & (bi3b >> ((b >> 5) & 6));
-return c;
-
-/*
-lir4,0xE994; 9 instructions, no memory access, minimal register dependence, 6 shifts, 2 adds, 1 inline assign
-rlwinmr5,r3,1,28,30
-rlwinmr6,r3,30,28,30
-rlwinmr7,r3,27,29,30
-rlwnmr8,r4,r5,30,31
-rlwnmr9,r4,r6,30,31
-rlwnmr10,r4,r7,30,31
-addr3,r8,r9
-addr3,r3,r10
-*/
-}
-
-var ret = 0;
-function TimeFunc(func) {
-  var x, y, t;
-  for(var x=0; x<500; x++)
-  for(var y=0; y<256; y++) {
-    ret += func(y);
-  }
-}
-
-TimeFunc(fast3bitlookup);
-assertEq(ret, 512000)
diff --git a/js/src/jit-test/tests/sunspider/check-bitops-bits-in-byte.js b/js/src/jit-test/tests/sunspider/check-bitops-bits-in-byte.js
deleted file mode 100644
index 8a0efdaa289..00000000000
--- a/js/src/jit-test/tests/sunspider/check-bitops-bits-in-byte.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2004 by Arthur Langereis (arthur_ext at domain xfinitegames, tld com)
-
-
-// 1 op = 2 assigns, 16 compare/branches, 8 ANDs, (0-8) ADDs, 8 SHLs
-// O(n)
-function bitsinbyte(b) {
-var m = 1, c = 0;
-while(m<0x100) {
-if(b & m) c++;
-m <<= 1;
-}
-return c;
-}
-
-var ret = 0;
-function TimeFunc(func) {
-var x, y, t;
-for(var x=0; x<350; x++)
-for(var y=0; y<256; y++) 
-  ret += func(y);
-}
-
-TimeFunc(bitsinbyte);
-assertEq(ret, 358400)
diff --git a/js/src/jit-test/tests/sunspider/check-bitops-bitwise-and.js b/js/src/jit-test/tests/sunspider/check-bitops-bitwise-and.js
deleted file mode 100644
index 5971de73eee..00000000000
--- a/js/src/jit-test/tests/sunspider/check-bitops-bitwise-and.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-bitwiseAndValue = 4294967296;
-for (var i = 0; i < 60; i++)
-    bitwiseAndValue = bitwiseAndValue & i;
-assertEq(bitwiseAndValue, 0)
diff --git a/js/src/jit-test/tests/sunspider/check-bitops-nsieve-bits.js b/js/src/jit-test/tests/sunspider/check-bitops-nsieve-bits.js
deleted file mode 100644
index 1db6ff27fa2..00000000000
--- a/js/src/jit-test/tests/sunspider/check-bitops-nsieve-bits.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// The Great Computer Language Shootout
-//  http://shootout.alioth.debian.org
-//
-//  Contributed by Ian Osgood
-
-var result = [];
-
-function pad(n,width) {
-  var s = n.toString();
-  while (s.length < width) s = ' ' + s;
-  return s;
-}
-
-function primes(isPrime, n) {
-  var i, count = 0, m = 10000<<n, size = m+31>>5;
-
-  for (i=0; i<size; i++) isPrime[i] = 0xffffffff;
-
-  for (i=2; i<m; i++)
-    if (isPrime[i>>5] & 1<<(i&31)) {
-      for (var j=i+i; j<m; j+=i)
-        result.push(isPrime[j>>5] &= ~(1<<(j&31)));
-      count++;
-    }
-}
-
-function sieve() {
-    for (var i = 4; i <= 4; i++) {
-        var isPrime = new Array((10000<<i)+31>>5);
-        primes(isPrime, i);
-    }
-}
-
-sieve();
-
-var ret = 0;
-for (var i = 0; i < result.length; ++i)
-  ret += result[i];
-
-assertEq(ret, -211235557404919)
diff --git a/js/src/jit-test/tests/sunspider/check-controlflow-recursive.js b/js/src/jit-test/tests/sunspider/check-controlflow-recursive.js
deleted file mode 100644
index 8ee010e9ba5..00000000000
--- a/js/src/jit-test/tests/sunspider/check-controlflow-recursive.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// The Computer Language Shootout
-// http://shootout.alioth.debian.org/
-// contributed by Isaac Gouy
-
-function ack(m,n){
-   if (m==0) { return n+1; }
-   if (n==0) { return ack(m-1,1); }
-   return ack(m-1, ack(m,n-1) );
-}
-
-function fib(n) {
-    if (n < 2){ return 1; }
-    return fib(n-2) + fib(n-1);
-}
-
-function tak(x,y,z) {
-    if (y >= x) return z;
-    return tak(tak(x-1,y,z), tak(y-1,z,x), tak(z-1,x,y));
-}
-
-var ret = 0;
-for ( var i = 3; i <= 5; i++ ) {
-    ret += ack(3,i);
-    ret += fib(17.0+i);
-    ret += tak(3*i+3,2*i+2,i+1);
-}
-assertEq(ret, 57775);
diff --git a/js/src/jit-test/tests/sunspider/check-date-format-tofte.js b/js/src/jit-test/tests/sunspider/check-date-format-tofte.js
deleted file mode 100644
index 1a8bcd1e34f..00000000000
--- a/js/src/jit-test/tests/sunspider/check-date-format-tofte.js
+++ /dev/null
@@ -1,302 +0,0 @@
-function arrayExists(array, x) {
-    for (var i = 0; i < array.length; i++) {
-        if (array[i] == x) return true;
-    }
-    return false;
-}
-
-Date.prototype.formatDate = function (input,time) {
-    // formatDate :
-    // a PHP date like function, for formatting date strings
-    // See: http://www.php.net/date
-    //
-    // input : format string
-    // time : epoch time (seconds, and optional)
-    //
-    // if time is not passed, formatting is based on 
-    // the current "this" date object's set time.
-    //
-    // supported:
-    // a, A, B, d, D, F, g, G, h, H, i, j, l (lowercase L), L, 
-    // m, M, n, O, r, s, S, t, U, w, W, y, Y, z
-    //
-    // unsupported:
-    // I (capital i), T, Z    
-
-    var switches =    ["a", "A", "B", "d", "D", "F", "g", "G", "h", "H", 
-                       "i", "j", "l", "L", "m", "M", "n", "O", "r", "s", 
-                       "S", "t", "U", "w", "W", "y", "Y", "z"];
-    var daysLong =    ["Sunday", "Monday", "Tuesday", "Wednesday", 
-                       "Thursday", "Friday", "Saturday"];
-    var daysShort =   ["Sun", "Mon", "Tue", "Wed", 
-                       "Thu", "Fri", "Sat"];
-    var monthsShort = ["Jan", "Feb", "Mar", "Apr",
-                       "May", "Jun", "Jul", "Aug", "Sep",
-                       "Oct", "Nov", "Dec"];
-    var monthsLong =  ["January", "February", "March", "April",
-                       "May", "June", "July", "August", "September",
-                       "October", "November", "December"];
-    var daysSuffix = ["st", "nd", "rd", "th", "th", "th", "th", // 1st - 7th
-                      "th", "th", "th", "th", "th", "th", "th", // 8th - 14th
-                      "th", "th", "th", "th", "th", "th", "st", // 15th - 21st
-                      "nd", "rd", "th", "th", "th", "th", "th", // 22nd - 28th
-                      "th", "th", "st"];                        // 29th - 31st
-
-    function a() {
-        // Lowercase Ante meridiem and Post meridiem
-        return self.getHours() > 11? "pm" : "am";
-    }
-    function A() {
-        // Uppercase Ante meridiem and Post meridiem
-        return self.getHours() > 11? "PM" : "AM";
-    }
-
-    function B(){
-        // Swatch internet time. code simply grabbed from ppk,
-        // since I was feeling lazy:
-        // http://www.xs4all.nl/~ppk/js/beat.html
-        var off = (self.getTimezoneOffset() + 60)*60;
-        var theSeconds = (self.getHours() * 3600) + 
-                         (self.getMinutes() * 60) + 
-                          self.getSeconds() + off;
-        var beat = Math.floor(theSeconds/86.4);
-        if (beat > 1000) beat -= 1000;
-        if (beat < 0) beat += 1000;
-        if ((""+beat).length == 1) beat = "00"+beat;
-        if ((""+beat).length == 2) beat = "0"+beat;
-        return beat;
-    }
-    
-    function d() {
-        // Day of the month, 2 digits with leading zeros
-        return new String(self.getDate()).length == 1?
-        "0"+self.getDate() : self.getDate();
-    }
-    function D() {
-        // A textual representation of a day, three letters
-        return daysShort[self.getDay()];
-    }
-    function F() {
-        // A full textual representation of a month
-        return monthsLong[self.getMonth()];
-    }
-    function g() {
-        // 12-hour format of an hour without leading zeros
-        return self.getHours() > 12? self.getHours()-12 : self.getHours();
-    }
-    function G() {
-        // 24-hour format of an hour without leading zeros
-        return self.getHours();
-    }
-    function h() {
-        // 12-hour format of an hour with leading zeros
-        if (self.getHours() > 12) {
-          var s = new String(self.getHours()-12);
-          return s.length == 1?
-          "0"+ (self.getHours()-12) : self.getHours()-12;
-        } else { 
-          var s = new String(self.getHours());
-          return s.length == 1?
-          "0"+self.getHours() : self.getHours();
-        }  
-    }
-    function H() {
-        // 24-hour format of an hour with leading zeros
-        return new String(self.getHours()).length == 1?
-        "0"+self.getHours() : self.getHours();
-    }
-    function i() {
-        // Minutes with leading zeros
-        return new String(self.getMinutes()).length == 1? 
-        "0"+self.getMinutes() : self.getMinutes(); 
-    }
-    function j() {
-        // Day of the month without leading zeros
-        return self.getDate();
-    }    
-    function l() {
-        // A full textual representation of the day of the week
-        return daysLong[self.getDay()];
-    }
-    function L() {
-        // leap year or not. 1 if leap year, 0 if not.
-        // the logic should match iso's 8601 standard.
-        var y_ = Y();
-        if (         
-            (y_ % 4 == 0 && y_ % 100 != 0) ||
-            (y_ % 4 == 0 && y_ % 100 == 0 && y_ % 400 == 0)
-            ) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-    function m() {
-        // Numeric representation of a month, with leading zeros
-        return self.getMonth() < 9?
-        "0"+(self.getMonth()+1) : 
-        self.getMonth()+1;
-    }
-    function M() {
-        // A short textual representation of a month, three letters
-        return monthsShort[self.getMonth()];
-    }
-    function n() {
-        // Numeric representation of a month, without leading zeros
-        return self.getMonth()+1;
-    }
-    function O() {
-        // Difference to Greenwich time (GMT) in hours
-        var os = Math.abs(self.getTimezoneOffset());
-        var h = ""+Math.floor(os/60);
-        var m = ""+(os%60);
-        h.length == 1? h = "0"+h:1;
-        m.length == 1? m = "0"+m:1;
-        return self.getTimezoneOffset() < 0 ? "+"+h+m : "-"+h+m;
-    }
-    function r() {
-        // RFC 822 formatted date
-        var r; // result
-        //  Thu    ,     21          Dec         2000
-        r = D() + ", " + j() + " " + M() + " " + Y() +
-        //        16     :    01     :    07          +0200
-            " " + H() + ":" + i() + ":" + s() + " " + O();
-        return r;
-    }
-    function S() {
-        // English ordinal suffix for the day of the month, 2 characters
-        return daysSuffix[self.getDate()-1];
-    }
-    function s() {
-        // Seconds, with leading zeros
-        return new String(self.getSeconds()).length == 1?
-        "0"+self.getSeconds() : self.getSeconds();
-    }
-    function t() {
-
-        // thanks to Matt Bannon for some much needed code-fixes here!
-        var daysinmonths = [null,31,28,31,30,31,30,31,31,30,31,30,31];
-        if (L()==1 && n()==2) return 29; // leap day
-        return daysinmonths[n()];
-    }
-    function U() {
-        // Seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
-        return Math.round(self.getTime()/1000);
-    }
-    function W() {
-        // Weeknumber, as per ISO specification:
-        // http://www.cl.cam.ac.uk/~mgk25/iso-time.html
-        
-        // if the day is three days before newyears eve,
-        // there's a chance it's "week 1" of next year.
-        // here we check for that.
-        var beforeNY = 364+L() - z();
-        var afterNY  = z();
-        var weekday = w()!=0?w()-1:6; // makes sunday (0), into 6.
-        if (beforeNY <= 2 && weekday <= 2-beforeNY) {
-            return 1;
-        }
-        // similarly, if the day is within threedays of newyears
-        // there's a chance it belongs in the old year.
-        var ny = new Date("January 1 " + Y() + " 00:00:00");
-        var nyDay = ny.getDay()!=0?ny.getDay()-1:6;
-        if (
-            (afterNY <= 2) && 
-            (nyDay >=4)  && 
-            (afterNY >= (6-nyDay))
-            ) {
-            // Since I'm not sure we can just always return 53,
-            // i call the function here again, using the last day
-            // of the previous year, as the date, and then just
-            // return that week.
-            var prevNY = new Date("December 31 " + (Y()-1) + " 00:00:00");
-            return prevNY.formatDate("W");
-        }
-        
-        // week 1, is the week that has the first thursday in it.
-        // note that this value is not zero index.
-        if (nyDay <= 3) {
-            // first day of the year fell on a thursday, or earlier.
-            return 1 + Math.floor( ( z() + nyDay ) / 7 );
-        } else {
-            // first day of the year fell on a friday, or later.
-            return 1 + Math.floor( ( z() - ( 7 - nyDay ) ) / 7 );
-        }
-    }
-    function w() {
-        // Numeric representation of the day of the week
-        return self.getDay();
-    }
-    
-    function Y() {
-        // A full numeric representation of a year, 4 digits
-
-        // we first check, if getFullYear is supported. if it
-        // is, we just use that. ppks code is nice, but wont
-        // work with dates outside 1900-2038, or something like that
-        if (self.getFullYear) {
-            var newDate = new Date("January 1 2001 00:00:00 +0000");
-            var x = newDate .getFullYear();
-            if (x == 2001) {              
-                // i trust the method now
-                return self.getFullYear();
-            }
-        }
-        // else, do this:
-        // codes thanks to ppk:
-        // http://www.xs4all.nl/~ppk/js/introdate.html
-        var x = self.getYear();
-        var y = x % 100;
-        y += (y < 38) ? 2000 : 1900;
-        return y;
-    }
-    function y() {
-        // A two-digit representation of a year
-        var y = Y()+"";
-        return y.substring(y.length-2,y.length);
-    }
-    function z() {
-        // The day of the year, zero indexed! 0 through 366
-        var t = new Date("January 1 " + Y() + " 00:00:00");
-        var diff = self.getTime() - t.getTime();
-        return Math.floor(diff/1000/60/60/24);
-    }
-        
-    var self = this;
-    if (time) {
-        // save time
-        var prevTime = self.getTime();
-        self.setTime(time);
-    }
-    
-    var ia = input.split("");
-    var ij = 0;
-    while (ia[ij]) {
-        if (ia[ij] == "\\") {
-            // this is our way of allowing users to escape stuff
-            ia.splice(ij,1);
-        } else {
-            if (arrayExists(switches,ia[ij])) {
-                ia[ij] = eval(ia[ij] + "()");
-            }
-        }
-        ij++;
-    }
-    // reset time, back to what it was
-    if (prevTime) {
-        self.setTime(prevTime);
-    }
-    return ia.join("");
-}
-
-var date = new Date("1/1/2007 1:11:11");
-
-var ret = "";
-for (i = 0; i < 500; ++i) {
-    var shortFormat = date.formatDate("Y-m-d");
-    var longFormat = date.formatDate("l, F d, Y g:i:s A");
-    ret += shortFormat + longFormat;
-    date.setTime(date.getTime() + 84266956);
-}
-var expected = "2007-01-01Monday, January 01, 2007 1:11:11 AM2007-01-02Tuesday, January 02, 2007 0:35:37 AM2007-01-03Wednesday, January 03, 2007 0:00:04 AM2007-01-03Wednesday, January 03, 2007 11:24:31 PM2007-01-04Thursday, January 04, 2007 10:48:58 PM2007-01-05Friday, January 05, 2007 10:13:25 PM2007-01-06Saturday, January 06, 2007 9:37:52 PM2007-01-07Sunday, January 07, 2007 9:02:19 PM2007-01-08Monday, January 08, 2007 8:26:46 PM2007-01-09Tuesday, January 09, 2007 7:51:13 PM2007-01-10Wednesday, January 10, 2007 7:15:40 PM2007-01-11Thursday, January 11, 2007 6:40:07 PM2007-01-12Friday, January 12, 2007 6:04:34 PM2007-01-13Saturday, January 13, 2007 5:29:01 PM2007-01-14Sunday, January 14, 2007 4:53:28 PM2007-01-15Monday, January 15, 2007 4:17:55 PM2007-01-16Tuesday, January 16, 2007 3:42:22 PM2007-01-17Wednesday, January 17, 2007 3:06:49 PM2007-01-18Thursday, January 18, 2007 2:31:16 PM2007-01-19Friday, January 19, 2007 1:55:43 PM2007-01-20Saturday, January 20, 2007 1:20:10 PM2007-01-21Sunday, January 21, 2007 12:44:37 PM2007-01-22Monday, January 22, 2007 12:09:04 PM2007-01-23Tuesday, January 23, 2007 11:33:30 AM2007-01-24Wednesday, January 24, 2007 10:57:57 AM2007-01-25Thursday, January 25, 2007 10:22:24 AM2007-01-26Friday, January 26, 2007 9:46:51 AM2007-01-27Saturday, January 27, 2007 9:11:18 AM2007-01-28Sunday, January 28, 2007 8:35:45 AM2007-01-29Monday, January 29, 2007 8:00:12 AM2007-01-30Tuesday, January 30, 2007 7:24:39 AM2007-01-31Wednesday, January 31, 2007 6:49:06 AM2007-02-01Thursday, February 01, 2007 6:13:33 AM2007-02-02Friday, February 02, 2007 5:38:00 AM2007-02-03Saturday, February 03, 2007 5:02:27 AM2007-02-04Sunday, February 04, 2007 4:26:54 AM2007-02-05Monday, February 05, 2007 3:51:21 AM2007-02-06Tuesday, February 06, 2007 3:15:48 AM2007-02-07Wednesday, February 07, 2007 2:40:15 AM2007-02-08Thursday, February 08, 2007 2:04:42 AM2007-02-09Friday, February 09, 2007 1:29:09 AM2007-02-10Saturday, February 10, 2007 0:53:36 AM2007-02-11Sunday, February 11, 2007 0:18:03 AM2007-02-11Sunday, February 11, 2007 11:42:30 PM2007-02-12Monday, February 12, 2007 11:06:57 PM2007-02-13Tuesday, February 13, 2007 10:31:24 PM2007-02-14Wednesday, February 14, 2007 9:55:50 PM2007-02-15Thursday, February 15, 2007 9:20:17 PM2007-02-16Friday, February 16, 2007 8:44:44 PM2007-02-17Saturday, February 17, 2007 8:09:11 PM2007-02-18Sunday, February 18, 2007 7:33:38 PM2007-02-19Monday, February 19, 2007 6:58:05 PM2007-02-20Tuesday, February 20, 2007 6:22:32 PM2007-02-21Wednesday, February 21, 2007 5:46:59 PM2007-02-22Thursday, February 22, 2007 5:11:26 PM2007-02-23Friday, February 23, 2007 4:35:53 PM2007-02-24Saturday, February 24, 2007 4:00:20 PM2007-02-25Sunday, February 25, 2007 3:24:47 PM2007-02-26Monday, February 26, 2007 2:49:14 PM2007-02-27Tuesday, February 27, 2007 2:13:41 PM2007-02-28Wednesday, February 28, 2007 1:38:08 PM2007-03-01Thursday, March 01, 2007 1:02:35 PM2007-03-02Friday, March 02, 2007 12:27:02 PM2007-03-03Saturday, March 03, 2007 11:51:29 AM2007-03-04Sunday, March 04, 2007 11:15:56 AM2007-03-05Monday, March 05, 2007 10:40:23 AM2007-03-06Tuesday, March 06, 2007 10:04:50 AM2007-03-07Wednesday, March 07, 2007 9:29:17 AM2007-03-08Thursday, March 08, 2007 8:53:44 AM2007-03-09Friday, March 09, 2007 8:18:10 AM2007-03-10Saturday, March 10, 2007 7:42:37 AM2007-03-11Sunday, March 11, 2007 8:07:04 AM2007-03-12Monday, March 12, 2007 7:31:31 AM2007-03-13Tuesday, March 13, 2007 6:55:58 AM2007-03-14Wednesday, March 14, 2007 6:20:25 AM2007-03-15Thursday, March 15, 2007 5:44:52 AM2007-03-16Friday, March 16, 2007 5:09:19 AM2007-03-17Saturday, March 17, 2007 4:33:46 AM2007-03-18Sunday, March 18, 2007 3:58:13 AM2007-03-19Monday, March 19, 2007 3:22:40 AM2007-03-20Tuesday, March 20, 2007 2:47:07 AM2007-03-21Wednesday, March 21, 2007 2:11:34 AM2007-03-22Thursday, March 22, 2007 1:36:01 AM2007-03-23Friday, March 23, 2007 1:00:28 AM2007-03-24Saturday, March 24, 2007 0:24:55 AM2007-03-24Saturday, March 24, 2007 11:49:22 PM2007-03-25Sunday, March 25, 2007 11:13:49 PM2007-03-26Monday, March 26, 2007 10:38:16 PM2007-03-27Tuesday, March 27, 2007 10:02:43 PM2007-03-28Wednesday, March 28, 2007 9:27:10 PM2007-03-29Thursday, March 29, 2007 8:51:37 PM2007-03-30Friday, March 30, 2007 8:16:03 PM2007-03-31Saturday, March 31, 2007 7:40:30 PM2007-04-01Sunday, April 01, 2007 7:04:57 PM2007-04-02Monday, April 02, 2007 6:29:24 PM2007-04-03Tuesday, April 03, 2007 5:53:51 PM2007-04-04Wednesday, April 04, 2007 5:18:18 PM2007-04-05Thursday, April 05, 2007 4:42:45 PM2007-04-06Friday, April 06, 2007 4:07:12 PM2007-04-07Saturday, April 07, 2007 3:31:39 PM2007-04-08Sunday, April 08, 2007 2:56:06 PM2007-04-09Monday, April 09, 2007 2:20:33 PM2007-04-10Tuesday, April 10, 2007 1:45:00 PM2007-04-11Wednesday, April 11, 2007 1:09:27 PM2007-04-12Thursday, April 12, 2007 12:33:54 PM2007-04-13Friday, April 13, 2007 11:58:21 AM2007-04-14Saturday, April 14, 2007 11:22:48 AM2007-04-15Sunday, April 15, 2007 10:47:15 AM2007-04-16Monday, April 16, 2007 10:11:42 AM2007-04-17Tuesday, April 17, 2007 9:36:09 AM2007-04-18Wednesday, April 18, 2007 9:00:36 AM2007-04-19Thursday, April 19, 2007 8:25:03 AM2007-04-20Friday, April 20, 2007 7:49:30 AM2007-04-21Saturday, April 21, 2007 7:13:57 AM2007-04-22Sunday, April 22, 2007 6:38:23 AM2007-04-23Monday, April 23, 2007 6:02:50 AM2007-04-24Tuesday, April 24, 2007 5:27:17 AM2007-04-25Wednesday, April 25, 2007 4:51:44 AM2007-04-26Thursday, April 26, 2007 4:16:11 AM2007-04-27Friday, April 27, 2007 3:40:38 AM2007-04-28Saturday, April 28, 2007 3:05:05 AM2007-04-29Sunday, April 29, 2007 2:29:32 AM2007-04-30Monday, April 30, 2007 1:53:59 AM2007-05-01Tuesday, May 01, 2007 1:18:26 AM2007-05-02Wednesday, May 02, 2007 0:42:53 AM2007-05-03Thursday, May 03, 2007 0:07:20 AM2007-05-03Thursday, May 03, 2007 11:31:47 PM2007-05-04Friday, May 04, 2007 10:56:14 PM2007-05-05Saturday, May 05, 2007 10:20:41 PM2007-05-06Sunday, May 06, 2007 9:45:08 PM2007-05-07Monday, May 07, 2007 9:09:35 PM2007-05-08Tuesday, May 08, 2007 8:34:02 PM2007-05-09Wednesday, May 09, 2007 7:58:29 PM2007-05-10Thursday, May 10, 2007 7:22:56 PM2007-05-11Friday, May 11, 2007 6:47:23 PM2007-05-12Saturday, May 12, 2007 6:11:50 PM2007-05-13Sunday, May 13, 2007 5:36:17 PM2007-05-14Monday, May 14, 2007 5:00:43 PM2007-05-15Tuesday, May 15, 2007 4:25:10 PM2007-05-16Wednesday, May 16, 2007 3:49:37 PM2007-05-17Thursday, May 17, 2007 3:14:04 PM2007-05-18Friday, May 18, 2007 2:38:31 PM2007-05-19Saturday, May 19, 2007 2:02:58 PM2007-05-20Sunday, May 20, 2007 1:27:25 PM2007-05-21Monday, May 21, 2007 12:51:52 PM2007-05-22Tuesday, May 22, 2007 12:16:19 PM2007-05-23Wednesday, May 23, 2007 11:40:46 AM2007-05-24Thursday, May 24, 2007 11:05:13 AM2007-05-25Friday, May 25, 2007 10:29:40 AM2007-05-26Saturday, May 26, 2007 9:54:07 AM2007-05-27Sunday, May 27, 2007 9:18:34 AM2007-05-28Monday, May 28, 2007 8:43:01 AM2007-05-29Tuesday, May 29, 2007 8:07:28 AM2007-05-30Wednesday, May 30, 2007 7:31:55 AM2007-05-31Thursday, May 31, 2007 6:56:22 AM2007-06-01Friday, June 01, 2007 6:20:49 AM2007-06-02Saturday, June 02, 2007 5:45:16 AM2007-06-03Sunday, June 03, 2007 5:09:43 AM2007-06-04Monday, June 04, 2007 4:34:10 AM2007-06-05Tuesday, June 05, 2007 3:58:37 AM2007-06-06Wednesday, June 06, 2007 3:23:03 AM2007-06-07Thursday, June 07, 2007 2:47:30 AM2007-06-08Friday, June 08, 2007 2:11:57 AM2007-06-09Saturday, June 09, 2007 1:36:24 AM2007-06-10Sunday, June 10, 2007 1:00:51 AM2007-06-11Monday, June 11, 2007 0:25:18 AM2007-06-11Monday, June 11, 2007 11:49:45 PM2007-06-12Tuesday, June 12, 2007 11:14:12 PM2007-06-13Wednesday, June 13, 2007 10:38:39 PM2007-06-14Thursday, June 14, 2007 10:03:06 PM2007-06-15Friday, June 15, 2007 9:27:33 PM2007-06-16Saturday, June 16, 2007 8:52:00 PM2007-06-17Sunday, June 17, 2007 8:16:27 PM2007-06-18Monday, June 18, 2007 7:40:54 PM2007-06-19Tuesday, June 19, 2007 7:05:21 PM2007-06-20Wednesday, June 20, 2007 6:29:48 PM2007-06-21Thursday, June 21, 2007 5:54:15 PM2007-06-22Friday, June 22, 2007 5:18:42 PM2007-06-23Saturday, June 23, 2007 4:43:09 PM2007-06-24Sunday, June 24, 2007 4:07:36 PM2007-06-25Monday, June 25, 2007 3:32:03 PM2007-06-26Tuesday, June 26, 2007 2:56:30 PM2007-06-27Wednesday, June 27, 2007 2:20:56 PM2007-06-28Thursday, June 28, 2007 1:45:23 PM2007-06-29Friday, June 29, 2007 1:09:50 PM2007-06-30Saturday, June 30, 2007 12:34:17 PM2007-07-01Sunday, July 01, 2007 11:58:44 AM2007-07-02Monday, July 02, 2007 11:23:11 AM2007-07-03Tuesday, July 03, 2007 10:47:38 AM2007-07-04Wednesday, July 04, 2007 10:12:05 AM2007-07-05Thursday, July 05, 2007 9:36:32 AM2007-07-06Friday, July 06, 2007 9:00:59 AM2007-07-07Saturday, July 07, 2007 8:25:26 AM2007-07-08Sunday, July 08, 2007 7:49:53 AM2007-07-09Monday, July 09, 2007 7:14:20 AM2007-07-10Tuesday, July 10, 2007 6:38:47 AM2007-07-11Wednesday, July 11, 2007 6:03:14 AM2007-07-12Thursday, July 12, 2007 5:27:41 AM2007-07-13Friday, July 13, 2007 4:52:08 AM2007-07-14Saturday, July 14, 2007 4:16:35 AM2007-07-15Sunday, July 15, 2007 3:41:02 AM2007-07-16Monday, July 16, 2007 3:05:29 AM2007-07-17Tuesday, July 17, 2007 2:29:56 AM2007-07-18Wednesday, July 18, 2007 1:54:23 AM2007-07-19Thursday, July 19, 2007 1:18:50 AM2007-07-20Friday, July 20, 2007 0:43:16 AM2007-07-21Saturday, July 21, 2007 0:07:43 AM2007-07-21Saturday, July 21, 2007 11:32:10 PM2007-07-22Sunday, July 22, 2007 10:56:37 PM2007-07-23Monday, July 23, 2007 10:21:04 PM2007-07-24Tuesday, July 24, 2007 9:45:31 PM2007-07-25Wednesday, July 25, 2007 9:09:58 PM2007-07-26Thursday, July 26, 2007 8:34:25 PM2007-07-27Friday, July 27, 2007 7:58:52 PM2007-07-28Saturday, July 28, 2007 7:23:19 PM2007-07-29Sunday, July 29, 2007 6:47:46 PM2007-07-30Monday, July 30, 2007 6:12:13 PM2007-07-31Tuesday, July 31, 2007 5:36:40 PM2007-08-01Wednesday, August 01, 2007 5:01:07 PM2007-08-02Thursday, August 02, 2007 4:25:34 PM2007-08-03Friday, August 03, 2007 3:50:01 PM2007-08-04Saturday, August 04, 2007 3:14:28 PM2007-08-05Sunday, August 05, 2007 2:38:55 PM2007-08-06Monday, August 06, 2007 2:03:22 PM2007-08-07Tuesday, August 07, 2007 1:27:49 PM2007-08-08Wednesday, August 08, 2007 12:52:16 PM2007-08-09Thursday, August 09, 2007 12:16:43 PM2007-08-10Friday, August 10, 2007 11:41:10 AM2007-08-11Saturday, August 11, 2007 11:05:36 AM2007-08-12Sunday, August 12, 2007 10:30:03 AM2007-08-13Monday, August 13, 2007 9:54:30 AM2007-08-14Tuesday, August 14, 2007 9:18:57 AM2007-08-15Wednesday, August 15, 2007 8:43:24 AM2007-08-16Thursday, August 16, 2007 8:07:51 AM2007-08-17Friday, August 17, 2007 7:32:18 AM2007-08-18Saturday, August 18, 2007 6:56:45 AM2007-08-19Sunday, August 19, 2007 6:21:12 AM2007-08-20Monday, August 20, 2007 5:45:39 AM2007-08-21Tuesday, August 21, 2007 5:10:06 AM2007-08-22Wednesday, August 22, 2007 4:34:33 AM2007-08-23Thursday, August 23, 2007 3:59:00 AM2007-08-24Friday, August 24, 2007 3:23:27 AM2007-08-25Saturday, August 25, 2007 2:47:54 AM2007-08-26Sunday, August 26, 2007 2:12:21 AM2007-08-27Monday, August 27, 2007 1:36:48 AM2007-08-28Tuesday, August 28, 2007 1:01:15 AM2007-08-29Wednesday, August 29, 2007 0:25:42 AM2007-08-29Wednesday, August 29, 2007 11:50:09 PM2007-08-30Thursday, August 30, 2007 11:14:36 PM2007-08-31Friday, August 31, 2007 10:39:03 PM2007-09-01Saturday, September 01, 2007 10:03:30 PM2007-09-02Sunday, September 02, 2007 9:27:56 PM2007-09-03Monday, September 03, 2007 8:52:23 PM2007-09-04Tuesday, September 04, 2007 8:16:50 PM2007-09-05Wednesday, September 05, 2007 7:41:17 PM2007-09-06Thursday, September 06, 2007 7:05:44 PM2007-09-07Friday, September 07, 2007 6:30:11 PM2007-09-08Saturday, September 08, 2007 5:54:38 PM2007-09-09Sunday, September 09, 2007 5:19:05 PM2007-09-10Monday, September 10, 2007 4:43:32 PM2007-09-11Tuesday, September 11, 2007 4:07:59 PM2007-09-12Wednesday, September 12, 2007 3:32:26 PM2007-09-13Thursday, September 13, 2007 2:56:53 PM2007-09-14Friday, September 14, 2007 2:21:20 PM2007-09-15Saturday, September 15, 2007 1:45:47 PM2007-09-16Sunday, September 16, 2007 1:10:14 PM2007-09-17Monday, September 17, 2007 12:34:41 PM2007-09-18Tuesday, September 18, 2007 11:59:08 AM2007-09-19Wednesday, September 19, 2007 11:23:35 AM2007-09-20Thursday, September 20, 2007 10:48:02 AM2007-09-21Friday, September 21, 2007 10:12:29 AM2007-09-22Saturday, September 22, 2007 9:36:56 AM2007-09-23Sunday, September 23, 2007 9:01:23 AM2007-09-24Monday, September 24, 2007 8:25:49 AM2007-09-25Tuesday, September 25, 2007 7:50:16 AM2007-09-26Wednesday, September 26, 2007 7:14:43 AM2007-09-27Thursday, September 27, 2007 6:39:10 AM2007-09-28Friday, September 28, 2007 6:03:37 AM2007-09-29Saturday, September 29, 2007 5:28:04 AM2007-09-30Sunday, September 30, 2007 4:52:31 AM2007-10-01Monday, October 01, 2007 4:16:58 AM2007-10-02Tuesday, October 02, 2007 3:41:25 AM2007-10-03Wednesday, October 03, 2007 3:05:52 AM2007-10-04Thursday, October 04, 2007 2:30:19 AM2007-10-05Friday, October 05, 2007 1:54:46 AM2007-10-06Saturday, October 06, 2007 1:19:13 AM2007-10-07Sunday, October 07, 2007 0:43:40 AM2007-10-08Monday, October 08, 2007 0:08:07 AM2007-10-08Monday, October 08, 2007 11:32:34 PM2007-10-09Tuesday, October 09, 2007 10:57:01 PM2007-10-10Wednesday, October 10, 2007 10:21:28 PM2007-10-11Thursday, October 11, 2007 9:45:55 PM2007-10-12Friday, October 12, 2007 9:10:22 PM2007-10-13Saturday, October 13, 2007 8:34:49 PM2007-10-14Sunday, October 14, 2007 7:59:16 PM2007-10-15Monday, October 15, 2007 7:23:43 PM2007-10-16Tuesday, October 16, 2007 6:48:09 PM2007-10-17Wednesday, October 17, 2007 6:12:36 PM2007-10-18Thursday, October 18, 2007 5:37:03 PM2007-10-19Friday, October 19, 2007 5:01:30 PM2007-10-20Saturday, October 20, 2007 4:25:57 PM2007-10-21Sunday, October 21, 2007 3:50:24 PM2007-10-22Monday, October 22, 2007 3:14:51 PM2007-10-23Tuesday, October 23, 2007 2:39:18 PM2007-10-24Wednesday, October 24, 2007 2:03:45 PM2007-10-25Thursday, October 25, 2007 1:28:12 PM2007-10-26Friday, October 26, 2007 12:52:39 PM2007-10-27Saturday, October 27, 2007 12:17:06 PM2007-10-28Sunday, October 28, 2007 11:41:33 AM2007-10-29Monday, October 29, 2007 11:06:00 AM2007-10-30Tuesday, October 30, 2007 10:30:27 AM2007-10-31Wednesday, October 31, 2007 9:54:54 AM2007-11-01Thursday, November 01, 2007 9:19:21 AM2007-11-02Friday, November 02, 2007 8:43:48 AM2007-11-03Saturday, November 03, 2007 8:08:15 AM2007-11-04Sunday, November 04, 2007 6:32:42 AM2007-11-05Monday, November 05, 2007 5:57:09 AM2007-11-06Tuesday, November 06, 2007 5:21:36 AM2007-11-07Wednesday, November 07, 2007 4:46:03 AM2007-11-08Thursday, November 08, 2007 4:10:29 AM2007-11-09Friday, November 09, 2007 3:34:56 AM2007-11-10Saturday, November 10, 2007 2:59:23 AM2007-11-11Sunday, November 11, 2007 2:23:50 AM2007-11-12Monday, November 12, 2007 1:48:17 AM2007-11-13Tuesday, November 13, 2007 1:12:44 AM2007-11-14Wednesday, November 14, 2007 0:37:11 AM2007-11-15Thursday, November 15, 2007 0:01:38 AM2007-11-15Thursday, November 15, 2007 11:26:05 PM2007-11-16Friday, November 16, 2007 10:50:32 PM2007-11-17Saturday, November 17, 2007 10:14:59 PM2007-11-18Sunday, November 18, 2007 9:39:26 PM2007-11-19Monday, November 19, 2007 9:03:53 PM2007-11-20Tuesday, November 20, 2007 8:28:20 PM2007-11-21Wednesday, November 21, 2007 7:52:47 PM2007-11-22Thursday, November 22, 2007 7:17:14 PM2007-11-23Friday, November 23, 2007 6:41:41 PM2007-11-24Saturday, November 24, 2007 6:06:08 PM2007-11-25Sunday, November 25, 2007 5:30:35 PM2007-11-26Monday, November 26, 2007 4:55:02 PM2007-11-27Tuesday, November 27, 2007 4:19:29 PM2007-11-28Wednesday, November 28, 2007 3:43:56 PM2007-11-29Thursday, November 29, 2007 3:08:22 PM2007-11-30Friday, November 30, 2007 2:32:49 PM2007-12-01Saturday, December 01, 2007 1:57:16 PM2007-12-02Sunday, December 02, 2007 1:21:43 PM2007-12-03Monday, December 03, 2007 12:46:10 PM2007-12-04Tuesday, December 04, 2007 12:10:37 PM2007-12-05Wednesday, December 05, 2007 11:35:04 AM2007-12-06Thursday, December 06, 2007 10:59:31 AM2007-12-07Friday, December 07, 2007 10:23:58 AM2007-12-08Saturday, December 08, 2007 9:48:25 AM2007-12-09Sunday, December 09, 2007 9:12:52 AM2007-12-10Monday, December 10, 2007 8:37:19 AM2007-12-11Tuesday, December 11, 2007 8:01:46 AM2007-12-12Wednesday, December 12, 2007 7:26:13 AM2007-12-13Thursday, December 13, 2007 6:50:40 AM2007-12-14Friday, December 14, 2007 6:15:07 AM2007-12-15Saturday, December 15, 2007 5:39:34 AM2007-12-16Sunday, December 16, 2007 5:04:01 AM2007-12-17Monday, December 17, 2007 4:28:28 AM2007-12-18Tuesday, December 18, 2007 3:52:55 AM2007-12-19Wednesday, December 19, 2007 3:17:22 AM2007-12-20Thursday, December 20, 2007 2:41:49 AM2007-12-21Friday, December 21, 2007 2:06:16 AM2007-12-22Saturday, December 22, 2007 1:30:42 AM2007-12-23Sunday, December 23, 2007 0:55:09 AM2007-12-24Monday, December 24, 2007 0:19:36 AM2007-12-24Monday, December 24, 2007 11:44:03 PM2007-12-25Tuesday, December 25, 2007 11:08:30 PM2007-12-26Wednesday, December 26, 2007 10:32:57 PM2007-12-27Thursday, December 27, 2007 9:57:24 PM2007-12-28Friday, December 28, 2007 9:21:51 PM2007-12-29Saturday, December 29, 2007 8:46:18 PM2007-12-30Sunday, December 30, 2007 8:10:45 PM2007-12-31Monday, December 31, 2007 7:35:12 PM2008-01-01Tuesday, January 01, 2008 6:59:39 PM2008-01-02Wednesday, January 02, 2008 6:24:06 PM2008-01-03Thursday, January 03, 2008 5:48:33 PM2008-01-04Friday, January 04, 2008 5:13:00 PM2008-01-05Saturday, January 05, 2008 4:37:27 PM2008-01-06Sunday, January 06, 2008 4:01:54 PM2008-01-07Monday, January 07, 2008 3:26:21 PM2008-01-08Tuesday, January 08, 2008 2:50:48 PM2008-01-09Wednesday, January 09, 2008 2:15:15 PM2008-01-10Thursday, January 10, 2008 1:39:42 PM2008-01-11Friday, January 11, 2008 1:04:09 PM2008-01-12Saturday, January 12, 2008 12:28:36 PM2008-01-13Sunday, January 13, 2008 11:53:02 AM2008-01-14Monday, January 14, 2008 11:17:29 AM2008-01-15Tuesday, January 15, 2008 10:41:56 AM2008-01-16Wednesday, January 16, 2008 10:06:23 AM2008-01-17Thursday, January 17, 2008 9:30:50 AM2008-01-18Friday, January 18, 2008 8:55:17 AM2008-01-19Saturday, January 19, 2008 8:19:44 AM2008-01-20Sunday, January 20, 2008 7:44:11 AM2008-01-21Monday, January 21, 2008 7:08:38 AM2008-01-22Tuesday, January 22, 2008 6:33:05 AM2008-01-23Wednesday, January 23, 2008 5:57:32 AM2008-01-24Thursday, January 24, 2008 5:21:59 AM2008-01-25Friday, January 25, 2008 4:46:26 AM2008-01-26Saturday, January 26, 2008 4:10:53 AM2008-01-27Sunday, January 27, 2008 3:35:20 AM2008-01-28Monday, January 28, 2008 2:59:47 AM2008-01-29Tuesday, January 29, 2008 2:24:14 AM2008-01-30Wednesday, January 30, 2008 1:48:41 AM2008-01-31Thursday, January 31, 2008 1:13:08 AM2008-02-01Friday, February 01, 2008 0:37:35 AM2008-02-02Saturday, February 02, 2008 0:02:02 AM2008-02-02Saturday, February 02, 2008 11:26:29 PM2008-02-03Sunday, February 03, 2008 10:50:56 PM2008-02-04Monday, February 04, 2008 10:15:22 PM2008-02-05Tuesday, February 05, 2008 9:39:49 PM2008-02-06Wednesday, February 06, 2008 9:04:16 PM2008-02-07Thursday, February 07, 2008 8:28:43 PM2008-02-08Friday, February 08, 2008 7:53:10 PM2008-02-09Saturday, February 09, 2008 7:17:37 PM2008-02-10Sunday, February 10, 2008 6:42:04 PM2008-02-11Monday, February 11, 2008 6:06:31 PM2008-02-12Tuesday, February 12, 2008 5:30:58 PM2008-02-13Wednesday, February 13, 2008 4:55:25 PM2008-02-14Thursday, February 14, 2008 4:19:52 PM2008-02-15Friday, February 15, 2008 3:44:19 PM2008-02-16Saturday, February 16, 2008 3:08:46 PM2008-02-17Sunday, February 17, 2008 2:33:13 PM2008-02-18Monday, February 18, 2008 1:57:40 PM2008-02-19Tuesday, February 19, 2008 1:22:07 PM2008-02-20Wednesday, February 20, 2008 12:46:34 PM2008-02-21Thursday, February 21, 2008 12:11:01 PM2008-02-22Friday, February 22, 2008 11:35:28 AM2008-02-23Saturday, February 23, 2008 10:59:55 AM2008-02-24Sunday, February 24, 2008 10:24:22 AM2008-02-25Monday, February 25, 2008 9:48:49 AM2008-02-26Tuesday, February 26, 2008 9:13:15 AM2008-02-27Wednesday, February 27, 2008 8:37:42 AM2008-02-28Thursday, February 28, 2008 8:02:09 AM2008-02-29Friday, February 29, 2008 7:26:36 AM2008-03-01Saturday, March 01, 2008 6:51:03 AM2008-03-02Sunday, March 02, 2008 6:15:30 AM2008-03-03Monday, March 03, 2008 5:39:57 AM2008-03-04Tuesday, March 04, 2008 5:04:24 AM2008-03-05Wednesday, March 05, 2008 4:28:51 AM2008-03-06Thursday, March 06, 2008 3:53:18 AM2008-03-07Friday, March 07, 2008 3:17:45 AM2008-03-08Saturday, March 08, 2008 2:42:12 AM2008-03-09Sunday, March 09, 2008 3:06:39 AM2008-03-10Monday, March 10, 2008 2:31:06 AM2008-03-11Tuesday, March 11, 2008 1:55:33 AM2008-03-12Wednesday, March 12, 2008 1:20:00 AM2008-03-13Thursday, March 13, 2008 0:44:27 AM2008-03-14Friday, March 14, 2008 0:08:54 AM2008-03-14Friday, March 14, 2008 11:33:21 PM2008-03-15Saturday, March 15, 2008 10:57:48 PM2008-03-16Sunday, March 16, 2008 10:22:15 PM2008-03-17Monday, March 17, 2008 9:46:42 PM2008-03-18Tuesday, March 18, 2008 9:11:09 PM2008-03-19Wednesday, March 19, 2008 8:35:35 PM2008-03-20Thursday, March 20, 2008 8:00:02 PM2008-03-21Friday, March 21, 2008 7:24:29 PM2008-03-22Saturday, March 22, 2008 6:48:56 PM2008-03-23Sunday, March 23, 2008 6:13:23 PM2008-03-24Monday, March 24, 2008 5:37:50 PM2008-03-25Tuesday, March 25, 2008 5:02:17 PM2008-03-26Wednesday, March 26, 2008 4:26:44 PM2008-03-27Thursday, March 27, 2008 3:51:11 PM2008-03-28Friday, March 28, 2008 3:15:38 PM2008-03-29Saturday, March 29, 2008 2:40:05 PM2008-03-30Sunday, March 30, 2008 2:04:32 PM2008-03-31Monday, March 31, 2008 1:28:59 PM2008-04-01Tuesday, April 01, 2008 12:53:26 PM2008-04-02Wednesday, April 02, 2008 12:17:53 PM2008-04-03Thursday, April 03, 2008 11:42:20 AM2008-04-04Friday, April 04, 2008 11:06:47 AM2008-04-05Saturday, April 05, 2008 10:31:14 AM2008-04-06Sunday, April 06, 2008 9:55:41 AM2008-04-07Monday, April 07, 2008 9:20:08 AM2008-04-08Tuesday, April 08, 2008 8:44:35 AM2008-04-09Wednesday, April 09, 2008 8:09:02 AM2008-04-10Thursday, April 10, 2008 7:33:29 AM2008-04-11Friday, April 11, 2008 6:57:55 AM2008-04-12Saturday, April 12, 2008 6:22:22 AM2008-04-13Sunday, April 13, 2008 5:46:49 AM2008-04-14Monday, April 14, 2008 5:11:16 AM2008-04-15Tuesday, April 15, 2008 4:35:43 AM2008-04-16Wednesday, April 16, 2008 4:00:10 AM2008-04-17Thursday, April 17, 2008 3:24:37 AM2008-04-18Friday, April 18, 2008 2:49:04 AM2008-04-19Saturday, April 19, 2008 2:13:31 AM2008-04-20Sunday, April 20, 2008 1:37:58 AM2008-04-21Monday, April 21, 2008 1:02:25 AM2008-04-22Tuesday, April 22, 2008 0:26:52 AM2008-04-22Tuesday, April 22, 2008 11:51:19 PM2008-04-23Wednesday, April 23, 2008 11:15:46 PM2008-04-24Thursday, April 24, 2008 10:40:13 PM2008-04-25Friday, April 25, 2008 10:04:40 PM2008-04-26Saturday, April 26, 2008 9:29:07 PM2008-04-27Sunday, April 27, 2008 8:53:34 PM2008-04-28Monday, April 28, 2008 8:18:01 PM2008-04-29Tuesday, April 29, 2008 7:42:28 PM2008-04-30Wednesday, April 30, 2008 7:06:55 PM2008-05-01Thursday, May 01, 2008 6:31:22 PM"
-assertEq(ret, expected);
diff --git a/js/src/jit-test/tests/sunspider/check-date-format-xparb.js b/js/src/jit-test/tests/sunspider/check-date-format-xparb.js
deleted file mode 100644
index 41f44fed50c..00000000000
--- a/js/src/jit-test/tests/sunspider/check-date-format-xparb.js
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * Copyright (C) 2004 Baron Schwartz <baron at sequent dot org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, version 2.1.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
- * details.
- */
-
-Date.parseFunctions = {count:0};
-Date.parseRegexes = [];
-Date.formatFunctions = {count:0};
-
-Date.prototype.dateFormat = function(format) {
-    if (Date.formatFunctions[format] == null) {
-        Date.createNewFormat(format);
-    }
-    var func = Date.formatFunctions[format];
-    return this[func]();
-}
-
-Date.createNewFormat = function(format) {
-    var funcName = "format" + Date.formatFunctions.count++;
-    Date.formatFunctions[format] = funcName;
-    var code = "Date.prototype." + funcName + " = function(){return ";
-    var special = false;
-    var ch = '';
-    for (var i = 0; i < format.length; ++i) {
-        ch = format.charAt(i);
-        if (!special && ch == "\\") {
-            special = true;
-        }
-        else if (special) {
-            special = false;
-            code += "'" + String.escape(ch) + "' + ";
-        }
-        else {
-            code += Date.getFormatCode(ch);
-        }
-    }
-    eval(code.substring(0, code.length - 3) + ";}");
-}
-
-Date.getFormatCode = function(character) {
-    switch (character) {
-    case "d":
-        return "String.leftPad(this.getDate(), 2, '0') + ";
-    case "D":
-        return "Date.dayNames[this.getDay()].substring(0, 3) + ";
-    case "j":
-        return "this.getDate() + ";
-    case "l":
-        return "Date.dayNames[this.getDay()] + ";
-    case "S":
-        return "this.getSuffix() + ";
-    case "w":
-        return "this.getDay() + ";
-    case "z":
-        return "this.getDayOfYear() + ";
-    case "W":
-        return "this.getWeekOfYear() + ";
-    case "F":
-        return "Date.monthNames[this.getMonth()] + ";
-    case "m":
-        return "String.leftPad(this.getMonth() + 1, 2, '0') + ";
-    case "M":
-        return "Date.monthNames[this.getMonth()].substring(0, 3) + ";
-    case "n":
-        return "(this.getMonth() + 1) + ";
-    case "t":
-        return "this.getDaysInMonth() + ";
-    case "L":
-        return "(this.isLeapYear() ? 1 : 0) + ";
-    case "Y":
-        return "this.getFullYear() + ";
-    case "y":
-        return "('' + this.getFullYear()).substring(2, 4) + ";
-    case "a":
-        return "(this.getHours() < 12 ? 'am' : 'pm') + ";
-    case "A":
-        return "(this.getHours() < 12 ? 'AM' : 'PM') + ";
-    case "g":
-        return "((this.getHours() %12) ? this.getHours() % 12 : 12) + ";
-    case "G":
-        return "this.getHours() + ";
-    case "h":
-        return "String.leftPad((this.getHours() %12) ? this.getHours() % 12 : 12, 2, '0') + ";
-    case "H":
-        return "String.leftPad(this.getHours(), 2, '0') + ";
-    case "i":
-        return "String.leftPad(this.getMinutes(), 2, '0') + ";
-    case "s":
-        return "String.leftPad(this.getSeconds(), 2, '0') + ";
-    case "O":
-        return "this.getGMTOffset() + ";
-    case "T":
-        return "this.getTimezone() + ";
-    case "Z":
-        return "(this.getTimezoneOffset() * -60) + ";
-    default:
-        return "'" + String.escape(character) + "' + ";
-    }
-}
-
-Date.parseDate = function(input, format) {
-    if (Date.parseFunctions[format] == null) {
-        Date.createParser(format);
-    }
-    var func = Date.parseFunctions[format];
-    return Date[func](input);
-}
-
-Date.createParser = function(format) {
-    var funcName = "parse" + Date.parseFunctions.count++;
-    var regexNum = Date.parseRegexes.length;
-    var currentGroup = 1;
-    Date.parseFunctions[format] = funcName;
-
-    var code = "Date." + funcName + " = function(input){\n"
-        + "var y = -1, m = -1, d = -1, h = -1, i = -1, s = -1;\n"
-        + "var d = new Date();\n"
-        + "y = d.getFullYear();\n"
-        + "m = d.getMonth();\n"
-        + "d = d.getDate();\n"
-        + "var results = input.match(Date.parseRegexes[" + regexNum + "]);\n"
-        + "if (results && results.length > 0) {"
-    var regex = "";
-
-    var special = false;
-    var ch = '';
-    for (var i = 0; i < format.length; ++i) {
-        ch = format.charAt(i);
-        if (!special && ch == "\\") {
-            special = true;
-        }
-        else if (special) {
-            special = false;
-            regex += String.escape(ch);
-        }
-        else {
-            obj = Date.formatCodeToRegex(ch, currentGroup);
-            currentGroup += obj.g;
-            regex += obj.s;
-            if (obj.g && obj.c) {
-                code += obj.c;
-            }
-        }
-    }
-
-    code += "if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0 && s >= 0)\n"
-        + "{return new Date(y, m, d, h, i, s);}\n"
-        + "else if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0)\n"
-        + "{return new Date(y, m, d, h, i);}\n"
-        + "else if (y > 0 && m >= 0 && d > 0 && h >= 0)\n"
-        + "{return new Date(y, m, d, h);}\n"
-        + "else if (y > 0 && m >= 0 && d > 0)\n"
-        + "{return new Date(y, m, d);}\n"
-        + "else if (y > 0 && m >= 0)\n"
-        + "{return new Date(y, m);}\n"
-        + "else if (y > 0)\n"
-        + "{return new Date(y);}\n"
-        + "}return null;}";
-
-    Date.parseRegexes[regexNum] = new RegExp("^" + regex + "$");
-    eval(code);
-}
-
-Date.formatCodeToRegex = function(character, currentGroup) {
-    switch (character) {
-    case "D":
-        return {g:0,
-        c:null,
-        s:"(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)"};
-    case "j":
-    case "d":
-        return {g:1,
-            c:"d = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{1,2})"};
-    case "l":
-        return {g:0,
-            c:null,
-            s:"(?:" + Date.dayNames.join("|") + ")"};
-    case "S":
-        return {g:0,
-            c:null,
-            s:"(?:st|nd|rd|th)"};
-    case "w":
-        return {g:0,
-            c:null,
-            s:"\\d"};
-    case "z":
-        return {g:0,
-            c:null,
-            s:"(?:\\d{1,3})"};
-    case "W":
-        return {g:0,
-            c:null,
-            s:"(?:\\d{2})"};
-    case "F":
-        return {g:1,
-            c:"m = parseInt(Date.monthNumbers[results[" + currentGroup + "].substring(0, 3)], 10);\n",
-            s:"(" + Date.monthNames.join("|") + ")"};
-    case "M":
-        return {g:1,
-            c:"m = parseInt(Date.monthNumbers[results[" + currentGroup + "]], 10);\n",
-            s:"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)"};
-    case "n":
-    case "m":
-        return {g:1,
-            c:"m = parseInt(results[" + currentGroup + "], 10) - 1;\n",
-            s:"(\\d{1,2})"};
-    case "t":
-        return {g:0,
-            c:null,
-            s:"\\d{1,2}"};
-    case "L":
-        return {g:0,
-            c:null,
-            s:"(?:1|0)"};
-    case "Y":
-        return {g:1,
-            c:"y = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{4})"};
-    case "y":
-        return {g:1,
-            c:"var ty = parseInt(results[" + currentGroup + "], 10);\n"
-                + "y = ty > Date.y2kYear ? 1900 + ty : 2000 + ty;\n",
-            s:"(\\d{1,2})"};
-    case "a":
-        return {g:1,
-            c:"if (results[" + currentGroup + "] == 'am') {\n"
-                + "if (h == 12) { h = 0; }\n"
-                + "} else { if (h < 12) { h += 12; }}",
-            s:"(am|pm)"};
-    case "A":
-        return {g:1,
-            c:"if (results[" + currentGroup + "] == 'AM') {\n"
-                + "if (h == 12) { h = 0; }\n"
-                + "} else { if (h < 12) { h += 12; }}",
-            s:"(AM|PM)"};
-    case "g":
-    case "G":
-    case "h":
-    case "H":
-        return {g:1,
-            c:"h = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{1,2})"};
-    case "i":
-        return {g:1,
-            c:"i = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{2})"};
-    case "s":
-        return {g:1,
-            c:"s = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{2})"};
-    case "O":
-        return {g:0,
-            c:null,
-            s:"[+-]\\d{4}"};
-    case "T":
-        return {g:0,
-            c:null,
-            s:"[A-Z]{3}"};
-    case "Z":
-        return {g:0,
-            c:null,
-            s:"[+-]\\d{1,5}"};
-    default:
-        return {g:0,
-            c:null,
-            s:String.escape(character)};
-    }
-}
-
-Date.prototype.getTimezone = function() {
-    return this.toString().replace(
-        /^.*? ([A-Z]{3}) [0-9]{4}.*$/, "$1").replace(
-        /^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/, "$1$2$3");
-}
-
-Date.prototype.getGMTOffset = function() {
-    return (this.getTimezoneOffset() > 0 ? "-" : "+")
-        + String.leftPad(Math.floor(this.getTimezoneOffset() / 60), 2, "0")
-        + String.leftPad(this.getTimezoneOffset() % 60, 2, "0");
-}
-
-Date.prototype.getDayOfYear = function() {
-    var num = 0;
-    Date.daysInMonth[1] = this.isLeapYear() ? 29 : 28;
-    for (var i = 0; i < this.getMonth(); ++i) {
-        num += Date.daysInMonth[i];
-    }
-    return num + this.getDate() - 1;
-}
-
-Date.prototype.getWeekOfYear = function() {
-    // Skip to Thursday of this week
-    var now = this.getDayOfYear() + (4 - this.getDay());
-    // Find the first Thursday of the year
-    var jan1 = new Date(this.getFullYear(), 0, 1);
-    var then = (7 - jan1.getDay() + 4);
-    document.write(then);
-    return String.leftPad(((now - then) / 7) + 1, 2, "0");
-}
-
-Date.prototype.isLeapYear = function() {
-    var year = this.getFullYear();
-    return ((year & 3) == 0 && (year % 100 || (year % 400 == 0 && year)));
-}
-
-Date.prototype.getFirstDayOfMonth = function() {
-    var day = (this.getDay() - (this.getDate() - 1)) % 7;
-    return (day < 0) ? (day + 7) : day;
-}
-
-Date.prototype.getLastDayOfMonth = function() {
-    var day = (this.getDay() + (Date.daysInMonth[this.getMonth()] - this.getDate())) % 7;
-    return (day < 0) ? (day + 7) : day;
-}
-
-Date.prototype.getDaysInMonth = function() {
-    Date.daysInMonth[1] = this.isLeapYear() ? 29 : 28;
-    return Date.daysInMonth[this.getMonth()];
-}
-
-Date.prototype.getSuffix = function() {
-    switch (this.getDate()) {
-        case 1:
-        case 21:
-        case 31:
-            return "st";
-        case 2:
-        case 22:
-            return "nd";
-        case 3:
-        case 23:
-            return "rd";
-        default:
-            return "th";
-    }
-}
-
-String.escape = function(string) {
-    return string.replace(/('|\\)/g, "\\$1");
-}
-
-String.leftPad = function (val, size, ch) {
-    var result = new String(val);
-    if (ch == null) {
-        ch = " ";
-    }
-    while (result.length < size) {
-        result = ch + result;
-    }
-    return result;
-}
-
-Date.daysInMonth = [31,28,31,30,31,30,31,31,30,31,30,31];
-Date.monthNames =
-   ["January",
-    "February",
-    "March",
-    "April",
-    "May",
-    "June",
-    "July",
-    "August",
-    "September",
-    "October",
-    "November",
-    "December"];
-Date.dayNames =
-   ["Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"];
-Date.y2kYear = 50;
-Date.monthNumbers = {
-    Jan:0,
-    Feb:1,
-    Mar:2,
-    Apr:3,
-    May:4,
-    Jun:5,
-    Jul:6,
-    Aug:7,
-    Sep:8,
-    Oct:9,
-    Nov:10,
-    Dec:11};
-Date.patterns = {
-    ISO8601LongPattern:"Y-m-d H:i:s",
-    ISO8601ShortPattern:"Y-m-d",
-    ShortDatePattern: "n/j/Y",
-    LongDatePattern: "l, F d, Y",
-    FullDateTimePattern: "l, F d, Y g:i:s A",
-    MonthDayPattern: "F d",
-    ShortTimePattern: "g:i A",
-    LongTimePattern: "g:i:s A",
-    SortableDateTimePattern: "Y-m-d\\TH:i:s",
-    UniversalSortableDateTimePattern: "Y-m-d H:i:sO",
-    YearMonthPattern: "F, Y"};
-
-var date = new Date("1/1/2007 1:11:11");
-
-var ret;
-for (i = 0; i < 4000; ++i) {
-    var shortFormat = date.dateFormat("Y-m-d");
-    var longFormat = date.dateFormat("l, F d, Y g:i:s A");
-    ret = shortFormat + longFormat;
-    date.setTime(date.getTime() + 84266956);
-}
-
-// No exact match because the output depends on the locale's time zone. See bug 524490.
-assertEq(/^2017-09-05Tuesday, September 05, 2017 [0-9:]* AM$/.exec(ret) != null, true);
diff --git a/js/src/jit-test/tests/sunspider/check-math-partial-sums.js b/js/src/jit-test/tests/sunspider/check-math-partial-sums.js
deleted file mode 100644
index a9082702ccf..00000000000
--- a/js/src/jit-test/tests/sunspider/check-math-partial-sums.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// The Computer Language Shootout
-// http://shootout.alioth.debian.org/
-// contributed by Isaac Gouy
-
-function partial(n){
-    var a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 = 0.0;
-    var twothirds = 2.0/3.0;
-    var alt = -1.0;
-    var k2 = k3 = sk = ck = 0.0;
-    
-    for (var k = 1; k <= n; k++){
-        k2 = k*k;
-        k3 = k2*k;
-        sk = Math.sin(k);
-        ck = Math.cos(k);
-        alt = -alt;
-        
-        a1 += Math.pow(twothirds,k-1);
-        a2 += Math.pow(k,-0.5);
-        a3 += 1.0/(k*(k+1.0));
-        a4 += 1.0/(k3 * sk*sk);
-        a5 += 1.0/(k3 * ck*ck);
-        a6 += 1.0/k;
-        a7 += 1.0/k2;
-        a8 += alt/k;
-        a9 += alt/(2*k -1);
-    }
-
-    return [ a1, a2, a3, a4, a5, a6, a7, a8, a9 ];
-}
-
-var actual = [];
-for (var i = 1024; i <= 16384; i *= 2)
-  Array.prototype.push.apply(actual, partial(i));
-
-var eps = 1e-12;
-var expect = [2.9999999999999987,62.555269219624684,0.9990243902439033,30.174793391263677,42.99468748637077,7.509175672278132,1.6439579810301654,0.6926591377284127,0.785154022830656,2.9999999999999987,89.06036157695789,0.9995119570522216,30.30796333494624,42.99485339033617,8.202078771817716,1.6444459047881168,0.6929030995395857,0.7852760930922243,2.9999999999999987,126.54745783224483,0.999755918965097,30.314167756318135,42.994888939123,8.89510389696629,1.6446899560231332,0.6930251251486118,0.7853371282421086,2.9999999999999987,179.56450569047874,0.9998779445868421,30.314499725429847,42.99489723774016,9.588190046095265,1.644812003986005,0.693086149128997,0.785367645819433,2.9999999999999987,254.54355172132264,0.9999389685688135,30.31451920492601,42.99489939769195,10.281306710008463,1.6448730335545856,0.6931166639131536,0.7853829046083998];
-
-assertEq(actual.length, expect.length);
-for (var i = 0; i < expect.length; ++i)
-  assertEq(Math.abs(actual[i] - expect[i]) < eps, true);
diff --git a/js/src/jit-test/tests/sunspider/check-mont.js b/js/src/jit-test/tests/sunspider/check-mont.js
deleted file mode 100644
index c31491c3689..00000000000
--- a/js/src/jit-test/tests/sunspider/check-mont.js
+++ /dev/null
@@ -1,119 +0,0 @@
-// regression test for Bug 452008 - TM: SRP in Clipperz crypto library fails when JIT (TraceMonkey) is enabled. 
-
-var x = [9385, 32112, 25383, 16317, 30138, 14565, 17812, 24500, 2719, 30174, 3546, 9096, 15352, 19120, 20648, 14334, 7426, 0, 0, 0];
-var n = [27875, 25925, 30422, 12227, 27798, 32170, 10873, 21748, 30629, 26296, 20697, 5125, 4815, 2221, 14392, 23369, 5560, 2, 0, 0];
-var np = 18229;
-var expected = [18770, 31456, 17999, 32635, 27508, 29131, 2856, 16233, 5439, 27580, 7093, 18192, 30804, 5472, 8529, 28649, 14852, 0, 0, 0];
-
-//globals
-bpe=0;         //bits stored per array element
-mask=0;        //AND this with an array element to chop it down to bpe bits
-
-//initialize the global variables
-for (bpe=0; (1<<(bpe+1)) > (1<<bpe); bpe++);  //bpe=number of bits in the mantissa on this platform
-bpe>>=1;                   //bpe=number of bits in one element of the array representing the bigInt
-mask=(1<<bpe)-1;           //AND the mask with an integer to get its bpe least significant bits
-
-
-//the following global variables are scratchpad memory to
-//reduce dynamic memory allocation in the inner loop
-sa = new Array(0); //used in mont_()
-
-//do x=y on bigInts x and y.  x must be an array at least as big as y (not counting the leading zeros in y).
-function copy_(x,y) {
-  var i;
-  var k=x.length<y.length ? x.length : y.length;
-  for (i=0;i<k;i++)
-    x[i]=y[i];
-  for (i=k;i<x.length;i++)
-    x[i]=0;
-}
-
-//do x=y on bigInt x and integer y.
-function copyInt_(x,n) {
-  var i,c;
-  for (c=n,i=0;i<x.length;i++) {
-    x[i]=c & mask;
-    c>>=bpe;
-  }
-}
-
-//is x > y? (x and y both nonnegative)
-function greater(x,y) {
-  var i;
-  var k=(x.length<y.length) ? x.length : y.length;
-
-  for (i=x.length;i<y.length;i++)
-    if (y[i])
-      return 0;  //y has more digits
-
-  for (i=y.length;i<x.length;i++)
-    if (x[i])
-      return 1;  //x has more digits
-
-  for (i=k-1;i>=0;i--)
-    if (x[i]>y[i])
-      return 1;
-    else if (x[i]<y[i])
-      return 0;
-  return 0;
-}
-
-
-//do x=x*y*Ri mod n for bigInts x,y,n,
-//  where Ri = 2**(-kn*bpe) mod n, and kn is the
-//  number of elements in the n array, not
-//  counting leading zeros.
-//x must be large enough to hold the answer.
-//It's OK if x and y are the same variable.
-//must have:
-//  x,y < n
-//  n is odd
-//  np = -(n^(-1)) mod radix
-function mont_(x,y,n,np) {
-  var i,j,c,ui,t;
-  var kn=n.length;
-  var ky=y.length;
-
-  if (sa.length!=kn)
-    sa=new Array(kn);
-
-  for (;kn>0 && n[kn-1]==0;kn--); //ignore leading zeros of n
-  for (;ky>0 && y[ky-1]==0;ky--); //ignore leading zeros of y
-
-  copyInt_(sa,0);
-
-  //the following loop consumes 95% of the runtime for randTruePrime_() and powMod_() for large keys
-  for (i=0; i<kn; i++) {
-    t=sa[0]+x[i]*y[0];
-    ui=((t & mask) * np) & mask;  //the inner "& mask" is needed on Macintosh MSIE, but not windows MSIE
-    c=(t+ui*n[0]) >> bpe;
-    t=x[i];
-
-    //do sa=(sa+x[i]*y+ui*n)/b   where b=2**bpe
-    for (j=1;j<ky;j++) {
-      c+=sa[j]+t*y[j]+ui*n[j];
-      sa[j-1]=c & mask;
-      c>>=bpe;
-    }
-    for (;j<kn;j++) {
-      c+=sa[j]+ui*n[j];
-      sa[j-1]=c & mask;
-      c>>=bpe;
-    }
-    sa[j-1]=c & mask;
-  }
-
-  if (!greater(n,sa))
-    sub_(sa,n);
-  copy_(x,sa);
-}
-
-mont_(x, x, n, np);
-
-var passed = expected.length == x.length;
-for (var i = 0; i < expected.length; i++) {
-  if (passed)
-    passed = expected[i] == x[i];
-}
-assertEq(passed, true);
diff --git a/js/src/jit-test/tests/sunspider/check-string-tagcloud.js b/js/src/jit-test/tests/sunspider/check-string-tagcloud.js
deleted file mode 100644
index f446e46ed5c..00000000000
--- a/js/src/jit-test/tests/sunspider/check-string-tagcloud.js
+++ /dev/null
@@ -1,270 +0,0 @@
-
-/*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-/*
-    Portions from:
-    json.js
-    2007-10-10
-
-    Public Domain
-*/
-
-// This test parses a JSON string giving tag names and popularity, and
-// generates html markup for a "tagcloud" view.
-
-if (!Object.prototype.toJSONString) {
-
-    Array.prototype.toJSONString = function (w) {
-        var a = [],     // The array holding the partial texts.
-            i,          // Loop counter.
-            l = this.length,
-            v;          // The value to be stringified.
-
-        for (i = 0; i < l; i += 1) {
-            v = this[i];
-            switch (typeof v) {
-            case 'object':
-
-                if (v && typeof v.toJSONString === 'function') {
-                    a.push(v.toJSONString(w));
-                } else {
-                    a.push('null');
-                }
-                break;
-
-            case 'string':
-            case 'number':
-            case 'boolean':
-                a.push(v.toJSONString());
-                break;
-            default:
-                a.push('null');
-            }
-        }
-
-        return '[' + a.join(',') + ']';
-    };
-
-
-    Boolean.prototype.toJSONString = function () {
-        return String(this);
-    };
-
-
-    Date.prototype.toJSONString = function () {
-
-        function f(n) {
-
-            return n < 10 ? '0' + n : n;
-        }
-
-        return '"' + this.getUTCFullYear()   + '-' +
-                   f(this.getUTCMonth() + 1) + '-' +
-                   f(this.getUTCDate())      + 'T' +
-                   f(this.getUTCHours())     + ':' +
-                   f(this.getUTCMinutes())   + ':' +
-                   f(this.getUTCSeconds())   + 'Z"';
-    };
-
-
-    Number.prototype.toJSONString = function () {
-
-        return isFinite(this) ? String(this) : 'null';
-    };
-
-
-    Object.prototype.toJSONString = function (w) {
-        var a = [],     // The array holding the partial texts.
-            k,          // The current key.
-            i,          // The loop counter.
-            v;          // The current value.
-
-        if (w) {
-            for (i = 0; i < w.length; i += 1) {
-                k = w[i];
-                if (typeof k === 'string') {
-                    v = this[k];
-                    switch (typeof v) {
-                    case 'object':
-
-                        if (v) {
-                            if (typeof v.toJSONString === 'function') {
-                                a.push(k.toJSONString() + ':' +
-                                       v.toJSONString(w));
-                            }
-                        } else {
-                            a.push(k.toJSONString() + ':null');
-                        }
-                        break;
-
-                    case 'string':
-                    case 'number':
-                    case 'boolean':
-                        a.push(k.toJSONString() + ':' + v.toJSONString());
-
-                    }
-                }
-            }
-        } else {
-
-            for (k in this) {
-                if (typeof k === 'string' &&
-                        Object.prototype.hasOwnProperty.apply(this, [k])) {
-                    v = this[k];
-                    switch (typeof v) {
-                    case 'object':
-
-                        if (v) {
-                            if (typeof v.toJSONString === 'function') {
-                                a.push(k.toJSONString() + ':' +
-                                       v.toJSONString());
-                            }
-                        } else {
-                            a.push(k.toJSONString() + ':null');
-                        }
-                        break;
-
-                    case 'string':
-                    case 'number':
-                    case 'boolean':
-                        a.push(k.toJSONString() + ':' + v.toJSONString());
-
-                    }
-                }
-            }
-        }
-
-        return '{' + a.join(',') + '}';
-    };
-
-
-    (function (s) {
-
-        var m = {
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '"' : '\\"',
-            '\\': '\\\\'
-        };
-
-
-        s.parseJSON = function (filter) {
-            var j;
-
-            function walk(k, v) {
-                var i, n;
-                if (v && typeof v === 'object') {
-                    for (i in v) {
-                        if (Object.prototype.hasOwnProperty.apply(v, [i])) {
-                            n = walk(i, v[i]);
-                            if (n !== undefined) {
-                                v[i] = n;
-                            }
-                        }
-                    }
-                }
-                return filter(k, v);
-            }
-
-            if (/^[\],:{}\s]*$/.test(this.replace(/\\./g, '@').
-                    replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(:?[eE][+\-]?\d+)?/g, ']').
-                    replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-                j = eval('(' + this + ')');
-
-                return typeof filter === 'function' ? walk('', j) : j;
-            }
-
-            throw new SyntaxError('parseJSON');
-        };
-
-
-        s.toJSONString = function () {
-
-            if (/["\\\x00-\x1f]/.test(this)) {
-                return '"' + this.replace(/[\x00-\x1f\\"]/g, function (a) {
-                    var c = m[a];
-                    if (c) {
-                        return c;
-                    }
-                    c = a.charCodeAt();
-                    return '\\u00' + Math.floor(c / 16).toString(16) +
-                                               (c % 16).toString(16);
-                }) + '"';
-            }
-            return '"' + this + '"';
-        };
-    })(String.prototype);
-}
-
-var tagInfoJSON = '[\n  {\n    \"tag\": "titillation",\n    \"popularity\": 4294967296\n  },\n  {\n    \"tag\": "foamless",\n    \"popularity\": 1257718401\n  },\n  {\n    \"tag\": "snarler",\n    \"popularity\": 613166183\n  },\n  {\n    \"tag\": "multangularness",\n    \"popularity\": 368304452\n  },\n  {\n    \"tag\": "Fesapo unventurous",\n    \"popularity\": 248026512\n  },\n  {\n    \"tag\": "esthesioblast",\n    \"popularity\": 179556755\n  },\n  {\n    \"tag\": "echeneidoid",\n    \"popularity\": 136641578\n  },\n  {\n    \"tag\": "embryoctony",\n    \"popularity\": 107852576\n  },\n  {\n    \"tag\": "undilatory",\n    \"popularity\": 87537981\n  },\n  {\n    \"tag\": "predisregard",\n    \"popularity\": 72630939\n  },\n  {\n    \"tag\": "allergenic",\n    \"popularity\": 61345190\n  },\n  {\n    \"tag\": "uncloudy",\n    \"popularity\": 52580571\n  },\n  {\n    \"tag\": "unforeseeably",\n    \"popularity\": 45628109\n  },\n  {\n    \"tag\": "sturniform",\n    \"popularity\": 40013489\n  },\n  {\n    \"tag\": "anesthetize",\n    \"popularity\": 35409226\n  },\n  {\n    \"tag\": "ametabolia",\n    \"popularity\": 31583050\n  },\n  {\n    \"tag\": "angiopathy",\n    \"popularity\": 28366350\n  },\n  {\n    \"tag\": "sultanaship",\n    \"popularity\": 25634218\n  },\n  {\n    \"tag\": "Frenchwise",\n    \"popularity\": 23292461\n  },\n  {\n    \"tag\": "cerviconasal",\n    \"popularity\": 21268909\n  },\n  {\n    \"tag\": "mercurialness",\n    \"popularity\": 19507481\n  },\n  {\n    \"tag\": "glutelin venditate",\n    \"popularity\": 17964042\n  },\n  {\n    \"tag\": "acred overblack",\n    \"popularity\": 16603454\n  },\n  {\n    \"tag\": "Atik",\n    \"popularity\": 15397451\n  },\n  {\n    \"tag\": "puncturer",\n    \"popularity\": 14323077\n  },\n  {\n    \"tag\": "pukatea",\n    \"popularity\": 13361525\n  },\n  {\n    \"tag\": "suberize",\n    \"popularity\": 12497261\n  },\n  {\n    \"tag\": "Godfrey",\n    \"popularity\": 11717365\n  },\n  {\n    \"tag\": "tetraptote",\n    \"popularity\": 11011011\n  },\n  {\n    \"tag\": "lucidness",\n    \"popularity\": 10369074\n  },\n  {\n    \"tag\": "tartness",\n    \"popularity\": 9783815\n  },\n  {\n    \"tag\": "axfetch",\n    \"popularity\": 9248634\n  },\n  {\n    \"tag\": "preacquittal",\n    \"popularity\": 8757877\n  },\n  {\n    \"tag\": "matris",\n    \"popularity\": 8306671\n  },\n  {\n    \"tag\": "hyphenate",\n    \"popularity\": 7890801\n  },\n  {\n    \"tag\": "semifabulous",\n    \"popularity\": 7506606\n  },\n  {\n    \"tag\": "oppressiveness",\n    \"popularity\": 7150890\n  },\n  {\n    \"tag\": "Protococcales",\n    \"popularity\": 6820856\n  },\n  {\n    \"tag\": "unpreventive",\n    \"popularity\": 6514045\n  },\n  {\n    \"tag\": "Cordia",\n    \"popularity\": 6228289\n  },\n  {\n    \"tag\": "Wakamba leaflike",\n    \"popularity\": 5961668\n  },\n  {\n    \"tag\": "dacryoma",\n    \"popularity\": 5712480\n  },\n  {\n    \"tag\": "inguinal",\n    \"popularity\": 5479211\n  },\n  {\n    \"tag\": "responseless",\n    \"popularity\": 5260507\n  },\n  {\n    \"tag\": "supplementarily",\n    \"popularity\": 5055158\n  },\n  {\n    \"tag\": "emu",\n    \"popularity\": 4862079\n  },\n  {\n    \"tag\": "countermeet",\n    \"popularity\": 4680292\n  },\n  {\n    \"tag\": "purrer",\n    \"popularity\": 4508918\n  },\n  {\n    \"tag\": "Corallinaceae",\n    \"popularity\": 4347162\n  },\n  {\n    \"tag\": "speculum",\n    \"popularity\": 4194304\n  },\n  {\n    \"tag\": "crimpness",\n    \"popularity\": 4049690\n  },\n  {\n    \"tag\": "antidetonant",\n    \"popularity\": 3912727\n  },\n  {\n    \"tag\": "topeewallah",\n    \"popularity\": 3782875\n  },\n  {\n    \"tag\": "fidalgo ballant",\n    \"popularity\": 3659640\n  },\n  {\n    \"tag\": "utriculose",\n    \"popularity\": 3542572\n  },\n  {\n    \"tag\": "testata",\n    \"popularity\": 3431259\n  },\n  {\n    \"tag\": "beltmaking",\n    \"popularity\": 3325322\n  },\n  {\n    \"tag\": "necrotype",\n    \"popularity\": 3224413\n  },\n  {\n    \"tag\": "ovistic",\n    \"popularity\": 3128215\n  },\n  {\n    \"tag\": "swindlership",\n    \"popularity\": 3036431\n  },\n  {\n    \"tag\": "augustal",\n    \"popularity\": 2948792\n  },\n  {\n    \"tag\": "Titoist",\n    \"popularity\": 2865047\n  },\n  {\n    \"tag\": "trisoctahedral",\n    \"popularity\": 2784963\n  },\n  {\n    \"tag\": "sequestrator",\n    \"popularity\": 2708327\n  },\n  {\n    \"tag\": "sideburns",\n    \"popularity\": 2634939\n  },\n  {\n    \"tag\": "paraphrasia",\n    \"popularity\": 2564616\n  },\n  {\n    \"tag\": "graminology unbay",\n    \"popularity\": 2497185\n  },\n  {\n    \"tag\": "acaridomatium emargination",\n    \"popularity\": 2432487\n  },\n  {\n    \"tag\": "roofward",\n    \"popularity\": 2370373\n  },\n  {\n    \"tag\": "lauder",\n    \"popularity\": 2310705\n  },\n  {\n    \"tag\": "subjunctive",\n    \"popularity\": 2253354\n  },\n  {\n    \"tag\": "subelongate",\n    \"popularity\": 2198199\n  },\n  {\n    \"tag\": "guacimo",\n    \"popularity\": 2145128\n  },\n  {\n    \"tag\": "cockade",\n    \"popularity\": 2094033\n  },\n  {\n    \"tag\": "misgauge",\n    \"popularity\": 2044818\n  },\n  {\n    \"tag\": "unexpensive",\n    \"popularity\": 1997388\n  },\n  {\n    \"tag\": "chebel",\n    \"popularity\": 1951657\n  },\n  {\n    \"tag\": "unpursuing",\n    \"popularity\": 1907543\n  },\n  {\n    \"tag\": "kilobar",\n    \"popularity\": 1864969\n  },\n  {\n    \"tag\": "obsecration",\n    \"popularity\": 1823863\n  },\n  {\n    \"tag\": "nacarine",\n    \"popularity\": 1784157\n  },\n  {\n    \"tag\": "spirituosity",\n    \"popularity\": 1745787\n  },\n  {\n    \"tag\": "movableness deity",\n    \"popularity\": 1708692\n  },\n  {\n    \"tag\": "exostracism",\n    \"popularity\": 1672816\n  },\n  {\n    \"tag\": "archipterygium",\n    \"popularity\": 1638104\n  },\n  {\n    \"tag\": "monostrophic",\n    \"popularity\": 1604506\n  },\n  {\n    \"tag\": "gynecide",\n    \"popularity\": 1571974\n  },\n  {\n    \"tag\": "gladden",\n    \"popularity\": 1540462\n  },\n  {\n    \"tag\": "throughbred",\n    \"popularity\": 1509927\n  },\n  {\n    \"tag\": "groper",\n    \"popularity\": 1480329\n  },\n  {\n    \"tag\": "Xenosaurus",\n    \"popularity\": 1451628\n  },\n  {\n    \"tag\": "photoetcher",\n    \"popularity\": 1423788\n  },\n  {\n    \"tag\": "glucosid",\n    \"popularity\": 1396775\n  },\n  {\n    \"tag\": "Galtonian",\n    \"popularity\": 1370555\n  },\n  {\n    \"tag\": "mesosporic",\n    \"popularity\": 1345097\n  },\n  {\n    \"tag\": "theody",\n    \"popularity\": 1320370\n  },\n  {\n    \"tag\": "zaffer",\n    \"popularity\": 1296348\n  },\n  {\n    \"tag\": "probiology",\n    \"popularity\": 1273003\n  },\n  {\n    \"tag\": "rhizomic",\n    \"popularity\": 1250308\n  },\n  {\n    \"tag\": "superphosphate",\n    \"popularity\": 1228240\n  },\n  {\n    \"tag\": "Hippolytan",\n    \"popularity\": 1206776\n  },\n  {\n    \"tag\": "garget",\n    \"popularity\": 1185892\n  },\n  {\n    \"tag\": "diploplacula",\n    \"popularity\": 1165568\n  },\n  {\n    \"tag\": "orohydrographical",\n    \"popularity\": 1145785\n  },\n  {\n    \"tag\": "enhypostatize",\n    \"popularity\": 1126521\n  },\n  {\n    \"tag\": "polisman",\n    \"popularity\": 1107759\n  },\n  {\n    \"tag\": "acetometer",\n    \"popularity\": 1089482\n  },\n  {\n    \"tag\": "unsnatched",\n    \"popularity\": 1071672\n  },\n  {\n    \"tag\": "yabber",\n    \"popularity\": 1054313\n  },\n  {\n    \"tag\": "demiwolf",\n    \"popularity\": 1037390\n  },\n  {\n    \"tag\": "chromascope",\n    \"popularity\": 1020888\n  },\n  {\n    \"tag\": "seamanship",\n    \"popularity\": 1004794\n  },\n  {\n    \"tag\": "nonfenestrated",\n    \"popularity\": 989092\n  },\n  {\n    \"tag\": "hydrophytism",\n    \"popularity\": 973771\n  },\n  {\n    \"tag\": "dotter",\n    \"popularity\": 958819\n  },\n  {\n    \"tag\": "thermoperiodism",\n    \"popularity\": 944222\n  },\n  {\n    \"tag\": "unlawyerlike",\n    \"popularity\": 929970\n  },\n  {\n    \"tag\": "enantiomeride citywards",\n    \"popularity\": 916052\n  },\n  {\n    \"tag\": "unmetallurgical",\n    \"popularity\": 902456\n  },\n  {\n    \"tag\": "prickled",\n    \"popularity\": 889174\n  },\n  {\n    \"tag\": "strangerwise manioc",\n    \"popularity\": 876195\n  },\n  {\n    \"tag\": "incisorial",\n    \"popularity\": 863510\n  },\n  {\n    \"tag\": "irrationalize",\n    \"popularity\": 851110\n  },\n  {\n    \"tag\": "nasology",\n    \"popularity\": 838987\n  },\n  {\n    \"tag\": "fatuism",\n    \"popularity\": 827131\n  },\n  {\n    \"tag\": "Huk",\n    \"popularity\": 815535\n  },\n  {\n    \"tag\": "properispomenon",\n    \"popularity\": 804192\n  },\n  {\n    \"tag\": "unpummelled",\n    \"popularity\": 793094\n  },\n  {\n    \"tag\": "technographically",\n    \"popularity\": 782233\n  },\n  {\n    \"tag\": "underfurnish",\n    \"popularity\": 771603\n  },\n  {\n    \"tag\": "sinter",\n    \"popularity\": 761198\n  },\n  {\n    \"tag\": "lateroanterior",\n    \"popularity\": 751010\n  },\n  {\n    \"tag\": "nonpersonification",\n    \"popularity\": 741034\n  },\n  {\n    \"tag\": "Sitophilus",\n    \"popularity\": 731264\n  },\n  {\n    \"tag\": "unstudded overexerted",\n    \"popularity\": 721694\n  },\n  {\n    \"tag\": "tracheation",\n    \"popularity\": 712318\n  },\n  {\n    \"tag\": "thirteenth begloze",\n    \"popularity\": 703131\n  },\n  {\n    \"tag\": "bespice",\n    \"popularity\": 694129\n  },\n  {\n    \"tag\": "doppia",\n    \"popularity\": 685305\n  },\n  {\n    \"tag\": "unadorned",\n    \"popularity\": 676656\n  },\n  {\n    \"tag\": "dovelet engraff",\n    \"popularity\": 668176\n  },\n  {\n    \"tag\": "diphyozooid",\n    \"popularity\": 659862\n  },\n  {\n    \"tag\": "mure",\n    \"popularity\": 651708\n  },\n  {\n    \"tag\": "Tripitaka",\n    \"popularity\": 643710\n  },\n  {\n    \"tag\": "Billjim",\n    \"popularity\": 635865\n  },\n  {\n    \"tag\": "pyramidical",\n    \"popularity\": 628169\n  },\n  {\n    \"tag\": "circumlocutionist",\n    \"popularity\": 620617\n  },\n  {\n    \"tag\": "slapstick",\n    \"popularity\": 613207\n  },\n  {\n    \"tag\": "preobedience",\n    \"popularity\": 605934\n  },\n  {\n    \"tag\": "unfriarlike",\n    \"popularity\": 598795\n  },\n  {\n    \"tag\": "microchromosome",\n    \"popularity\": 591786\n  },\n  {\n    \"tag\": "Orphicism",\n    \"popularity\": 584905\n  },\n  {\n    \"tag\": "peel",\n    \"popularity\": 578149\n  },\n  {\n    \"tag\": "obediential",\n    \"popularity\": 571514\n  },\n  {\n    \"tag\": "Peripatidea",\n    \"popularity\": 564997\n  },\n  {\n    \"tag\": "undoubtful",\n    \"popularity\": 558596\n  },\n  {\n    \"tag\": "lodgeable",\n    \"popularity\": 552307\n  },\n  {\n    \"tag\": "pustulated woodchat",\n    \"popularity\": 546129\n  },\n  {\n    \"tag\": "antepast",\n    \"popularity\": 540057\n  },\n  {\n    \"tag\": "sagittoid matrimoniously",\n    \"popularity\": 534091\n  },\n  {\n    \"tag\": "Albizzia",\n    \"popularity\": 528228\n  },\n  {\n    \"tag\": "Elateridae unnewness",\n    \"popularity\": 522464\n  },\n  {\n    \"tag\": "convertingness",\n    \"popularity\": 516798\n  },\n  {\n    \"tag\": "Pelew",\n    \"popularity\": 511228\n  },\n  {\n    \"tag\": "recapitulation",\n    \"popularity\": 505751\n  },\n  {\n    \"tag\": "shack",\n    \"popularity\": 500365\n  },\n  {\n    \"tag\": "unmellowed",\n    \"popularity\": 495069\n  },\n  {\n    \"tag\": "pavis capering",\n    \"popularity\": 489859\n  },\n  {\n    \"tag\": "fanfare",\n    \"popularity\": 484735\n  },\n  {\n    \"tag\": "sole",\n    \"popularity\": 479695\n  },\n  {\n    \"tag\": "subarcuate",\n    \"popularity\": 474735\n  },\n  {\n    \"tag\": "multivious",\n    \"popularity\": 469856\n  },\n  {\n    \"tag\": "squandermania",\n    \"popularity\": 465054\n  },\n  {\n    \"tag\": "scintle",\n    \"popularity\": 460329\n  },\n  {\n    \"tag\": "hash chirognomic",\n    \"popularity\": 455679\n  },\n  {\n    \"tag\": "linseed",\n    \"popularity\": 451101\n  },\n  {\n    \"tag\": "redoubtable",\n    \"popularity\": 446596\n  },\n  {\n    \"tag\": "poachy reimpact",\n    \"popularity\": 442160\n  },\n  {\n    \"tag\": "limestone",\n    \"popularity\": 437792\n  },\n  {\n    \"tag\": "serranid",\n    \"popularity\": 433492\n  },\n  {\n    \"tag\": "pohna",\n    \"popularity\": 429258\n  },\n  {\n    \"tag\": "warwolf",\n    \"popularity\": 425088\n  },\n  {\n    \"tag\": "ruthenous",\n    \"popularity\": 420981\n  },\n  {\n    \"tag\": "dover",\n    \"popularity\": 416935\n  },\n  {\n    \"tag\": "deuteroalbumose",\n    \"popularity\": 412950\n  },\n  {\n    \"tag\": "pseudoprophetic",\n    \"popularity\": 409025\n  },\n  {\n    \"tag\": "dissoluteness",\n    \"popularity\": 405157\n  },\n  {\n    \"tag\": "preinvention",\n    \"popularity\": 401347\n  },\n  {\n    \"tag\": "swagbellied",\n    \"popularity\": 397592\n  },\n  {\n    \"tag\": "Ophidia",\n    \"popularity\": 393892\n  },\n  {\n    \"tag\": "equanimity",\n    \"popularity\": 390245\n  },\n  {\n    \"tag\": "troutful",\n    \"popularity\": 386651\n  },\n  {\n    \"tag\": "uke",\n    \"popularity\": 383108\n  },\n  {\n    \"tag\": "preacquaint",\n    \"popularity\": 379616\n  },\n  {\n    \"tag\": "shoq",\n    \"popularity\": 376174\n  },\n  {\n    \"tag\": "yox",\n    \"popularity\": 372780\n  },\n  {\n    \"tag\": "unelemental",\n    \"popularity\": 369434\n  },\n  {\n    \"tag\": "Yavapai",\n    \"popularity\": 366134\n  },\n  {\n    \"tag\": "joulean",\n    \"popularity\": 362880\n  },\n  {\n    \"tag\": "dracontine",\n    \"popularity\": 359672\n  },\n  {\n    \"tag\": "hardmouth",\n    \"popularity\": 356507\n  },\n  {\n    \"tag\": "sylvanize",\n    \"popularity\": 353386\n  },\n  {\n    \"tag\": "intraparenchymatous meadowbur",\n    \"popularity\": 350308\n  },\n  {\n    \"tag\": "uncharily",\n    \"popularity\": 347271\n  },\n  {\n    \"tag\": "redtab flexibly",\n    \"popularity\": 344275\n  },\n  {\n    \"tag\": "centervelic",\n    \"popularity\": 341319\n  },\n  {\n    \"tag\": "unravellable",\n    \"popularity\": 338403\n  },\n  {\n    \"tag\": "infortunately",\n    \"popularity\": 335526\n  },\n  {\n    \"tag\": "cannel",\n    \"popularity\": 332687\n  },\n  {\n    \"tag\": "oxyblepsia",\n    \"popularity\": 329885\n  },\n  {\n    \"tag\": "Damon",\n    \"popularity\": 327120\n  },\n  {\n    \"tag\": "etherin",\n    \"popularity\": 324391\n  },\n  {\n    \"tag\": "luminal",\n    \"popularity\": 321697\n  },\n  {\n    \"tag\": "interrogatorily presbyte",\n    \"popularity\": 319038\n  },\n  {\n    \"tag\": "hemiclastic",\n    \"popularity\": 316414\n  },\n  {\n    \"tag\": "poh flush",\n    \"popularity\": 313823\n  },\n  {\n    \"tag\": "Psoroptes",\n    \"popularity\": 311265\n  },\n  {\n    \"tag\": "dispirit",\n    \"popularity\": 308740\n  },\n  {\n    \"tag\": "nashgab",\n    \"popularity\": 306246\n  },\n  {\n    \"tag\": "Aphidiinae",\n    \"popularity\": 303784\n  },\n  {\n    \"tag\": "rhapsody nonconstruction",\n    \"popularity\": 301353\n  },\n  {\n    \"tag\": "Osmond",\n    \"popularity\": 298952\n  },\n  {\n    \"tag\": "Leonis",\n    \"popularity\": 296581\n  },\n  {\n    \"tag\": "Lemnian",\n    \"popularity\": 294239\n  },\n  {\n    \"tag\": "acetonic gnathonic",\n    \"popularity\": 291926\n  },\n  {\n    \"tag\": "surculus",\n    \"popularity\": 289641\n  },\n  {\n    \"tag\": "diagonally",\n    \"popularity\": 287384\n  },\n  {\n    \"tag\": "counterpenalty",\n    \"popularity\": 285154\n  },\n  {\n    \"tag\": "Eugenie",\n    \"popularity\": 282952\n  },\n  {\n    \"tag\": "hornbook",\n    \"popularity\": 280776\n  },\n  {\n    \"tag\": "miscoin",\n    \"popularity\": 278626\n  },\n  {\n    \"tag\": "admi",\n    \"popularity\": 276501\n  },\n  {\n    \"tag\": "Tarmac",\n    \"popularity\": 274402\n  },\n  {\n    \"tag\": "inexplicable",\n    \"popularity\": 272328\n  },\n  {\n    \"tag\": "rascallion",\n    \"popularity\": 270278\n  },\n  {\n    \"tag\": "dusterman",\n    \"popularity\": 268252\n  },\n  {\n    \"tag\": "osteostomous unhoroscopic",\n    \"popularity\": 266250\n  },\n  {\n    \"tag\": "spinibulbar",\n    \"popularity\": 264271\n  },\n  {\n    \"tag\": "phototelegraphically",\n    \"popularity\": 262315\n  },\n  {\n    \"tag\": "Manihot",\n    \"popularity\": 260381\n  },\n  {\n    \"tag\": "neighborhood",\n    \"popularity\": 258470\n  },\n  {\n    \"tag\": "Vincetoxicum",\n    \"popularity\": 256581\n  },\n  {\n    \"tag\": "khirka",\n    \"popularity\": 254713\n  },\n  {\n    \"tag\": "conscriptive",\n    \"popularity\": 252866\n  },\n  {\n    \"tag\": "synechthran",\n    \"popularity\": 251040\n  },\n  {\n    \"tag\": "Guttiferales",\n    \"popularity\": 249235\n  },\n  {\n    \"tag\": "roomful",\n    \"popularity\": 247450\n  },\n  {\n    \"tag\": "germinal",\n    \"popularity\": 245685\n  },\n  {\n    \"tag\": "untraitorous",\n    \"popularity\": 243939\n  },\n  {\n    \"tag\": "nondissenting",\n    \"popularity\": 242213\n  },\n  {\n    \"tag\": "amotion",\n    \"popularity\": 240506\n  },\n  {\n    \"tag\": "badious",\n    \"popularity\": 238817\n  },\n  {\n    \"tag\": "sumpit",\n    \"popularity\": 237147\n  },\n  {\n    \"tag\": "ectozoic",\n    \"popularity\": 235496\n  },\n  {\n    \"tag\": "elvet",\n    \"popularity\": 233862\n  },\n  {\n    \"tag\": "underclerk",\n    \"popularity\": 232246\n  },\n  {\n    \"tag\": "reticency",\n    \"popularity\": 230647\n  },\n  {\n    \"tag\": "neutroclusion",\n    \"popularity\": 229065\n  },\n  {\n    \"tag\": "unbelieving",\n    \"popularity\": 227500\n  },\n  {\n    \"tag\": "histogenetic",\n    \"popularity\": 225952\n  },\n  {\n    \"tag\": "dermamyiasis",\n    \"popularity\": 224421\n  },\n  {\n    \"tag\": "telenergy",\n    \"popularity\": 222905\n  },\n  {\n    \"tag\": "axiomatic",\n    \"popularity\": 221406\n  },\n  {\n    \"tag\": "undominoed",\n    \"popularity\": 219922\n  },\n  {\n    \"tag\": "periosteoma",\n    \"popularity\": 218454\n  },\n  {\n    \"tag\": "justiciaryship",\n    \"popularity\": 217001\n  },\n  {\n    \"tag\": "autoluminescence",\n    \"popularity\": 215563\n  },\n  {\n    \"tag\": "osmous",\n    \"popularity\": 214140\n  },\n  {\n    \"tag\": "borgh",\n    \"popularity\": 212731\n  },\n  {\n    \"tag\": "bedebt",\n    \"popularity\": 211337\n  },\n  {\n    \"tag\": "considerableness adenoidism",\n    \"popularity\": 209957\n  },\n  {\n    \"tag\": "sailorizing",\n    \"popularity\": 208592\n  },\n  {\n    \"tag\": "Montauk",\n    \"popularity\": 207240\n  },\n  {\n    \"tag\": "Bridget",\n    \"popularity\": 205901\n  },\n  {\n    \"tag\": "Gekkota",\n    \"popularity\": 204577\n  },\n  {\n    \"tag\": "subcorymbose",\n    \"popularity\": 203265\n  },\n  {\n    \"tag\": "undersap",\n    \"popularity\": 201967\n  },\n  {\n    \"tag\": "poikilothermic",\n    \"popularity\": 200681\n  },\n  {\n    \"tag\": "enneatical",\n    \"popularity\": 199409\n  },\n  {\n    \"tag\": "martinetism",\n    \"popularity\": 198148\n  },\n  {\n    \"tag\": "sustanedly",\n    \"popularity\": 196901\n  },\n  {\n    \"tag\": "declaration",\n    \"popularity\": 195665\n  },\n  {\n    \"tag\": "myringoplasty",\n    \"popularity\": 194442\n  },\n  {\n    \"tag\": "Ginkgo",\n    \"popularity\": 193230\n  },\n  {\n    \"tag\": "unrecurrent",\n    \"popularity\": 192031\n  },\n  {\n    \"tag\": "proprecedent",\n    \"popularity\": 190843\n  },\n  {\n    \"tag\": "roadman",\n    \"popularity\": 189666\n  },\n  {\n    \"tag\": "elemin",\n    \"popularity\": 188501\n  },\n  {\n    \"tag\": "maggot",\n    \"popularity\": 187347\n  },\n  {\n    \"tag\": "alitrunk",\n    \"popularity\": 186204\n  },\n  {\n    \"tag\": "introspection",\n    \"popularity\": 185071\n  },\n  {\n    \"tag\": "batiker",\n    \"popularity\": 183950\n  },\n  {\n    \"tag\": "backhatch oversettle",\n    \"popularity\": 182839\n  },\n  {\n    \"tag\": "thresherman",\n    \"popularity\": 181738\n  },\n  {\n    \"tag\": "protemperance",\n    \"popularity\": 180648\n  },\n  {\n    \"tag\": "undern",\n    \"popularity\": 179568\n  },\n  {\n    \"tag\": "tweeg",\n    \"popularity\": 178498\n  },\n  {\n    \"tag\": "crosspath",\n    \"popularity\": 177438\n  },\n  {\n    \"tag\": "Tangaridae",\n    \"popularity\": 176388\n  },\n  {\n    \"tag\": "scrutation",\n    \"popularity\": 175348\n  },\n  {\n    \"tag\": "piecemaker",\n    \"popularity\": 174317\n  },\n  {\n    \"tag\": "paster",\n    \"popularity\": 173296\n  },\n  {\n    \"tag\": "unpretendingness",\n    \"popularity\": 172284\n  },\n  {\n    \"tag\": "inframundane",\n    \"popularity\": 171281\n  },\n  {\n    \"tag\": "kiblah",\n    \"popularity\": 170287\n  },\n  {\n    \"tag\": "playwrighting",\n    \"popularity\": 169302\n  },\n  {\n    \"tag\": "gonepoiesis snowslip",\n    \"popularity\": 168326\n  },\n  {\n    \"tag\": "hoodwise",\n    \"popularity\": 167359\n  },\n  {\n    \"tag\": "postseason",\n    \"popularity\": 166401\n  },\n  {\n    \"tag\": "equivocality",\n    \"popularity\": 165451\n  },\n  {\n    \"tag\": "Opiliaceae nuclease",\n    \"popularity\": 164509\n  },\n  {\n    \"tag\": "sextipara",\n    \"popularity\": 163576\n  },\n  {\n    \"tag\": "weeper",\n    \"popularity\": 162651\n  },\n  {\n    \"tag\": "frambesia",\n    \"popularity\": 161735\n  },\n  {\n    \"tag\": "answerable",\n    \"popularity\": 160826\n  },\n  {\n    \"tag\": "Trichosporum",\n    \"popularity\": 159925\n  },\n  {\n    \"tag\": "cajuputol",\n    \"popularity\": 159033\n  },\n  {\n    \"tag\": "pleomorphous",\n    \"popularity\": 158148\n  },\n  {\n    \"tag\": "aculeolate",\n    \"popularity\": 157270\n  },\n  {\n    \"tag\": "wherever",\n    \"popularity\": 156400\n  },\n  {\n    \"tag\": "collapse",\n    \"popularity\": 155538\n  },\n  {\n    \"tag\": "porky",\n    \"popularity\": 154683\n  },\n  {\n    \"tag\": "perule",\n    \"popularity\": 153836\n  },\n  {\n    \"tag\": "Nevada",\n    \"popularity\": 152996\n  },\n  {\n    \"tag\": "conalbumin",\n    \"popularity\": 152162\n  },\n  {\n    \"tag\": "tsunami",\n    \"popularity\": 151336\n  },\n  {\n    \"tag\": "Gulf",\n    \"popularity\": 150517\n  },\n  {\n    \"tag\": "hertz",\n    \"popularity\": 149705\n  },\n  {\n    \"tag\": "limmock",\n    \"popularity\": 148900\n  },\n  {\n    \"tag\": "Tartarize",\n    \"popularity\": 148101\n  },\n  {\n    \"tag\": "entosphenoid",\n    \"popularity\": 147310\n  },\n  {\n    \"tag\": "ibis",\n    \"popularity\": 146524\n  },\n  {\n    \"tag\": "unyeaned",\n    \"popularity\": 145746\n  },\n  {\n    \"tag\": "tritural",\n    \"popularity\": 144973\n  },\n  {\n    \"tag\": "hundredary",\n    \"popularity\": 144207\n  },\n  {\n    \"tag\": "stolonlike",\n    \"popularity\": 143448\n  },\n  {\n    \"tag\": "chorister",\n    \"popularity\": 142694\n  },\n  {\n    \"tag\": "mismove",\n    \"popularity\": 141947\n  },\n  {\n    \"tag\": "Andine",\n    \"popularity\": 141206\n  },\n  {\n    \"tag\": "Annette proneur escribe",\n    \"popularity\": 140471\n  },\n  {\n    \"tag\": "exoperidium",\n    \"popularity\": 139742\n  },\n  {\n    \"tag\": "disedge",\n    \"popularity\": 139019\n  },\n  {\n    \"tag\": "hypochloruria",\n    \"popularity\": 138302\n  },\n  {\n    \"tag\": "prepupa",\n    \"popularity\": 137590\n  },\n  {\n    \"tag\": "assent",\n    \"popularity\": 136884\n  },\n  {\n    \"tag\": "hydrazobenzene",\n    \"popularity\": 136184\n  },\n  {\n    \"tag\": "emballonurid",\n    \"popularity\": 135489\n  },\n  {\n    \"tag\": "roselle",\n    \"popularity\": 134800\n  },\n  {\n    \"tag\": "unifiedly",\n    \"popularity\": 134117\n  },\n  {\n    \"tag\": "clang",\n    \"popularity\": 133439\n  },\n  {\n    \"tag\": "acetolytic",\n    \"popularity\": 132766\n  },\n  {\n    \"tag\": "cladodont",\n    \"popularity\": 132098\n  },\n  {\n    \"tag\": "recoast",\n    \"popularity\": 131436\n  },\n  {\n    \"tag\": "celebrated tydie Eocarboniferous",\n    \"popularity\": 130779\n  },\n  {\n    \"tag\": "superconsciousness",\n    \"popularity\": 130127\n  },\n  {\n    \"tag\": "soberness",\n    \"popularity\": 129480\n  },\n  {\n    \"tag\": "panoramist",\n    \"popularity\": 128838\n  },\n  {\n    \"tag\": "Orbitolina",\n    \"popularity\": 128201\n  },\n  {\n    \"tag\": "overlewd",\n    \"popularity\": 127569\n  },\n  {\n    \"tag\": "demiquaver",\n    \"popularity\": 126942\n  },\n  {\n    \"tag\": "kamelaukion",\n    \"popularity\": 126319\n  },\n  {\n    \"tag\": "flancard",\n    \"popularity\": 125702\n  },\n  {\n    \"tag\": "tricuspid",\n    \"popularity\": 125089\n  },\n  {\n    \"tag\": "bepelt",\n    \"popularity\": 124480\n  },\n  {\n    \"tag\": "decuplet",\n    \"popularity\": 123877\n  },\n  {\n    \"tag\": "Rockies",\n    \"popularity\": 123278\n  },\n  {\n    \"tag\": "unforgeability",\n    \"popularity\": 122683\n  },\n  {\n    \"tag\": "mocha",\n    \"popularity\": 122093\n  },\n  {\n    \"tag\": "scrunge",\n    \"popularity\": 121507\n  },\n  {\n    \"tag\": "delighter",\n    \"popularity\": 120926\n  },\n  {\n    \"tag\": "willey Microtinae",\n    \"popularity\": 120349\n  },\n  {\n    \"tag\": "unhuntable",\n    \"popularity\": 119777\n  },\n  {\n    \"tag\": "historically",\n    \"popularity\": 119208\n  },\n  {\n    \"tag\": "vicegerentship",\n    \"popularity\": 118644\n  },\n  {\n    \"tag\": "hemangiosarcoma",\n    \"popularity\": 118084\n  },\n  {\n    \"tag\": "harpago",\n    \"popularity\": 117528\n  },\n  {\n    \"tag\": "unionoid",\n    \"popularity\": 116976\n  },\n  {\n    \"tag\": "wiseman",\n    \"popularity\": 116429\n  },\n  {\n    \"tag\": "diclinism",\n    \"popularity\": 115885\n  },\n  {\n    \"tag\": "Maud",\n    \"popularity\": 115345\n  },\n  {\n    \"tag\": "scaphocephalism",\n    \"popularity\": 114809\n  },\n  {\n    \"tag\": "obtenebration",\n    \"popularity\": 114277\n  },\n  {\n    \"tag\": "cymar predreadnought",\n    \"popularity\": 113749\n  },\n  {\n    \"tag\": "discommend",\n    \"popularity\": 113225\n  },\n  {\n    \"tag\": "crude",\n    \"popularity\": 112704\n  },\n  {\n    \"tag\": "upflash",\n    \"popularity\": 112187\n  },\n  {\n    \"tag\": "saltimbank",\n    \"popularity\": 111674\n  },\n  {\n    \"tag\": "posthysterical",\n    \"popularity\": 111165\n  },\n  {\n    \"tag\": "trample",\n    \"popularity\": 110659\n  },\n  {\n    \"tag\": "ungirthed",\n    \"popularity\": 110157\n  },\n  {\n    \"tag\": "unshakable",\n    \"popularity\": 109658\n  },\n  {\n    \"tag\": "hepatocystic",\n    \"popularity\": 109163\n  },\n  {\n    \"tag\": "psammophyte",\n    \"popularity\": 108671\n  },\n  {\n    \"tag\": "millionfold",\n    \"popularity\": 108183\n  },\n  {\n    \"tag\": "outtaste",\n    \"popularity\": 107698\n  },\n  {\n    \"tag\": "poppycockish",\n    \"popularity\": 107217\n  },\n  {\n    \"tag\": "viduine",\n    \"popularity\": 106739\n  },\n  {\n    \"tag\": "pleasureman",\n    \"popularity\": 106264\n  },\n  {\n    \"tag\": "cholesterolemia",\n    \"popularity\": 105792\n  },\n  {\n    \"tag\": "hostlerwife",\n    \"popularity\": 105324\n  },\n  {\n    \"tag\": "figure undergrass",\n    \"popularity\": 104859\n  },\n  {\n    \"tag\": "bedrape",\n    \"popularity\": 104398\n  },\n  {\n    \"tag\": "nuttishness",\n    \"popularity\": 103939\n  },\n  {\n    \"tag\": "fow",\n    \"popularity\": 103484\n  },\n  {\n    \"tag\": "rachianesthesia",\n    \"popularity\": 103031\n  },\n  {\n    \"tag\": "recruitable",\n    \"popularity\": 102582\n  },\n  {\n    \"tag\": "semianatomical Oenotheraceae",\n    \"popularity\": 102136\n  },\n  {\n    \"tag\": "extracapsular",\n    \"popularity\": 101693\n  },\n  {\n    \"tag\": "unsigneted",\n    \"popularity\": 101253\n  },\n  {\n    \"tag\": "fissural",\n    \"popularity\": 100816\n  },\n  {\n    \"tag\": "ayous",\n    \"popularity\": 100381\n  },\n  {\n    \"tag\": "crestfallenness odontograph",\n    \"popularity\": 99950\n  },\n  {\n    \"tag\": "monopodium",\n    \"popularity\": 99522\n  },\n  {\n    \"tag\": "germfree",\n    \"popularity\": 99096\n  },\n  {\n    \"tag\": "dauphin",\n    \"popularity\": 98673\n  },\n  {\n    \"tag\": "nonagesimal",\n    \"popularity\": 98254\n  },\n  {\n    \"tag\": "waterchat",\n    \"popularity\": 97836\n  },\n  {\n    \"tag\": "Entelodon",\n    \"popularity\": 97422\n  },\n  {\n    \"tag\": "semischolastic",\n    \"popularity\": 97010\n  },\n  {\n    \"tag\": "somata",\n    \"popularity\": 96602\n  },\n  {\n    \"tag\": "expositorily",\n    \"popularity\": 96195\n  },\n  {\n    \"tag\": "bass",\n    \"popularity\": 95792\n  },\n  {\n    \"tag\": "calorimetry",\n    \"popularity\": 95391\n  },\n  {\n    \"tag\": "entireness",\n    \"popularity\": 94993\n  },\n  {\n    \"tag\": "ratline soppiness",\n    \"popularity\": 94597\n  },\n  {\n    \"tag\": "shor",\n    \"popularity\": 94204\n  },\n  {\n    \"tag\": "coprecipitation",\n    \"popularity\": 93813\n  },\n  {\n    \"tag\": "unblushingly",\n    \"popularity\": 93425\n  },\n  {\n    \"tag\": "macarize",\n    \"popularity\": 93040\n  },\n  {\n    \"tag\": "scruplesomeness",\n    \"popularity\": 92657\n  },\n  {\n    \"tag\": "offsaddle",\n    \"popularity\": 92276\n  },\n  {\n    \"tag\": "hypertragical",\n    \"popularity\": 91898\n  },\n  {\n    \"tag\": "uncassock loined",\n    \"popularity\": 91522\n  },\n  {\n    \"tag\": "interlobate",\n    \"popularity\": 91149\n  },\n  {\n    \"tag\": "releasor orrisroot stoloniferously",\n    \"popularity\": 90778\n  },\n  {\n    \"tag\": "elementoid",\n    \"popularity\": 90410\n  },\n  {\n    \"tag\": "Lentilla",\n    \"popularity\": 90043\n  },\n  {\n    \"tag\": "distressing",\n    \"popularity\": 89679\n  },\n  {\n    \"tag\": "hydrodrome",\n    \"popularity\": 89318\n  },\n  {\n    \"tag\": "Jeannette",\n    \"popularity\": 88958\n  },\n  {\n    \"tag\": "Kuli",\n    \"popularity\": 88601\n  },\n  {\n    \"tag\": "taxinomist",\n    \"popularity\": 88246\n  },\n  {\n    \"tag\": "southwestwardly",\n    \"popularity\": 87894\n  },\n  {\n    \"tag\": "polyparia",\n    \"popularity\": 87543\n  },\n  {\n    \"tag\": "exmeridian",\n    \"popularity\": 87195\n  },\n  {\n    \"tag\": "splenius regimentaled",\n    \"popularity\": 86849\n  },\n  {\n    \"tag\": "Sphaeropsidaceae",\n    \"popularity\": 86505\n  },\n  {\n    \"tag\": "unbegun",\n    \"popularity\": 86163\n  },\n  {\n    \"tag\": "something",\n    \"popularity\": 85823\n  },\n  {\n    \"tag\": "contaminable nonexpulsion",\n    \"popularity\": 85486\n  },\n  {\n    \"tag\": "douser",\n    \"popularity\": 85150\n  },\n  {\n    \"tag\": "prostrike",\n    \"popularity\": 84817\n  },\n  {\n    \"tag\": "worky",\n    \"popularity\": 84485\n  },\n  {\n    \"tag\": "folliful",\n    \"popularity\": 84156\n  },\n  {\n    \"tag\": "prioracy",\n    \"popularity\": 83828\n  },\n  {\n    \"tag\": "undermentioned",\n    \"popularity\": 83503\n  },\n  {\n    \"tag\": "Judaica",\n    \"popularity\": 83179\n  },\n  {\n    \"tag\": "multifarious",\n    \"popularity\": 82858\n  },\n  {\n    \"tag\": "poogye",\n    \"popularity\": 82538\n  },\n  {\n    \"tag\": "Sparganium",\n    \"popularity\": 82221\n  },\n  {\n    \"tag\": "thurrock",\n    \"popularity\": 81905\n  },\n  {\n    \"tag\": "outblush",\n    \"popularity\": 81591\n  },\n  {\n    \"tag\": "Strophanthus supraordination",\n    \"popularity\": 81279\n  },\n  {\n    \"tag\": "gingerroot",\n    \"popularity\": 80969\n  },\n  {\n    \"tag\": "unconscient",\n    \"popularity\": 80661\n  },\n  {\n    \"tag\": "unconstitutionally",\n    \"popularity\": 80354\n  },\n  {\n    \"tag\": "plaguily",\n    \"popularity\": 80050\n  },\n  {\n    \"tag\": "waterily equatorwards",\n    \"popularity\": 79747\n  },\n  {\n    \"tag\": "nondeposition",\n    \"popularity\": 79446\n  },\n  {\n    \"tag\": "dronishly",\n    \"popularity\": 79147\n  },\n  {\n    \"tag\": "gateado",\n    \"popularity\": 78849\n  },\n  {\n    \"tag\": "dislink",\n    \"popularity\": 78553\n  },\n  {\n    \"tag\": "Joceline",\n    \"popularity\": 78259\n  },\n  {\n    \"tag\": "amphiboliferous",\n    \"popularity\": 77967\n  },\n  {\n    \"tag\": "bushrope",\n    \"popularity\": 77676\n  },\n  {\n    \"tag\": "plumicorn sulphosalicylic",\n    \"popularity\": 77387\n  },\n  {\n    \"tag\": "nonefficiency",\n    \"popularity\": 77100\n  },\n  {\n    \"tag\": "hieroscopy",\n    \"popularity\": 76815\n  },\n  {\n    \"tag\": "causativeness",\n    \"popularity\": 76531\n  },\n  {\n    \"tag\": "swird paleoeremology",\n    \"popularity\": 76249\n  },\n  {\n    \"tag\": "camphoric",\n    \"popularity\": 75968\n  },\n  {\n    \"tag\": "retaining",\n    \"popularity\": 75689\n  },\n  {\n    \"tag\": "thyreoprotein",\n    \"popularity\": 75411\n  },\n  {\n    \"tag\": "carbona",\n    \"popularity\": 75136\n  },\n  {\n    \"tag\": "protectively",\n    \"popularity\": 74861\n  },\n  {\n    \"tag\": "mosasaur",\n    \"popularity\": 74589\n  },\n  {\n    \"tag\": "reciprocator",\n    \"popularity\": 74317\n  },\n  {\n    \"tag\": "detentive",\n    \"popularity\": 74048\n  },\n  {\n    \"tag\": "supravital",\n    \"popularity\": 73780\n  },\n  {\n    \"tag\": "Vespertilionidae",\n    \"popularity\": 73513\n  },\n  {\n    \"tag\": "parka",\n    \"popularity\": 73248\n  },\n  {\n    \"tag\": "pickaway",\n    \"popularity\": 72984\n  },\n  {\n    \"tag\": "oleaceous",\n    \"popularity\": 72722\n  },\n  {\n    \"tag\": "anticogitative",\n    \"popularity\": 72462\n  },\n  {\n    \"tag\": "woe",\n    \"popularity\": 72203\n  },\n  {\n    \"tag\": "skeuomorph",\n    \"popularity\": 71945\n  },\n  {\n    \"tag\": "helpmeet",\n    \"popularity\": 71689\n  },\n  {\n    \"tag\": "Hexactinellida brickmaking",\n    \"popularity\": 71434\n  },\n  {\n    \"tag\": "resink",\n    \"popularity\": 71180\n  },\n  {\n    \"tag\": "diluter",\n    \"popularity\": 70928\n  },\n  {\n    \"tag\": "micromicron",\n    \"popularity\": 70677\n  },\n  {\n    \"tag\": "parentage",\n    \"popularity\": 70428\n  },\n  {\n    \"tag\": "galactorrhoea",\n    \"popularity\": 70180\n  },\n  {\n    \"tag\": "gey",\n    \"popularity\": 69934\n  },\n  {\n    \"tag\": "gesticulatory",\n    \"popularity\": 69689\n  },\n  {\n    \"tag\": "wergil",\n    \"popularity\": 69445\n  },\n  {\n    \"tag\": "Lecanora",\n    \"popularity\": 69202\n  },\n  {\n    \"tag\": "malanders karst",\n    \"popularity\": 68961\n  },\n  {\n    \"tag\": "vibetoite",\n    \"popularity\": 68721\n  },\n  {\n    \"tag\": "unrequitedness",\n    \"popularity\": 68483\n  },\n  {\n    \"tag\": "outwash",\n    \"popularity\": 68245\n  },\n  {\n    \"tag\": "unsacred",\n    \"popularity\": 68009\n  },\n  {\n    \"tag\": "unabetted dividend",\n    \"popularity\": 67775\n  },\n  {\n    \"tag\": "untraveling",\n    \"popularity\": 67541\n  },\n  {\n    \"tag\": "thermobattery",\n    \"popularity\": 67309\n  },\n  {\n    \"tag\": "polypragmist",\n    \"popularity\": 67078\n  },\n  {\n    \"tag\": "irrefutableness",\n    \"popularity\": 66848\n  },\n  {\n    \"tag\": "remiges",\n    \"popularity\": 66620\n  },\n  {\n    \"tag\": "implode",\n    \"popularity\": 66393\n  },\n  {\n    \"tag\": "superfluousness",\n    \"popularity\": 66166\n  },\n  {\n    \"tag\": "croakily unalleviated",\n    \"popularity\": 65942\n  },\n  {\n    \"tag\": "edicule",\n    \"popularity\": 65718\n  },\n  {\n    \"tag\": "entophytous",\n    \"popularity\": 65495\n  },\n  {\n    \"tag\": "benefactorship Toryish",\n    \"popularity\": 65274\n  },\n  {\n    \"tag\": "pseudoamateurish",\n    \"popularity\": 65054\n  },\n  {\n    \"tag\": "flueless Iguanodontoidea snipnose",\n    \"popularity\": 64835\n  },\n  {\n    \"tag\": "zealotical Zamicrus interpole",\n    \"popularity\": 64617\n  },\n  {\n    \"tag\": "whereabout",\n    \"popularity\": 64401\n  },\n  {\n    \"tag\": "benzazide",\n    \"popularity\": 64185\n  },\n  {\n    \"tag\": "pokeweed",\n    \"popularity\": 63971\n  },\n  {\n    \"tag\": "calamitoid",\n    \"popularity\": 63757\n  },\n  {\n    \"tag\": "sporozoal",\n    \"popularity\": 63545\n  },\n  {\n    \"tag\": "physcioid Welshwoman",\n    \"popularity\": 63334\n  },\n  {\n    \"tag\": "wanting",\n    \"popularity\": 63124\n  },\n  {\n    \"tag\": "unencumbering",\n    \"popularity\": 62915\n  },\n  {\n    \"tag\": "Tupi",\n    \"popularity\": 62707\n  },\n  {\n    \"tag\": "potbank",\n    \"popularity\": 62501\n  },\n  {\n    \"tag\": "bulked",\n    \"popularity\": 62295\n  },\n  {\n    \"tag\": "uparise",\n    \"popularity\": 62090\n  },\n  {\n    \"tag\": "Sudra",\n    \"popularity\": 61887\n  },\n  {\n    \"tag\": "hyperscrupulosity",\n    \"popularity\": 61684\n  },\n  {\n    \"tag\": "subterraneously unmaid",\n    \"popularity\": 61483\n  },\n  {\n    \"tag\": "poisonousness",\n    \"popularity\": 61282\n  },\n  {\n    \"tag\": "phare",\n    \"popularity\": 61083\n  },\n  {\n    \"tag\": "dicynodont",\n    \"popularity\": 60884\n  },\n  {\n    \"tag\": "chewer",\n    \"popularity\": 60687\n  },\n  {\n    \"tag\": "uliginous",\n    \"popularity\": 60490\n  },\n  {\n    \"tag\": "tinman",\n    \"popularity\": 60295\n  },\n  {\n    \"tag\": "coconut",\n    \"popularity\": 60100\n  },\n  {\n    \"tag\": "phryganeoid",\n    \"popularity\": 59907\n  },\n  {\n    \"tag\": "bismillah",\n    \"popularity\": 59714\n  },\n  {\n    \"tag\": "tautomeric",\n    \"popularity\": 59523\n  },\n  {\n    \"tag\": "jerquer",\n    \"popularity\": 59332\n  },\n  {\n    \"tag\": "Dryopithecinae",\n    \"popularity\": 59143\n  },\n  {\n    \"tag\": "ghizite",\n    \"popularity\": 58954\n  },\n  {\n    \"tag\": "unliveable",\n    \"popularity\": 58766\n  },\n  {\n    \"tag\": "craftsmaster",\n    \"popularity\": 58579\n  },\n  {\n    \"tag\": "semiscenic",\n    \"popularity\": 58394\n  },\n  {\n    \"tag\": "danaid",\n    \"popularity\": 58209\n  },\n  {\n    \"tag\": "flawful",\n    \"popularity\": 58025\n  },\n  {\n    \"tag\": "risibleness",\n    \"popularity\": 57841\n  },\n  {\n    \"tag\": "Muscovite",\n    \"popularity\": 57659\n  },\n  {\n    \"tag\": "snaringly",\n    \"popularity\": 57478\n  },\n  {\n    \"tag\": "brilliantwise",\n    \"popularity\": 57297\n  },\n  {\n    \"tag\": "plebeity",\n    \"popularity\": 57118\n  },\n  {\n    \"tag\": "historicalness",\n    \"popularity\": 56939\n  },\n  {\n    \"tag\": "piecemeal",\n    \"popularity\": 56761\n  },\n  {\n    \"tag\": "maxillipedary",\n    \"popularity\": 56584\n  },\n  {\n    \"tag\": "Hypenantron",\n    \"popularity\": 56408\n  },\n  {\n    \"tag\": "quaintness avigate",\n    \"popularity\": 56233\n  },\n  {\n    \"tag\": "ave",\n    \"popularity\": 56059\n  },\n  {\n    \"tag\": "mediaevally",\n    \"popularity\": 55885\n  },\n  {\n    \"tag\": "brucite",\n    \"popularity\": 55712\n  },\n  {\n    \"tag\": "Schwendenerian",\n    \"popularity\": 55541\n  },\n  {\n    \"tag\": "julole",\n    \"popularity\": 55370\n  },\n  {\n    \"tag\": "palaeolith",\n    \"popularity\": 55199\n  },\n  {\n    \"tag\": "cotyledonary",\n    \"popularity\": 55030\n  },\n  {\n    \"tag\": "rond",\n    \"popularity\": 54861\n  },\n  {\n    \"tag\": "boomster tassoo",\n    \"popularity\": 54694\n  },\n  {\n    \"tag\": "cattishly",\n    \"popularity\": 54527\n  },\n  {\n    \"tag\": "tonguefence",\n    \"popularity\": 54360\n  },\n  {\n    \"tag\": "hexastylar triskele",\n    \"popularity\": 54195\n  },\n  {\n    \"tag\": "ariot",\n    \"popularity\": 54030\n  },\n  {\n    \"tag\": "intarsist",\n    \"popularity\": 53867\n  },\n  {\n    \"tag\": "Oscines",\n    \"popularity\": 53704\n  },\n  {\n    \"tag\": "Spaniolize",\n    \"popularity\": 53541\n  },\n  {\n    \"tag\": "smellfungus",\n    \"popularity\": 53380\n  },\n  {\n    \"tag\": "redisplay",\n    \"popularity\": 53219\n  },\n  {\n    \"tag\": "phosphene",\n    \"popularity\": 53059\n  },\n  {\n    \"tag\": "phycomycete",\n    \"popularity\": 52900\n  },\n  {\n    \"tag\": "prophetic",\n    \"popularity\": 52741\n  },\n  {\n    \"tag\": "overtrustful",\n    \"popularity\": 52584\n  },\n  {\n    \"tag\": "pinitol",\n    \"popularity\": 52427\n  },\n  {\n    \"tag\": "asthmatic",\n    \"popularity\": 52270\n  },\n  {\n    \"tag\": "convulsive",\n    \"popularity\": 52115\n  },\n  {\n    \"tag\": "draughtswoman",\n    \"popularity\": 51960\n  },\n  {\n    \"tag\": "unetymologizable",\n    \"popularity\": 51806\n  },\n  {\n    \"tag\": "centrarchoid",\n    \"popularity\": 51652\n  },\n  {\n    \"tag\": "mesioincisal",\n    \"popularity\": 51500\n  },\n  {\n    \"tag\": "transbaikal",\n    \"popularity\": 51348\n  },\n  {\n    \"tag\": "silveriness",\n    \"popularity\": 51196\n  },\n  {\n    \"tag\": "costotomy",\n    \"popularity\": 51046\n  },\n  {\n    \"tag\": "caracore",\n    \"popularity\": 50896\n  },\n  {\n    \"tag\": "depotentiation",\n    \"popularity\": 50747\n  },\n  {\n    \"tag\": "glossoepiglottidean",\n    \"popularity\": 50598\n  },\n  {\n    \"tag\": "upswell",\n    \"popularity\": 50450\n  },\n  {\n    \"tag\": "flecnodal",\n    \"popularity\": 50303\n  },\n  {\n    \"tag\": "coventrate",\n    \"popularity\": 50157\n  },\n  {\n    \"tag\": "duchesse",\n    \"popularity\": 50011\n  },\n  {\n    \"tag\": "excisemanship trophied",\n    \"popularity\": 49866\n  },\n  {\n    \"tag\": "cytinaceous",\n    \"popularity\": 49721\n  },\n  {\n    \"tag\": "assuringly",\n    \"popularity\": 49577\n  },\n  {\n    \"tag\": "unconducted upliftitis",\n    \"popularity\": 49434\n  },\n  {\n    \"tag\": "rachicentesis",\n    \"popularity\": 49292\n  },\n  {\n    \"tag\": "antiangular",\n    \"popularity\": 49150\n  },\n  {\n    \"tag\": "advisal",\n    \"popularity\": 49008\n  },\n  {\n    \"tag\": "birdcatcher",\n    \"popularity\": 48868\n  },\n  {\n    \"tag\": "secularistic",\n    \"popularity\": 48728\n  },\n  {\n    \"tag\": "grandeeism superinformal",\n    \"popularity\": 48588\n  },\n  {\n    \"tag\": "unapprehension",\n    \"popularity\": 48449\n  },\n  {\n    \"tag\": "excipulum",\n    \"popularity\": 48311\n  },\n  {\n    \"tag\": "decimole",\n    \"popularity\": 48174\n  },\n  {\n    \"tag\": "semidrachm",\n    \"popularity\": 48037\n  },\n  {\n    \"tag\": "uvulotome",\n    \"popularity\": 47901\n  },\n  {\n    \"tag\": "Lemaneaceae",\n    \"popularity\": 47765\n  },\n  {\n    \"tag\": "corrade",\n    \"popularity\": 47630\n  },\n  {\n    \"tag\": "Kuroshio",\n    \"popularity\": 47495\n  },\n  {\n    \"tag\": "Araliophyllum",\n    \"popularity\": 47361\n  },\n  {\n    \"tag\": "victoriousness cardiosphygmograph",\n    \"popularity\": 47228\n  },\n  {\n    \"tag\": "reinvent",\n    \"popularity\": 47095\n  },\n  {\n    \"tag\": "Macrotolagus",\n    \"popularity\": 46963\n  },\n  {\n    \"tag\": "strenuousness",\n    \"popularity\": 46831\n  },\n  {\n    \"tag\": "deviability",\n    \"popularity\": 46700\n  },\n  {\n    \"tag\": "phyllospondylous",\n    \"popularity\": 46570\n  },\n  {\n    \"tag\": "bisect rudderhole",\n    \"popularity\": 46440\n  },\n  {\n    \"tag\": "crownwork",\n    \"popularity\": 46311\n  },\n  {\n    \"tag\": "Ascalabota",\n    \"popularity\": 46182\n  },\n  {\n    \"tag\": "prostatomyomectomy",\n    \"popularity\": 46054\n  },\n  {\n    \"tag\": "neurosyphilis",\n    \"popularity\": 45926\n  },\n  {\n    \"tag\": "tabloid scraplet",\n    \"popularity\": 45799\n  },\n  {\n    \"tag\": "nonmedullated servility",\n    \"popularity\": 45673\n  },\n  {\n    \"tag\": "melopoeic practicalization",\n    \"popularity\": 45547\n  },\n  {\n    \"tag\": "nonrhythmic",\n    \"popularity\": 45421\n  },\n  {\n    \"tag\": "deplorer",\n    \"popularity\": 45296\n  },\n  {\n    \"tag\": "Ophion",\n    \"popularity\": 45172\n  },\n  {\n    \"tag\": "subprioress",\n    \"popularity\": 45048\n  },\n  {\n    \"tag\": "semiregular",\n    \"popularity\": 44925\n  },\n  {\n    \"tag\": "praelection",\n    \"popularity\": 44802\n  },\n  {\n    \"tag\": "discinct",\n    \"popularity\": 44680\n  },\n  {\n    \"tag\": "preplace",\n    \"popularity\": 44558\n  },\n  {\n    \"tag\": "paternoster",\n    \"popularity\": 44437\n  },\n  {\n    \"tag\": "suboccipital",\n    \"popularity\": 44316\n  },\n  {\n    \"tag\": "Teutophil",\n    \"popularity\": 44196\n  },\n  {\n    \"tag\": "tracheole",\n    \"popularity\": 44076\n  },\n  {\n    \"tag\": "subsmile",\n    \"popularity\": 43957\n  },\n  {\n    \"tag\": "nonapostatizing",\n    \"popularity\": 43839\n  },\n  {\n    \"tag\": "cleidotomy",\n    \"popularity\": 43720\n  },\n  {\n    \"tag\": "hingle",\n    \"popularity\": 43603\n  },\n  {\n    \"tag\": "jocoque",\n    \"popularity\": 43486\n  },\n  {\n    \"tag\": "trundler notidanian",\n    \"popularity\": 43369\n  },\n  {\n    \"tag\": "strangling misdaub",\n    \"popularity\": 43253\n  },\n  {\n    \"tag\": "noncancellable",\n    \"popularity\": 43137\n  },\n  {\n    \"tag\": "lavabo",\n    \"popularity\": 43022\n  },\n  {\n    \"tag\": "lanterloo",\n    \"popularity\": 42907\n  },\n  {\n    \"tag\": "uncitizenly",\n    \"popularity\": 42793\n  },\n  {\n    \"tag\": "autoturning",\n    \"popularity\": 42679\n  },\n  {\n    \"tag\": "Haganah",\n    \"popularity\": 42566\n  },\n  {\n    \"tag\": "Glecoma",\n    \"popularity\": 42453\n  },\n  {\n    \"tag\": "membered",\n    \"popularity\": 42341\n  },\n  {\n    \"tag\": "consuetudinal",\n    \"popularity\": 42229\n  },\n  {\n    \"tag\": "gatehouse",\n    \"popularity\": 42117\n  },\n  {\n    \"tag\": "tetherball",\n    \"popularity\": 42006\n  },\n  {\n    \"tag\": "counterrevolutionist numismatical",\n    \"popularity\": 41896\n  },\n  {\n    \"tag\": "pagehood plateiasmus",\n    \"popularity\": 41786\n  },\n  {\n    \"tag\": "pelterer",\n    \"popularity\": 41676\n  },\n  {\n    \"tag\": "splenemphraxis",\n    \"popularity\": 41567\n  },\n  {\n    \"tag\": "Crypturidae",\n    \"popularity\": 41458\n  },\n  {\n    \"tag\": "caboodle",\n    \"popularity\": 41350\n  },\n  {\n    \"tag\": "Filaria",\n    \"popularity\": 41242\n  },\n  {\n    \"tag\": "noninvincibility",\n    \"popularity\": 41135\n  },\n  {\n    \"tag\": "preadvertisement",\n    \"popularity\": 41028\n  },\n  {\n    \"tag\": "bathrobe",\n    \"popularity\": 40921\n  },\n  {\n    \"tag\": "nitrifier",\n    \"popularity\": 40815\n  },\n  {\n    \"tag\": "furthermore",\n    \"popularity\": 40709\n  },\n  {\n    \"tag\": "recrate",\n    \"popularity\": 40604\n  },\n  {\n    \"tag\": "inexist",\n    \"popularity\": 40499\n  },\n  {\n    \"tag\": "Mocoan",\n    \"popularity\": 40395\n  },\n  {\n    \"tag\": "forint",\n    \"popularity\": 40291\n  },\n  {\n    \"tag\": "cardiomyoliposis",\n    \"popularity\": 40187\n  },\n  {\n    \"tag\": "channeling",\n    \"popularity\": 40084\n  },\n  {\n    \"tag\": "quebrachine",\n    \"popularity\": 39981\n  },\n  {\n    \"tag\": "magistery",\n    \"popularity\": 39879\n  },\n  {\n    \"tag\": "koko",\n    \"popularity\": 39777\n  },\n  {\n    \"tag\": "nobilify",\n    \"popularity\": 39676\n  },\n  {\n    \"tag\": "articulate taprooted",\n    \"popularity\": 39575\n  },\n  {\n    \"tag\": "cardiotonic Nicaragua",\n    \"popularity\": 39474\n  },\n  {\n    \"tag\": "assertiveness",\n    \"popularity\": 39374\n  },\n  {\n    \"tag\": "springtail",\n    \"popularity\": 39274\n  },\n  {\n    \"tag\": "spontoon",\n    \"popularity\": 39174\n  },\n  {\n    \"tag\": "plesiobiosis",\n    \"popularity\": 39075\n  },\n  {\n    \"tag\": "rooinek",\n    \"popularity\": 38976\n  },\n  {\n    \"tag\": "hairif falsehood",\n    \"popularity\": 38878\n  },\n  {\n    \"tag\": "synodally",\n    \"popularity\": 38780\n  },\n  {\n    \"tag\": "biodynamics",\n    \"popularity\": 38683\n  },\n  {\n    \"tag\": "trickling",\n    \"popularity\": 38585\n  },\n  {\n    \"tag\": "oxfly daystar",\n    \"popularity\": 38489\n  },\n  {\n    \"tag\": "epicycloidal",\n    \"popularity\": 38392\n  },\n  {\n    \"tag\": "shorthand",\n    \"popularity\": 38296\n  },\n  {\n    \"tag\": "herpolhode",\n    \"popularity\": 38201\n  },\n  {\n    \"tag\": "polysynthesism",\n    \"popularity\": 38105\n  },\n  {\n    \"tag\": "cany",\n    \"popularity\": 38010\n  },\n  {\n    \"tag\": "sideage",\n    \"popularity\": 37916\n  },\n  {\n    \"tag\": "strainableness",\n    \"popularity\": 37822\n  },\n  {\n    \"tag\": "superformidable",\n    \"popularity\": 37728\n  },\n  {\n    \"tag\": "slendang",\n    \"popularity\": 37634\n  },\n  {\n    \"tag\": "impropriation",\n    \"popularity\": 37541\n  },\n  {\n    \"tag\": "ficklehearted",\n    \"popularity\": 37449\n  },\n  {\n    \"tag\": "wintrify",\n    \"popularity\": 37356\n  },\n  {\n    \"tag\": "geomorphogenist",\n    \"popularity\": 37264\n  },\n  {\n    \"tag\": "smuggleable",\n    \"popularity\": 37173\n  },\n  {\n    \"tag\": "delapsion",\n    \"popularity\": 37081\n  },\n  {\n    \"tag\": "projective",\n    \"popularity\": 36990\n  },\n  {\n    \"tag\": "unglue exfoliation",\n    \"popularity\": 36900\n  },\n  {\n    \"tag\": "Acerae",\n    \"popularity\": 36810\n  },\n  {\n    \"tag\": "unstaged",\n    \"popularity\": 36720\n  },\n  {\n    \"tag\": "ranal",\n    \"popularity\": 36630\n  },\n  {\n    \"tag\": "worrier",\n    \"popularity\": 36541\n  },\n  {\n    \"tag\": "unhid",\n    \"popularity\": 36452\n  },\n  {\n    \"tag\": "adequation",\n    \"popularity\": 36363\n  },\n  {\n    \"tag\": "strongylid Sokotri",\n    \"popularity\": 36275\n  },\n  {\n    \"tag\": "fumingly",\n    \"popularity\": 36187\n  },\n  {\n    \"tag\": "gynosporangium phaenogenetic",\n    \"popularity\": 36100\n  },\n  {\n    \"tag\": "uniunguiculate",\n    \"popularity\": 36012\n  },\n  {\n    \"tag\": "prudelike",\n    \"popularity\": 35926\n  },\n  {\n    \"tag\": "seminomata",\n    \"popularity\": 35839\n  },\n  {\n    \"tag\": "trinklet",\n    \"popularity\": 35753\n  },\n  {\n    \"tag\": "risorial",\n    \"popularity\": 35667\n  },\n  {\n    \"tag\": "pericardiocentesis",\n    \"popularity\": 35581\n  },\n  {\n    \"tag\": "filmist",\n    \"popularity\": 35496\n  },\n  {\n    \"tag\": "Nana",\n    \"popularity\": 35411\n  },\n  {\n    \"tag\": "cynipoid",\n    \"popularity\": 35326\n  },\n  {\n    \"tag\": "cteniform",\n    \"popularity\": 35242\n  },\n  {\n    \"tag\": "semiflex",\n    \"popularity\": 35158\n  },\n  {\n    \"tag\": "solstitially",\n    \"popularity\": 35074\n  },\n  {\n    \"tag\": "Algarsife",\n    \"popularity\": 34991\n  },\n  {\n    \"tag\": "noncriminal",\n    \"popularity\": 34908\n  },\n  {\n    \"tag\": "compassion",\n    \"popularity\": 34825\n  },\n  {\n    \"tag\": "Buddhic",\n    \"popularity\": 34743\n  },\n  {\n    \"tag\": "vellicative dactylically hotfoot",\n    \"popularity\": 34661\n  },\n  {\n    \"tag\": "chicory",\n    \"popularity\": 34579\n  },\n  {\n    \"tag\": "transperitoneally",\n    \"popularity\": 34497\n  },\n  {\n    \"tag\": "pennae",\n    \"popularity\": 34416\n  },\n  {\n    \"tag\": "Flamandize",\n    \"popularity\": 34335\n  },\n  {\n    \"tag\": "underviewer",\n    \"popularity\": 34254\n  },\n  {\n    \"tag\": "assoil",\n    \"popularity\": 34174\n  },\n  {\n    \"tag\": "saccharobacillus",\n    \"popularity\": 34094\n  },\n  {\n    \"tag\": "biacetylene",\n    \"popularity\": 34014\n  },\n  {\n    \"tag\": "mouchardism",\n    \"popularity\": 33935\n  },\n  {\n    \"tag\": "anisomeric",\n    \"popularity\": 33856\n  },\n  {\n    \"tag\": "digestive",\n    \"popularity\": 33777\n  },\n  {\n    \"tag\": "darlingly",\n    \"popularity\": 33698\n  },\n  {\n    \"tag\": "liman",\n    \"popularity\": 33620\n  },\n  {\n    \"tag\": "soldanrie",\n    \"popularity\": 33542\n  },\n  {\n    \"tag\": "sully",\n    \"popularity\": 33464\n  },\n  {\n    \"tag\": "brightsmith",\n    \"popularity\": 33387\n  },\n  {\n    \"tag\": "inwrap antiliturgist ureterocervical",\n    \"popularity\": 33309\n  },\n  {\n    \"tag\": "discommodity",\n    \"popularity\": 33232\n  },\n  {\n    \"tag\": "typical aggrandizer",\n    \"popularity\": 33156\n  },\n  {\n    \"tag\": "xenogeny",\n    \"popularity\": 33079\n  },\n  {\n    \"tag\": "uncountrified",\n    \"popularity\": 33003\n  },\n  {\n    \"tag\": "Podarge",\n    \"popularity\": 32928\n  },\n  {\n    \"tag\": "uninterviewed",\n    \"popularity\": 32852\n  },\n  {\n    \"tag\": "underprior",\n    \"popularity\": 32777\n  },\n  {\n    \"tag\": "leiomyomatous",\n    \"popularity\": 32702\n  },\n  {\n    \"tag\": "postdysenteric",\n    \"popularity\": 32627\n  },\n  {\n    \"tag\": "Fusicladium",\n    \"popularity\": 32553\n  },\n  {\n    \"tag\": "Dulcinea",\n    \"popularity\": 32478\n  },\n  {\n    \"tag\": "interspersion",\n    \"popularity\": 32404\n  },\n  {\n    \"tag\": "preobligate",\n    \"popularity\": 32331\n  },\n  {\n    \"tag\": "subaggregate",\n    \"popularity\": 32257\n  },\n  {\n    \"tag\": "grammarianism",\n    \"popularity\": 32184\n  },\n  {\n    \"tag\": "palikar",\n    \"popularity\": 32111\n  },\n  {\n    \"tag\": "facileness",\n    \"popularity\": 32039\n  },\n  {\n    \"tag\": "deuterofibrinose",\n    \"popularity\": 31966\n  },\n  {\n    \"tag\": "pseudesthesia",\n    \"popularity\": 31894\n  },\n  {\n    \"tag\": "sedimentary",\n    \"popularity\": 31822\n  },\n  {\n    \"tag\": "typewrite",\n    \"popularity\": 31751\n  },\n  {\n    \"tag\": "immemorable",\n    \"popularity\": 31679\n  },\n  {\n    \"tag\": "Myrtus",\n    \"popularity\": 31608\n  },\n  {\n    \"tag\": "hauchecornite",\n    \"popularity\": 31537\n  },\n  {\n    \"tag\": "galleylike",\n    \"popularity\": 31467\n  },\n  {\n    \"tag\": "thimber",\n    \"popularity\": 31396\n  },\n  {\n    \"tag\": "Hegelianism",\n    \"popularity\": 31326\n  },\n  {\n    \"tag\": "strig",\n    \"popularity\": 31256\n  },\n  {\n    \"tag\": "skyre",\n    \"popularity\": 31187\n  },\n  {\n    \"tag\": "eupepticism",\n    \"popularity\": 31117\n  },\n  {\n    \"tag\": "eponymism",\n    \"popularity\": 31048\n  },\n  {\n    \"tag\": "flunkeyhood",\n    \"popularity\": 30979\n  },\n  {\n    \"tag\": "Abama",\n    \"popularity\": 30911\n  },\n  {\n    \"tag\": "adiadochokinesis",\n    \"popularity\": 30842\n  },\n  {\n    \"tag\": "spendthrifty",\n    \"popularity\": 30774\n  },\n  {\n    \"tag\": "chalcedony",\n    \"popularity\": 30706\n  },\n  {\n    \"tag\": "authorism",\n    \"popularity\": 30638\n  },\n  {\n    \"tag\": "nasturtium",\n    \"popularity\": 30571\n  },\n  {\n    \"tag\": "Acanthocereus",\n    \"popularity\": 30504\n  },\n  {\n    \"tag\": "uncollapsible",\n    \"popularity\": 30437\n  },\n  {\n    \"tag\": "excursionist",\n    \"popularity\": 30370\n  },\n  {\n    \"tag\": "fogbow",\n    \"popularity\": 30303\n  },\n  {\n    \"tag\": "overlie",\n    \"popularity\": 30237\n  },\n  {\n    \"tag\": "velours",\n    \"popularity\": 30171\n  },\n  {\n    \"tag\": "zoodendria madrigal stagbush",\n    \"popularity\": 30105\n  },\n  {\n    \"tag\": "imi",\n    \"popularity\": 30039\n  },\n  {\n    \"tag\": "cojudge",\n    \"popularity\": 29974\n  },\n  {\n    \"tag\": "depurate argal",\n    \"popularity\": 29909\n  },\n  {\n    \"tag\": "unrecognition",\n    \"popularity\": 29844\n  },\n  {\n    \"tag\": "paunchful",\n    \"popularity\": 29779\n  },\n  {\n    \"tag\": "invalued",\n    \"popularity\": 29714\n  },\n  {\n    \"tag\": "probang",\n    \"popularity\": 29650\n  },\n  {\n    \"tag\": "chetvert",\n    \"popularity\": 29586\n  },\n  {\n    \"tag\": "enactable",\n    \"popularity\": 29522\n  },\n  {\n    \"tag\": "detoxicate adhibit",\n    \"popularity\": 29458\n  },\n  {\n    \"tag\": "kullaite",\n    \"popularity\": 29395\n  },\n  {\n    \"tag\": "undazzling",\n    \"popularity\": 29332\n  },\n  {\n    \"tag\": "excalation",\n    \"popularity\": 29269\n  },\n  {\n    \"tag\": "sievings",\n    \"popularity\": 29206\n  },\n  {\n    \"tag\": "disenthral",\n    \"popularity\": 29143\n  },\n  {\n    \"tag\": "disinterestedly",\n    \"popularity\": 29081\n  },\n  {\n    \"tag\": "stanner",\n    \"popularity\": 29018\n  },\n  {\n    \"tag\": "recapitulative",\n    \"popularity\": 28956\n  },\n  {\n    \"tag\": "objectivist",\n    \"popularity\": 28895\n  },\n  {\n    \"tag\": "hypermetropia",\n    \"popularity\": 28833\n  },\n  {\n    \"tag\": "incumbency",\n    \"popularity\": 28772\n  },\n  {\n    \"tag\": "protegee",\n    \"popularity\": 28711\n  },\n  {\n    \"tag\": "zealotic",\n    \"popularity\": 28650\n  },\n  {\n    \"tag\": "predebit",\n    \"popularity\": 28589\n  },\n  {\n    \"tag\": "cupolar",\n    \"popularity\": 28528\n  },\n  {\n    \"tag\": "unattributed",\n    \"popularity\": 28468\n  },\n  {\n    \"tag\": "louisine",\n    \"popularity\": 28408\n  },\n  {\n    \"tag\": "illustrate",\n    \"popularity\": 28348\n  },\n  {\n    \"tag\": "inofficiousness",\n    \"popularity\": 28288\n  },\n  {\n    \"tag\": "Americawards",\n    \"popularity\": 28228\n  },\n  {\n    \"tag\": "foreflap",\n    \"popularity\": 28169\n  },\n  {\n    \"tag\": "eruditeness",\n    \"popularity\": 28110\n  },\n  {\n    \"tag\": "copiopsia",\n    \"popularity\": 28051\n  },\n  {\n    \"tag\": "sporuliferous",\n    \"popularity\": 27992\n  },\n  {\n    \"tag\": "muttering",\n    \"popularity\": 27934\n  },\n  {\n    \"tag\": "prepsychology adrip",\n    \"popularity\": 27875\n  },\n  {\n    \"tag\": "unfriendly",\n    \"popularity\": 27817\n  },\n  {\n    \"tag\": "sulphanilic",\n    \"popularity\": 27759\n  },\n  {\n    \"tag\": "Coelococcus",\n    \"popularity\": 27701\n  },\n  {\n    \"tag\": "undoubtfulness",\n    \"popularity\": 27643\n  },\n  {\n    \"tag\": "flaringly",\n    \"popularity\": 27586\n  },\n  {\n    \"tag\": "unordain",\n    \"popularity\": 27529\n  },\n  {\n    \"tag\": "fratchety",\n    \"popularity\": 27472\n  },\n  {\n    \"tag\": "decadentism dolefully",\n    \"popularity\": 27415\n  },\n  {\n    \"tag\": "synthronus",\n    \"popularity\": 27358\n  },\n  {\n    \"tag\": "maiid",\n    \"popularity\": 27301\n  },\n  {\n    \"tag\": "rhinobyon",\n    \"popularity\": 27245\n  },\n  {\n    \"tag\": "Didynamia",\n    \"popularity\": 27189\n  },\n  {\n    \"tag\": "millionairedom",\n    \"popularity\": 27133\n  },\n  {\n    \"tag\": "mulierine",\n    \"popularity\": 27077\n  },\n  {\n    \"tag\": "Mayo",\n    \"popularity\": 27021\n  },\n  {\n    \"tag\": "perceivedness",\n    \"popularity\": 26966\n  },\n  {\n    \"tag\": "unadoration",\n    \"popularity\": 26911\n  },\n  {\n    \"tag\": "regraft",\n    \"popularity\": 26856\n  },\n  {\n    \"tag\": "witch",\n    \"popularity\": 26801\n  },\n  {\n    \"tag\": "ungrow",\n    \"popularity\": 26746\n  },\n  {\n    \"tag\": "glossopharyngeus",\n    \"popularity\": 26691\n  },\n  {\n    \"tag\": "unstirrable",\n    \"popularity\": 26637\n  },\n  {\n    \"tag\": "synodsman",\n    \"popularity\": 26583\n  },\n  {\n    \"tag\": "placentalian",\n    \"popularity\": 26529\n  },\n  {\n    \"tag\": "corpulently",\n    \"popularity\": 26475\n  },\n  {\n    \"tag\": "photochromoscope",\n    \"popularity\": 26421\n  },\n  {\n    \"tag\": "indusiate retinasphaltum chokestrap",\n    \"popularity\": 26368\n  },\n  {\n    \"tag\": "murdrum",\n    \"popularity\": 26314\n  },\n  {\n    \"tag\": "belatedness",\n    \"popularity\": 26261\n  },\n  {\n    \"tag\": "Cochin",\n    \"popularity\": 26208\n  },\n  {\n    \"tag\": "Leonist",\n    \"popularity\": 26155\n  },\n  {\n    \"tag\": "keeker confined",\n    \"popularity\": 26102\n  },\n  {\n    \"tag\": "unintellectual",\n    \"popularity\": 26050\n  },\n  {\n    \"tag\": "nymphaline bait",\n    \"popularity\": 25997\n  },\n  {\n    \"tag\": "sarcosporidiosis",\n    \"popularity\": 25945\n  },\n  {\n    \"tag\": "catawamptiously",\n    \"popularity\": 25893\n  },\n  {\n    \"tag\": "outshame",\n    \"popularity\": 25841\n  },\n  {\n    \"tag\": "animalism",\n    \"popularity\": 25790\n  },\n  {\n    \"tag\": "epithalamial",\n    \"popularity\": 25738\n  },\n  {\n    \"tag\": "ganner",\n    \"popularity\": 25687\n  },\n  {\n    \"tag\": "desilicify",\n    \"popularity\": 25635\n  },\n  {\n    \"tag\": "dandyism",\n    \"popularity\": 25584\n  },\n  {\n    \"tag\": "hyleg",\n    \"popularity\": 25533\n  },\n  {\n    \"tag\": "photophysical",\n    \"popularity\": 25483\n  },\n  {\n    \"tag\": "underload",\n    \"popularity\": 25432\n  },\n  {\n    \"tag\": "unintrusive",\n    \"popularity\": 25382\n  },\n  {\n    \"tag\": "succinamic",\n    \"popularity\": 25331\n  },\n  {\n    \"tag\": "matchy",\n    \"popularity\": 25281\n  },\n  {\n    \"tag\": "concordal",\n    \"popularity\": 25231\n  },\n  {\n    \"tag\": "exteriority",\n    \"popularity\": 25181\n  },\n  {\n    \"tag\": "sterculiad",\n    \"popularity\": 25132\n  },\n  {\n    \"tag\": "sulfoxylic",\n    \"popularity\": 25082\n  },\n  {\n    \"tag\": "oversubscription",\n    \"popularity\": 25033\n  },\n  {\n    \"tag\": "chiasmic",\n    \"popularity\": 24984\n  },\n  {\n    \"tag\": "pseudoparthenogenesis",\n    \"popularity\": 24935\n  },\n  {\n    \"tag\": "indorse",\n    \"popularity\": 24886\n  },\n  {\n    \"tag\": "Krishnaite",\n    \"popularity\": 24837\n  },\n  {\n    \"tag\": "calcinize",\n    \"popularity\": 24788\n  },\n  {\n    \"tag\": "rhodium",\n    \"popularity\": 24740\n  },\n  {\n    \"tag\": "tragopan",\n    \"popularity\": 24692\n  },\n  {\n    \"tag\": "overwhelmingly",\n    \"popularity\": 24643\n  },\n  {\n    \"tag\": "procidence accorporate",\n    \"popularity\": 24595\n  },\n  {\n    \"tag\": "polemize speelless",\n    \"popularity\": 24548\n  },\n  {\n    \"tag\": "radiocarpal goran",\n    \"popularity\": 24500\n  },\n  {\n    \"tag\": "counteroffer Pelodytes",\n    \"popularity\": 24452\n  },\n  {\n    \"tag\": "lionhearted",\n    \"popularity\": 24405\n  },\n  {\n    \"tag\": "paramastoid",\n    \"popularity\": 24358\n  },\n  {\n    \"tag\": "murine",\n    \"popularity\": 24310\n  },\n  {\n    \"tag\": "woodbined",\n    \"popularity\": 24263\n  },\n  {\n    \"tag\": "packthread",\n    \"popularity\": 24217\n  },\n  {\n    \"tag\": "citreous",\n    \"popularity\": 24170\n  },\n  {\n    \"tag\": "unfallaciously",\n    \"popularity\": 24123\n  },\n  {\n    \"tag\": "tentwork reincarnadine",\n    \"popularity\": 24077\n  },\n  {\n    \"tag\": "verminousness",\n    \"popularity\": 24030\n  },\n  {\n    \"tag\": "sillometer",\n    \"popularity\": 23984\n  },\n  {\n    \"tag\": "jointy",\n    \"popularity\": 23938\n  },\n  {\n    \"tag\": "streptolysin",\n    \"popularity\": 23892\n  },\n  {\n    \"tag\": "Florentinism",\n    \"popularity\": 23847\n  },\n  {\n    \"tag\": "monosomatous",\n    \"popularity\": 23801\n  },\n  {\n    \"tag\": "capsulociliary",\n    \"popularity\": 23756\n  },\n  {\n    \"tag\": "organum",\n    \"popularity\": 23710\n  },\n  {\n    \"tag\": "overtly",\n    \"popularity\": 23665\n  },\n  {\n    \"tag\": "ophthalmoscopical",\n    \"popularity\": 23620\n  },\n  {\n    \"tag\": "supposititiously",\n    \"popularity\": 23575\n  },\n  {\n    \"tag\": "radiochemistry",\n    \"popularity\": 23530\n  },\n  {\n    \"tag\": "flaxtail",\n    \"popularity\": 23486\n  },\n  {\n    \"tag\": "pretympanic",\n    \"popularity\": 23441\n  },\n  {\n    \"tag\": "auscultation",\n    \"popularity\": 23397\n  },\n  {\n    \"tag\": "hairdresser",\n    \"popularity\": 23352\n  },\n  {\n    \"tag\": "chaffless",\n    \"popularity\": 23308\n  },\n  {\n    \"tag\": "polioencephalitis",\n    \"popularity\": 23264\n  },\n  {\n    \"tag\": "axolotl",\n    \"popularity\": 23220\n  },\n  {\n    \"tag\": "smous",\n    \"popularity\": 23177\n  },\n  {\n    \"tag\": "morgen disenamour toothed",\n    \"popularity\": 23133\n  },\n  {\n    \"tag\": "chaiseless",\n    \"popularity\": 23089\n  },\n  {\n    \"tag\": "frugally",\n    \"popularity\": 23046\n  },\n  {\n    \"tag\": "combustive antievolutionist cinenegative",\n    \"popularity\": 23003\n  },\n  {\n    \"tag\": "malacolite",\n    \"popularity\": 22960\n  },\n  {\n    \"tag\": "borne",\n    \"popularity\": 22917\n  },\n  {\n    \"tag\": "mercaptole",\n    \"popularity\": 22874\n  },\n  {\n    \"tag\": "judicatory",\n    \"popularity\": 22831\n  },\n  {\n    \"tag\": "noctivagation",\n    \"popularity\": 22789\n  },\n  {\n    \"tag\": "synthete",\n    \"popularity\": 22746\n  },\n  {\n    \"tag\": "tomboyism",\n    \"popularity\": 22704\n  },\n  {\n    \"tag\": "serranoid",\n    \"popularity\": 22661\n  },\n  {\n    \"tag\": "impostorism",\n    \"popularity\": 22619\n  },\n  {\n    \"tag\": "flagellosis Talitha",\n    \"popularity\": 22577\n  },\n  {\n    \"tag\": "pseudoviscous",\n    \"popularity\": 22535\n  },\n  {\n    \"tag\": "Galleriidae",\n    \"popularity\": 22494\n  },\n  {\n    \"tag\": "undulation didelph Comintern",\n    \"popularity\": 22452\n  },\n  {\n    \"tag\": "triangulopyramidal",\n    \"popularity\": 22411\n  },\n  {\n    \"tag\": "middlings",\n    \"popularity\": 22369\n  },\n  {\n    \"tag\": "piperazin",\n    \"popularity\": 22328\n  },\n  {\n    \"tag\": "endostitis",\n    \"popularity\": 22287\n  },\n  {\n    \"tag\": "swordlike",\n    \"popularity\": 22246\n  },\n  {\n    \"tag\": "forthwith",\n    \"popularity\": 22205\n  },\n  {\n    \"tag\": "menaceful",\n    \"popularity\": 22164\n  },\n  {\n    \"tag\": "explantation defective",\n    \"popularity\": 22123\n  },\n  {\n    \"tag\": "arrear",\n    \"popularity\": 22083\n  },\n  {\n    \"tag\": "engraft",\n    \"popularity\": 22042\n  },\n  {\n    \"tag\": "revolunteer",\n    \"popularity\": 22002\n  },\n  {\n    \"tag\": "foliaceous",\n    \"popularity\": 21962\n  },\n  {\n    \"tag\": "pseudograph",\n    \"popularity\": 21922\n  },\n  {\n    \"tag\": "maenaite",\n    \"popularity\": 21882\n  },\n  {\n    \"tag\": "interfinger",\n    \"popularity\": 21842\n  },\n  {\n    \"tag\": "macroscopically",\n    \"popularity\": 21802\n  },\n  {\n    \"tag\": "bluewood",\n    \"popularity\": 21762\n  },\n  {\n    \"tag\": "chikara",\n    \"popularity\": 21723\n  },\n  {\n    \"tag\": "reprehension diazeuxis nickelous",\n    \"popularity\": 21683\n  },\n  {\n    \"tag\": "vacuation",\n    \"popularity\": 21644\n  },\n  {\n    \"tag\": "Sartish",\n    \"popularity\": 21605\n  },\n  {\n    \"tag\": "pseudogyny",\n    \"popularity\": 21566\n  },\n  {\n    \"tag\": "friedcake",\n    \"popularity\": 21527\n  },\n  {\n    \"tag\": "thraw",\n    \"popularity\": 21488\n  },\n  {\n    \"tag\": "bifid",\n    \"popularity\": 21449\n  },\n  {\n    \"tag\": "truthlessly",\n    \"popularity\": 21411\n  },\n  {\n    \"tag\": "lungy",\n    \"popularity\": 21372\n  },\n  {\n    \"tag\": "fluoborite",\n    \"popularity\": 21334\n  },\n  {\n    \"tag\": "anthropolithic",\n    \"popularity\": 21295\n  },\n  {\n    \"tag\": "coachee straw",\n    \"popularity\": 21257\n  },\n  {\n    \"tag\": "dehorner Grecize",\n    \"popularity\": 21219\n  },\n  {\n    \"tag\": "spondylopyosis",\n    \"popularity\": 21181\n  },\n  {\n    \"tag\": "institutionary",\n    \"popularity\": 21143\n  },\n  {\n    \"tag\": "agentry",\n    \"popularity\": 21105\n  },\n  {\n    \"tag\": "musing bietle",\n    \"popularity\": 21068\n  },\n  {\n    \"tag\": "cormophyte",\n    \"popularity\": 21030\n  },\n  {\n    \"tag\": "semielliptic",\n    \"popularity\": 20993\n  },\n  {\n    \"tag\": "ependytes",\n    \"popularity\": 20955\n  },\n  {\n    \"tag\": "coachmaster",\n    \"popularity\": 20918\n  },\n  {\n    \"tag\": "overexuberant",\n    \"popularity\": 20881\n  },\n  {\n    \"tag\": "selectable",\n    \"popularity\": 20844\n  },\n  {\n    \"tag\": "saclike",\n    \"popularity\": 20807\n  },\n  {\n    \"tag\": "mullion",\n    \"popularity\": 20770\n  },\n  {\n    \"tag\": "pantheonize prevalency",\n    \"popularity\": 20733\n  },\n  {\n    \"tag\": "trophosperm",\n    \"popularity\": 20697\n  },\n  {\n    \"tag\": "paraphrasist",\n    \"popularity\": 20660\n  },\n  {\n    \"tag\": "undercarry",\n    \"popularity\": 20624\n  },\n  {\n    \"tag\": "thallogenic",\n    \"popularity\": 20587\n  },\n  {\n    \"tag\": "bulgy forbid",\n    \"popularity\": 20551\n  },\n  {\n    \"tag\": "proliquor gratulatory",\n    \"popularity\": 20515\n  },\n  {\n    \"tag\": "booker",\n    \"popularity\": 20479\n  },\n  {\n    \"tag\": "wizen",\n    \"popularity\": 20443\n  },\n  {\n    \"tag\": "synchondrosially",\n    \"popularity\": 20407\n  },\n  {\n    \"tag\": "herbless",\n    \"popularity\": 20371\n  },\n  {\n    \"tag\": "arfvedsonite",\n    \"popularity\": 20336\n  },\n  {\n    \"tag\": "Neuroptera",\n    \"popularity\": 20300\n  },\n  {\n    \"tag\": "fingerstone",\n    \"popularity\": 20265\n  },\n  {\n    \"tag\": "Odontoglossae",\n    \"popularity\": 20229\n  },\n  {\n    \"tag\": "transmigrator",\n    \"popularity\": 20194\n  },\n  {\n    \"tag\": "Dehaites",\n    \"popularity\": 20159\n  },\n  {\n    \"tag\": "Molinist",\n    \"popularity\": 20124\n  },\n  {\n    \"tag\": "novelistic",\n    \"popularity\": 20089\n  },\n  {\n    \"tag\": "astelic",\n    \"popularity\": 20054\n  },\n  {\n    \"tag\": "pyelometry",\n    \"popularity\": 20019\n  },\n  {\n    \"tag\": "pigmentation",\n    \"popularity\": 19984\n  },\n  {\n    \"tag\": "epinaos",\n    \"popularity\": 19950\n  },\n  {\n    \"tag\": "outdare",\n    \"popularity\": 19915\n  },\n  {\n    \"tag\": "Funje philaristocracy",\n    \"popularity\": 19881\n  },\n  {\n    \"tag\": "keddah",\n    \"popularity\": 19846\n  },\n  {\n    \"tag\": "axoidean",\n    \"popularity\": 19812\n  },\n  {\n    \"tag\": "ovule",\n    \"popularity\": 19778\n  },\n  {\n    \"tag\": "solidify",\n    \"popularity\": 19744\n  },\n  {\n    \"tag\": "noncelestial",\n    \"popularity\": 19710\n  },\n  {\n    \"tag\": "overmultiplication",\n    \"popularity\": 19676\n  },\n  {\n    \"tag\": "hexatetrahedron",\n    \"popularity\": 19642\n  },\n  {\n    \"tag\": "pliciform",\n    \"popularity\": 19609\n  },\n  {\n    \"tag\": "zimbalon",\n    \"popularity\": 19575\n  },\n  {\n    \"tag\": "annexational",\n    \"popularity\": 19542\n  },\n  {\n    \"tag\": "eurhodol",\n    \"popularity\": 19508\n  },\n  {\n    \"tag\": "yark",\n    \"popularity\": 19475\n  },\n  {\n    \"tag\": "illegality nitroalizarin",\n    \"popularity\": 19442\n  },\n  {\n    \"tag\": "quadratum",\n    \"popularity\": 19409\n  },\n  {\n    \"tag\": "saccharine",\n    \"popularity\": 19376\n  },\n  {\n    \"tag\": "unemploy",\n    \"popularity\": 19343\n  },\n  {\n    \"tag\": "uniclinal unipotent",\n    \"popularity\": 19310\n  },\n  {\n    \"tag\": "turbo",\n    \"popularity\": 19277\n  },\n  {\n    \"tag\": "sybarism",\n    \"popularity\": 19244\n  },\n  {\n    \"tag\": "motacilline",\n    \"popularity\": 19212\n  },\n  {\n    \"tag\": "weaselly",\n    \"popularity\": 19179\n  },\n  {\n    \"tag\": "plastid",\n    \"popularity\": 19147\n  },\n  {\n    \"tag\": "wasting",\n    \"popularity\": 19114\n  },\n  {\n    \"tag\": "begrime fluting",\n    \"popularity\": 19082\n  },\n  {\n    \"tag\": "Nephilinae",\n    \"popularity\": 19050\n  },\n  {\n    \"tag\": "disregardance",\n    \"popularity\": 19018\n  },\n  {\n    \"tag\": "Shakerlike",\n    \"popularity\": 18986\n  },\n  {\n    \"tag\": "uniped",\n    \"popularity\": 18954\n  },\n  {\n    \"tag\": "knap",\n    \"popularity\": 18922\n  },\n  {\n    \"tag\": "electivism undergardener",\n    \"popularity\": 18890\n  },\n  {\n    \"tag\": "hulverheaded",\n    \"popularity\": 18858\n  },\n  {\n    \"tag\": "unruptured",\n    \"popularity\": 18827\n  },\n  {\n    \"tag\": "solemnize credently",\n    \"popularity\": 18795\n  },\n  {\n    \"tag\": "pentastomoid possessingly",\n    \"popularity\": 18764\n  },\n  {\n    \"tag\": "octose",\n    \"popularity\": 18733\n  },\n  {\n    \"tag\": "psithurism indefensibility",\n    \"popularity\": 18701\n  },\n  {\n    \"tag\": "torrentuous cyanometer subcrenate",\n    \"popularity\": 18670\n  },\n  {\n    \"tag\": "photoplaywright tapaculo",\n    \"popularity\": 18639\n  },\n  {\n    \"tag\": "univalence",\n    \"popularity\": 18608\n  },\n  {\n    \"tag\": "Porthetria",\n    \"popularity\": 18577\n  },\n  {\n    \"tag\": "funambulo",\n    \"popularity\": 18546\n  },\n  {\n    \"tag\": "pedion",\n    \"popularity\": 18515\n  },\n  {\n    \"tag\": "horticulturally",\n    \"popularity\": 18485\n  },\n  {\n    \"tag\": "marennin",\n    \"popularity\": 18454\n  },\n  {\n    \"tag\": "horselaugh",\n    \"popularity\": 18423\n  },\n  {\n    \"tag\": "semiexecutive",\n    \"popularity\": 18393\n  },\n  {\n    \"tag\": "Monopteridae",\n    \"popularity\": 18363\n  },\n  {\n    \"tag\": "commonable",\n    \"popularity\": 18332\n  },\n  {\n    \"tag\": "dreariment",\n    \"popularity\": 18302\n  },\n  {\n    \"tag\": "disbud",\n    \"popularity\": 18272\n  },\n  {\n    \"tag\": "monocled",\n    \"popularity\": 18242\n  },\n  {\n    \"tag\": "hurlbarrow",\n    \"popularity\": 18212\n  },\n  {\n    \"tag\": "opiateproof",\n    \"popularity\": 18182\n  },\n  {\n    \"tag\": "Fahrenheit",\n    \"popularity\": 18152\n  },\n  {\n    \"tag\": "writhed",\n    \"popularity\": 18122\n  },\n  {\n    \"tag\": "Volstead",\n    \"popularity\": 18093\n  },\n  {\n    \"tag\": "yesternight",\n    \"popularity\": 18063\n  },\n  {\n    \"tag\": "readmittance",\n    \"popularity\": 18033\n  },\n  {\n    \"tag\": "reiterable",\n    \"popularity\": 18004\n  },\n  {\n    \"tag\": "triquetral",\n    \"popularity\": 17975\n  },\n  {\n    \"tag\": "guillotinement",\n    \"popularity\": 17945\n  },\n  {\n    \"tag\": "repermission",\n    \"popularity\": 17916\n  },\n  {\n    \"tag\": "assishly",\n    \"popularity\": 17887\n  },\n  {\n    \"tag\": "daidle",\n    \"popularity\": 17858\n  },\n  {\n    \"tag\": "prismatoid",\n    \"popularity\": 17829\n  },\n  {\n    \"tag\": "irreptitious",\n    \"popularity\": 17800\n  },\n  {\n    \"tag\": "sourdeline",\n    \"popularity\": 17771\n  },\n  {\n    \"tag\": "Austrian",\n    \"popularity\": 17742\n  },\n  {\n    \"tag\": "psychorrhagic",\n    \"popularity\": 17713\n  },\n  {\n    \"tag\": "Monumbo",\n    \"popularity\": 17685\n  },\n  {\n    \"tag\": "cloiochoanitic",\n    \"popularity\": 17656\n  },\n  {\n    \"tag\": "hant",\n    \"popularity\": 17628\n  },\n  {\n    \"tag\": "roily pulldown",\n    \"popularity\": 17599\n  },\n  {\n    \"tag\": "recongratulation",\n    \"popularity\": 17571\n  },\n  {\n    \"tag\": "Peking",\n    \"popularity\": 17543\n  },\n  {\n    \"tag\": "erdvark",\n    \"popularity\": 17514\n  },\n  {\n    \"tag\": "antimnemonic",\n    \"popularity\": 17486\n  },\n  {\n    \"tag\": "noncapillarity",\n    \"popularity\": 17458\n  },\n  {\n    \"tag\": "irrepressive",\n    \"popularity\": 17430\n  },\n  {\n    \"tag\": "Petromyzontes",\n    \"popularity\": 17402\n  },\n  {\n    \"tag\": "piscatorially",\n    \"popularity\": 17374\n  },\n  {\n    \"tag\": "cholesterosis",\n    \"popularity\": 17346\n  },\n  {\n    \"tag\": "denunciate",\n    \"popularity\": 17319\n  },\n  {\n    \"tag\": "unmetalled",\n    \"popularity\": 17291\n  },\n  {\n    \"tag\": "Tigris enruin",\n    \"popularity\": 17263\n  },\n  {\n    \"tag\": "anaspalin",\n    \"popularity\": 17236\n  },\n  {\n    \"tag\": "monodromy",\n    \"popularity\": 17208\n  },\n  {\n    \"tag\": "Canichanan",\n    \"popularity\": 17181\n  },\n  {\n    \"tag\": "mesolabe",\n    \"popularity\": 17154\n  },\n  {\n    \"tag\": "trichothallic overcunningness",\n    \"popularity\": 17127\n  },\n  {\n    \"tag\": "spinsterishly",\n    \"popularity\": 17099\n  },\n  {\n    \"tag\": "sensilla",\n    \"popularity\": 17072\n  },\n  {\n    \"tag\": "wifelkin",\n    \"popularity\": 17045\n  },\n  {\n    \"tag\": "suppositionless",\n    \"popularity\": 17018\n  },\n  {\n    \"tag\": "irksomeness",\n    \"popularity\": 16991\n  },\n  {\n    \"tag\": "sanbenito",\n    \"popularity\": 16964\n  },\n  {\n    \"tag\": "nonstatement",\n    \"popularity\": 16938\n  },\n  {\n    \"tag\": "phenoloid",\n    \"popularity\": 16911\n  },\n  {\n    \"tag\": "Steinberger",\n    \"popularity\": 16884\n  },\n  {\n    \"tag\": "replicated boom",\n    \"popularity\": 16858\n  },\n  {\n    \"tag\": "sciomachiology",\n    \"popularity\": 16831\n  },\n  {\n    \"tag\": "starwise",\n    \"popularity\": 16805\n  },\n  {\n    \"tag\": "prerich",\n    \"popularity\": 16778\n  },\n  {\n    \"tag\": "unspawned",\n    \"popularity\": 16752\n  },\n  {\n    \"tag\": "unindentable",\n    \"popularity\": 16726\n  },\n  {\n    \"tag\": "stromatic",\n    \"popularity\": 16700\n  },\n  {\n    \"tag\": "fetishize",\n    \"popularity\": 16673\n  },\n  {\n    \"tag\": "dihydroxy",\n    \"popularity\": 16647\n  },\n  {\n    \"tag\": "precaudal",\n    \"popularity\": 16621\n  },\n  {\n    \"tag\": "Madagascar",\n    \"popularity\": 16595\n  },\n  {\n    \"tag\": "repinement",\n    \"popularity\": 16570\n  },\n  {\n    \"tag\": "noncathedral wenzel",\n    \"popularity\": 16544\n  },\n  {\n    \"tag\": "corollike",\n    \"popularity\": 16518\n  },\n  {\n    \"tag\": "pubes unamortization",\n    \"popularity\": 16492\n  },\n  {\n    \"tag\": "brickcroft",\n    \"popularity\": 16467\n  },\n  {\n    \"tag\": "intertrabecular",\n    \"popularity\": 16441\n  },\n  {\n    \"tag\": "formulaic",\n    \"popularity\": 16416\n  },\n  {\n    \"tag\": "arienzo",\n    \"popularity\": 16390\n  },\n  {\n    \"tag\": "Mazzinian",\n    \"popularity\": 16365\n  },\n  {\n    \"tag\": "wallowishly",\n    \"popularity\": 16339\n  },\n  {\n    \"tag\": "sysselman",\n    \"popularity\": 16314\n  },\n  {\n    \"tag\": "seligmannite",\n    \"popularity\": 16289\n  },\n  {\n    \"tag\": "harlequinery",\n    \"popularity\": 16264\n  },\n  {\n    \"tag\": "zucchetto",\n    \"popularity\": 16239\n  },\n  {\n    \"tag\": "malonyl",\n    \"popularity\": 16214\n  },\n  {\n    \"tag\": "patwari",\n    \"popularity\": 16189\n  },\n  {\n    \"tag\": "neoholmia venturesomeness",\n    \"popularity\": 16164\n  },\n  {\n    \"tag\": "Dehwar",\n    \"popularity\": 16139\n  },\n  {\n    \"tag\": "fetiferous",\n    \"popularity\": 16114\n  },\n  {\n    \"tag\": "chromatophore",\n    \"popularity\": 16090\n  },\n  {\n    \"tag\": "reregistration",\n    \"popularity\": 16065\n  },\n  {\n    \"tag\": "alienor",\n    \"popularity\": 16040\n  },\n  {\n    \"tag\": "Hexagynia",\n    \"popularity\": 16016\n  },\n  {\n    \"tag\": "cerebrotonia",\n    \"popularity\": 15991\n  },\n  {\n    \"tag\": "deedbox",\n    \"popularity\": 15967\n  },\n  {\n    \"tag\": "staab",\n    \"popularity\": 15943\n  },\n  {\n    \"tag\": "uratemia",\n    \"popularity\": 15918\n  },\n  {\n    \"tag\": "flaunt",\n    \"popularity\": 15894\n  },\n  {\n    \"tag\": "bogy",\n    \"popularity\": 15870\n  },\n  {\n    \"tag\": "subcartilaginous",\n    \"popularity\": 15846\n  },\n  {\n    \"tag\": "protonephridial",\n    \"popularity\": 15822\n  },\n  {\n    \"tag\": "Boswellia",\n    \"popularity\": 15798\n  },\n  {\n    \"tag\": "relaxant untiaraed protoepiphyte",\n    \"popularity\": 15774\n  },\n  {\n    \"tag\": "nesslerization",\n    \"popularity\": 15750\n  },\n  {\n    \"tag\": "precession",\n    \"popularity\": 15726\n  },\n  {\n    \"tag\": "peat",\n    \"popularity\": 15702\n  },\n  {\n    \"tag\": "unbit",\n    \"popularity\": 15678\n  },\n  {\n    \"tag\": "snailish",\n    \"popularity\": 15655\n  },\n  {\n    \"tag\": "porismatical",\n    \"popularity\": 15631\n  },\n  {\n    \"tag\": "hooflike",\n    \"popularity\": 15608\n  },\n  {\n    \"tag\": "resuppose phene cranic",\n    \"popularity\": 15584\n  },\n  {\n    \"tag\": "peptonization kipskin",\n    \"popularity\": 15561\n  },\n  {\n    \"tag\": "birdstone",\n    \"popularity\": 15537\n  },\n  {\n    \"tag\": "empty inferoanterior",\n    \"popularity\": 15514\n  },\n  {\n    \"tag\": "androtauric",\n    \"popularity\": 15491\n  },\n  {\n    \"tag\": "triamide",\n    \"popularity\": 15467\n  },\n  {\n    \"tag\": "showmanry",\n    \"popularity\": 15444\n  },\n  {\n    \"tag\": "doing",\n    \"popularity\": 15421\n  },\n  {\n    \"tag\": "bouchaleen",\n    \"popularity\": 15398\n  },\n  {\n    \"tag\": "precollude",\n    \"popularity\": 15375\n  },\n  {\n    \"tag\": "finger",\n    \"popularity\": 15352\n  },\n  {\n    \"tag\": "limnetic intermessenger",\n    \"popularity\": 15329\n  },\n  {\n    \"tag\": "uncharitable picrotoxic",\n    \"popularity\": 15306\n  },\n  {\n    \"tag\": "nationalizer Phasmidae",\n    \"popularity\": 15283\n  },\n  {\n    \"tag\": "laughingstock",\n    \"popularity\": 15261\n  },\n  {\n    \"tag\": "nondeferential",\n    \"popularity\": 15238\n  },\n  {\n    \"tag\": "uproariously",\n    \"popularity\": 15215\n  },\n  {\n    \"tag\": "manzanilla",\n    \"popularity\": 15193\n  },\n  {\n    \"tag\": "khahoon",\n    \"popularity\": 15170\n  },\n  {\n    \"tag\": "olericulturally longshanks",\n    \"popularity\": 15148\n  },\n  {\n    \"tag\": "enthusiastically methionic",\n    \"popularity\": 15125\n  },\n  {\n    \"tag\": "pobs",\n    \"popularity\": 15103\n  },\n  {\n    \"tag\": "tricarpellate",\n    \"popularity\": 15081\n  },\n  {\n    \"tag\": "souterrain",\n    \"popularity\": 15058\n  },\n  {\n    \"tag\": "tethelin",\n    \"popularity\": 15036\n  },\n  {\n    \"tag\": "tartle",\n    \"popularity\": 15014\n  },\n  {\n    \"tag\": "tidelike",\n    \"popularity\": 14992\n  },\n  {\n    \"tag\": "cosmoramic",\n    \"popularity\": 14970\n  },\n  {\n    \"tag\": "pretardiness",\n    \"popularity\": 14948\n  },\n  {\n    \"tag\": "insoul",\n    \"popularity\": 14926\n  },\n  {\n    \"tag\": "anthroxan",\n    \"popularity\": 14904\n  },\n  {\n    \"tag\": "jilter",\n    \"popularity\": 14882\n  },\n  {\n    \"tag\": "pectinibranchian trematode",\n    \"popularity\": 14860\n  },\n  {\n    \"tag\": "Renaissancist",\n    \"popularity\": 14838\n  },\n  {\n    \"tag\": "imaginant",\n    \"popularity\": 14817\n  },\n  {\n    \"tag\": "supercensure",\n    \"popularity\": 14795\n  },\n  {\n    \"tag\": "festilogy",\n    \"popularity\": 14773\n  },\n  {\n    \"tag\": "regression",\n    \"popularity\": 14752\n  },\n  {\n    \"tag\": "mesobregmate languorously",\n    \"popularity\": 14730\n  },\n  {\n    \"tag\": "unsupernaturalized",\n    \"popularity\": 14709\n  },\n  {\n    \"tag\": "boobyish",\n    \"popularity\": 14687\n  },\n  {\n    \"tag\": "scopolamine",\n    \"popularity\": 14666\n  },\n  {\n    \"tag\": "reamputation unchristianly",\n    \"popularity\": 14645\n  },\n  {\n    \"tag\": "cuneatic",\n    \"popularity\": 14623\n  },\n  {\n    \"tag\": "heathberry",\n    \"popularity\": 14602\n  },\n  {\n    \"tag\": "hate",\n    \"popularity\": 14581\n  },\n  {\n    \"tag\": "redeemableness",\n    \"popularity\": 14560\n  },\n  {\n    \"tag\": "damasse",\n    \"popularity\": 14539\n  },\n  {\n    \"tag\": "thrillsome",\n    \"popularity\": 14518\n  },\n  {\n    \"tag\": "disseverment",\n    \"popularity\": 14497\n  },\n  {\n    \"tag\": "underbishopric Ostyak",\n    \"popularity\": 14476\n  },\n  {\n    \"tag\": "Exoascales",\n    \"popularity\": 14455\n  },\n  {\n    \"tag\": "soiled",\n    \"popularity\": 14434\n  },\n  {\n    \"tag\": "Cain",\n    \"popularity\": 14413\n  },\n  {\n    \"tag\": "mismanageable arenae",\n    \"popularity\": 14392\n  },\n  {\n    \"tag\": "manducate unhinderably",\n    \"popularity\": 14372\n  },\n  {\n    \"tag\": "peregrin",\n    \"popularity\": 14351\n  },\n  {\n    \"tag\": "musicianly",\n    \"popularity\": 14330\n  },\n  {\n    \"tag\": "aln",\n    \"popularity\": 14310\n  },\n  {\n    \"tag\": "intercentrum",\n    \"popularity\": 14289\n  },\n  {\n    \"tag\": "roothold",\n    \"popularity\": 14269\n  },\n  {\n    \"tag\": "jane aneurism",\n    \"popularity\": 14248\n  },\n  {\n    \"tag\": "insinuatively forefeel phytolatrous",\n    \"popularity\": 14228\n  },\n  {\n    \"tag\": "kanchil",\n    \"popularity\": 14208\n  },\n  {\n    \"tag\": "Austrophile",\n    \"popularity\": 14187\n  },\n  {\n    \"tag\": "unterrorized",\n    \"popularity\": 14167\n  },\n  {\n    \"tag\": "admeasure",\n    \"popularity\": 14147\n  },\n  {\n    \"tag\": "electrodissolution",\n    \"popularity\": 14127\n  },\n  {\n    \"tag\": "unweddedly",\n    \"popularity\": 14107\n  },\n  {\n    \"tag\": "unannoying",\n    \"popularity\": 14087\n  },\n  {\n    \"tag\": "uningenuous",\n    \"popularity\": 14067\n  },\n  {\n    \"tag\": "omnibenevolent",\n    \"popularity\": 14047\n  },\n  {\n    \"tag\": "commissure",\n    \"popularity\": 14027\n  },\n  {\n    \"tag\": "tellureted",\n    \"popularity\": 14007\n  },\n  {\n    \"tag\": "suffragan",\n    \"popularity\": 13987\n  },\n  {\n    \"tag\": "sphaeriaceous",\n    \"popularity\": 13967\n  },\n  {\n    \"tag\": "unfearing",\n    \"popularity\": 13947\n  },\n  {\n    \"tag\": "stentoriousness precounsellor",\n    \"popularity\": 13928\n  },\n  {\n    \"tag\": "haemaspectroscope",\n    \"popularity\": 13908\n  },\n  {\n    \"tag\": "teras",\n    \"popularity\": 13888\n  },\n  {\n    \"tag\": "pulicine",\n    \"popularity\": 13869\n  },\n  {\n    \"tag\": "colicystopyelitis",\n    \"popularity\": 13849\n  },\n  {\n    \"tag\": "Physalia",\n    \"popularity\": 13830\n  },\n  {\n    \"tag\": "Saxicolidae",\n    \"popularity\": 13810\n  },\n  {\n    \"tag\": "peritonital",\n    \"popularity\": 13791\n  },\n  {\n    \"tag\": "dysphotic",\n    \"popularity\": 13771\n  },\n  {\n    \"tag\": "unabandoned",\n    \"popularity\": 13752\n  },\n  {\n    \"tag\": "rashful",\n    \"popularity\": 13733\n  },\n  {\n    \"tag\": "goodyness Manobo",\n    \"popularity\": 13714\n  },\n  {\n    \"tag\": "glaring",\n    \"popularity\": 13694\n  },\n  {\n    \"tag\": "horrorful",\n    \"popularity\": 13675\n  },\n  {\n    \"tag\": "intercepting",\n    \"popularity\": 13656\n  },\n  {\n    \"tag\": "semifine",\n    \"popularity\": 13637\n  },\n  {\n    \"tag\": "Gaypoo",\n    \"popularity\": 13618\n  },\n  {\n    \"tag\": "Metrosideros",\n    \"popularity\": 13599\n  },\n  {\n    \"tag\": "thoracicolumbar",\n    \"popularity\": 13580\n  },\n  {\n    \"tag\": "unserried",\n    \"popularity\": 13561\n  },\n  {\n    \"tag\": "keeperess cauterization",\n    \"popularity\": 13542\n  },\n  {\n    \"tag\": "administrant",\n    \"popularity\": 13523\n  },\n  {\n    \"tag\": "unpropitiatedness",\n    \"popularity\": 13505\n  },\n  {\n    \"tag\": "pensileness",\n    \"popularity\": 13486\n  },\n  {\n    \"tag\": "quinaldic unreceivable",\n    \"popularity\": 13467\n  },\n  {\n    \"tag\": "Carnaria",\n    \"popularity\": 13448\n  },\n  {\n    \"tag\": "azothionium wurrus",\n    \"popularity\": 13430\n  },\n  {\n    \"tag\": "mistresshood",\n    \"popularity\": 13411\n  },\n  {\n    \"tag\": "Savara",\n    \"popularity\": 13393\n  },\n  {\n    \"tag\": "dasyurine",\n    \"popularity\": 13374\n  },\n  {\n    \"tag\": "superideal",\n    \"popularity\": 13356\n  },\n  {\n    \"tag\": "Parisianize",\n    \"popularity\": 13337\n  },\n  {\n    \"tag\": "underearth",\n    \"popularity\": 13319\n  },\n  {\n    \"tag\": "athrogenic",\n    \"popularity\": 13301\n  },\n  {\n    \"tag\": "communicate",\n    \"popularity\": 13282\n  },\n  {\n    \"tag\": "denervation enworthed",\n    \"popularity\": 13264\n  },\n  {\n    \"tag\": "subbromide",\n    \"popularity\": 13246\n  },\n  {\n    \"tag\": "stenocoriasis",\n    \"popularity\": 13228\n  },\n  {\n    \"tag\": "facetiousness",\n    \"popularity\": 13209\n  },\n  {\n    \"tag\": "twaddling",\n    \"popularity\": 13191\n  },\n  {\n    \"tag\": "tetartoconid",\n    \"popularity\": 13173\n  },\n  {\n    \"tag\": "audiophile",\n    \"popularity\": 13155\n  },\n  {\n    \"tag\": "fustigate",\n    \"popularity\": 13137\n  },\n  {\n    \"tag\": "Sorbian cacophonia",\n    \"popularity\": 13119\n  },\n  {\n    \"tag\": "fondish",\n    \"popularity\": 13101\n  },\n  {\n    \"tag\": "endomastoiditis",\n    \"popularity\": 13084\n  },\n  {\n    \"tag\": "sniptious",\n    \"popularity\": 13066\n  },\n  {\n    \"tag\": "glochidiate",\n    \"popularity\": 13048\n  },\n  {\n    \"tag\": "polycarboxylic",\n    \"popularity\": 13030\n  },\n  {\n    \"tag\": "stamp",\n    \"popularity\": 13012\n  },\n  {\n    \"tag\": "tritonymph endotoxoid",\n    \"popularity\": 12995\n  },\n  {\n    \"tag\": "wolfskin",\n    \"popularity\": 12977\n  },\n  {\n    \"tag\": "oncosimeter",\n    \"popularity\": 12959\n  },\n  {\n    \"tag\": "outward",\n    \"popularity\": 12942\n  },\n  {\n    \"tag\": "circumscribed",\n    \"popularity\": 12924\n  },\n  {\n    \"tag\": "autohemolytic",\n    \"popularity\": 12907\n  },\n  {\n    \"tag\": "isorhamnose",\n    \"popularity\": 12889\n  },\n  {\n    \"tag\": "monarchomachic",\n    \"popularity\": 12872\n  },\n  {\n    \"tag\": "phaenomenon",\n    \"popularity\": 12855\n  },\n  {\n    \"tag\": "angiopressure",\n    \"popularity\": 12837\n  },\n  {\n    \"tag\": "similarize",\n    \"popularity\": 12820\n  },\n  {\n    \"tag\": "unseeable",\n    \"popularity\": 12803\n  },\n  {\n    \"tag\": "Toryize",\n    \"popularity\": 12785\n  },\n  {\n    \"tag\": "fruitling",\n    \"popularity\": 12768\n  },\n  {\n    \"tag\": "axle",\n    \"popularity\": 12751\n  },\n  {\n    \"tag\": "priestal cocked",\n    \"popularity\": 12734\n  },\n  {\n    \"tag\": "serotoxin",\n    \"popularity\": 12717\n  },\n  {\n    \"tag\": "unmovably",\n    \"popularity\": 12700\n  },\n  {\n    \"tag\": "darbha",\n    \"popularity\": 12683\n  },\n  {\n    \"tag\": "Mongolize",\n    \"popularity\": 12666\n  },\n  {\n    \"tag\": "clusteringly",\n    \"popularity\": 12649\n  },\n  {\n    \"tag\": "tendence",\n    \"popularity\": 12632\n  },\n  {\n    \"tag\": "foziness",\n    \"popularity\": 12615\n  },\n  {\n    \"tag\": "brickkiln lithify",\n    \"popularity\": 12598\n  },\n  {\n    \"tag\": "unpriest",\n    \"popularity\": 12581\n  },\n  {\n    \"tag\": "convincer",\n    \"popularity\": 12564\n  },\n  {\n    \"tag\": "mornlike",\n    \"popularity\": 12548\n  },\n  {\n    \"tag\": "overaddiction ostentatiousness",\n    \"popularity\": 12531\n  },\n  {\n    \"tag\": "diffusively moccasin pendom",\n    \"popularity\": 12514\n  },\n  {\n    \"tag\": "boose",\n    \"popularity\": 12498\n  },\n  {\n    \"tag\": "myonosus",\n    \"popularity\": 12481\n  },\n  {\n    \"tag\": "handsome",\n    \"popularity\": 12464\n  },\n  {\n    \"tag\": "paroxysmic",\n    \"popularity\": 12448\n  },\n  {\n    \"tag\": "Ulidian",\n    \"popularity\": 12431\n  },\n  {\n    \"tag\": "heartache",\n    \"popularity\": 12415\n  },\n  {\n    \"tag\": "torporize",\n    \"popularity\": 12398\n  },\n  {\n    \"tag\": "hippish",\n    \"popularity\": 12382\n  },\n  {\n    \"tag\": "stigmal militation",\n    \"popularity\": 12366\n  },\n  {\n    \"tag\": "matmaker",\n    \"popularity\": 12349\n  },\n  {\n    \"tag\": "marantaceous bivoluminous",\n    \"popularity\": 12333\n  },\n  {\n    \"tag\": "Uraniidae",\n    \"popularity\": 12317\n  },\n  {\n    \"tag\": "risper",\n    \"popularity\": 12301\n  },\n  {\n    \"tag\": "tintinnabulation",\n    \"popularity\": 12284\n  },\n  {\n    \"tag\": "tributorian",\n    \"popularity\": 12268\n  },\n  {\n    \"tag\": "ashamedly",\n    \"popularity\": 12252\n  },\n  {\n    \"tag\": "Macrourus",\n    \"popularity\": 12236\n  },\n  {\n    \"tag\": "Chora",\n    \"popularity\": 12220\n  },\n  {\n    \"tag\": "caul",\n    \"popularity\": 12204\n  },\n  {\n    \"tag\": "exsector",\n    \"popularity\": 12188\n  },\n  {\n    \"tag\": "acutish",\n    \"popularity\": 12172\n  },\n  {\n    \"tag\": "amphichrome",\n    \"popularity\": 12156\n  },\n  {\n    \"tag\": "guarder",\n    \"popularity\": 12140\n  },\n  {\n    \"tag\": "sculpturally",\n    \"popularity\": 12124\n  },\n  {\n    \"tag\": "benightmare",\n    \"popularity\": 12108\n  },\n  {\n    \"tag\": "chucky",\n    \"popularity\": 12093\n  },\n  {\n    \"tag\": "Venetian",\n    \"popularity\": 12077\n  },\n  {\n    \"tag\": "autotheater",\n    \"popularity\": 12061\n  },\n  {\n    \"tag\": "planarioid",\n    \"popularity\": 12045\n  },\n  {\n    \"tag\": "handkerchiefful",\n    \"popularity\": 12030\n  },\n  {\n    \"tag\": "fuliginousness potentize",\n    \"popularity\": 12014\n  },\n  {\n    \"tag\": "pantheum",\n    \"popularity\": 11998\n  },\n  {\n    \"tag\": "heavyweight",\n    \"popularity\": 11983\n  },\n  {\n    \"tag\": "unbrick",\n    \"popularity\": 11967\n  },\n  {\n    \"tag\": "duomachy",\n    \"popularity\": 11952\n  },\n  {\n    \"tag\": "polyphyodont",\n    \"popularity\": 11936\n  },\n  {\n    \"tag\": "hibernacle",\n    \"popularity\": 11921\n  },\n  {\n    \"tag\": "undistend",\n    \"popularity\": 11905\n  },\n  {\n    \"tag\": "hystericky",\n    \"popularity\": 11890\n  },\n  {\n    \"tag\": "paleolimnology",\n    \"popularity\": 11875\n  },\n  {\n    \"tag\": "cedarware",\n    \"popularity\": 11859\n  },\n  {\n    \"tag\": "overwrested",\n    \"popularity\": 11844\n  },\n  {\n    \"tag\": "Syriacism",\n    \"popularity\": 11829\n  },\n  {\n    \"tag\": "pretan",\n    \"popularity\": 11813\n  },\n  {\n    \"tag\": "formant",\n    \"popularity\": 11798\n  },\n  {\n    \"tag\": "pharmacopoeist Fedia",\n    \"popularity\": 11783\n  },\n  {\n    \"tag\": "exorcist eerisome",\n    \"popularity\": 11768\n  },\n  {\n    \"tag\": "separation",\n    \"popularity\": 11753\n  },\n  {\n    \"tag\": "infancy",\n    \"popularity\": 11738\n  },\n  {\n    \"tag\": "ecrasite",\n    \"popularity\": 11723\n  },\n  {\n    \"tag\": "propolize",\n    \"popularity\": 11708\n  },\n  {\n    \"tag\": "uncram phyllin",\n    \"popularity\": 11693\n  },\n  {\n    \"tag\": "thymopathy",\n    \"popularity\": 11678\n  },\n  {\n    \"tag\": "omniscient",\n    \"popularity\": 11663\n  },\n  {\n    \"tag\": "coussinet hazer",\n    \"popularity\": 11648\n  },\n  {\n    \"tag\": "contributiveness",\n    \"popularity\": 11633\n  },\n  {\n    \"tag\": "septifluous",\n    \"popularity\": 11618\n  },\n  {\n    \"tag\": "halfness",\n    \"popularity\": 11603\n  },\n  {\n    \"tag\": "tocher",\n    \"popularity\": 11589\n  },\n  {\n    \"tag\": "monotonist",\n    \"popularity\": 11574\n  },\n  {\n    \"tag\": "headchair",\n    \"popularity\": 11559\n  },\n  {\n    \"tag\": "everywhence",\n    \"popularity\": 11544\n  },\n  {\n    \"tag\": "gerate",\n    \"popularity\": 11530\n  },\n  {\n    \"tag\": "unrepellent",\n    \"popularity\": 11515\n  },\n  {\n    \"tag\": "inidoneous",\n    \"popularity\": 11500\n  },\n  {\n    \"tag\": "Rifi",\n    \"popularity\": 11486\n  },\n  {\n    \"tag\": "unstop",\n    \"popularity\": 11471\n  },\n  {\n    \"tag\": "conformer",\n    \"popularity\": 11457\n  },\n  {\n    \"tag\": "vivisectionally",\n    \"popularity\": 11442\n  },\n  {\n    \"tag\": "nonfinishing",\n    \"popularity\": 11428\n  },\n  {\n    \"tag\": "tyranness",\n    \"popularity\": 11413\n  },\n  {\n    \"tag\": "shepherdage havoc",\n    \"popularity\": 11399\n  },\n  {\n    \"tag\": "coronale",\n    \"popularity\": 11385\n  },\n  {\n    \"tag\": "airmarker",\n    \"popularity\": 11370\n  },\n  {\n    \"tag\": "subpanel",\n    \"popularity\": 11356\n  },\n  {\n    \"tag\": "conciliation",\n    \"popularity\": 11342\n  },\n  {\n    \"tag\": "supergun",\n    \"popularity\": 11327\n  },\n  {\n    \"tag\": "photoheliography",\n    \"popularity\": 11313\n  },\n  {\n    \"tag\": "cacosmia",\n    \"popularity\": 11299\n  },\n  {\n    \"tag\": "caressant",\n    \"popularity\": 11285\n  },\n  {\n    \"tag\": "swivet",\n    \"popularity\": 11270\n  },\n  {\n    \"tag\": "coddler",\n    \"popularity\": 11256\n  },\n  {\n    \"tag\": "rakehellish",\n    \"popularity\": 11242\n  },\n  {\n    \"tag\": "recohabitation",\n    \"popularity\": 11228\n  },\n  {\n    \"tag\": "postillator",\n    \"popularity\": 11214\n  },\n  {\n    \"tag\": "receipt",\n    \"popularity\": 11200\n  },\n  {\n    \"tag\": "nonconformistical",\n    \"popularity\": 11186\n  },\n  {\n    \"tag\": "unglorified",\n    \"popularity\": 11172\n  },\n  {\n    \"tag\": "unordinariness",\n    \"popularity\": 11158\n  },\n  {\n    \"tag\": "tetrahydroxy",\n    \"popularity\": 11144\n  },\n  {\n    \"tag\": "haploperistomic corporeity",\n    \"popularity\": 11130\n  },\n  {\n    \"tag\": "varical",\n    \"popularity\": 11117\n  },\n  {\n    \"tag\": "pilferment",\n    \"popularity\": 11103\n  },\n  {\n    \"tag\": "reverentially playcraft",\n    \"popularity\": 11089\n  },\n  {\n    \"tag\": "unretentive",\n    \"popularity\": 11075\n  },\n  {\n    \"tag\": "readiness",\n    \"popularity\": 11061\n  },\n  {\n    \"tag\": "thermomagnetism",\n    \"popularity\": 11048\n  },\n  {\n    \"tag\": "spotless",\n    \"popularity\": 11034\n  },\n  {\n    \"tag\": "semishrubby",\n    \"popularity\": 11020\n  },\n  {\n    \"tag\": "metrotomy",\n    \"popularity\": 11007\n  },\n  {\n    \"tag\": "hocker",\n    \"popularity\": 10993\n  },\n  {\n    \"tag\": "anecdotal",\n    \"popularity\": 10979\n  },\n  {\n    \"tag\": "tetrabelodont",\n    \"popularity\": 10966\n  },\n  {\n    \"tag\": "Ramillied",\n    \"popularity\": 10952\n  },\n  {\n    \"tag\": "sympatheticism",\n    \"popularity\": 10939\n  },\n  {\n    \"tag\": "kiskatom",\n    \"popularity\": 10925\n  },\n  {\n    \"tag\": "concyclically",\n    \"popularity\": 10912\n  },\n  {\n    \"tag\": "tunicless",\n    \"popularity\": 10899\n  },\n  {\n    \"tag\": "formalistic",\n    \"popularity\": 10885\n  },\n  {\n    \"tag\": "thermacogenesis",\n    \"popularity\": 10872\n  },\n  {\n    \"tag\": "multimotored",\n    \"popularity\": 10858\n  },\n  {\n    \"tag\": "inversive",\n    \"popularity\": 10845\n  },\n  {\n    \"tag\": "Jatki",\n    \"popularity\": 10832\n  },\n  {\n    \"tag\": "highest",\n    \"popularity\": 10818\n  },\n  {\n    \"tag\": "rubidic",\n    \"popularity\": 10805\n  },\n  {\n    \"tag\": "acranial",\n    \"popularity\": 10792\n  },\n  {\n    \"tag\": "pulvinulus",\n    \"popularity\": 10779\n  },\n  {\n    \"tag\": "nattiness",\n    \"popularity\": 10766\n  },\n  {\n    \"tag\": "antisimoniacal",\n    \"popularity\": 10752\n  },\n  {\n    \"tag\": "tetanize",\n    \"popularity\": 10739\n  },\n  {\n    \"tag\": "spectrophobia",\n    \"popularity\": 10726\n  },\n  {\n    \"tag\": "monopolitical",\n    \"popularity\": 10713\n  },\n  {\n    \"tag\": "teallite",\n    \"popularity\": 10700\n  },\n  {\n    \"tag\": "alicyclic interpellator",\n    \"popularity\": 10687\n  },\n  {\n    \"tag\": "nonsynthesized",\n    \"popularity\": 10674\n  },\n  {\n    \"tag\": "wheelwrighting",\n    \"popularity\": 10661\n  },\n  {\n    \"tag\": "pelliculate",\n    \"popularity\": 10648\n  },\n  {\n    \"tag\": "Euphyllopoda",\n    \"popularity\": 10635\n  },\n  {\n    \"tag\": "graver",\n    \"popularity\": 10622\n  },\n  {\n    \"tag\": "automorph",\n    \"popularity\": 10609\n  },\n  {\n    \"tag\": "underhanded",\n    \"popularity\": 10597\n  },\n  {\n    \"tag\": "causal",\n    \"popularity\": 10584\n  },\n  {\n    \"tag\": "odoom",\n    \"popularity\": 10571\n  },\n  {\n    \"tag\": "apodictical",\n    \"popularity\": 10558\n  },\n  {\n    \"tag\": "foundery",\n    \"popularity\": 10545\n  },\n  {\n    \"tag\": "unneighbored",\n    \"popularity\": 10533\n  },\n  {\n    \"tag\": "woolshearing",\n    \"popularity\": 10520\n  },\n  {\n    \"tag\": "boschveld",\n    \"popularity\": 10507\n  },\n  {\n    \"tag\": "unhardened lipopod",\n    \"popularity\": 10495\n  },\n  {\n    \"tag\": "unenriching",\n    \"popularity\": 10482\n  },\n  {\n    \"tag\": "spak",\n    \"popularity\": 10469\n  },\n  {\n    \"tag\": "yogasana",\n    \"popularity\": 10457\n  },\n  {\n    \"tag\": "depoetize",\n    \"popularity\": 10444\n  },\n  {\n    \"tag\": "parousiamania",\n    \"popularity\": 10432\n  },\n  {\n    \"tag\": "longlegs",\n    \"popularity\": 10419\n  },\n  {\n    \"tag\": "gelatinizability",\n    \"popularity\": 10407\n  },\n  {\n    \"tag\": "edeology",\n    \"popularity\": 10394\n  },\n  {\n    \"tag\": "sodwork",\n    \"popularity\": 10382\n  },\n  {\n    \"tag\": "somnambule",\n    \"popularity\": 10369\n  },\n  {\n    \"tag\": "antiquing",\n    \"popularity\": 10357\n  },\n  {\n    \"tag\": "intaker",\n    \"popularity\": 10344\n  },\n  {\n    \"tag\": "Gerberia",\n    \"popularity\": 10332\n  },\n  {\n    \"tag\": "preadmit",\n    \"popularity\": 10320\n  },\n  {\n    \"tag\": "bullhorn",\n    \"popularity\": 10307\n  },\n  {\n    \"tag\": "sororal",\n    \"popularity\": 10295\n  },\n  {\n    \"tag\": "phaeophyceous",\n    \"popularity\": 10283\n  },\n  {\n    \"tag\": "omphalopsychite",\n    \"popularity\": 10271\n  },\n  {\n    \"tag\": "substantious",\n    \"popularity\": 10258\n  },\n  {\n    \"tag\": "undemonstratively",\n    \"popularity\": 10246\n  },\n  {\n    \"tag\": "corallike blackit",\n    \"popularity\": 10234\n  },\n  {\n    \"tag\": "amoebous",\n    \"popularity\": 10222\n  },\n  {\n    \"tag\": "Polypodium",\n    \"popularity\": 10210\n  },\n  {\n    \"tag\": "blodite",\n    \"popularity\": 10198\n  },\n  {\n    \"tag\": "hordarian",\n    \"popularity\": 10186\n  },\n  {\n    \"tag\": "nonmoral",\n    \"popularity\": 10174\n  },\n  {\n    \"tag\": "dredgeful",\n    \"popularity\": 10162\n  },\n  {\n    \"tag\": "nourishingly",\n    \"popularity\": 10150\n  },\n  {\n    \"tag\": "seamy",\n    \"popularity\": 10138\n  },\n  {\n    \"tag\": "vara",\n    \"popularity\": 10126\n  },\n  {\n    \"tag\": "incorruptibleness",\n    \"popularity\": 10114\n  },\n  {\n    \"tag\": "manipulator",\n    \"popularity\": 10102\n  },\n  {\n    \"tag\": "chromodiascope uncountably",\n    \"popularity\": 10090\n  },\n  {\n    \"tag\": "typhemia",\n    \"popularity\": 10078\n  },\n  {\n    \"tag\": "Smalcaldic",\n    \"popularity\": 10066\n  },\n  {\n    \"tag\": "precontrive",\n    \"popularity\": 10054\n  },\n  {\n    \"tag\": "sowarry",\n    \"popularity\": 10042\n  },\n  {\n    \"tag\": "monopodic",\n    \"popularity\": 10031\n  },\n  {\n    \"tag\": "recodify",\n    \"popularity\": 10019\n  },\n  {\n    \"tag\": "phosphowolframic rimple",\n    \"popularity\": 10007\n  },\n  {\n    \"tag\": "triconch",\n    \"popularity\": 9995\n  },\n  {\n    \"tag\": "pycnodontoid",\n    \"popularity\": 9984\n  },\n  {\n    \"tag\": "bradyspermatism",\n    \"popularity\": 9972\n  },\n  {\n    \"tag\": "extensionist",\n    \"popularity\": 9960\n  },\n  {\n    \"tag\": "characterize",\n    \"popularity\": 9949\n  },\n  {\n    \"tag\": "anatreptic proteolytic",\n    \"popularity\": 9937\n  },\n  {\n    \"tag\": "waterboard",\n    \"popularity\": 9925\n  },\n  {\n    \"tag\": "allopathically",\n    \"popularity\": 9914\n  },\n  {\n    \"tag\": "arithmetician",\n    \"popularity\": 9902\n  },\n  {\n    \"tag\": "subsist",\n    \"popularity\": 9891\n  },\n  {\n    \"tag\": "Islamitish",\n    \"popularity\": 9879\n  },\n  {\n    \"tag\": "biddy",\n    \"popularity\": 9868\n  },\n  {\n    \"tag\": "reverberation",\n    \"popularity\": 9856\n  },\n  {\n    \"tag\": "Zaporogue",\n    \"popularity\": 9845\n  },\n  {\n    \"tag\": "soapberry",\n    \"popularity\": 9833\n  },\n  {\n    \"tag\": "physiognomics",\n    \"popularity\": 9822\n  },\n  {\n    \"tag\": "hospitalization",\n    \"popularity\": 9810\n  },\n  {\n    \"tag\": "dissembler",\n    \"popularity\": 9799\n  },\n  {\n    \"tag\": "festinate",\n    \"popularity\": 9788\n  },\n  {\n    \"tag\": "angiectopia",\n    \"popularity\": 9776\n  },\n  {\n    \"tag\": "Pulicidae",\n    \"popularity\": 9765\n  },\n  {\n    \"tag\": "beslimer",\n    \"popularity\": 9754\n  },\n  {\n    \"tag\": "nontreaty",\n    \"popularity\": 9743\n  },\n  {\n    \"tag\": "unhaggled",\n    \"popularity\": 9731\n  },\n  {\n    \"tag\": "catfall",\n    \"popularity\": 9720\n  },\n  {\n    \"tag\": "stola",\n    \"popularity\": 9709\n  },\n  {\n    \"tag\": "pataco",\n    \"popularity\": 9698\n  },\n  {\n    \"tag\": "ontologistic",\n    \"popularity\": 9686\n  },\n  {\n    \"tag\": "aerosphere",\n    \"popularity\": 9675\n  },\n  {\n    \"tag\": "deobstruent",\n    \"popularity\": 9664\n  },\n  {\n    \"tag\": "threepence",\n    \"popularity\": 9653\n  },\n  {\n    \"tag\": "cyprinoid",\n    \"popularity\": 9642\n  },\n  {\n    \"tag\": "overbank",\n    \"popularity\": 9631\n  },\n  {\n    \"tag\": "prostyle",\n    \"popularity\": 9620\n  },\n  {\n    \"tag\": "photoactivation",\n    \"popularity\": 9609\n  },\n  {\n    \"tag\": "homothetic",\n    \"popularity\": 9598\n  },\n  {\n    \"tag\": "roguedom",\n    \"popularity\": 9587\n  },\n  {\n    \"tag\": "underschool",\n    \"popularity\": 9576\n  },\n  {\n    \"tag\": "tractility",\n    \"popularity\": 9565\n  },\n  {\n    \"tag\": "gardenin",\n    \"popularity\": 9554\n  },\n  {\n    \"tag\": "Micromastictora",\n    \"popularity\": 9543\n  },\n  {\n    \"tag\": "gossypine",\n    \"popularity\": 9532\n  },\n  {\n    \"tag\": "amylodyspepsia",\n    \"popularity\": 9521\n  },\n  {\n    \"tag\": "Luciana",\n    \"popularity\": 9510\n  },\n  {\n    \"tag\": "meetly nonfisherman",\n    \"popularity\": 9500\n  },\n  {\n    \"tag\": "backhanded",\n    \"popularity\": 9489\n  },\n  {\n    \"tag\": "decrustation",\n    \"popularity\": 9478\n  },\n  {\n    \"tag\": "pinrail",\n    \"popularity\": 9467\n  },\n  {\n    \"tag\": "Mahori",\n    \"popularity\": 9456\n  },\n  {\n    \"tag\": "unsizable",\n    \"popularity\": 9446\n  },\n  {\n    \"tag\": "disawa",\n    \"popularity\": 9435\n  },\n  {\n    \"tag\": "launderability inconsidered",\n    \"popularity\": 9424\n  },\n  {\n    \"tag\": "unclassical",\n    \"popularity\": 9414\n  },\n  {\n    \"tag\": "inobtrusiveness",\n    \"popularity\": 9403\n  },\n  {\n    \"tag\": "sialogenous",\n    \"popularity\": 9392\n  },\n  {\n    \"tag\": "sulphonamide",\n    \"popularity\": 9382\n  },\n  {\n    \"tag\": "diluvion",\n    \"popularity\": 9371\n  },\n  {\n    \"tag\": "deuteranope",\n    \"popularity\": 9361\n  },\n  {\n    \"tag\": "addition",\n    \"popularity\": 9350\n  },\n  {\n    \"tag\": "bockeret",\n    \"popularity\": 9339\n  },\n  {\n    \"tag\": "unidentified",\n    \"popularity\": 9329\n  },\n  {\n    \"tag\": "caryatic",\n    \"popularity\": 9318\n  },\n  {\n    \"tag\": "misattribution",\n    \"popularity\": 9308\n  },\n  {\n    \"tag\": "outray",\n    \"popularity\": 9297\n  },\n  {\n    \"tag\": "areometrical",\n    \"popularity\": 9287\n  },\n  {\n    \"tag\": "antilogism",\n    \"popularity\": 9277\n  },\n  {\n    \"tag\": "inadjustable",\n    \"popularity\": 9266\n  },\n  {\n    \"tag\": "byssus",\n    \"popularity\": 9256\n  },\n  {\n    \"tag\": "trun",\n    \"popularity\": 9245\n  },\n  {\n    \"tag\": "thereology",\n    \"popularity\": 9235\n  },\n  {\n    \"tag\": "extort",\n    \"popularity\": 9225\n  },\n  {\n    \"tag\": "bumpkin",\n    \"popularity\": 9214\n  },\n  {\n    \"tag\": "sulphobenzide",\n    \"popularity\": 9204\n  },\n  {\n    \"tag\": "hydrogeology",\n    \"popularity\": 9194\n  },\n  {\n    \"tag\": "nidulariaceous",\n    \"popularity\": 9183\n  },\n  {\n    \"tag\": "propodiale",\n    \"popularity\": 9173\n  },\n  {\n    \"tag\": "fierily",\n    \"popularity\": 9163\n  },\n  {\n    \"tag\": "aerotonometry",\n    \"popularity\": 9153\n  },\n  {\n    \"tag\": "pelobatid oversuperstitious",\n    \"popularity\": 9142\n  },\n  {\n    \"tag\": "restringent",\n    \"popularity\": 9132\n  },\n  {\n    \"tag\": "tetrapodic",\n    \"popularity\": 9122\n  },\n  {\n    \"tag\": "heroicness Vendidad",\n    \"popularity\": 9112\n  },\n  {\n    \"tag\": "Sphingurus",\n    \"popularity\": 9102\n  },\n  {\n    \"tag\": "sclerote",\n    \"popularity\": 9092\n  },\n  {\n    \"tag\": "unkeyed",\n    \"popularity\": 9082\n  },\n  {\n    \"tag\": "superparliamentary",\n    \"popularity\": 9072\n  },\n  {\n    \"tag\": "hetericism",\n    \"popularity\": 9061\n  },\n  {\n    \"tag\": "hucklebone",\n    \"popularity\": 9051\n  },\n  {\n    \"tag\": "yojan",\n    \"popularity\": 9041\n  },\n  {\n    \"tag\": "bossed",\n    \"popularity\": 9031\n  },\n  {\n    \"tag\": "spiderwork",\n    \"popularity\": 9021\n  },\n  {\n    \"tag\": "millfeed dullery",\n    \"popularity\": 9011\n  },\n  {\n    \"tag\": "adnoun",\n    \"popularity\": 9001\n  },\n  {\n    \"tag\": "mesometric",\n    \"popularity\": 8992\n  },\n  {\n    \"tag\": "doublehandedness",\n    \"popularity\": 8982\n  },\n  {\n    \"tag\": "suppurant",\n    \"popularity\": 8972\n  },\n  {\n    \"tag\": "Berlinize",\n    \"popularity\": 8962\n  },\n  {\n    \"tag\": "sontag",\n    \"popularity\": 8952\n  },\n  {\n    \"tag\": "biplane",\n    \"popularity\": 8942\n  },\n  {\n    \"tag\": "insula",\n    \"popularity\": 8932\n  },\n  {\n    \"tag\": "unbrand",\n    \"popularity\": 8922\n  },\n  {\n    \"tag\": "Basilosaurus",\n    \"popularity\": 8913\n  },\n  {\n    \"tag\": "prenomination",\n    \"popularity\": 8903\n  },\n  {\n    \"tag\": "untextual",\n    \"popularity\": 8893\n  },\n  {\n    \"tag\": "coleslaw",\n    \"popularity\": 8883\n  },\n  {\n    \"tag\": "langsyne",\n    \"popularity\": 8874\n  },\n  {\n    \"tag\": "impede",\n    \"popularity\": 8864\n  },\n  {\n    \"tag\": "irrigator",\n    \"popularity\": 8854\n  },\n  {\n    \"tag\": "deflocculation",\n    \"popularity\": 8844\n  },\n  {\n    \"tag\": "narghile",\n    \"popularity\": 8835\n  },\n  {\n    \"tag\": "unguardedly ebenaceous",\n    \"popularity\": 8825\n  },\n  {\n    \"tag\": "conversantly subocular",\n    \"popularity\": 8815\n  },\n  {\n    \"tag\": "hydroponic",\n    \"popularity\": 8806\n  },\n  {\n    \"tag\": "anthropopsychism",\n    \"popularity\": 8796\n  },\n  {\n    \"tag\": "panoptic",\n    \"popularity\": 8787\n  },\n  {\n    \"tag\": "insufferable",\n    \"popularity\": 8777\n  },\n  {\n    \"tag\": "salema",\n    \"popularity\": 8768\n  },\n  {\n    \"tag\": "Myriapoda",\n    \"popularity\": 8758\n  },\n  {\n    \"tag\": "regarrison",\n    \"popularity\": 8748\n  },\n  {\n    \"tag\": "overlearned",\n    \"popularity\": 8739\n  },\n  {\n    \"tag\": "ultraroyalist conventical bureaucratical",\n    \"popularity\": 8729\n  },\n  {\n    \"tag\": "epicaridan",\n    \"popularity\": 8720\n  },\n  {\n    \"tag\": "poetastress",\n    \"popularity\": 8711\n  },\n  {\n    \"tag\": "monophthalmus",\n    \"popularity\": 8701\n  },\n  {\n    \"tag\": "simnel",\n    \"popularity\": 8692\n  },\n  {\n    \"tag\": "compotor",\n    \"popularity\": 8682\n  },\n  {\n    \"tag\": "hydrolase",\n    \"popularity\": 8673\n  },\n  {\n    \"tag\": "attemptless",\n    \"popularity\": 8663\n  },\n  {\n    \"tag\": "visceroptosis",\n    \"popularity\": 8654\n  },\n  {\n    \"tag\": "unpreparedly",\n    \"popularity\": 8645\n  },\n  {\n    \"tag\": "mastage",\n    \"popularity\": 8635\n  },\n  {\n    \"tag\": "preinfluence",\n    \"popularity\": 8626\n  },\n  {\n    \"tag\": "Siwan",\n    \"popularity\": 8617\n  },\n  {\n    \"tag\": "ceratotheca belvedere",\n    \"popularity\": 8607\n  },\n  {\n    \"tag\": "disenablement",\n    \"popularity\": 8598\n  },\n  {\n    \"tag\": "nine",\n    \"popularity\": 8589\n  },\n  {\n    \"tag\": "spellingdown abridgment",\n    \"popularity\": 8580\n  },\n  {\n    \"tag\": "twilightless",\n    \"popularity\": 8571\n  },\n  {\n    \"tag\": "overflow",\n    \"popularity\": 8561\n  },\n  {\n    \"tag\": "mismeasurement",\n    \"popularity\": 8552\n  },\n  {\n    \"tag\": "nawabship",\n    \"popularity\": 8543\n  },\n  {\n    \"tag\": "Phrynosoma",\n    \"popularity\": 8534\n  },\n  {\n    \"tag\": "unanticipatingly",\n    \"popularity\": 8525\n  },\n  {\n    \"tag\": "blankite",\n    \"popularity\": 8516\n  },\n  {\n    \"tag\": "role",\n    \"popularity\": 8506\n  },\n  {\n    \"tag\": "peperine edelweiss",\n    \"popularity\": 8497\n  },\n  {\n    \"tag\": "unhysterical",\n    \"popularity\": 8488\n  },\n  {\n    \"tag\": "attentiveness",\n    \"popularity\": 8479\n  },\n  {\n    \"tag\": "scintillant",\n    \"popularity\": 8470\n  },\n  {\n    \"tag\": "stenostomatous",\n    \"popularity\": 8461\n  },\n  {\n    \"tag\": "pectinite",\n    \"popularity\": 8452\n  },\n  {\n    \"tag\": "herring",\n    \"popularity\": 8443\n  },\n  {\n    \"tag\": "interroom",\n    \"popularity\": 8434\n  },\n  {\n    \"tag\": "laccol",\n    \"popularity\": 8425\n  },\n  {\n    \"tag\": "unpartably kylite",\n    \"popularity\": 8416\n  },\n  {\n    \"tag\": "spirivalve",\n    \"popularity\": 8407\n  },\n  {\n    \"tag\": "hoosegow",\n    \"popularity\": 8398\n  },\n  {\n    \"tag\": "doat",\n    \"popularity\": 8389\n  },\n  {\n    \"tag\": "amphibian",\n    \"popularity\": 8380\n  },\n  {\n    \"tag\": "exposit",\n    \"popularity\": 8371\n  },\n  {\n    \"tag\": "canopy",\n    \"popularity\": 8363\n  },\n  {\n    \"tag\": "houndlike",\n    \"popularity\": 8354\n  },\n  {\n    \"tag\": "spikebill",\n    \"popularity\": 8345\n  },\n  {\n    \"tag\": "wiseacre pyrotechnic",\n    \"popularity\": 8336\n  },\n  {\n    \"tag\": "confessingly woodman",\n    \"popularity\": 8327\n  },\n  {\n    \"tag\": "overside",\n    \"popularity\": 8318\n  },\n  {\n    \"tag\": "oftwhiles",\n    \"popularity\": 8310\n  },\n  {\n    \"tag\": "Musophagidae",\n    \"popularity\": 8301\n  },\n  {\n    \"tag\": "slumberer",\n    \"popularity\": 8292\n  },\n  {\n    \"tag\": "leiotrichy",\n    \"popularity\": 8283\n  },\n  {\n    \"tag\": "Mantispidae",\n    \"popularity\": 8275\n  },\n  {\n    \"tag\": "perceptually",\n    \"popularity\": 8266\n  },\n  {\n    \"tag\": "biller",\n    \"popularity\": 8257\n  },\n  {\n    \"tag\": "eudaemonical",\n    \"popularity\": 8249\n  },\n  {\n    \"tag\": "underfiend",\n    \"popularity\": 8240\n  },\n  {\n    \"tag\": "impartible",\n    \"popularity\": 8231\n  },\n  {\n    \"tag\": "saxicavous",\n    \"popularity\": 8223\n  },\n  {\n    \"tag\": "yapster",\n    \"popularity\": 8214\n  },\n  {\n    \"tag\": "aliseptal",\n    \"popularity\": 8205\n  },\n  {\n    \"tag\": "omniparient",\n    \"popularity\": 8197\n  },\n  {\n    \"tag\": "nishiki",\n    \"popularity\": 8188\n  },\n  {\n    \"tag\": "yuzluk",\n    \"popularity\": 8180\n  },\n  {\n    \"tag\": "solderer",\n    \"popularity\": 8171\n  },\n  {\n    \"tag\": "Pinna",\n    \"popularity\": 8162\n  },\n  {\n    \"tag\": "reinterfere",\n    \"popularity\": 8154\n  },\n  {\n    \"tag\": "superepic",\n    \"popularity\": 8145\n  },\n  {\n    \"tag\": "ronquil",\n    \"popularity\": 8137\n  },\n  {\n    \"tag\": "bratstvo",\n    \"popularity\": 8128\n  },\n  {\n    \"tag\": "Thea",\n    \"popularity\": 8120\n  },\n  {\n    \"tag\": "hermaphroditical",\n    \"popularity\": 8111\n  },\n  {\n    \"tag\": "enlief",\n    \"popularity\": 8103\n  },\n  {\n    \"tag\": "Jesuate",\n    \"popularity\": 8095\n  },\n  {\n    \"tag\": "gaysome",\n    \"popularity\": 8086\n  },\n  {\n    \"tag\": "iliohypogastric",\n    \"popularity\": 8078\n  },\n  {\n    \"tag\": "regardance",\n    \"popularity\": 8069\n  },\n  {\n    \"tag\": "cumulately",\n    \"popularity\": 8061\n  },\n  {\n    \"tag\": "haustorial nucleolocentrosome",\n    \"popularity\": 8053\n  },\n  {\n    \"tag\": "cosmocrat",\n    \"popularity\": 8044\n  },\n  {\n    \"tag\": "onyxitis",\n    \"popularity\": 8036\n  },\n  {\n    \"tag\": "Cabinda",\n    \"popularity\": 8028\n  },\n  {\n    \"tag\": "coresort",\n    \"popularity\": 8019\n  },\n  {\n    \"tag\": "drusy preformant",\n    \"popularity\": 8011\n  },\n  {\n    \"tag\": "piningly",\n    \"popularity\": 8003\n  },\n  {\n    \"tag\": "bootlessly",\n    \"popularity\": 7994\n  },\n  {\n    \"tag\": "talari",\n    \"popularity\": 7986\n  },\n  {\n    \"tag\": "amidoacetal",\n    \"popularity\": 7978\n  },\n  {\n    \"tag\": "pschent",\n    \"popularity\": 7970\n  },\n  {\n    \"tag\": "consumptional scarer titivate",\n    \"popularity\": 7962\n  },\n  {\n    \"tag\": "Anserinae",\n    \"popularity\": 7953\n  },\n  {\n    \"tag\": "flaunter",\n    \"popularity\": 7945\n  },\n  {\n    \"tag\": "reindeer",\n    \"popularity\": 7937\n  },\n  {\n    \"tag\": "disparage",\n    \"popularity\": 7929\n  },\n  {\n    \"tag\": "superheat",\n    \"popularity\": 7921\n  },\n  {\n    \"tag\": "Chromatium",\n    \"popularity\": 7912\n  },\n  {\n    \"tag\": "Tina",\n    \"popularity\": 7904\n  },\n  {\n    \"tag\": "rededicatory",\n    \"popularity\": 7896\n  },\n  {\n    \"tag\": "nontransient",\n    \"popularity\": 7888\n  },\n  {\n    \"tag\": "Phocaean brinkless",\n    \"popularity\": 7880\n  },\n  {\n    \"tag\": "ventriculose",\n    \"popularity\": 7872\n  },\n  {\n    \"tag\": "upplough",\n    \"popularity\": 7864\n  },\n  {\n    \"tag\": "succorless",\n    \"popularity\": 7856\n  },\n  {\n    \"tag\": "hayrake",\n    \"popularity\": 7848\n  },\n  {\n    \"tag\": "merriness amorphia",\n    \"popularity\": 7840\n  },\n  {\n    \"tag\": "merycism",\n    \"popularity\": 7832\n  },\n  {\n    \"tag\": "checkrow",\n    \"popularity\": 7824\n  },\n  {\n    \"tag\": "scry",\n    \"popularity\": 7816\n  },\n  {\n    \"tag\": "obvolve",\n    \"popularity\": 7808\n  },\n  {\n    \"tag\": "orchard",\n    \"popularity\": 7800\n  },\n  {\n    \"tag\": "isomerize",\n    \"popularity\": 7792\n  },\n  {\n    \"tag\": "competitrix",\n    \"popularity\": 7784\n  },\n  {\n    \"tag\": "unbannered",\n    \"popularity\": 7776\n  },\n  {\n    \"tag\": "undoctrined",\n    \"popularity\": 7768\n  },\n  {\n    \"tag\": "theologian",\n    \"popularity\": 7760\n  },\n  {\n    \"tag\": "nebby",\n    \"popularity\": 7752\n  },\n  {\n    \"tag\": "Cardiazol",\n    \"popularity\": 7745\n  },\n  {\n    \"tag\": "phagedenic",\n    \"popularity\": 7737\n  },\n  {\n    \"tag\": "nostalgic",\n    \"popularity\": 7729\n  },\n  {\n    \"tag\": "orthodoxy",\n    \"popularity\": 7721\n  },\n  {\n    \"tag\": "oversanguine",\n    \"popularity\": 7713\n  },\n  {\n    \"tag\": "lish",\n    \"popularity\": 7705\n  },\n  {\n    \"tag\": "ketogenic",\n    \"popularity\": 7698\n  },\n  {\n    \"tag\": "syndicalize",\n    \"popularity\": 7690\n  },\n  {\n    \"tag\": "leeftail",\n    \"popularity\": 7682\n  },\n  {\n    \"tag\": "bulbomedullary",\n    \"popularity\": 7674\n  },\n  {\n    \"tag\": "reletter",\n    \"popularity\": 7667\n  },\n  {\n    \"tag\": "bitterly",\n    \"popularity\": 7659\n  },\n  {\n    \"tag\": "participatory",\n    \"popularity\": 7651\n  },\n  {\n    \"tag\": "baldberry",\n    \"popularity\": 7643\n  },\n  {\n    \"tag\": "prowaterpower",\n    \"popularity\": 7636\n  },\n  {\n    \"tag\": "lexicographical",\n    \"popularity\": 7628\n  },\n  {\n    \"tag\": "Anisodactyli",\n    \"popularity\": 7620\n  },\n  {\n    \"tag\": "amphipodous",\n    \"popularity\": 7613\n  },\n  {\n    \"tag\": "triglandular",\n    \"popularity\": 7605\n  },\n  {\n    \"tag\": "xanthopsin",\n    \"popularity\": 7597\n  },\n  {\n    \"tag\": "indefinitude",\n    \"popularity\": 7590\n  },\n  {\n    \"tag\": "bookworm",\n    \"popularity\": 7582\n  },\n  {\n    \"tag\": "suffocative",\n    \"popularity\": 7574\n  },\n  {\n    \"tag\": "uncongested tyrant",\n    \"popularity\": 7567\n  },\n  {\n    \"tag\": "alow harmoniously Pamir",\n    \"popularity\": 7559\n  },\n  {\n    \"tag\": "monander",\n    \"popularity\": 7552\n  },\n  {\n    \"tag\": "bagatelle",\n    \"popularity\": 7544\n  },\n  {\n    \"tag\": "membranology",\n    \"popularity\": 7537\n  },\n  {\n    \"tag\": "parturifacient",\n    \"popularity\": 7529\n  },\n  {\n    \"tag\": "excitovascular",\n    \"popularity\": 7522\n  },\n  {\n    \"tag\": "homopolar",\n    \"popularity\": 7514\n  },\n  {\n    \"tag\": "phobiac",\n    \"popularity\": 7507\n  },\n  {\n    \"tag\": "clype",\n    \"popularity\": 7499\n  },\n  {\n    \"tag\": "unsubversive",\n    \"popularity\": 7492\n  },\n  {\n    \"tag\": "bostrychoidal scorpionwort",\n    \"popularity\": 7484\n  },\n  {\n    \"tag\": "biliteralism",\n    \"popularity\": 7477\n  },\n  {\n    \"tag\": "dentatocostate",\n    \"popularity\": 7469\n  },\n  {\n    \"tag\": "Pici",\n    \"popularity\": 7462\n  },\n  {\n    \"tag\": "sideritic",\n    \"popularity\": 7454\n  },\n  {\n    \"tag\": "syntaxis",\n    \"popularity\": 7447\n  },\n  {\n    \"tag\": "ingest",\n    \"popularity\": 7440\n  },\n  {\n    \"tag\": "rigmarolish",\n    \"popularity\": 7432\n  },\n  {\n    \"tag\": "ocreaceous",\n    \"popularity\": 7425\n  },\n  {\n    \"tag\": "hyperbrachyskelic",\n    \"popularity\": 7418\n  },\n  {\n    \"tag\": "basophobia",\n    \"popularity\": 7410\n  },\n  {\n    \"tag\": "substantialness",\n    \"popularity\": 7403\n  },\n  {\n    \"tag\": "agglutinoid",\n    \"popularity\": 7396\n  },\n  {\n    \"tag\": "longleaf",\n    \"popularity\": 7388\n  },\n  {\n    \"tag\": "electroengraving",\n    \"popularity\": 7381\n  },\n  {\n    \"tag\": "laparoenterotomy",\n    \"popularity\": 7374\n  },\n  {\n    \"tag\": "oxalylurea",\n    \"popularity\": 7366\n  },\n  {\n    \"tag\": "unattaintedly",\n    \"popularity\": 7359\n  },\n  {\n    \"tag\": "pennystone",\n    \"popularity\": 7352\n  },\n  {\n    \"tag\": "Plumbaginaceae",\n    \"popularity\": 7345\n  },\n  {\n    \"tag\": "horntip",\n    \"popularity\": 7337\n  },\n  {\n    \"tag\": "begrudge",\n    \"popularity\": 7330\n  },\n  {\n    \"tag\": "bechignoned",\n    \"popularity\": 7323\n  },\n  {\n    \"tag\": "hologonidium",\n    \"popularity\": 7316\n  },\n  {\n    \"tag\": "Pulian",\n    \"popularity\": 7309\n  },\n  {\n    \"tag\": "gratulation",\n    \"popularity\": 7301\n  },\n  {\n    \"tag\": "Sebright",\n    \"popularity\": 7294\n  },\n  {\n    \"tag\": "coinstantaneous emotionally",\n    \"popularity\": 7287\n  },\n  {\n    \"tag\": "thoracostracan",\n    \"popularity\": 7280\n  },\n  {\n    \"tag\": "saurodont",\n    \"popularity\": 7273\n  },\n  {\n    \"tag\": "coseat",\n    \"popularity\": 7266\n  },\n  {\n    \"tag\": "irascibility",\n    \"popularity\": 7259\n  },\n  {\n    \"tag\": "occlude",\n    \"popularity\": 7251\n  },\n  {\n    \"tag\": "metallurgist",\n    \"popularity\": 7244\n  },\n  {\n    \"tag\": "extraviolet",\n    \"popularity\": 7237\n  },\n  {\n    \"tag\": "clinic",\n    \"popularity\": 7230\n  },\n  {\n    \"tag\": "skater",\n    \"popularity\": 7223\n  },\n  {\n    \"tag\": "linguistic",\n    \"popularity\": 7216\n  },\n  {\n    \"tag\": "attacheship",\n    \"popularity\": 7209\n  },\n  {\n    \"tag\": "Rachianectes",\n    \"popularity\": 7202\n  },\n  {\n    \"tag\": "foliolose",\n    \"popularity\": 7195\n  },\n  {\n    \"tag\": "claudetite",\n    \"popularity\": 7188\n  },\n  {\n    \"tag\": "aphidian scratching",\n    \"popularity\": 7181\n  },\n  {\n    \"tag\": "Carida",\n    \"popularity\": 7174\n  },\n  {\n    \"tag\": "tiepin polymicroscope",\n    \"popularity\": 7167\n  },\n  {\n    \"tag\": "telpherage",\n    \"popularity\": 7160\n  },\n  {\n    \"tag\": "meek",\n    \"popularity\": 7153\n  },\n  {\n    \"tag\": "swiftness",\n    \"popularity\": 7146\n  },\n  {\n    \"tag\": "gentes",\n    \"popularity\": 7139\n  },\n  {\n    \"tag\": "uncommemorated",\n    \"popularity\": 7132\n  },\n  {\n    \"tag\": "Lazarus",\n    \"popularity\": 7125\n  },\n  {\n    \"tag\": "redivive",\n    \"popularity\": 7119\n  },\n  {\n    \"tag\": "nonfebrile",\n    \"popularity\": 7112\n  },\n  {\n    \"tag\": "nymphet",\n    \"popularity\": 7105\n  },\n  {\n    \"tag\": "areologically",\n    \"popularity\": 7098\n  },\n  {\n    \"tag\": "undonkey",\n    \"popularity\": 7091\n  },\n  {\n    \"tag\": "projecting",\n    \"popularity\": 7084\n  },\n  {\n    \"tag\": "pinnigrade",\n    \"popularity\": 7077\n  },\n  {\n    \"tag\": "butylation",\n    \"popularity\": 7071\n  },\n  {\n    \"tag\": "philologistic lenticle",\n    \"popularity\": 7064\n  },\n  {\n    \"tag\": "nooky",\n    \"popularity\": 7057\n  },\n  {\n    \"tag\": "incestuousness",\n    \"popularity\": 7050\n  },\n  {\n    \"tag\": "palingenetically",\n    \"popularity\": 7043\n  },\n  {\n    \"tag\": "mitochondria",\n    \"popularity\": 7037\n  },\n  {\n    \"tag\": "truthify",\n    \"popularity\": 7030\n  },\n  {\n    \"tag\": "titanyl",\n    \"popularity\": 7023\n  },\n  {\n    \"tag\": "bestride",\n    \"popularity\": 7016\n  },\n  {\n    \"tag\": "chende",\n    \"popularity\": 7010\n  },\n  {\n    \"tag\": "Chaucerian monophote",\n    \"popularity\": 7003\n  },\n  {\n    \"tag\": "cutback",\n    \"popularity\": 6996\n  },\n  {\n    \"tag\": "unpatiently",\n    \"popularity\": 6989\n  },\n  {\n    \"tag\": "subvitreous",\n    \"popularity\": 6983\n  },\n  {\n    \"tag\": "organizable",\n    \"popularity\": 6976\n  },\n  {\n    \"tag\": "anniverse uncomprehensible",\n    \"popularity\": 6969\n  },\n  {\n    \"tag\": "hyalescence",\n    \"popularity\": 6963\n  },\n  {\n    \"tag\": "amniochorial",\n    \"popularity\": 6956\n  },\n  {\n    \"tag\": "Corybantian",\n    \"popularity\": 6949\n  },\n  {\n    \"tag\": "genocide Scaphitidae",\n    \"popularity\": 6943\n  },\n  {\n    \"tag\": "accordionist",\n    \"popularity\": 6936\n  },\n  {\n    \"tag\": "becheck",\n    \"popularity\": 6930\n  },\n  {\n    \"tag\": "overproduce",\n    \"popularity\": 6923\n  },\n  {\n    \"tag\": "unmaniac frijolillo",\n    \"popularity\": 6916\n  },\n  {\n    \"tag\": "multisulcated",\n    \"popularity\": 6910\n  },\n  {\n    \"tag\": "wennebergite",\n    \"popularity\": 6903\n  },\n  {\n    \"tag\": "tautousious mowth",\n    \"popularity\": 6897\n  },\n  {\n    \"tag\": "marigold",\n    \"popularity\": 6890\n  },\n  {\n    \"tag\": "affray",\n    \"popularity\": 6884\n  },\n  {\n    \"tag\": "nonidolatrous",\n    \"popularity\": 6877\n  },\n  {\n    \"tag\": "aphrasia",\n    \"popularity\": 6871\n  },\n  {\n    \"tag\": "muddlingly",\n    \"popularity\": 6864\n  },\n  {\n    \"tag\": "clear",\n    \"popularity\": 6858\n  },\n  {\n    \"tag\": "Clitoria",\n    \"popularity\": 6851\n  },\n  {\n    \"tag\": "apportionment underwaist",\n    \"popularity\": 6845\n  },\n  {\n    \"tag\": "kodakist",\n    \"popularity\": 6838\n  },\n  {\n    \"tag\": "Momotidae",\n    \"popularity\": 6832\n  },\n  {\n    \"tag\": "cryptovalency",\n    \"popularity\": 6825\n  },\n  {\n    \"tag\": "floe",\n    \"popularity\": 6819\n  },\n  {\n    \"tag\": "aphagia",\n    \"popularity\": 6812\n  },\n  {\n    \"tag\": "brontograph",\n    \"popularity\": 6806\n  },\n  {\n    \"tag\": "tubulous",\n    \"popularity\": 6799\n  },\n  {\n    \"tag\": "unhorse",\n    \"popularity\": 6793\n  },\n  {\n    \"tag\": "chlordane",\n    \"popularity\": 6787\n  },\n  {\n    \"tag\": "colloquy brochan",\n    \"popularity\": 6780\n  },\n  {\n    \"tag\": "sloosh",\n    \"popularity\": 6774\n  },\n  {\n    \"tag\": "battered",\n    \"popularity\": 6767\n  },\n  {\n    \"tag\": "monocularity pluriguttulate",\n    \"popularity\": 6761\n  },\n  {\n    \"tag\": "chiastoneury",\n    \"popularity\": 6755\n  },\n  {\n    \"tag\": "Sanguinaria",\n    \"popularity\": 6748\n  },\n  {\n    \"tag\": "confessionary",\n    \"popularity\": 6742\n  },\n  {\n    \"tag\": "enzymic",\n    \"popularity\": 6736\n  },\n  {\n    \"tag\": "cord",\n    \"popularity\": 6729\n  },\n  {\n    \"tag\": "oviducal",\n    \"popularity\": 6723\n  },\n  {\n    \"tag\": "crozzle outsea",\n    \"popularity\": 6717\n  },\n  {\n    \"tag\": "balladical",\n    \"popularity\": 6710\n  },\n  {\n    \"tag\": "uncollectibleness",\n    \"popularity\": 6704\n  },\n  {\n    \"tag\": "predorsal",\n    \"popularity\": 6698\n  },\n  {\n    \"tag\": "reauthenticate",\n    \"popularity\": 6692\n  },\n  {\n    \"tag\": "ravissant",\n    \"popularity\": 6685\n  },\n  {\n    \"tag\": "advantageousness",\n    \"popularity\": 6679\n  },\n  {\n    \"tag\": "rung",\n    \"popularity\": 6673\n  },\n  {\n    \"tag\": "duncedom",\n    \"popularity\": 6667\n  },\n  {\n    \"tag\": "hematolite",\n    \"popularity\": 6660\n  },\n  {\n    \"tag\": "thisness",\n    \"popularity\": 6654\n  },\n  {\n    \"tag\": "mapau",\n    \"popularity\": 6648\n  },\n  {\n    \"tag\": "Hecatic",\n    \"popularity\": 6642\n  },\n  {\n    \"tag\": "meningoencephalocele",\n    \"popularity\": 6636\n  },\n  {\n    \"tag\": "confection sorra",\n    \"popularity\": 6630\n  },\n  {\n    \"tag\": "unsedate",\n    \"popularity\": 6623\n  },\n  {\n    \"tag\": "meningocerebritis",\n    \"popularity\": 6617\n  },\n  {\n    \"tag\": "biopsychological",\n    \"popularity\": 6611\n  },\n  {\n    \"tag\": "clavicithern",\n    \"popularity\": 6605\n  },\n  {\n    \"tag\": "resun",\n    \"popularity\": 6599\n  },\n  {\n    \"tag\": "bayamo",\n    \"popularity\": 6593\n  },\n  {\n    \"tag\": "seeableness",\n    \"popularity\": 6587\n  },\n  {\n    \"tag\": "hypsidolichocephalism",\n    \"popularity\": 6581\n  },\n  {\n    \"tag\": "salivous",\n    \"popularity\": 6574\n  },\n  {\n    \"tag\": "neumatize",\n    \"popularity\": 6568\n  },\n  {\n    \"tag\": "stree",\n    \"popularity\": 6562\n  },\n  {\n    \"tag\": "markshot",\n    \"popularity\": 6556\n  },\n  {\n    \"tag\": "phraseologically",\n    \"popularity\": 6550\n  },\n  {\n    \"tag\": "yealing",\n    \"popularity\": 6544\n  },\n  {\n    \"tag\": "puggy",\n    \"popularity\": 6538\n  },\n  {\n    \"tag\": "sexadecimal",\n    \"popularity\": 6532\n  },\n  {\n    \"tag\": "unofficerlike",\n    \"popularity\": 6526\n  },\n  {\n    \"tag\": "curiosa",\n    \"popularity\": 6520\n  },\n  {\n    \"tag\": "pedomotor",\n    \"popularity\": 6514\n  },\n  {\n    \"tag\": "astrally",\n    \"popularity\": 6508\n  },\n  {\n    \"tag\": "prosomatic",\n    \"popularity\": 6502\n  },\n  {\n    \"tag\": "bulletheaded",\n    \"popularity\": 6496\n  },\n  {\n    \"tag\": "fortuned",\n    \"popularity\": 6490\n  },\n  {\n    \"tag\": "pixy",\n    \"popularity\": 6484\n  },\n  {\n    \"tag\": "protectrix",\n    \"popularity\": 6478\n  },\n  {\n    \"tag\": "arthritical",\n    \"popularity\": 6472\n  },\n  {\n    \"tag\": "coction",\n    \"popularity\": 6466\n  },\n  {\n    \"tag\": "Anthropos",\n    \"popularity\": 6460\n  },\n  {\n    \"tag\": "runer",\n    \"popularity\": 6454\n  },\n  {\n    \"tag\": "prenotify",\n    \"popularity\": 6449\n  },\n  {\n    \"tag\": "microspheric gastroparalysis",\n    \"popularity\": 6443\n  },\n  {\n    \"tag\": "Jovicentrical",\n    \"popularity\": 6437\n  },\n  {\n    \"tag\": "ceratopsid",\n    \"popularity\": 6431\n  },\n  {\n    \"tag\": "Theodoric",\n    \"popularity\": 6425\n  },\n  {\n    \"tag\": "Pactolus",\n    \"popularity\": 6419\n  },\n  {\n    \"tag\": "spawning",\n    \"popularity\": 6413\n  },\n  {\n    \"tag\": "nonconfidential",\n    \"popularity\": 6407\n  },\n  {\n    \"tag\": "halotrichite infumate",\n    \"popularity\": 6402\n  },\n  {\n    \"tag\": "undiscriminatingly",\n    \"popularity\": 6396\n  },\n  {\n    \"tag\": "unexasperated",\n    \"popularity\": 6390\n  },\n  {\n    \"tag\": "isoeugenol",\n    \"popularity\": 6384\n  },\n  {\n    \"tag\": "pressboard",\n    \"popularity\": 6378\n  },\n  {\n    \"tag\": "unshrew",\n    \"popularity\": 6372\n  },\n  {\n    \"tag\": "huffingly",\n    \"popularity\": 6367\n  },\n  {\n    \"tag\": "wagaun",\n    \"popularity\": 6361\n  },\n  {\n    \"tag\": "squirt Philistine",\n    \"popularity\": 6355\n  },\n  {\n    \"tag\": "kryptic",\n    \"popularity\": 6349\n  },\n  {\n    \"tag\": "paraform",\n    \"popularity\": 6344\n  },\n  {\n    \"tag\": "preverify",\n    \"popularity\": 6338\n  },\n  {\n    \"tag\": "dalar",\n    \"popularity\": 6332\n  },\n  {\n    \"tag\": "interdictor appraisingly",\n    \"popularity\": 6326\n  },\n  {\n    \"tag\": "chipped",\n    \"popularity\": 6321\n  },\n  {\n    \"tag\": "Pteropoda",\n    \"popularity\": 6315\n  },\n  {\n    \"tag\": "Bohairic",\n    \"popularity\": 6309\n  },\n  {\n    \"tag\": "felting",\n    \"popularity\": 6303\n  },\n  {\n    \"tag\": "compurgatorial",\n    \"popularity\": 6298\n  },\n  {\n    \"tag\": "unclead",\n    \"popularity\": 6292\n  },\n  {\n    \"tag\": "stockish",\n    \"popularity\": 6286\n  },\n  {\n    \"tag\": "mulligatawny",\n    \"popularity\": 6281\n  },\n  {\n    \"tag\": "Monotheletism",\n    \"popularity\": 6275\n  },\n  {\n    \"tag\": "lutanist",\n    \"popularity\": 6269\n  },\n  {\n    \"tag\": "gluttonize",\n    \"popularity\": 6264\n  },\n  {\n    \"tag\": "hackneyed",\n    \"popularity\": 6258\n  },\n  {\n    \"tag\": "yield",\n    \"popularity\": 6253\n  },\n  {\n    \"tag\": "sulphonamido",\n    \"popularity\": 6247\n  },\n  {\n    \"tag\": "granulative",\n    \"popularity\": 6241\n  },\n  {\n    \"tag\": "swingy",\n    \"popularity\": 6236\n  },\n  {\n    \"tag\": "Desmidiales",\n    \"popularity\": 6230\n  },\n  {\n    \"tag\": "tootlish",\n    \"popularity\": 6224\n  },\n  {\n    \"tag\": "unsatisfiedly",\n    \"popularity\": 6219\n  },\n  {\n    \"tag\": "burucha",\n    \"popularity\": 6213\n  },\n  {\n    \"tag\": "premeditatingly",\n    \"popularity\": 6208\n  },\n  {\n    \"tag\": "cowrie",\n    \"popularity\": 6202\n  },\n  {\n    \"tag\": "pleurolysis",\n    \"popularity\": 6197\n  },\n  {\n    \"tag\": "nationalist",\n    \"popularity\": 6191\n  },\n  {\n    \"tag\": "Pholadacea",\n    \"popularity\": 6186\n  },\n  {\n    \"tag\": "anakrousis",\n    \"popularity\": 6180\n  },\n  {\n    \"tag\": "proctorial",\n    \"popularity\": 6175\n  },\n  {\n    \"tag\": "cavillation",\n    \"popularity\": 6169\n  },\n  {\n    \"tag\": "cervicobregmatic",\n    \"popularity\": 6163\n  },\n  {\n    \"tag\": "interspecific",\n    \"popularity\": 6158\n  },\n  {\n    \"tag\": "Teutonity",\n    \"popularity\": 6152\n  },\n  {\n    \"tag\": "snakeholing",\n    \"popularity\": 6147\n  },\n  {\n    \"tag\": "balcony",\n    \"popularity\": 6142\n  },\n  {\n    \"tag\": "latchless",\n    \"popularity\": 6136\n  },\n  {\n    \"tag\": "Mithraea",\n    \"popularity\": 6131\n  },\n  {\n    \"tag\": "pseudepigraph",\n    \"popularity\": 6125\n  },\n  {\n    \"tag\": "flosser",\n    \"popularity\": 6120\n  },\n  {\n    \"tag\": "kotyle",\n    \"popularity\": 6114\n  },\n  {\n    \"tag\": "outdo",\n    \"popularity\": 6109\n  },\n  {\n    \"tag\": "interclerical",\n    \"popularity\": 6103\n  },\n  {\n    \"tag\": "aurar",\n    \"popularity\": 6098\n  },\n  {\n    \"tag\": "apophyseal",\n    \"popularity\": 6093\n  },\n  {\n    \"tag\": "Miro",\n    \"popularity\": 6087\n  },\n  {\n    \"tag\": "Priscillian",\n    \"popularity\": 6082\n  },\n  {\n    \"tag\": "alluvia",\n    \"popularity\": 6076\n  },\n  {\n    \"tag\": "exordize",\n    \"popularity\": 6071\n  },\n  {\n    \"tag\": "breakage",\n    \"popularity\": 6066\n  },\n  {\n    \"tag\": "unclosable",\n    \"popularity\": 6060\n  },\n  {\n    \"tag\": "monocondylous",\n    \"popularity\": 6055\n  },\n  {\n    \"tag\": "dyarchy",\n    \"popularity\": 6050\n  },\n  {\n    \"tag\": "subchelate",\n    \"popularity\": 6044\n  },\n  {\n    \"tag\": "hearsay",\n    \"popularity\": 6039\n  },\n  {\n    \"tag\": "prestigiously",\n    \"popularity\": 6034\n  },\n  {\n    \"tag\": "unimuscular",\n    \"popularity\": 6028\n  },\n  {\n    \"tag\": "lingwort",\n    \"popularity\": 6023\n  },\n  {\n    \"tag\": "jealous",\n    \"popularity\": 6018\n  },\n  {\n    \"tag\": "artilleryman",\n    \"popularity\": 6012\n  },\n  {\n    \"tag\": "phantasmagorially",\n    \"popularity\": 6007\n  },\n  {\n    \"tag\": "stagnum",\n    \"popularity\": 6002\n  },\n  {\n    \"tag\": "organotropism shatteringly",\n    \"popularity\": 5997\n  },\n  {\n    \"tag\": "Mytilus Hebraist",\n    \"popularity\": 5991\n  },\n  {\n    \"tag\": "returf",\n    \"popularity\": 5986\n  },\n  {\n    \"tag\": "townfolk",\n    \"popularity\": 5981\n  },\n  {\n    \"tag\": "propitiative",\n    \"popularity\": 5976\n  },\n  {\n    \"tag\": "Anita unsullied",\n    \"popularity\": 5970\n  },\n  {\n    \"tag\": "bandoleered",\n    \"popularity\": 5965\n  },\n  {\n    \"tag\": "cubby",\n    \"popularity\": 5960\n  },\n  {\n    \"tag\": "Hexanchus",\n    \"popularity\": 5955\n  },\n  {\n    \"tag\": "circuminsular",\n    \"popularity\": 5949\n  },\n  {\n    \"tag\": "chamberletted eumycete",\n    \"popularity\": 5944\n  },\n  {\n    \"tag\": "secure",\n    \"popularity\": 5939\n  },\n  {\n    \"tag\": "Edwardean",\n    \"popularity\": 5934\n  },\n  {\n    \"tag\": "strenth",\n    \"popularity\": 5929\n  },\n  {\n    \"tag\": "exhaustless",\n    \"popularity\": 5923\n  },\n  {\n    \"tag\": "electioneerer",\n    \"popularity\": 5918\n  },\n  {\n    \"tag\": "estoile",\n    \"popularity\": 5913\n  },\n  {\n    \"tag\": "redden",\n    \"popularity\": 5908\n  },\n  {\n    \"tag\": "solicitee",\n    \"popularity\": 5903\n  },\n  {\n    \"tag\": "nonpatented",\n    \"popularity\": 5898\n  },\n  {\n    \"tag\": "lemming",\n    \"popularity\": 5893\n  },\n  {\n    \"tag\": "marled subalate",\n    \"popularity\": 5887\n  },\n  {\n    \"tag\": "premial horizonward",\n    \"popularity\": 5882\n  },\n  {\n    \"tag\": "nonrefueling",\n    \"popularity\": 5877\n  },\n  {\n    \"tag\": "rupturewort",\n    \"popularity\": 5872\n  },\n  {\n    \"tag\": "unfed",\n    \"popularity\": 5867\n  },\n  {\n    \"tag\": "empanelment",\n    \"popularity\": 5862\n  },\n  {\n    \"tag\": "isoosmosis",\n    \"popularity\": 5857\n  },\n  {\n    \"tag\": "jipijapa",\n    \"popularity\": 5852\n  },\n  {\n    \"tag\": "Fiji",\n    \"popularity\": 5847\n  },\n  {\n    \"tag\": "interferant",\n    \"popularity\": 5842\n  },\n  {\n    \"tag\": "reconstitution",\n    \"popularity\": 5837\n  },\n  {\n    \"tag\": "dockyardman",\n    \"popularity\": 5832\n  },\n  {\n    \"tag\": "dolichopodous",\n    \"popularity\": 5826\n  },\n  {\n    \"tag\": "whiteworm",\n    \"popularity\": 5821\n  },\n  {\n    \"tag\": "atheistically",\n    \"popularity\": 5816\n  },\n  {\n    \"tag\": "nonconcern",\n    \"popularity\": 5811\n  },\n  {\n    \"tag\": "scarabaeidoid",\n    \"popularity\": 5806\n  },\n  {\n    \"tag\": "triumviri",\n    \"popularity\": 5801\n  },\n  {\n    \"tag\": "rakit",\n    \"popularity\": 5796\n  },\n  {\n    \"tag\": "leecheater",\n    \"popularity\": 5791\n  },\n  {\n    \"tag\": "Arthrostraca",\n    \"popularity\": 5786\n  },\n  {\n    \"tag\": "upknit",\n    \"popularity\": 5781\n  },\n  {\n    \"tag\": "tymbalon",\n    \"popularity\": 5776\n  },\n  {\n    \"tag\": "inventurous",\n    \"popularity\": 5771\n  },\n  {\n    \"tag\": "perradiate",\n    \"popularity\": 5766\n  },\n  {\n    \"tag\": "seer",\n    \"popularity\": 5762\n  },\n  {\n    \"tag\": "Auricularia",\n    \"popularity\": 5757\n  },\n  {\n    \"tag\": "wettish exclusivity",\n    \"popularity\": 5752\n  },\n  {\n    \"tag\": "arteriosympathectomy",\n    \"popularity\": 5747\n  },\n  {\n    \"tag\": "tunlike",\n    \"popularity\": 5742\n  },\n  {\n    \"tag\": "cephalocercal",\n    \"popularity\": 5737\n  },\n  {\n    \"tag\": "meaninglessness",\n    \"popularity\": 5732\n  },\n  {\n    \"tag\": "fountful",\n    \"popularity\": 5727\n  },\n  {\n    \"tag\": "appraisement",\n    \"popularity\": 5722\n  },\n  {\n    \"tag\": "geniculated",\n    \"popularity\": 5717\n  },\n  {\n    \"tag\": "rotator",\n    \"popularity\": 5712\n  },\n  {\n    \"tag\": "foremarch biography",\n    \"popularity\": 5707\n  },\n  {\n    \"tag\": "arid",\n    \"popularity\": 5703\n  },\n  {\n    \"tag\": "inapprehensible",\n    \"popularity\": 5698\n  },\n  {\n    \"tag\": "chlorosulphonic",\n    \"popularity\": 5693\n  },\n  {\n    \"tag\": "braguette",\n    \"popularity\": 5688\n  },\n  {\n    \"tag\": "panophthalmitis",\n    \"popularity\": 5683\n  },\n  {\n    \"tag\": "pro objurgatorily",\n    \"popularity\": 5678\n  },\n  {\n    \"tag\": "zooplasty",\n    \"popularity\": 5673\n  },\n  {\n    \"tag\": "Terebratulidae",\n    \"popularity\": 5669\n  },\n  {\n    \"tag\": "Mahran",\n    \"popularity\": 5664\n  },\n  {\n    \"tag\": "anthologize merocele",\n    \"popularity\": 5659\n  },\n  {\n    \"tag\": "firecracker chiropractic",\n    \"popularity\": 5654\n  },\n  {\n    \"tag\": "tenorist",\n    \"popularity\": 5649\n  },\n  {\n    \"tag\": "amphitene",\n    \"popularity\": 5645\n  },\n  {\n    \"tag\": "silverbush toadstone",\n    \"popularity\": 5640\n  },\n  {\n    \"tag\": "entozoological",\n    \"popularity\": 5635\n  },\n  {\n    \"tag\": "trustlessness",\n    \"popularity\": 5630\n  },\n  {\n    \"tag\": "reassay",\n    \"popularity\": 5625\n  },\n  {\n    \"tag\": "chrysalides",\n    \"popularity\": 5621\n  },\n  {\n    \"tag\": "truncation",\n    \"popularity\": 5616\n  },\n  {\n    \"tag\": "unwavered mausoleal",\n    \"popularity\": 5611\n  },\n  {\n    \"tag\": "unserrated",\n    \"popularity\": 5606\n  },\n  {\n    \"tag\": "frampler",\n    \"popularity\": 5602\n  },\n  {\n    \"tag\": "celestial",\n    \"popularity\": 5597\n  },\n  {\n    \"tag\": "depreter",\n    \"popularity\": 5592\n  },\n  {\n    \"tag\": "retaliate",\n    \"popularity\": 5588\n  },\n  {\n    \"tag\": "decempunctate",\n    \"popularity\": 5583\n  },\n  {\n    \"tag\": "submitter",\n    \"popularity\": 5578\n  },\n  {\n    \"tag\": "phenothiazine",\n    \"popularity\": 5573\n  },\n  {\n    \"tag\": "hobbledehoyish",\n    \"popularity\": 5569\n  },\n  {\n    \"tag\": "erraticness",\n    \"popularity\": 5564\n  },\n  {\n    \"tag\": "ovariodysneuria",\n    \"popularity\": 5559\n  },\n  {\n    \"tag\": "puja",\n    \"popularity\": 5555\n  },\n  {\n    \"tag\": "cesspool",\n    \"popularity\": 5550\n  },\n  {\n    \"tag\": "sonation",\n    \"popularity\": 5545\n  },\n  {\n    \"tag\": "moggan",\n    \"popularity\": 5541\n  },\n  {\n    \"tag\": "overjutting",\n    \"popularity\": 5536\n  },\n  {\n    \"tag\": "cohobate",\n    \"popularity\": 5531\n  },\n  {\n    \"tag\": "Distoma",\n    \"popularity\": 5527\n  },\n  {\n    \"tag\": "Plectognathi",\n    \"popularity\": 5522\n  },\n  {\n    \"tag\": "dumple caliphate",\n    \"popularity\": 5517\n  },\n  {\n    \"tag\": "shiko",\n    \"popularity\": 5513\n  },\n  {\n    \"tag\": "downness",\n    \"popularity\": 5508\n  },\n  {\n    \"tag\": "whippletree",\n    \"popularity\": 5504\n  },\n  {\n    \"tag\": "nymphaeum",\n    \"popularity\": 5499\n  },\n  {\n    \"tag\": "there trest",\n    \"popularity\": 5494\n  },\n  {\n    \"tag\": "psychrometer",\n    \"popularity\": 5490\n  },\n  {\n    \"tag\": "pyelograph",\n    \"popularity\": 5485\n  },\n  {\n    \"tag\": "unsalvable",\n    \"popularity\": 5481\n  },\n  {\n    \"tag\": "bescreen",\n    \"popularity\": 5476\n  },\n  {\n    \"tag\": "cushy",\n    \"popularity\": 5471\n  },\n  {\n    \"tag\": "plicatolobate",\n    \"popularity\": 5467\n  },\n  {\n    \"tag\": "lakie",\n    \"popularity\": 5462\n  },\n  {\n    \"tag\": "anthropodeoxycholic",\n    \"popularity\": 5458\n  },\n  {\n    \"tag\": "resatisfaction",\n    \"popularity\": 5453\n  },\n  {\n    \"tag\": "unravelment unaccidental",\n    \"popularity\": 5449\n  },\n  {\n    \"tag\": "telewriter monogeneous",\n    \"popularity\": 5444\n  },\n  {\n    \"tag\": "unsabred",\n    \"popularity\": 5440\n  },\n  {\n    \"tag\": "startlingly",\n    \"popularity\": 5435\n  },\n  {\n    \"tag\": "Aralia",\n    \"popularity\": 5431\n  },\n  {\n    \"tag\": "alamonti",\n    \"popularity\": 5426\n  },\n  {\n    \"tag\": "Franklinization",\n    \"popularity\": 5422\n  },\n  {\n    \"tag\": "parliament",\n    \"popularity\": 5417\n  },\n  {\n    \"tag\": "schoolkeeper",\n    \"popularity\": 5413\n  },\n  {\n    \"tag\": "nonsociety",\n    \"popularity\": 5408\n  },\n  {\n    \"tag\": "parenthetic",\n    \"popularity\": 5404\n  },\n  {\n    \"tag\": "stog",\n    \"popularity\": 5399\n  },\n  {\n    \"tag\": "Pristipomidae",\n    \"popularity\": 5395\n  },\n  {\n    \"tag\": "exocarp",\n    \"popularity\": 5390\n  },\n  {\n    \"tag\": "monaxonial",\n    \"popularity\": 5386\n  },\n  {\n    \"tag\": "tramroad",\n    \"popularity\": 5381\n  },\n  {\n    \"tag\": "hookah",\n    \"popularity\": 5377\n  },\n  {\n    \"tag\": "saccharonic",\n    \"popularity\": 5372\n  },\n  {\n    \"tag\": "perimetrium",\n    \"popularity\": 5368\n  },\n  {\n    \"tag\": "libelluloid",\n    \"popularity\": 5364\n  },\n  {\n    \"tag\": "overrunningly",\n    \"popularity\": 5359\n  },\n  {\n    \"tag\": "untwister",\n    \"popularity\": 5355\n  },\n  {\n    \"tag\": "ninnyhammer",\n    \"popularity\": 5350\n  },\n  {\n    \"tag\": "metranate",\n    \"popularity\": 5346\n  },\n  {\n    \"tag\": "sarcoblast",\n    \"popularity\": 5341\n  },\n  {\n    \"tag\": "porkish",\n    \"popularity\": 5337\n  },\n  {\n    \"tag\": "chauvinistic",\n    \"popularity\": 5333\n  },\n  {\n    \"tag\": "sexagesimal",\n    \"popularity\": 5328\n  },\n  {\n    \"tag\": "hematogenic",\n    \"popularity\": 5324\n  },\n  {\n    \"tag\": "selfpreservatory",\n    \"popularity\": 5320\n  },\n  {\n    \"tag\": "myelauxe",\n    \"popularity\": 5315\n  },\n  {\n    \"tag\": "triply",\n    \"popularity\": 5311\n  },\n  {\n    \"tag\": "metaphysicous",\n    \"popularity\": 5306\n  },\n  {\n    \"tag\": "vitrinoid",\n    \"popularity\": 5302\n  },\n  {\n    \"tag\": "glabellae",\n    \"popularity\": 5298\n  },\n  {\n    \"tag\": "moonlighter",\n    \"popularity\": 5293\n  },\n  {\n    \"tag\": "monotheistically epexegetical",\n    \"popularity\": 5289\n  },\n  {\n    \"tag\": "pseudolateral",\n    \"popularity\": 5285\n  },\n  {\n    \"tag\": "heptamethylene",\n    \"popularity\": 5280\n  },\n  {\n    \"tag\": "salvadora",\n    \"popularity\": 5276\n  },\n  {\n    \"tag\": "unjovial diphenylthiourea",\n    \"popularity\": 5272\n  },\n  {\n    \"tag\": "thievishness",\n    \"popularity\": 5268\n  },\n  {\n    \"tag\": "unridable",\n    \"popularity\": 5263\n  },\n  {\n    \"tag\": "underhandedly",\n    \"popularity\": 5259\n  },\n  {\n    \"tag\": "fungiform",\n    \"popularity\": 5255\n  },\n  {\n    \"tag\": "scruffle",\n    \"popularity\": 5250\n  },\n  {\n    \"tag\": "preindisposition",\n    \"popularity\": 5246\n  },\n  {\n    \"tag\": "Amadis",\n    \"popularity\": 5242\n  },\n  {\n    \"tag\": "Culex",\n    \"popularity\": 5238\n  },\n  {\n    \"tag\": "churning",\n    \"popularity\": 5233\n  },\n  {\n    \"tag\": "imperite",\n    \"popularity\": 5229\n  },\n  {\n    \"tag\": "levorotation",\n    \"popularity\": 5225\n  },\n  {\n    \"tag\": "barbate",\n    \"popularity\": 5221\n  },\n  {\n    \"tag\": "knotwort",\n    \"popularity\": 5216\n  },\n  {\n    \"tag\": "gypsiferous",\n    \"popularity\": 5212\n  },\n  {\n    \"tag\": "tourmalinic",\n    \"popularity\": 5208\n  },\n  {\n    \"tag\": "helleboric",\n    \"popularity\": 5204\n  },\n  {\n    \"tag\": "pneumograph",\n    \"popularity\": 5199\n  },\n  {\n    \"tag\": "Peltigeraceae",\n    \"popularity\": 5195\n  },\n  {\n    \"tag\": "busine",\n    \"popularity\": 5191\n  },\n  {\n    \"tag\": "Ailuridae",\n    \"popularity\": 5187\n  },\n  {\n    \"tag\": "azotate",\n    \"popularity\": 5183\n  },\n  {\n    \"tag\": "unlikable",\n    \"popularity\": 5178\n  },\n  {\n    \"tag\": "sloyd",\n    \"popularity\": 5174\n  },\n  {\n    \"tag\": "biblioclasm",\n    \"popularity\": 5170\n  },\n  {\n    \"tag\": "Seres",\n    \"popularity\": 5166\n  },\n  {\n    \"tag\": "unaccurateness",\n    \"popularity\": 5162\n  },\n  {\n    \"tag\": "scrollwise",\n    \"popularity\": 5157\n  },\n  {\n    \"tag\": "flandowser",\n    \"popularity\": 5153\n  },\n  {\n    \"tag\": "unblackened",\n    \"popularity\": 5149\n  },\n  {\n    \"tag\": "schistosternia",\n    \"popularity\": 5145\n  },\n  {\n    \"tag\": "fuse",\n    \"popularity\": 5141\n  },\n  {\n    \"tag\": "narthecal",\n    \"popularity\": 5137\n  },\n  {\n    \"tag\": "Cueva",\n    \"popularity\": 5133\n  },\n  {\n    \"tag\": "appositeness",\n    \"popularity\": 5128\n  },\n  {\n    \"tag\": "proindustrial",\n    \"popularity\": 5124\n  },\n  {\n    \"tag\": "dermatorrhoea",\n    \"popularity\": 5120\n  },\n  {\n    \"tag\": "oxyurous tendential",\n    \"popularity\": 5116\n  },\n  {\n    \"tag\": "isopurpurin",\n    \"popularity\": 5112\n  },\n  {\n    \"tag\": "impose",\n    \"popularity\": 5108\n  },\n  {\n    \"tag\": "wordsmanship",\n    \"popularity\": 5104\n  },\n  {\n    \"tag\": "saturator",\n    \"popularity\": 5100\n  },\n  {\n    \"tag\": "Nordicity",\n    \"popularity\": 5096\n  },\n  {\n    \"tag\": "interaccuse",\n    \"popularity\": 5092\n  },\n  {\n    \"tag\": "acridinic",\n    \"popularity\": 5087\n  },\n  {\n    \"tag\": "scholion",\n    \"popularity\": 5083\n  },\n  {\n    \"tag\": "pseudoaconitine",\n    \"popularity\": 5079\n  },\n  {\n    \"tag\": "doctorial",\n    \"popularity\": 5075\n  },\n  {\n    \"tag\": "Etchimin",\n    \"popularity\": 5071\n  },\n  {\n    \"tag\": "oliviform",\n    \"popularity\": 5067\n  },\n  {\n    \"tag\": "Pele",\n    \"popularity\": 5063\n  },\n  {\n    \"tag\": "Chiromantis Progymnasium",\n    \"popularity\": 5059\n  },\n  {\n    \"tag\": "toxosis",\n    \"popularity\": 5055\n  },\n  {\n    \"tag\": "spadilla",\n    \"popularity\": 5051\n  },\n  {\n    \"tag\": "Actinopterygii",\n    \"popularity\": 5047\n  },\n  {\n    \"tag\": "untiring",\n    \"popularity\": 5043\n  },\n  {\n    \"tag\": "butyral",\n    \"popularity\": 5039\n  },\n  {\n    \"tag\": "Gymnoderinae",\n    \"popularity\": 5035\n  },\n  {\n    \"tag\": "testudo",\n    \"popularity\": 5031\n  },\n  {\n    \"tag\": "frigorify",\n    \"popularity\": 5027\n  },\n  {\n    \"tag\": "aliency",\n    \"popularity\": 5023\n  },\n  {\n    \"tag\": "jargon",\n    \"popularity\": 5019\n  },\n  {\n    \"tag\": "counterservice",\n    \"popularity\": 5015\n  },\n  {\n    \"tag\": "isostrychnine",\n    \"popularity\": 5011\n  },\n  {\n    \"tag\": "tellership",\n    \"popularity\": 5007\n  },\n  {\n    \"tag\": "miscegenetic",\n    \"popularity\": 5003\n  },\n  {\n    \"tag\": "sorcer",\n    \"popularity\": 4999\n  },\n  {\n    \"tag\": "tilewright",\n    \"popularity\": 4995\n  },\n  {\n    \"tag\": "cyanoplastid",\n    \"popularity\": 4991\n  },\n  {\n    \"tag\": "fluxionally",\n    \"popularity\": 4987\n  },\n  {\n    \"tag\": "proudhearted",\n    \"popularity\": 4983\n  },\n  {\n    \"tag\": "blithely",\n    \"popularity\": 4979\n  },\n  {\n    \"tag\": "jestproof",\n    \"popularity\": 4975\n  },\n  {\n    \"tag\": "jestwise",\n    \"popularity\": 4971\n  },\n  {\n    \"tag\": "nonassimilable",\n    \"popularity\": 4967\n  },\n  {\n    \"tag\": "compurgation",\n    \"popularity\": 4964\n  },\n  {\n    \"tag\": "unhate",\n    \"popularity\": 4960\n  },\n  {\n    \"tag\": "haplodonty",\n    \"popularity\": 4956\n  },\n  {\n    \"tag\": "cardholder",\n    \"popularity\": 4952\n  },\n  {\n    \"tag\": "rainlight megohmmeter overstout",\n    \"popularity\": 4948\n  },\n  {\n    \"tag\": "itchless",\n    \"popularity\": 4944\n  },\n  {\n    \"tag\": "begiggle",\n    \"popularity\": 4940\n  },\n  {\n    \"tag\": "chromatosphere",\n    \"popularity\": 4936\n  },\n  {\n    \"tag\": "typicality",\n    \"popularity\": 4932\n  },\n  {\n    \"tag\": "overgrown",\n    \"popularity\": 4928\n  },\n  {\n    \"tag\": "envolume",\n    \"popularity\": 4925\n  },\n  {\n    \"tag\": "pachycholia",\n    \"popularity\": 4921\n  },\n  {\n    \"tag\": "passageable",\n    \"popularity\": 4917\n  },\n  {\n    \"tag\": "pathopoiesis",\n    \"popularity\": 4913\n  },\n  {\n    \"tag\": "overbreak",\n    \"popularity\": 4909\n  },\n  {\n    \"tag\": "satyric",\n    \"popularity\": 4905\n  },\n  {\n    \"tag\": "unaudited",\n    \"popularity\": 4901\n  },\n  {\n    \"tag\": "whimble",\n    \"popularity\": 4898\n  },\n  {\n    \"tag\": "pressureless",\n    \"popularity\": 4894\n  },\n  {\n    \"tag\": "Selene",\n    \"popularity\": 4890\n  },\n  {\n    \"tag\": "slithery",\n    \"popularity\": 4886\n  },\n  {\n    \"tag\": "nondisfigurement",\n    \"popularity\": 4882\n  },\n  {\n    \"tag\": "overdelicious",\n    \"popularity\": 4878\n  },\n  {\n    \"tag\": "Perca",\n    \"popularity\": 4875\n  },\n  {\n    \"tag\": "Palladium",\n    \"popularity\": 4871\n  },\n  {\n    \"tag\": "insagacity",\n    \"popularity\": 4867\n  },\n  {\n    \"tag\": "peristoma",\n    \"popularity\": 4863\n  },\n  {\n    \"tag\": "uncreativeness",\n    \"popularity\": 4859\n  },\n  {\n    \"tag\": "incomparability surfboarding",\n    \"popularity\": 4856\n  },\n  {\n    \"tag\": "bacillar",\n    \"popularity\": 4852\n  },\n  {\n    \"tag\": "ulcerative",\n    \"popularity\": 4848\n  },\n  {\n    \"tag\": "stychomythia",\n    \"popularity\": 4844\n  },\n  {\n    \"tag\": "sesma somatics nonentry",\n    \"popularity\": 4840\n  },\n  {\n    \"tag\": "unsepulchred",\n    \"popularity\": 4837\n  },\n  {\n    \"tag\": "cephalanthium",\n    \"popularity\": 4833\n  },\n  {\n    \"tag\": "Asiaticization",\n    \"popularity\": 4829\n  },\n  {\n    \"tag\": "killeen",\n    \"popularity\": 4825\n  },\n  {\n    \"tag\": "Pseudococcus",\n    \"popularity\": 4822\n  },\n  {\n    \"tag\": "untractable",\n    \"popularity\": 4818\n  },\n  {\n    \"tag\": "apolegamic",\n    \"popularity\": 4814\n  },\n  {\n    \"tag\": "hyperpnea",\n    \"popularity\": 4810\n  },\n  {\n    \"tag\": "martyrolatry",\n    \"popularity\": 4807\n  },\n  {\n    \"tag\": "Sarmatic",\n    \"popularity\": 4803\n  },\n  {\n    \"tag\": "nonsurface",\n    \"popularity\": 4799\n  },\n  {\n    \"tag\": "adjoined",\n    \"popularity\": 4796\n  },\n  {\n    \"tag\": "vasiform",\n    \"popularity\": 4792\n  },\n  {\n    \"tag\": "tastelessness",\n    \"popularity\": 4788\n  },\n  {\n    \"tag\": "rumbo",\n    \"popularity\": 4784\n  },\n  {\n    \"tag\": "subdititious",\n    \"popularity\": 4781\n  },\n  {\n    \"tag\": "reparticipation",\n    \"popularity\": 4777\n  },\n  {\n    \"tag\": "Yorkshireism",\n    \"popularity\": 4773\n  },\n  {\n    \"tag\": "outcrow",\n    \"popularity\": 4770\n  },\n  {\n    \"tag\": "casserole",\n    \"popularity\": 4766\n  },\n  {\n    \"tag\": "semideltaic",\n    \"popularity\": 4762\n  },\n  {\n    \"tag\": "freemason",\n    \"popularity\": 4759\n  },\n  {\n    \"tag\": "catkin",\n    \"popularity\": 4755\n  },\n  {\n    \"tag\": "conscient",\n    \"popularity\": 4751\n  },\n  {\n    \"tag\": "reliably",\n    \"popularity\": 4748\n  },\n  {\n    \"tag\": "Telembi",\n    \"popularity\": 4744\n  },\n  {\n    \"tag\": "hide",\n    \"popularity\": 4740\n  },\n  {\n    \"tag\": "social",\n    \"popularity\": 4737\n  },\n  {\n    \"tag\": "ichneutic",\n    \"popularity\": 4733\n  },\n  {\n    \"tag\": "polypotome blouse pentagrammatic",\n    \"popularity\": 4729\n  },\n  {\n    \"tag\": "airdrome pesthole",\n    \"popularity\": 4726\n  },\n  {\n    \"tag\": "unportended",\n    \"popularity\": 4722\n  },\n  {\n    \"tag\": "sheerly",\n    \"popularity\": 4719\n  },\n  {\n    \"tag\": "acardiac",\n    \"popularity\": 4715\n  },\n  {\n    \"tag\": "fetor",\n    \"popularity\": 4711\n  },\n  {\n    \"tag\": "storax",\n    \"popularity\": 4708\n  },\n  {\n    \"tag\": "syndactylic",\n    \"popularity\": 4704\n  },\n  {\n    \"tag\": "otiatrics",\n    \"popularity\": 4700\n  },\n  {\n    \"tag\": "range",\n    \"popularity\": 4697\n  },\n  {\n    \"tag\": "branchway",\n    \"popularity\": 4693\n  },\n  {\n    \"tag\": "beatific",\n    \"popularity\": 4690\n  },\n  {\n    \"tag\": "Rugosa",\n    \"popularity\": 4686\n  },\n  {\n    \"tag\": "rafty",\n    \"popularity\": 4682\n  },\n  {\n    \"tag\": "gapy",\n    \"popularity\": 4679\n  },\n  {\n    \"tag\": "heterocercal",\n    \"popularity\": 4675\n  },\n  {\n    \"tag\": "actinopterygious",\n    \"popularity\": 4672\n  },\n  {\n    \"tag\": "glauconite",\n    \"popularity\": 4668\n  },\n  {\n    \"tag\": "limbless priest",\n    \"popularity\": 4665\n  },\n  {\n    \"tag\": "chrysene",\n    \"popularity\": 4661\n  },\n  {\n    \"tag\": "isentropic",\n    \"popularity\": 4658\n  },\n  {\n    \"tag\": "lairdess",\n    \"popularity\": 4654\n  },\n  {\n    \"tag\": "butterhead choliambic",\n    \"popularity\": 4650\n  },\n  {\n    \"tag\": "hexaseme",\n    \"popularity\": 4647\n  },\n  {\n    \"tag\": "treeify",\n    \"popularity\": 4643\n  },\n  {\n    \"tag\": "coronetted fructify",\n    \"popularity\": 4640\n  },\n  {\n    \"tag\": "admiralty",\n    \"popularity\": 4636\n  },\n  {\n    \"tag\": "Flosculariidae",\n    \"popularity\": 4633\n  },\n  {\n    \"tag\": "limaceous",\n    \"popularity\": 4629\n  },\n  {\n    \"tag\": "subterconscious",\n    \"popularity\": 4626\n  },\n  {\n    \"tag\": "stayless",\n    \"popularity\": 4622\n  },\n  {\n    \"tag\": "psha",\n    \"popularity\": 4619\n  },\n  {\n    \"tag\": "Mediterraneanize",\n    \"popularity\": 4615\n  },\n  {\n    \"tag\": "impenetrably",\n    \"popularity\": 4612\n  },\n  {\n    \"tag\": "Myrmeleonidae",\n    \"popularity\": 4608\n  },\n  {\n    \"tag\": "germander",\n    \"popularity\": 4605\n  },\n  {\n    \"tag\": "Buri",\n    \"popularity\": 4601\n  },\n  {\n    \"tag\": "papyrotamia",\n    \"popularity\": 4598\n  },\n  {\n    \"tag\": "Toxylon",\n    \"popularity\": 4594\n  },\n  {\n    \"tag\": "batatilla",\n    \"popularity\": 4591\n  },\n  {\n    \"tag\": "fabella assumer",\n    \"popularity\": 4587\n  },\n  {\n    \"tag\": "macromethod",\n    \"popularity\": 4584\n  },\n  {\n    \"tag\": "Blechnum",\n    \"popularity\": 4580\n  },\n  {\n    \"tag\": "pantography",\n    \"popularity\": 4577\n  },\n  {\n    \"tag\": "seminovel",\n    \"popularity\": 4574\n  },\n  {\n    \"tag\": "disembarrassment",\n    \"popularity\": 4570\n  },\n  {\n    \"tag\": "bushmaking",\n    \"popularity\": 4567\n  },\n  {\n    \"tag\": "neurosis",\n    \"popularity\": 4563\n  },\n  {\n    \"tag\": "Animalia",\n    \"popularity\": 4560\n  },\n  {\n    \"tag\": "Bernice",\n    \"popularity\": 4556\n  },\n  {\n    \"tag\": "wisen",\n    \"popularity\": 4553\n  },\n  {\n    \"tag\": "subhymenium",\n    \"popularity\": 4549\n  },\n  {\n    \"tag\": "esophagomycosis",\n    \"popularity\": 4546\n  },\n  {\n    \"tag\": "wireworks",\n    \"popularity\": 4543\n  },\n  {\n    \"tag\": "Sabellidae",\n    \"popularity\": 4539\n  },\n  {\n    \"tag\": "fustianish",\n    \"popularity\": 4536\n  },\n  {\n    \"tag\": "professively",\n    \"popularity\": 4532\n  },\n  {\n    \"tag\": "overcorruptly",\n    \"popularity\": 4529\n  },\n  {\n    \"tag\": "overcreep",\n    \"popularity\": 4526\n  },\n  {\n    \"tag\": "Castilloa",\n    \"popularity\": 4522\n  },\n  {\n    \"tag\": "forelady Georgie",\n    \"popularity\": 4519\n  },\n  {\n    \"tag\": "outsider",\n    \"popularity\": 4515\n  },\n  {\n    \"tag\": "Enukki",\n    \"popularity\": 4512\n  },\n  {\n    \"tag\": "gypsy",\n    \"popularity\": 4509\n  },\n  {\n    \"tag\": "Passamaquoddy",\n    \"popularity\": 4505\n  },\n  {\n    \"tag\": "reposit",\n    \"popularity\": 4502\n  },\n  {\n    \"tag\": "overtenderness",\n    \"popularity\": 4499\n  },\n  {\n    \"tag\": "keratome",\n    \"popularity\": 4495\n  },\n  {\n    \"tag\": "interclavicular hypermonosyllable Susanna",\n    \"popularity\": 4492\n  },\n  {\n    \"tag\": "mispropose",\n    \"popularity\": 4489\n  },\n  {\n    \"tag\": "Membranipora",\n    \"popularity\": 4485\n  },\n  {\n    \"tag\": "lampad",\n    \"popularity\": 4482\n  },\n  {\n    \"tag\": "header",\n    \"popularity\": 4479\n  },\n  {\n    \"tag\": "triseriate",\n    \"popularity\": 4475\n  },\n  {\n    \"tag\": "distrainment",\n    \"popularity\": 4472\n  },\n  {\n    \"tag\": "staphyloplastic",\n    \"popularity\": 4469\n  },\n  {\n    \"tag\": "outscour",\n    \"popularity\": 4465\n  },\n  {\n    \"tag\": "tallowmaking",\n    \"popularity\": 4462\n  },\n  {\n    \"tag\": "plugger",\n    \"popularity\": 4459\n  },\n  {\n    \"tag\": "fashionize",\n    \"popularity\": 4455\n  },\n  {\n    \"tag\": "puzzle",\n    \"popularity\": 4452\n  },\n  {\n    \"tag\": "imbrue",\n    \"popularity\": 4449\n  },\n  {\n    \"tag\": "osteoblast",\n    \"popularity\": 4445\n  },\n  {\n    \"tag\": "Hydrocores",\n    \"popularity\": 4442\n  },\n  {\n    \"tag\": "Lutra",\n    \"popularity\": 4439\n  },\n  {\n    \"tag\": "upridge scarfy",\n    \"popularity\": 4435\n  },\n  {\n    \"tag\": "ancon taffle",\n    \"popularity\": 4432\n  },\n  {\n    \"tag\": "impest",\n    \"popularity\": 4429\n  },\n  {\n    \"tag\": "uncollatedness",\n    \"popularity\": 4426\n  },\n  {\n    \"tag\": "hypersensitize",\n    \"popularity\": 4422\n  },\n  {\n    \"tag\": "autographically",\n    \"popularity\": 4419\n  },\n  {\n    \"tag\": "louther",\n    \"popularity\": 4416\n  },\n  {\n    \"tag\": "Ollie",\n    \"popularity\": 4413\n  },\n  {\n    \"tag\": "recompensate",\n    \"popularity\": 4409\n  },\n  {\n    \"tag\": "Shan",\n    \"popularity\": 4406\n  },\n  {\n    \"tag\": "brachycnemic",\n    \"popularity\": 4403\n  },\n  {\n    \"tag\": "Carinatae",\n    \"popularity\": 4399\n  },\n  {\n    \"tag\": "geotherm",\n    \"popularity\": 4396\n  },\n  {\n    \"tag\": "sawback",\n    \"popularity\": 4393\n  },\n  {\n    \"tag\": "Novatianist",\n    \"popularity\": 4390\n  },\n  {\n    \"tag\": "reapproach",\n    \"popularity\": 4387\n  },\n  {\n    \"tag\": "myelopoietic",\n    \"popularity\": 4383\n  },\n  {\n    \"tag\": "cyanin",\n    \"popularity\": 4380\n  },\n  {\n    \"tag\": "unsmutted",\n    \"popularity\": 4377\n  },\n  {\n    \"tag\": "nonpapist",\n    \"popularity\": 4374\n  },\n  {\n    \"tag\": "transbaikalian",\n    \"popularity\": 4370\n  },\n  {\n    \"tag\": "connately",\n    \"popularity\": 4367\n  },\n  {\n    \"tag\": "tenderize iterance",\n    \"popularity\": 4364\n  },\n  {\n    \"tag\": "hydrostatical",\n    \"popularity\": 4361\n  },\n  {\n    \"tag\": "unflag",\n    \"popularity\": 4358\n  },\n  {\n    \"tag\": "translate",\n    \"popularity\": 4354\n  },\n  {\n    \"tag\": "Scorzonera",\n    \"popularity\": 4351\n  },\n  {\n    \"tag\": "uncomforted",\n    \"popularity\": 4348\n  },\n  {\n    \"tag\": "risser varied",\n    \"popularity\": 4345\n  },\n  {\n    \"tag\": "plumbate",\n    \"popularity\": 4342\n  },\n  {\n    \"tag\": "Usneaceae",\n    \"popularity\": 4338\n  },\n  {\n    \"tag\": "fohat",\n    \"popularity\": 4335\n  },\n  {\n    \"tag\": "slagging",\n    \"popularity\": 4332\n  },\n  {\n    \"tag\": "superserious",\n    \"popularity\": 4329\n  },\n  {\n    \"tag\": "theocracy",\n    \"popularity\": 4326\n  },\n  {\n    \"tag\": "valonia",\n    \"popularity\": 4323\n  },\n  {\n    \"tag\": "Sapindales",\n    \"popularity\": 4319\n  },\n  {\n    \"tag\": "palaeozoologist",\n    \"popularity\": 4316\n  },\n  {\n    \"tag\": "yalb",\n    \"popularity\": 4313\n  },\n  {\n    \"tag\": "unviewed",\n    \"popularity\": 4310\n  },\n  {\n    \"tag\": "polyarteritis",\n    \"popularity\": 4307\n  },\n  {\n    \"tag\": "vectorial",\n    \"popularity\": 4304\n  },\n  {\n    \"tag\": "skimpingly",\n    \"popularity\": 4301\n  },\n  {\n    \"tag\": "athort",\n    \"popularity\": 4297\n  },\n  {\n    \"tag\": "tribofluorescence",\n    \"popularity\": 4294\n  },\n  {\n    \"tag\": "benzonitrol",\n    \"popularity\": 4291\n  },\n  {\n    \"tag\": "swiller subobtuse subjacency",\n    \"popularity\": 4288\n  },\n  {\n    \"tag\": "uncompassed",\n    \"popularity\": 4285\n  },\n  {\n    \"tag\": "cacochymia",\n    \"popularity\": 4282\n  },\n  {\n    \"tag\": "commensalist butadiene",\n    \"popularity\": 4279\n  },\n  {\n    \"tag\": "culpable",\n    \"popularity\": 4276\n  },\n  {\n    \"tag\": "contributive",\n    \"popularity\": 4273\n  },\n  {\n    \"tag\": "attemperately",\n    \"popularity\": 4269\n  },\n  {\n    \"tag\": "spelt",\n    \"popularity\": 4266\n  },\n  {\n    \"tag\": "exoneration",\n    \"popularity\": 4263\n  },\n  {\n    \"tag\": "antivivisectionist",\n    \"popularity\": 4260\n  },\n  {\n    \"tag\": "granitification",\n    \"popularity\": 4257\n  },\n  {\n    \"tag\": "palladize",\n    \"popularity\": 4254\n  },\n  {\n    \"tag\": "marksmanship",\n    \"popularity\": 4251\n  },\n  {\n    \"tag\": "bullydom",\n    \"popularity\": 4248\n  },\n  {\n    \"tag\": "spirality",\n    \"popularity\": 4245\n  },\n  {\n    \"tag\": "caliginous",\n    \"popularity\": 4242\n  },\n  {\n    \"tag\": "reportedly",\n    \"popularity\": 4239\n  },\n  {\n    \"tag\": "polyad",\n    \"popularity\": 4236\n  },\n  {\n    \"tag\": "arthroempyesis",\n    \"popularity\": 4233\n  },\n  {\n    \"tag\": "semibay facultatively",\n    \"popularity\": 4229\n  },\n  {\n    \"tag\": "metastatically",\n    \"popularity\": 4226\n  },\n  {\n    \"tag\": "prophetically",\n    \"popularity\": 4223\n  },\n  {\n    \"tag\": "Linguatula elapid",\n    \"popularity\": 4220\n  },\n  {\n    \"tag\": "pyknatom",\n    \"popularity\": 4217\n  },\n  {\n    \"tag\": "centimeter",\n    \"popularity\": 4214\n  },\n  {\n    \"tag\": "mensurate",\n    \"popularity\": 4211\n  },\n  {\n    \"tag\": "migraine",\n    \"popularity\": 4208\n  },\n  {\n    \"tag\": "pentagamist",\n    \"popularity\": 4205\n  },\n  {\n    \"tag\": "querken",\n    \"popularity\": 4202\n  },\n  {\n    \"tag\": "ambulance",\n    \"popularity\": 4199\n  },\n  {\n    \"tag\": "Stokavian",\n    \"popularity\": 4196\n  },\n  {\n    \"tag\": "malvasian",\n    \"popularity\": 4193\n  },\n  {\n    \"tag\": "uncouthsome",\n    \"popularity\": 4190\n  },\n  {\n    \"tag\": "readable",\n    \"popularity\": 4187\n  },\n  {\n    \"tag\": "enlodge",\n    \"popularity\": 4184\n  },\n  {\n    \"tag\": "plasterwise Appendiculariidae perspectograph",\n    \"popularity\": 4181\n  },\n  {\n    \"tag\": "inkweed",\n    \"popularity\": 4178\n  },\n  {\n    \"tag\": "streep",\n    \"popularity\": 4175\n  },\n  {\n    \"tag\": "diadelphian cultured",\n    \"popularity\": 4172\n  },\n  {\n    \"tag\": "hymenopterous",\n    \"popularity\": 4169\n  },\n  {\n    \"tag\": "unexorableness",\n    \"popularity\": 4166\n  },\n  {\n    \"tag\": "cascaron",\n    \"popularity\": 4163\n  },\n  {\n    \"tag\": "undaintiness",\n    \"popularity\": 4160\n  },\n  {\n    \"tag\": "Curtana",\n    \"popularity\": 4157\n  },\n  {\n    \"tag\": "scurvied",\n    \"popularity\": 4154\n  },\n  {\n    \"tag\": "molluscoidal",\n    \"popularity\": 4151\n  },\n  {\n    \"tag\": "yurt",\n    \"popularity\": 4148\n  },\n  {\n    \"tag\": "deciduitis",\n    \"popularity\": 4145\n  },\n  {\n    \"tag\": "creephole",\n    \"popularity\": 4142\n  },\n  {\n    \"tag\": "quatrefeuille",\n    \"popularity\": 4139\n  },\n  {\n    \"tag\": "bicapitate adenomatome",\n    \"popularity\": 4136\n  },\n  {\n    \"tag\": "damassin",\n    \"popularity\": 4134\n  },\n  {\n    \"tag\": "planching",\n    \"popularity\": 4131\n  },\n  {\n    \"tag\": "dashedly inferential",\n    \"popularity\": 4128\n  },\n  {\n    \"tag\": "lobe",\n    \"popularity\": 4125\n  },\n  {\n    \"tag\": "Hyrachyus",\n    \"popularity\": 4122\n  },\n  {\n    \"tag\": "knab",\n    \"popularity\": 4119\n  },\n  {\n    \"tag\": "discohexaster",\n    \"popularity\": 4116\n  },\n  {\n    \"tag\": "malign",\n    \"popularity\": 4113\n  },\n  {\n    \"tag\": "pedagoguism",\n    \"popularity\": 4110\n  },\n  {\n    \"tag\": "shrubbery",\n    \"popularity\": 4107\n  },\n  {\n    \"tag\": "undershrub",\n    \"popularity\": 4104\n  },\n  {\n    \"tag\": "bureaucrat",\n    \"popularity\": 4101\n  },\n  {\n    \"tag\": "pantaleon",\n    \"popularity\": 4098\n  },\n  {\n    \"tag\": "mesoventral",\n    \"popularity\": 4096\n  }]';
-
-var log2 = Math.log(2);
-var tagInfo = tagInfoJSON.parseJSON(function(a, b) { if (a == "popularity") { return Math.log(b) / log2; } else {return b; } });
-
-function makeTagCloud(tagInfo)
-{
-    var output = '<div class="tagCloud" style="width: 100%">';
-
-    tagInfo.sort(function(a, b) { if (a.tag < b.tag) { return -1; } else if (a.tag == b.tag) { return 0; } else return 1; });
-
-    for (var i = 0; i < tagInfo.length; i++) {
-        var tag = tagInfo[i].tag;
-
-        var validates = true;
-        for (var j = 0; j < tag.length; j++) {
-            var ch = tag.charCodeAt(j);
-            if (ch < 0x20 || ch >= 0x7f) {
-                validates = false;
-                break;
-            }
-        }
-
-        if (!validates)
-            continue;
-
-        var url = "http://example.com/tag/" + tag.replace(" ", "").toLowerCase();
-        var popularity = tagInfo[i].popularity;
-        var color = 'rgb(' + Math.floor(255 * (popularity - 12) / 20) + ', 0, 255)';
-        output += ' <a href="' + url + '" style="font-size: ' + popularity + 'px; color: ' + color + '">' + tag + '</a> \n';
-    }
-
-    output += '</div>';
-    output.replace(" ", "&nbsp;");
-
-    return output;
-}
-
-var tagcloud = makeTagCloud(tagInfo);
-tagInfo = null;
-
-// The result string embeds floating-point numbers, which can vary a bit on different platforms,
-// so we truncate them a bit before comparing.
-var tagcloud_norm = tagcloud.replace(/([0-9.]+)px/g, function(str, p1) { return p1.substr(0, 10) + 'px' })
-assertEq(tagcloud_norm.length, 295906)
diff --git a/js/src/tests/js1_8_1/jit/browser.js b/js/src/tests/js1_8_1/jit/browser.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/js/src/tests/js1_8_1/jit/jstests.list b/js/src/tests/js1_8_1/jit/jstests.list
deleted file mode 100644
index d21cf7d0743..00000000000
--- a/js/src/tests/js1_8_1/jit/jstests.list
+++ /dev/null
@@ -1,24 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_8_1/jit/
-script math-jit-tests.js
-skip script regress-451673.js # bogus perf test (bug 540512)
-skip script regress-451974-01.js # bogus perf test (bug 540512)
-skip script regress-451974-02.js # bogus perf test (bug 540512)
-skip script regress-452498-01.js # bogus perf test (bug 540512)
-script regress-458838.js
-script regress-462459-01.js
-script regress-462459-02.js
-script regress-462459-03.js
-script regress-462459-04.js
-script regress-462459-05.js
-script regress-462459-06.js
-script regress-462459-07.js
-script regress-462459-08.js
-script regress-462459-09.js
-script regress-462459-10.js
-script regress-462459-11.js
-script regress-462459-12.js
-skip script regress-469927.js # bogus perf test (bug 540512)
-skip script regress-470739.js # bogus perf test (bug 540512)
-script regress-471635.js
-script regress-489682.js
-script testDeepBailFromNonNative.js
diff --git a/js/src/tests/js1_8_1/jit/regress-451673.js b/js/src/tests/js1_8_1/jit/regress-451673.js
deleted file mode 100644
index 5c7202fe039..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-451673.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Boris Zbarsky
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 451673;
-var summary = 'TM: Tracing prime number generation';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  function doTest(enablejit)
-  {
-    if (enablejit)
-      jit(true);
-    else
-      jit(false);
-
-    var n = 1000000;
-    var start = new Date();
-    var i=0;
-    var j=0;
-    var numprimes=0;
-    var limit=0;
-    numprimes = 1; // 2 is prime
-    var mceil = Math.floor;
-    var msqrt = Math.sqrt;
-    var isPrime = 1;
-
-    for (i = 3; i<= n; i+=2)
-    {
-	    isPrime=1;
-	    limit = mceil(msqrt(i)+1) + 1;
-
-	    for (j = 3; j < limit; j+=2)
-      {
-		    if (i % j == 0)
-        {
-			    isPrime = 0;
-			    break;
-        }
-      }
-
-	    if (isPrime)
-      {
-		    numprimes ++;
-      }
-    }
-
-    var end = new Date();
-
-    var timetaken = end - start;
-    timetaken = timetaken / 1000;
-
-    if (enablejit)
-      jit(false);
-
-    print((enablejit ? '    JIT' : 'Non-JIT') + ": Number of primes up to: " + n + " is " + numprimes + ", counted in " + timetaken + " secs.");
-
-    return timetaken;
-  }
-
-  var timenonjit = doTest(false);
-  var timejit    = doTest(true);
-
-  expect = true;
-  actual = timejit < timenonjit;
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff --git a/js/src/tests/js1_8_1/jit/regress-451974-01.js b/js/src/tests/js1_8_1/jit/regress-451974-01.js
deleted file mode 100644
index 59fc1415da3..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-451974-01.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Andreas Gal
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 451974;
-var summary = 'TM: loops with anon functions should not be slower with jit enabled';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-var chars = '0123456789abcdef';
-var size = 10000;
-var mult = 1000;
-var densearray = [];
-var lsize = size;
-
-while (lsize--) 
-{ 
-  densearray.push(chars); 
-}
-
-function loop()
-{
-  var start = new Date();
-
-  for (var a = 0; a < mult; a++) 
-  {
-    var f = (function(x){}); 
-    for (var i = 0, len = densearray.length; i < len; i++) 
-    { 
-      f(densearray[i]); 
-    }
-  }
-
-  var stop = new Date();
-  return stop - start;
-}
-
-jit(false);
-var timenonjit = loop();
-jit(true);
-var timejit = loop();
-jit(false);
-
-print('time: nonjit = ' + timenonjit + ', jit = ' + timejit);
-
-expect = true;
-actual = timejit < timenonjit/2;
-
-reportCompare(expect, actual, summary);
diff --git a/js/src/tests/js1_8_1/jit/regress-451974-02.js b/js/src/tests/js1_8_1/jit/regress-451974-02.js
deleted file mode 100644
index f0de29d49bf..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-451974-02.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Andreas Gal
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 451974;
-var summary = 'TM: loops with anon functions should not be slower with jit enabled';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  var chars = '0123456789abcdef';
-  var size = 10000;
-  var mult = 1000;
-  var densearray = [];
-  var lsize = size;
-
-  while (lsize--) 
-  { 
-    densearray.push(chars); 
-  }
-
-  function loop()
-  {
-    var start = new Date();
-
-    for (var a = 0; a < mult; a++) 
-    {
-      var f = (function(x){}); 
-      for (var i = 0, len = densearray.length; i < len; i++) 
-      { 
-        f(densearray[i]); 
-      }
-    }
-
-    var stop = new Date();
-    return stop - start;
-  }
-
-  jit(false);
-  var timenonjit = loop();
-  jit(true);
-  var timejit = loop();
-  jit(false);
-
-  print('time: nonjit = ' + timenonjit + ', jit = ' + timejit);
-
-  expect = true;
-  actual = timejit < timenonjit/2;
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff --git a/js/src/tests/js1_8_1/jit/regress-452498-01.js b/js/src/tests/js1_8_1/jit/regress-452498-01.js
deleted file mode 100644
index c857e2087af..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-452498-01.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Boris Zbarsky
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 452498;
-var summary = 'TM: upvar2: jit heavyweight functions';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-function complex(aReal, aImag) {
-  this.r = aReal;
-  this.i = aImag;
-  this.square = function() {
-    return new complex(this.r * this.r - this.i * this.i,
-                       2 * this.r * this.i);
-  }
-  this.dist = function() {
-    return Math.sqrt(this.r * this.r + this.i * this.i);
-  }
-  this.add = function(aComplex) {
-    return new complex(this.r + aComplex.r, this.i + aComplex.i);
-  }
-}
-
-function mandelbrotValueOO (aC, aIterMax) {
-  let Z = new complex(0.0, 0.0);
-  for (var iter = 0; iter < aIterMax; iter++) {
-    Z = Z.square().add(aC);
-    if (Z.r * Z.r + Z.i * Z.i > 256) { break; }
-  }
-  return iter;
-}
-
-function f(trace) {
-  jit(trace);
-  var start = Date.now();
-  const width = 60;
-  const height = 60;
-  const max_iters = 50;
-  var output = [];
-  for (let img_x = 0; img_x < width; img_x++) {
-    for (let img_y = 0; img_y < height; img_y++) {
-      let C = new complex(-2 + (img_x / width) * 3,
-                          -1.5 + (img_y / height) * 3);
-      var res = mandelbrotValueOO(C, max_iters);
-      if (output.length > 0 && output[output.length -1][0] == res) {
-        output[output.length-1][1]++;
-      } else {
-        output.push([res, 1]);
-      }
-    }
-  }
-  jit(false);
-  const reference = "[[2, 6], [3, 17], [4, 6], [5, 1], [50, 1], [5, 1], [4, 6], [3, 17], [2, 10], [3, 17], [4, 6], [5, 1], [6, 1], [50, 1], [6, 1], [5, 1], [4, 6], [3, 17], [2, 8], [3, 17], [4, 6], [5, 2], [6, 1], [50, 1], [6, 1], [5, 2], [4, 6], [3, 17], [2, 6], [3, 17], [4, 6], [5, 2], [6, 1], [7, 1], [50, 1], [7, 1], [6, 1], [5, 2], [4, 6], [3, 17], [2, 4], [3, 17], [4, 7], [5, 2], [6, 1], [8, 1], [50, 1], [8, 1], [6, 1], [5, 2], [4, 7], [3, 17], [2, 2], [3, 17], [4, 7], [5, 3], [6, 1], [9, 1], [50, 1], [9, 1], [6, 1], [5, 3], [4, 7], [3, 17], [2, 1], [3, 16], [4, 7], [5, 3], [6, 2], [8, 1], [50, 1], [8, 1], [6, 2], [5, 3], [4, 7], [3, 32], [4, 7], [5, 4], [6, 1], [7, 1], [8, 1], [50, 1], [8, 1], [7, 1], [6, 1], [5, 4], [4, 7], [3, 31], [4, 7], [5, 3], [6, 2], [7, 1], [8, 1], [50, 1], [8, 1], [7, 1], [6, 2], [5, 3], [4, 7], [3, 30], [4, 7], [5, 4], [6, 2], [7, 1], [8, 1], [50, 1], [8, 1], [7, 1], [6, 2], [5, 4], [4, 7], [3, 28], [4, 7], [5, 4], [6, 2], [7, 1], [8, 1], [10, 1], [50, 1], [10, 1], [8, 1], [7, 1], [6, 2], [5, 4], [4, 7], [3, 26], [4, 7], [5, 4], [6, 2], [7, 1], [8, 1], [9, 1], [11, 1], [50, 1], [11, 1], [9, 1], [8, 1], [7, 1], [6, 2], [5, 4], [4, 7], [3, 25], [4, 6], [5, 3], [6, 3], [7, 1], [8, 1], [18, 1], [13, 1], [15, 1], [50, 1], [15, 1], [13, 1], [18, 1], [8, 1], [7, 1], [6, 3], [5, 3], [4, 6], [3, 24], [4, 7], [5, 2], [6, 2], [7, 3], [8, 1], [10, 1], [14, 1], [50, 3], [14, 1], [10, 1], [8, 1], [7, 3], [6, 2], [5, 2], [4, 7], [3, 23], [4, 6], [5, 3], [7, 1], [8, 1], [9, 1], [8, 2], [10, 1], [11, 1], [15, 1], [50, 3], [15, 1], [11, 1], [10, 1], [8, 2], [9, 1], [8, 1], [7, 1], [5, 3], [4, 6], [3, 22], [4, 7], [5, 2], [6, 1], [7, 1], [14, 1], [16, 1], [11, 1], [10, 1], [12, 1], [20, 1], [23, 1], [46, 1], [50, 1], [46, 1], [23, 1], [20, 1], [12, 1], [10, 1], [11, 1], [16, 1], [14, 1], [7, 1], [6, 1], [5, 2], [4, 7], [3, 20], [4, 7], [5, 3], [6, 1], [7, 1], [8, 1], [10, 1], [17, 1], [16, 1], [20, 1], [50, 7], [20, 1], [16, 1], [17, 1], [10, 1], [8, 1], [7, 1], [6, 1], [5, 3], [4, 7], [3, 19], [4, 7], [5, 3], [6, 2], [7, 1], [10, 1], [21, 1], [50, 11], [21, 1], [10, 1], [7, 1], [6, 2], [5, 3], [4, 7], [3, 18], [4, 7], [5, 4], [6, 1], [7, 1], [8, 1], [9, 1], [13, 1], [25, 1], [50, 9], [25, 1], [13, 1], [9, 1], [8, 1], [7, 1], [6, 1], [5, 4], [4, 7], [3, 17], [4, 7], [5, 4], [6, 1], [7, 1], [8, 1], [14, 2], [50, 11], [14, 2], [8, 1], [7, 1], [6, 1], [5, 4], [4, 7], [3, 16], [4, 7], [5, 4], [6, 2], [7, 1], [8, 1], [11, 1], [36, 1], [50, 11], [36, 1], [11, 1], [8, 1], [7, 1], [6, 2], [5, 4], [4, 7], [3, 15], [4, 7], [5, 4], [6, 2], [7, 1], [8, 1], [9, 1], [14, 1], [50, 11], [14, 1], [9, 1], [8, 1], [7, 1], [6, 2], [5, 4], [4, 7], [3, 14], [4, 7], [5, 4], [6, 3], [7, 1], [8, 1], [9, 1], [12, 1], [26, 1], [50, 9], [26, 1], [12, 1], [9, 1], [8, 1], [7, 1], [6, 3], [5, 4], [4, 7], [3, 13], [4, 7], [5, 4], [6, 2], [7, 2], [8, 1], [9, 1], [10, 1], [15, 1], [50, 9], [15, 1], [10, 1], [9, 1], [8, 1], [7, 2], [6, 2], [5, 4], [4, 7], [3, 12], [4, 7], [5, 4], [6, 3], [7, 1], [8, 2], [9, 1], [10, 1], [12, 1], [16, 1], [50, 7], [16, 1], [12, 1], [10, 1], [9, 1], [8, 2], [7, 1], [6, 3], [5, 4], [4, 7], [3, 11], [4, 6], [5, 4], [6, 3], [7, 1], [8, 2], [9, 1], [11, 1], [12, 1], [14, 1], [17, 1], [23, 1], [34, 1], [50, 3], [34, 1], [23, 1], [17, 1], [14, 1], [12, 1], [11, 1], [9, 1], [8, 2], [7, 1], [6, 3], [5, 4], [4, 6], [3, 10], [4, 7], [5, 3], [6, 2], [7, 2], [8, 1], [9, 1], [22, 1], [12, 1], [50, 1], [25, 1], [50, 11], [25, 1], [50, 1], [12, 1], [22, 1], [9, 1], [8, 1], [7, 2], [6, 2], [5, 3], [4, 7], [3, 9], [4, 6], [5, 4], [6, 1], [7, 1], [8, 2], [9, 1], [14, 1], [50, 1], [21, 1], [50, 15], [21, 1], [50, 1], [14, 1], [9, 1], [8, 2], [7, 1], [6, 1], [5, 4], [4, 6], [3, 8], [4, 7], [5, 3], [6, 2], [9, 1], [14, 1], [13, 1], [11, 1], [13, 1], [26, 1], [50, 17], [26, 1], [13, 1], [11, 1], [13, 1], [14, 1], [9, 1], [6, 2], [5, 3], [4, 7], [3, 7], [4, 6], [5, 4], [6, 1], [7, 1], [9, 1], [49, 1], [43, 1], [50, 23], [43, 1], [49, 1], [9, 1], [7, 1], [6, 1], [5, 4], [4, 6], [3, 7], [4, 5], [5, 4], [6, 2], [7, 1], [9, 1], [13, 1], [50, 25], [13, 1], [9, 1], [7, 1], [6, 2], [5, 4], [4, 5], [3, 6], [4, 6], [5, 3], [6, 2], [7, 2], [9, 1], [11, 1], [17, 1], [50, 23], [17, 1], [11, 1], [9, 1], [7, 2], [6, 2], [5, 3], [4, 6], [3, 5], [4, 5], [5, 3], [6, 3], [7, 1], [8, 1], [9, 1], [50, 1], [26, 1], [50, 23], [26, 1], [50, 1], [9, 1], [8, 1], [7, 1], [6, 3], [5, 3], [4, 5], [3, 5], [4, 4], [5, 3], [6, 3], [7, 1], [8, 2], [10, 1], [21, 1], [50, 25], [21, 1], [10, 1], [8, 2], [7, 1], [6, 3], [5, 3], [4, 4], [3, 5], [4, 4], [5, 2], [6, 3], [7, 1], [12, 1], [9, 1], [10, 1], [11, 1], [50, 27], [11, 1], [10, 1], [9, 1], [12, 1], [7, 1], [6, 3], [5, 2], [4, 4], [3, 5], [4, 3], [5, 2], [6, 2], [7, 2], [9, 1], [42, 1], [15, 1], [23, 1], [14, 1], [50, 27], [14, 1], [23, 1], [15, 1], [42, 1], [9, 1], [7, 2], [6, 2], [5, 2], [4, 3], [3, 5], [4, 3], [5, 1], [6, 1], [20, 1], [9, 1], [8, 1], [9, 1], [10, 1], [16, 1], [50, 33], [16, 1], [10, 1], [9, 1], [8, 1], [9, 1], [20, 1], [6, 1], [5, 1], [4, 3], [3, 5], [4, 3], [5, 1], [6, 1], [9, 1], [13, 1], [12, 1], [11, 1], [38, 1], [25, 1], [50, 33], [25, 1], [38, 1], [11, 1], [12, 1], [13, 1], [9, 1], [6, 1], [5, 1], [4, 3], [3, 5], [4, 3], [5, 2], [6, 1], [7, 1], [10, 1], [24, 1], [25, 1], [50, 35], [25, 1], [24, 1], [10, 1], [7, 1], [6, 1], [5, 2], [4, 3], [3, 5], [4, 4], [5, 1], [6, 1], [7, 1], [11, 2], [13, 1], [19, 1], [50, 33], [19, 1], [13, 1], [11, 2], [7, 1], [6, 1], [5, 1], [4, 4], [3, 5], [4, 4], [5, 2], [6, 1], [50, 1], [8, 2], [17, 1], [19, 1], [35, 1], [14, 1], [24, 1], [50, 25], [24, 1], [14, 1], [35, 1], [19, 1], [17, 1], [8, 2], [50, 1], [6, 1], [5, 2], [4, 4], [3, 5], [4, 5], [5, 2], [6, 2], [7, 1], [8, 1], [9, 2], [11, 1], [38, 1], [50, 25], [38, 1], [11, 1], [9, 2], [8, 1], [7, 1], [6, 2], [5, 2], [4, 5], [3, 6], [4, 4], [5, 3], [6, 2], [7, 2], [8, 1], [9, 1], [15, 1], [50, 25], [15, 1], [9, 1], [8, 1], [7, 2], [6, 2], [5, 3], [4, 4], [3, 7], [4, 5], [5, 3], [6, 3], [7, 1], [9, 1], [42, 1], [21, 1], [50, 23], [21, 1], [42, 1], [9, 1], [7, 1], [6, 3], [5, 3], [4, 5], [3, 8], [4, 5], [5, 3], [6, 2], [7, 1], [8, 1], [9, 1], [13, 1], [50, 23], [13, 1], [9, 1], [8, 1], [7, 1], [6, 2], [5, 3], [4, 5], [3, 9], [4, 6], [5, 3], [6, 2], [7, 1], [9, 1], [14, 1], [50, 23], [14, 1], [9, 1], [7, 1], [6, 2], [5, 3], [4, 6], [3, 10], [4, 6], [5, 3], [6, 1], [7, 1], [9, 1], [16, 1], [50, 2], [35, 1], [50, 8], [13, 1], [50, 8], [35, 1], [50, 2], [16, 1], [9, 1], [7, 1], [6, 1], [5, 3], [4, 6], [3, 12], [4, 6], [5, 2], [6, 1], [19, 1], [16, 1], [17, 1], [25, 1], [21, 1], [13, 1], [18, 1], [50, 6], [11, 1], [9, 1], [11, 1], [50, 6], [18, 1], [13, 1], [21, 1], [25, 1], [17, 1], [16, 1], [19, 1], [6, 1], [5, 2], [4, 6], [3, 14], [4, 5], [5, 3], [6, 1], [8, 1], [16, 1], [10, 1], [8, 2], [11, 1], [50, 1], [16, 1], [15, 1], [32, 1], [29, 1], [9, 1], [8, 1], [7, 1], [8, 1], [9, 1], [29, 1], [32, 1], [15, 1], [16, 1], [50, 1], [11, 1], [8, 2], [10, 1], [16, 1], [8, 1], [6, 1], [5, 3], [4, 5], [3, 15], [4, 6], [5, 3], [6, 4], [7, 1], [20, 1], [19, 1], [9, 3], [7, 3], [6, 1], [7, 3], [9, 3], [19, 1], [20, 1], [7, 1], [6, 4], [5, 3], [4, 6], [3, 16], [4, 7], [5, 4], [6, 3], [7, 1], [6, 13], [7, 1], [6, 3], [5, 4], [4, 7], [3, 18], [4, 7], [5, 27], [4, 7], [3, 20], [4, 9], [5, 21], [4, 9], [3, 23], [4, 12], [5, 11], [4, 12], [3, 26], [4, 33], [3, 29], [4, 29], [3, 33], [4, 25], [3, 38], [4, 19], [3, 20], [2, 1], [3, 26], [4, 7], [3, 26], [2, 2], [3, 57], [2, 1]]";
-  reportCompare(reference, output.toSource(), summary + ': correctness jit=' + trace);
-  return (Date.now() - start);
-}
-
-
-var timenonjit = f(false);
-var timejit = f(true);
-
-expect = true;
-actual = timejit < timenonjit;
-
-print('time nonjit: ' + timenonjit + ', time    jit: ' + timejit);
-
-reportCompare(expect, actual, summary);
diff --git a/js/src/tests/js1_8_1/jit/regress-458838.js b/js/src/tests/js1_8_1/jit/regress-458838.js
deleted file mode 100644
index 0cc6991eb78..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-458838.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Boris Zbarksy
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 458838;
-var summary = 'TM: do not fall off trace when nested function accesses var of outer function';
-var actual = '';
-var expect = '';
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  jit(true);
-
-  function f() {
-    var a = 1;
-    function g() {
-      var b = 0
-        for (var i = 0; i < 10; ++i) {
-          b += a;
-        }
-      return b;
-    }
-
-    return g();
-  }
-
-  expect = 10;
-  actual  = f();
-
-  var recorderStarted;
-  var recorderAborted;
-  var traceCompleted;
-  var skip = true;
-  
-  if (this.tracemonkey && !this.tracemonkey.profiler)
-  {
-    recorderStarted = this.tracemonkey.recorderStarted;
-    recorderAborted = this.tracemonkey.recorderAborted;
-    traceCompleted  = this.tracemonkey.traceCompleted;
-    skip = false;
-  }
-
-  jit(false);
-
-  reportCompare(expect, actual, summary + ': return value 10');
-
-  if (!skip)
-  {
-    expect = 'recorderStarted=1, recorderAborted=0, traceCompleted=1';
-    actual = 'recorderStarted=' + recorderStarted + ', recorderAborted=' + recorderAborted + ', traceCompleted=' + traceCompleted;
-    reportCompare(expect, actual, summary + ': trace');
-  }
-
-  exitFunc ('test');
-}
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-01.js b/js/src/tests/js1_8_1/jit/regress-462459-01.js
deleted file mode 100644
index 7cfe2a90ba4..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-462459-01.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace Array()';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-if (!this.tracemonkey || this.tracemonkey.profiler)
-{
-  jit(false);
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-  jit(true);
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    Array();
-  }
-
-  jit(false);
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-02.js b/js/src/tests/js1_8_1/jit/regress-462459-02.js
deleted file mode 100644
index 14cc20198c4..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-462459-02.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace Array(1)';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-if (!this.tracemonkey || this.tracemonkey.profiler)
-{
-  jit(false);
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-  jit(true);
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    Array(1);
-  }
-
-  jit(false);
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-03.js b/js/src/tests/js1_8_1/jit/regress-462459-03.js
deleted file mode 100644
index a1d3db47083..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-462459-03.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace Array(1, 2)';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-if (!this.tracemonkey || this.tracemonkey.profiler)
-{
-  jit(false);
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-  jit(true);
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    Array(1, 2);
-  }
-
-  jit(false);
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-04.js b/js/src/tests/js1_8_1/jit/regress-462459-04.js
deleted file mode 100644
index 3bfe7278b1e..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-462459-04.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace Array(1, 2, 3)';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-if (!this.tracemonkey || this.tracemonkey.profiler)
-{
-  jit(false);
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-  jit(true);
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    Array(1, 2, 3);
-  }
-
-  jit(false);
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-05.js b/js/src/tests/js1_8_1/jit/regress-462459-05.js
deleted file mode 100644
index 5513b078e44..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-462459-05.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace new Array()';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-if (!this.tracemonkey || this.tracemonkey.profiler)
-{
-  jit(false);
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-  jit(true);
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    new Array();
-  }
-
-  jit(false);
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-06.js b/js/src/tests/js1_8_1/jit/regress-462459-06.js
deleted file mode 100644
index aab4093ab5a..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-462459-06.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace new Array(1)';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-if (!this.tracemonkey || this.tracemonkey.profiler)
-{
-  jit(false);
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-  jit(true);
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    new Array(1);
-  }
-
-  jit(false);
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-07.js b/js/src/tests/js1_8_1/jit/regress-462459-07.js
deleted file mode 100644
index 0a9632a723d..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-462459-07.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace new Array(1, 2)';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-if (!this.tracemonkey || this.tracemonkey.profiler)
-{
-  jit(false);
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-  jit(true);
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    new Array(1, 2);
-  }
-
-  jit(false);
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-08.js b/js/src/tests/js1_8_1/jit/regress-462459-08.js
deleted file mode 100644
index 2c57b27fde4..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-462459-08.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace new Array(1, 2, 3)';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-if (!this.tracemonkey || this.tracemonkey.profiler)
-{
-  jit(false);
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-  jit(true);
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    new Array(1, 2, 3);
-  }
-
-  jit(false);
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-09.js b/js/src/tests/js1_8_1/jit/regress-462459-09.js
deleted file mode 100644
index 221fc19c429..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-462459-09.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace []';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-if (!this.tracemonkey || this.tracemonkey.profiler)
-{
-  jit(false);
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-  jit(true);
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    [];
-  }
-
-  jit(false);
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-10.js b/js/src/tests/js1_8_1/jit/regress-462459-10.js
deleted file mode 100644
index 4917d5cf31b..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-462459-10.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace [1]';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-if (!this.tracemonkey || this.tracemonkey.profiler)
-{
-  jit(false);
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-  jit(true);
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    [1];
-  }
-
-  jit(false);
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-11.js b/js/src/tests/js1_8_1/jit/regress-462459-11.js
deleted file mode 100644
index 2f7cb1c5945..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-462459-11.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace [1, 2]';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-if (!this.tracemonkey || this.tracemonkey.profiler)
-{
-  jit(false);
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-  jit(true);
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    [1, 2];
-  }
-
-  jit(false);
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-12.js b/js/src/tests/js1_8_1/jit/regress-462459-12.js
deleted file mode 100644
index 524a7e4ae4c..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-462459-12.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 462459;
-var summary = 'TM: trace [1, 2, 3]';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-if (!this.tracemonkey || this.tracemonkey.profiler)
-{
-  jit(false);
-  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
-  reportCompare(expect, actual, summary);
-}
-else
-{
-  jit(true);
-
-  expect = 'recorder started, recorder not aborted, trace completed';
-  actual = '';
-
-  var recorderStartedStart = this.tracemonkey.recorderStarted;
-  var recorderAbortedStart = this.tracemonkey.recorderAborted;
-  var traceCompletedStart  = this.tracemonkey.traceCompleted;
-
-
-  for (var i = 0; i < RUNLOOP; i++)
-  {
-    [1, 2, 3];
-  }
-
-  jit(false);
-
-  var recorderStartedEnd = this.tracemonkey.recorderStarted;
-  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
-  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
-
-  if (recorderStartedEnd > recorderStartedStart)
-  {
-    actual = 'recorder started, ';
-  }
-  else
-  {
-    actual = 'recorder not started, ';
-  }
-
-  if (recorderAbortedEnd > recorderAbortedStart)
-  {
-    actual += 'recorder aborted, ';
-  }
-  else
-  {
-    actual += 'recorder not aborted, ';
-  }
-
-  if (traceCompletedEnd > traceCompletedStart)
-  {
-    actual += 'trace completed';
-  }
-  else
-  {
-    actual += 'trace not completed';
-  }
-
-  reportCompare(expect, actual, summary);
-}
-
diff --git a/js/src/tests/js1_8_1/jit/regress-469927.js b/js/src/tests/js1_8_1/jit/regress-469927.js
deleted file mode 100644
index 17b893674b1..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-469927.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Jesse Ruderman
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 469927;
-var summary = 'TM: jit should not slow down short loop with let';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  function letitbe() {
-    var start = new Date();
-    for (let i = 0; i < 500000; ++i) { 
-      for (let j = 0; j < 4; ++j) { } 
-    }
-    var stop = new Date();
-    return stop - start;
-  }
-
-  jit(false);
-  var timenonjit = letitbe();
-  jit(true);
-  var timejit = letitbe();
-  jit(false);
-
-  print('time: nonjit = ' + timenonjit + ', jit = ' + timejit);
-
-  expect = true;
-  actual = timejit < timenonjit;
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff --git a/js/src/tests/js1_8_1/jit/regress-470739.js b/js/src/tests/js1_8_1/jit/regress-470739.js
deleted file mode 100644
index b6b0e64e0f2..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-470739.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Jesse Ruderman
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 470739;
-var summary = 'TM: never abort on ==';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  function loop()
-  {
-    var i;
-    var start = new Date();
-
-    for(i=0;i<500000;++i) { var r = (void 0) == null; }
-
-    var stop = new Date();
-    return stop - start;
-  }
-
-  jit(false);
-  var timenonjit = loop();
-  jit(true);
-  var timejit = loop();
-  jit(false);
-
-  print('time: nonjit = ' + timenonjit + ', jit = ' + timejit);
-
-  expect = true;
-  actual = timejit < timenonjit;
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff --git a/js/src/tests/js1_8_1/jit/regress-471635.js b/js/src/tests/js1_8_1/jit/regress-471635.js
deleted file mode 100644
index 76078649204..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-471635.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Boris Zbarksy
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 471635;
-var summary = 'TM: trace js shell print()';
-var actual = '';
-var expect = '';
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  jit(true);
-
-  (function(){
-    for (var i = 1; i < 20; ++i) {
-      print("#");
-    }
-  })();
-
-  var recorderStarted;
-  var recorderAborted;
-  var traceCompleted;
-  var skip = true;
-
-  if (this.tracemonkey && !this.tracemonkey.profiler)
-  {
-    recorderStarted = this.tracemonkey.recorderStarted;
-    recorderAborted = this.tracemonkey.recorderAborted;
-    traceCompleted  = this.tracemonkey.traceCompleted;
-    skip = false;
-  }
-
-  jit(false);
-
-  if (!skip)
-  {
-    expect = 'recorderStarted=1, recorderAborted=0, traceCompleted=1';
-    actual = 'recorderStarted=' + recorderStarted + ', recorderAborted=' + recorderAborted + ', traceCompleted=' + traceCompleted;
-  }
-  else
-  {
-    expect = actual = 'Test skipped due to lack of tracemonkey jitstats object.';
-  }
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff --git a/js/src/tests/js1_8_1/jit/regress-489682.js b/js/src/tests/js1_8_1/jit/regress-489682.js
deleted file mode 100644
index b8b73ec1ca7..00000000000
--- a/js/src/tests/js1_8_1/jit/regress-489682.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Jesse Ruderman
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 489682;
-var summary = 'TM: wrong number with nested type-unstable loops';
-var actual = '';
-var expect = '';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-jit(true);
-
-var v = 0;
-
-for each (var a in [0, {}, {}, {}]) {
-  print(v);
-  v = v >>> 0;
-  for each (var b in [{}, {}, new String(''), 42, new String(''), {}, 42]) 
-           {
-           }
-         }
-print(v);
-
-jit(false);
-
-expect = '0';
-actual = v + '';
-
-reportCompare(expect, actual, summary);
diff --git a/js/src/tests/js1_8_1/jit/shell.js b/js/src/tests/js1_8_1/jit/shell.js
deleted file mode 100644
index 63f283b96f8..00000000000
--- a/js/src/tests/js1_8_1/jit/shell.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// The loop count at which we trace
-const RECORDLOOP = this.tracemonkey ? tracemonkey.HOTLOOP : 8;
-// The loop count at which we run the trace
-const RUNLOOP = RECORDLOOP + 1;
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
index a269fa3b9f4..96aa49899b4 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
@@ -21,6 +21,7 @@
  *
  * Contributor(s):
  * Mike Hommey <mh@glandium.org>
+ * Siarhei Siamashka <siarhei.siamashka@nokia.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -44,6 +45,13 @@
 #error "This code is for Linux ARM only. Check that it works on your system, too.\nBeware that this code is highly compiler dependent."
 #endif
 
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) \
+    && defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP) && !defined(__ARM_PCS)
+#error "Can't identify floating point calling conventions.\nPlease ensure that your toolchain defines __ARM_PCS or __ARM_PCS_VFP."
+#endif
+
+#ifndef __ARM_PCS_VFP
+
 /* This function copies a 64-bits word from dw to the given pointer in
  * a buffer delimited by start and end, possibly wrapping around the
  * buffer boundaries, and/or properly aligning the data at 64-bits word
@@ -189,3 +197,252 @@ NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
                     stack_space[base_size * 2 - 2],
                     stack_space[base_size * 2 - 1]);
 }    
+
+#else /* __ARM_PCS_VFP */
+
+/* "Procedure Call Standard for the ARM Architecture" document, sections
+ * "5.5 Parameter Passing" and "6.1.2 Procedure Calling" contain all the
+ * needed information.
+ *
+ * http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042d/IHI0042D_aapcs.pdf
+ */
+
+#if defined(__thumb__) && !defined(__thumb2__)
+#error "Thumb1 is not supported"
+#endif
+
+#ifndef __ARMEL__
+#error "Only little endian compatibility was tested"
+#endif
+
+/*
+ * Allocation of integer function arguments initially to registers r1-r3
+ * and then to stack. Handling of 'this' argument which goes to r0 registers
+ * is handled separately and does not belong to these two inline functions.
+ *
+ * The doubleword arguments are allocated to even:odd
+ * register pairs or get aligned at 8-byte boundary on stack. The "holes"
+ * which may appear as a result of this realignment remain unused.
+ *
+ * 'ireg_args'  - pointer to the current position in the buffer,
+ *                corresponding to the register arguments
+ * 'stack_args' - pointer to the current position in the buffer,
+ *                corresponding to the arguments on stack
+ * 'end'        - pointer to the end of the registers argument
+ *                buffer (it is guaranteed to be 8-bytes aligned)
+ */
+
+static inline void copy_word(PRUint32* &ireg_args,
+                             PRUint32* &stack_args,
+                             PRUint32* end,
+                             PRUint32  data)
+{
+  if (ireg_args < end) {
+    *ireg_args = data;
+    ireg_args++;
+  } else {
+    *stack_args = data;
+    stack_args++;
+  }
+}
+
+static inline void copy_dword(PRUint32* &ireg_args,
+                              PRUint32* &stack_args,
+                              PRUint32* end,
+                              PRUint64  data)
+{
+  if (ireg_args + 1 < end) {
+    if ((PRUint32)ireg_args & 4) {
+      ireg_args++;
+    }
+    *(PRUint64 *)ireg_args = data;
+    ireg_args += 2;
+  } else {
+    if ((PRUint32)stack_args & 4) {
+      stack_args++;
+    }
+    *(PRUint64 *)stack_args = data;
+    stack_args += 2;
+  }
+}
+
+/*
+ * Allocation of floating point arguments to VFP registers (s0-s15, d0-d7).
+ *
+ * Unlike integer registers allocation, "back-filling" needs to be
+ * supported. For example, the third floating point argument in the
+ * following function is going to be allocated to s1 register, back-filling
+ * the "hole":
+ *    void f(float s0, double d1, float s1)
+ *
+ * Refer to the "Procedure Call Standard for the ARM Architecture" document
+ * for more details.
+ *
+ * 'vfp_s_args' - pointer to the current position in the buffer with
+ *                the next unallocated single precision register
+ * 'vfp_d_args' - pointer to the current position in the buffer with
+ *                the next unallocated double precision register,
+ *                it has the same value as 'vfp_s_args' when back-filling
+ *                is not used
+ * 'end'        - pointer to the end of the vfp registers argument
+ *                buffer (it is guaranteed to be 8-bytes aligned)
+ *
+ * Mozilla bugtracker has a test program attached which be used for
+ * experimenting with VFP registers allocation code and testing its
+ * correctness:
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=601914#c19
+ */
+
+static inline bool copy_vfp_single(float* &vfp_s_args, double* &vfp_d_args,
+                                   float* end, float data)
+{
+  if (vfp_s_args >= end)
+    return false;
+
+  *vfp_s_args = data;
+  vfp_s_args++;
+  if (vfp_s_args < (float *)vfp_d_args) {
+    // It was the case of back-filling, now the next free single precision
+    // register should overlap with the next free double precision register
+    vfp_s_args = (float *)vfp_d_args;
+  } else if (vfp_s_args > (float *)vfp_d_args) {
+    // also update the pointer to the next free double precision register
+    vfp_d_args++;
+  }
+  return true;
+}
+
+static inline bool copy_vfp_double(float* &vfp_s_args, double* &vfp_d_args,
+                                   float* end, double data)
+{
+  if (vfp_d_args >= (double *)end) {
+    // The back-filling continues only so long as no VFP CPRC has been
+    // allocated to a slot on the stack. Basically no VFP registers can
+    // be allocated after this point.
+    vfp_s_args = end;
+    return false;
+  }
+
+  if (vfp_s_args == (float *)vfp_d_args) {
+    // also update the pointer to the next free single precision register
+    vfp_s_args += 2;
+  }
+  *vfp_d_args = data;
+  vfp_d_args++;
+  return true;
+}
+
+static void
+invoke_copy_to_stack(PRUint32* stk, PRUint32 *end,
+                     PRUint32 paramCount, nsXPTCVariant* s)
+{
+  PRUint32 *ireg_args  = end - 3;
+  float    *vfp_s_args = (float *)end;
+  double   *vfp_d_args = (double *)end;
+  float    *vfp_end    = vfp_s_args + 16;
+
+  for (PRUint32 i = 0; i < paramCount; i++, s++) {
+    if (s->IsPtrData()) {
+      copy_word(ireg_args, stk, end, (PRUint32)s->ptr);
+      continue;
+    }
+    // According to the ARM EABI, integral types that are smaller than a word
+    // are to be sign/zero-extended to a full word and treated as 4-byte values
+    switch (s->type)
+    {
+      case nsXPTType::T_FLOAT:
+        if (!copy_vfp_single(vfp_s_args, vfp_d_args, vfp_end, s->val.f)) {
+          copy_word(end, stk, end, reinterpret_cast<PRUint32&>(s->val.f));
+        }
+        break;
+      case nsXPTType::T_DOUBLE:
+        if (!copy_vfp_double(vfp_s_args, vfp_d_args, vfp_end, s->val.d)) {
+          copy_dword(end, stk, end, reinterpret_cast<PRUint64&>(s->val.d));
+        }
+        break;
+      case nsXPTType::T_I8:  copy_word(ireg_args, stk, end, s->val.i8);   break;
+      case nsXPTType::T_I16: copy_word(ireg_args, stk, end, s->val.i16);  break;
+      case nsXPTType::T_I32: copy_word(ireg_args, stk, end, s->val.i32);  break;
+      case nsXPTType::T_I64: copy_dword(ireg_args, stk, end, s->val.i64); break;
+      case nsXPTType::T_U8:  copy_word(ireg_args, stk, end, s->val.u8);   break;
+      case nsXPTType::T_U16: copy_word(ireg_args, stk, end, s->val.u16);  break;
+      case nsXPTType::T_U32: copy_word(ireg_args, stk, end, s->val.u32);  break;
+      case nsXPTType::T_U64: copy_dword(ireg_args, stk, end, s->val.u64); break;
+      case nsXPTType::T_BOOL: copy_word(ireg_args, stk, end, s->val.b);   break;
+      case nsXPTType::T_CHAR: copy_word(ireg_args, stk, end, s->val.c);   break;
+      case nsXPTType::T_WCHAR: copy_word(ireg_args, stk, end, s->val.wc); break;
+      default:
+        // all the others are plain pointer types
+        copy_word(ireg_args, stk, end, reinterpret_cast<PRUint32>(s->val.p));
+        break;
+    }
+  }
+}
+
+typedef PRUint32 (*vtable_func)(nsISupports *, PRUint32, PRUint32, PRUint32);
+
+EXPORT_XPCOM_API(nsresult)
+NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+                   PRUint32 paramCount, nsXPTCVariant* params)
+{
+  vtable_func *vtable = *reinterpret_cast<vtable_func **>(that);
+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
+  vtable_func func = vtable[methodIndex];
+#else /* non G++ V3 ABI */
+  vtable_func func = vtable[2 + methodIndex];
+#endif
+  // 'register PRUint32 result asm("r0")' could be used here, but it does not
+  //  seem to be reliable in all cases: http://gcc.gnu.org/PR46164
+  PRUint32 result;
+  asm (
+    "mov    %[stack_space_size], %[param_count_plus_2], lsl #3\n"
+    "tst    sp, #4\n" /* check stack alignment */
+
+    "add    %[stack_space_size], #(4 * 16)\n" /* space for VFP registers */
+    "mov    r3, %[params]\n"
+
+    "it     ne\n"
+    "addne  %[stack_space_size], %[stack_space_size], #4\n"
+    "sub    r0, sp, %[stack_space_size]\n" /* allocate space on stack */
+
+    "sub    r2, %[param_count_plus_2], #2\n"
+    "mov    sp, r0\n"
+
+    "add    r1, r0, %[param_count_plus_2], lsl #3\n"
+    "blx    %[invoke_copy_to_stack]\n"
+
+    "add    ip, sp, %[param_count_plus_2], lsl #3\n"
+    "mov    r0, %[that]\n"
+    "ldmdb  ip, {r1, r2, r3}\n"
+    "vldm   ip, {d0, d1, d2, d3, d4, d5, d6, d7}\n"
+    "blx    %[func]\n"
+
+    "add    sp, sp, %[stack_space_size]\n" /* cleanup stack */
+    "mov    %[stack_space_size], r0\n" /* it's actually 'result' variable */
+    : [stack_space_size]     "=&r" (result)
+    : [func]                 "r"   (func),
+      [that]                 "r"   (that),
+      [params]               "r"   (params),
+      [param_count_plus_2]   "r"   (paramCount + 2),
+      [invoke_copy_to_stack] "r"   (invoke_copy_to_stack)
+    : "cc", "memory",
+      // Mark all the scratch registers as clobbered because they may be
+      // modified by the functions, called from this inline assembly block
+      "r0", "r1", "r2", "r3", "ip", "lr",
+      "d0",  "d1",  "d2",  "d3",  "d4",  "d5",  "d6",  "d7",
+      // Also unconditionally mark d16-d31 registers as clobbered even though
+      // they actually don't exist in vfpv2 and vfpv3-d16 variants. There is
+      // no way to identify VFP variant using preprocessor at the momemnt
+      // (see http://gcc.gnu.org/PR46128 for more details), but fortunately
+      // current versions of gcc do not seem to complain about these registers
+      // even when this code is compiled with '-mfpu=vfpv3-d16' option.
+      // If gcc becomes more strict in the future and/or provides a way to
+      // identify VFP variant, the following d16-d31 registers list needs
+      // to be wrapped into some #ifdef
+      "d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23",
+      "d24", "d25", "d26", "d27", "d28", "d29", "d30", "d31"
+  );
+  return result;
+}
+
+#endif

From e949dc9ad9ce1530e234ba8800f3622c8269bd65 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Wed, 27 Oct 2010 13:10:15 -0700
Subject: [PATCH 12/57] Bug 607287 - Crash when trying to disable or uninstall
 an add-on [@ nsWindow::UserActivity]. r=mwu

--HG--
extra : rebase_source : 0b0c8654fbf4c52471947c929fae23df5f13a585
---
 widget/src/android/nsWindow.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/widget/src/android/nsWindow.cpp b/widget/src/android/nsWindow.cpp
index b51167fc69f..fb853440ad4 100644
--- a/widget/src/android/nsWindow.cpp
+++ b/widget/src/android/nsWindow.cpp
@@ -663,6 +663,10 @@ nsWindow::OnGlobalAndroidEvent(AndroidGeckoEvent *ae)
     if (!AndroidBridge::Bridge())
         return;
 
+    nsWindow *win = TopWindow();
+    if (!win)
+        return;
+
     switch (ae->Type()) {
         case AndroidGeckoEvent::SIZE_CHANGED: {
             int nw = ae->P0().x;
@@ -686,12 +690,12 @@ nsWindow::OnGlobalAndroidEvent(AndroidGeckoEvent *ae)
         }
 
         case AndroidGeckoEvent::MOTION_EVENT: {
-            TopWindow()->UserActivity();
+            win->UserActivity();
             if (!gTopLevelWindows.IsEmpty()) {
                 nsIntPoint pt(ae->P0());
                 pt.x = NS_MIN(NS_MAX(pt.x, 0), gAndroidBounds.width - 1);
                 pt.y = NS_MIN(NS_MAX(pt.y, 0), gAndroidBounds.height - 1);
-                nsWindow *target = TopWindow()->FindWindowForPoint(pt);
+                nsWindow *target = win->FindWindowForPoint(pt);
 
 #if 0
                 ALOG("MOTION_EVENT %f,%f -> %p (visible: %d children: %d)", ae->P0().x, ae->P0().y, (void*)target,
@@ -712,23 +716,22 @@ nsWindow::OnGlobalAndroidEvent(AndroidGeckoEvent *ae)
         }
 
         case AndroidGeckoEvent::KEY_EVENT:
-            TopWindow()->UserActivity();
+            win->UserActivity();
             if (gFocusedWindow)
                 gFocusedWindow->OnKeyEvent(ae);
             break;
 
         case AndroidGeckoEvent::DRAW:
-            if (TopWindow())
-                TopWindow()->OnDraw(ae);
+            win->OnDraw(ae);
             break;
 
         case AndroidGeckoEvent::IME_EVENT:
-            TopWindow()->UserActivity();
+            win->UserActivity();
             if (gFocusedWindow) {
                 gFocusedWindow->OnIMEEvent(ae);
             } else {
                 NS_WARNING("Sending unexpected IME event to top window");
-                TopWindow()->OnIMEEvent(ae);
+                win->OnIMEEvent(ae);
             }
             break;
 

From 96ef92cce446ec22fe86b0665cae0036f2005038 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <me@shawnwilsher.com>
Date: Wed, 27 Oct 2010 13:14:16 -0700
Subject: [PATCH 13/57] Bug 607469 - IPC-only Crash [@
 mozilla::places::History::NotifyVisited] r=dougt a=blocking

--HG--
extra : rebase_source : 74fbebfccb8544ef56adb0f66e778372148b0506
---
 toolkit/components/places/src/History.cpp     | 15 +++++++++
 .../places/tests/cpp/test_IHistory.cpp        | 33 +++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/toolkit/components/places/src/History.cpp b/toolkit/components/places/src/History.cpp
index 2979722d898..375ebbde2f0 100644
--- a/toolkit/components/places/src/History.cpp
+++ b/toolkit/components/places/src/History.cpp
@@ -1212,12 +1212,27 @@ History::RegisterVisitedCallback(nsIURI* aURI,
     // Links wanting to know about this URI.  Therefore, we should query the
     // database now.
     nsresult rv = VisitedQuery::Start(aURI);
+
+    // In IPC builds, we are passed a NULL Link from
+    // ContentParent::RecvStartVisitedQuery.  Since we won't be adding a NULL
+    // entry to our list of observers, and the code after this point assumes
+    // that aLink is non-NULL, we will need to return now.
     if (NS_FAILED(rv) || !aLink) {
       // Remove our array from the hashtable so we don't keep it around.
       mObservers.RemoveEntry(aURI);
       return rv;
     }
   }
+#ifdef MOZ_IPC
+  // In IPC builds, we are passed a NULL Link from
+  // ContentParent::RecvStartVisitedQuery.  All of our code after this point
+  // assumes aLink is non-NULL, so we have to return now.
+  else if (!aLink) {
+    NS_ASSERTION(XRE_GetProcessType() == GeckoProcessType_Default,
+                 "We should only ever get a null Link in the default process!");
+    return NS_OK;
+  }
+#endif
 
   // Sanity check that Links are not registered more than once for a given URI.
   // This will not catch a case where it is registered for two different URIs.
diff --git a/toolkit/components/places/tests/cpp/test_IHistory.cpp b/toolkit/components/places/tests/cpp/test_IHistory.cpp
index a8b506b14f1..d417063042a 100644
--- a/toolkit/components/places/tests/cpp/test_IHistory.cpp
+++ b/toolkit/components/places/tests/cpp/test_IHistory.cpp
@@ -550,6 +550,34 @@ test_visituri_transition_embed()
   run_next_test();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+//// IPC-only Tests
+
+#ifdef MOZ_IPC
+void
+test_two_null_links_same_uri()
+{
+  // Tests that we do not crash when we have had two NULL Links passed to
+  // RegisterVisitedCallback and then the visit occurs (bug 607469).  This only
+  // happens in IPC builds.
+  nsCOMPtr<nsIURI> testURI(new_test_uri());
+
+  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsresult rv = history->RegisterVisitedCallback(testURI, NULL);
+  do_check_success(rv);
+  rv = history->RegisterVisitedCallback(testURI, NULL);
+  do_check_success(rv);
+
+  rv = history->VisitURI(testURI, NULL, mozilla::IHistory::TOP_LEVEL);
+  do_check_success(rv);
+
+  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
+  finisher->WaitForNotification();
+
+  run_next_test();
+}
+#endif // MOZ_IPC
+
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Harness
 
@@ -571,6 +599,11 @@ Test gTests[] = {
   TEST(test_visituri_creates_visit),
   TEST(test_visituri_transition_typed),
   TEST(test_visituri_transition_embed),
+
+  // The rest of these tests are tests that are only run in IPC builds.
+#ifdef MOZ_IPC
+  TEST(test_two_null_links_same_uri),
+#endif // MOZ_IPC
 };
 
 const char* file = __FILE__;

From e3b8971b3891a66ca8aa4d7af83170b5072fde78 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Wed, 27 Oct 2010 13:36:15 -0700
Subject: [PATCH 14/57] Backed out changeset dd50da0646a4

---
 js/src/jit-test/README                        |  74 +++
 js/src/jit-test/lib/prolog.js                 |  48 ++
 js/src/jit-test/tests/arguments/args6.js      |  22 +
 js/src/jit-test/tests/arguments/args8.js      |  14 +
 js/src/jit-test/tests/arguments/argsx-4.js    |  23 +
 js/src/jit-test/tests/basic/arith.js          |  11 +
 js/src/jit-test/tests/basic/bug520498.js      |   9 +
 js/src/jit-test/tests/basic/bug522136.js      |  10 +
 js/src/jit-test/tests/basic/bug528644.js      |  16 +
 js/src/jit-test/tests/basic/bug557841.js      |   1 +
 js/src/jit-test/tests/basic/bug578041.js      |   3 +
 js/src/jit-test/tests/basic/bug579740.js      |   7 +
 js/src/jit-test/tests/basic/bug584499-1.js    |   6 +
 js/src/jit-test/tests/basic/bug584499-2.js    |  12 +
 js/src/jit-test/tests/basic/bug584565.js      |  10 +
 js/src/jit-test/tests/basic/call2.js          |  13 +
 .../tests/basic/delete-named-names.js         |  17 +
 .../jit-test/tests/basic/jitstatsArchFlags.js |  14 +
 js/src/jit-test/tests/basic/parseIntTests.js  |  23 +
 .../tests/basic/strictParseIntOctal.js        |  16 +
 .../testAssignmentThatIgnoresSetterRetval.js  |  10 +
 js/src/jit-test/tests/basic/testBug458838.js  |  19 +
 js/src/jit-test/tests/basic/testBug504520.js  |  11 +
 .../tests/basic/testBug504520Harder.js        |  33 ++
 js/src/jit-test/tests/basic/testBug552248.js  |  36 ++
 js/src/jit-test/tests/basic/testBug579602.js  |  21 +
 js/src/jit-test/tests/basic/testBug579646.js  |  22 +
 js/src/jit-test/tests/basic/testBug584650.js  |   9 +
 js/src/jit-test/tests/basic/testBug597736.js  |  32 ++
 .../basic/testEliminatedGuardWithinAnchor.js  |  12 +
 .../tests/basic/testHoleInDenseArray.js       |  18 +
 .../jit-test/tests/basic/testIntOverflow.js   |  15 +
 .../tests/basic/testMethodInitSafety.js       |  14 +
 .../tests/basic/testNativeArgsRooting.js      |  14 +
 .../tests/basic/testNestedDeepBail.js         |  20 +
 .../tests/basic/testNestedExitStackOuter.js   |  29 ++
 .../jit-test/tests/basic/testNewArrayCount.js |  12 +
 .../tests/basic/testNewArrayCount2.js         |   8 +
 .../tests/basic/testProxyConstructors.js      |   9 +
 .../tests/basic/testPutOnEmptyArgsObject.js   |  16 +
 .../jit-test/tests/basic/testRebranding2.js   |  21 +
 .../basic/testReconstructImacroPCStack.js     |  28 ++
 js/src/jit-test/tests/basic/testRegExpTest.js |  10 +
 .../basic/testScriptGetter_JSOP_CALLPROP.js   |  11 +
 js/src/jit-test/tests/basic/testShiftLeft.js  |  38 ++
 .../tests/basic/testShiftRightArithmetic.js   |  44 ++
 .../tests/basic/testSideExitInConstructor.js  |  39 ++
 .../tests/basic/testSlowNativeBail.js         |  10 +
 .../tests/basic/testStackQuotaExhausted.js    |  29 ++
 js/src/jit-test/tests/closures/bug540136.js   |  17 +
 js/src/jit-test/tests/closures/bug540242.js   |  17 +
 js/src/jit-test/tests/closures/bug540243.js   |  10 +
 js/src/jit-test/tests/closures/bug541239.js   |  16 +
 js/src/jit-test/tests/closures/lambda.js      |  27 ++
 .../tests/closures/setname-inner-heavy.js     |  18 +
 js/src/jit-test/tests/jaeger/bug554580-5.js   |  20 +
 js/src/jit-test/tests/jaeger/bug555155.js     |  12 +
 js/src/jit-test/tests/jaeger/bug555543.js     |   8 +
 js/src/jit-test/tests/jaeger/bug556525.js     |   5 +
 .../tests/jaeger/bug563000/eif-trap-newvar.js |   9 +
 .../jaeger/bug563000/eif-trap-typechange.js   |  10 +
 .../tests/jaeger/bug563000/eif-trap.js        |  10 +
 .../tests/jaeger/bug563000/simple-trap-1.js   |   9 +
 .../tests/jaeger/bug563000/simple-trap-2.js   |  10 +
 .../tests/jaeger/bug563000/simple-untrap.js   |  11 +
 .../jaeger/bug563000/trap-force-return-1.js   |   7 +
 .../jaeger/bug563000/trap-force-return-2.js   |   7 +
 .../jaeger/bug563000/trap-own-callsite.js     |  15 +
 .../jaeger/bug563000/trap-parent-from-trap.js |  21 +
 .../tests/jaeger/bug563000/trap-parent.js     |  16 +
 .../jaeger/bug563000/trap-self-as-parent.js   |  18 +
 .../jaeger/bug563000/trap-self-from-trap.js   |  23 +
 .../tests/jaeger/bug563000/trap-self.js       |  11 +
 .../jaeger/bug563000/untrap-own-trapsite.js   |  15 +
 .../tests/jaeger/bug563000/untrap-self.js     |  13 +
 js/src/jit-test/tests/jaeger/bug573433.js     |   7 +
 js/src/jit-test/tests/jaeger/bug580884.js     |   8 +
 js/src/jit-test/tests/jaeger/bug582286.js     |   3 +
 js/src/jit-test/tests/jaeger/bug583158.js     |   9 +
 js/src/jit-test/tests/jaeger/bug585341.js     |   6 +
 js/src/jit-test/tests/jaeger/bug588338.js     |  14 +
 js/src/jit-test/tests/jaeger/bug588363-2.js   |   7 +
 .../jit-test/tests/jaeger/crash-on-compare.js |   1 +
 js/src/jit-test/tests/jaeger/fused-eq-ifeq.js |   6 +
 js/src/jit-test/tests/pic/bug558099.js        |  60 +++
 .../tests/sunspider/check-3d-morph.js         |  59 +++
 .../tests/sunspider/check-3d-raytrace.js      | 443 ++++++++++++++++++
 .../sunspider/check-access-binary-trees.js    |  52 ++
 .../tests/sunspider/check-access-fannkuch.js  |  66 +++
 .../tests/sunspider/check-access-nbody.js     | 171 +++++++
 .../tests/sunspider/check-access-nsieve.js    |  40 ++
 .../check-bitops-3bit-bits-in-byte.js         |  35 ++
 .../sunspider/check-bitops-bits-in-byte.js    |  24 +
 .../sunspider/check-bitops-bitwise-and.js     |  29 ++
 .../sunspider/check-bitops-nsieve-bits.js     |  40 ++
 .../sunspider/check-controlflow-recursive.js  |  27 ++
 .../sunspider/check-date-format-tofte.js      | 302 ++++++++++++
 .../sunspider/check-date-format-xparb.js      | 422 +++++++++++++++++
 .../sunspider/check-math-partial-sums.js      |  41 ++
 js/src/jit-test/tests/sunspider/check-mont.js | 119 +++++
 .../tests/sunspider/check-string-tagcloud.js  | 270 +++++++++++
 js/src/tests/js1_8_1/jit/browser.js           |   0
 js/src/tests/js1_8_1/jit/jstests.list         |  24 +
 js/src/tests/js1_8_1/jit/regress-451673.js    | 115 +++++
 js/src/tests/js1_8_1/jit/regress-451974-01.js |  86 ++++
 js/src/tests/js1_8_1/jit/regress-451974-02.js |  97 ++++
 js/src/tests/js1_8_1/jit/regress-452498-01.js | 105 +++++
 js/src/tests/js1_8_1/jit/regress-458838.js    |  97 ++++
 js/src/tests/js1_8_1/jit/regress-462459-01.js | 107 +++++
 js/src/tests/js1_8_1/jit/regress-462459-02.js | 106 +++++
 js/src/tests/js1_8_1/jit/regress-462459-03.js | 107 +++++
 js/src/tests/js1_8_1/jit/regress-462459-04.js | 107 +++++
 js/src/tests/js1_8_1/jit/regress-462459-05.js | 107 +++++
 js/src/tests/js1_8_1/jit/regress-462459-06.js | 107 +++++
 js/src/tests/js1_8_1/jit/regress-462459-07.js | 107 +++++
 js/src/tests/js1_8_1/jit/regress-462459-08.js | 107 +++++
 js/src/tests/js1_8_1/jit/regress-462459-09.js | 107 +++++
 js/src/tests/js1_8_1/jit/regress-462459-10.js | 107 +++++
 js/src/tests/js1_8_1/jit/regress-462459-11.js | 107 +++++
 js/src/tests/js1_8_1/jit/regress-462459-12.js | 107 +++++
 js/src/tests/js1_8_1/jit/regress-469927.js    |  78 +++
 js/src/tests/js1_8_1/jit/regress-470739.js    |  80 ++++
 js/src/tests/js1_8_1/jit/regress-471635.js    |  90 ++++
 js/src/tests/js1_8_1/jit/regress-489682.js    |  65 +++
 js/src/tests/js1_8_1/jit/shell.js             |   4 +
 .../xptcall/src/md/unix/xptcinvoke_arm.cpp    | 257 ----------
 126 files changed, 5679 insertions(+), 257 deletions(-)
 create mode 100644 js/src/jit-test/README
 create mode 100644 js/src/jit-test/lib/prolog.js
 create mode 100644 js/src/jit-test/tests/arguments/args6.js
 create mode 100644 js/src/jit-test/tests/arguments/args8.js
 create mode 100644 js/src/jit-test/tests/arguments/argsx-4.js
 create mode 100644 js/src/jit-test/tests/basic/arith.js
 create mode 100644 js/src/jit-test/tests/basic/bug520498.js
 create mode 100644 js/src/jit-test/tests/basic/bug522136.js
 create mode 100644 js/src/jit-test/tests/basic/bug528644.js
 create mode 100644 js/src/jit-test/tests/basic/bug557841.js
 create mode 100644 js/src/jit-test/tests/basic/bug578041.js
 create mode 100644 js/src/jit-test/tests/basic/bug579740.js
 create mode 100644 js/src/jit-test/tests/basic/bug584499-1.js
 create mode 100644 js/src/jit-test/tests/basic/bug584499-2.js
 create mode 100644 js/src/jit-test/tests/basic/bug584565.js
 create mode 100644 js/src/jit-test/tests/basic/call2.js
 create mode 100644 js/src/jit-test/tests/basic/delete-named-names.js
 create mode 100644 js/src/jit-test/tests/basic/jitstatsArchFlags.js
 create mode 100644 js/src/jit-test/tests/basic/parseIntTests.js
 create mode 100644 js/src/jit-test/tests/basic/strictParseIntOctal.js
 create mode 100644 js/src/jit-test/tests/basic/testAssignmentThatIgnoresSetterRetval.js
 create mode 100644 js/src/jit-test/tests/basic/testBug458838.js
 create mode 100644 js/src/jit-test/tests/basic/testBug504520.js
 create mode 100644 js/src/jit-test/tests/basic/testBug504520Harder.js
 create mode 100644 js/src/jit-test/tests/basic/testBug552248.js
 create mode 100644 js/src/jit-test/tests/basic/testBug579602.js
 create mode 100644 js/src/jit-test/tests/basic/testBug579646.js
 create mode 100644 js/src/jit-test/tests/basic/testBug584650.js
 create mode 100644 js/src/jit-test/tests/basic/testBug597736.js
 create mode 100644 js/src/jit-test/tests/basic/testEliminatedGuardWithinAnchor.js
 create mode 100644 js/src/jit-test/tests/basic/testHoleInDenseArray.js
 create mode 100644 js/src/jit-test/tests/basic/testIntOverflow.js
 create mode 100644 js/src/jit-test/tests/basic/testMethodInitSafety.js
 create mode 100644 js/src/jit-test/tests/basic/testNativeArgsRooting.js
 create mode 100644 js/src/jit-test/tests/basic/testNestedDeepBail.js
 create mode 100644 js/src/jit-test/tests/basic/testNestedExitStackOuter.js
 create mode 100644 js/src/jit-test/tests/basic/testNewArrayCount.js
 create mode 100644 js/src/jit-test/tests/basic/testNewArrayCount2.js
 create mode 100644 js/src/jit-test/tests/basic/testProxyConstructors.js
 create mode 100644 js/src/jit-test/tests/basic/testPutOnEmptyArgsObject.js
 create mode 100644 js/src/jit-test/tests/basic/testRebranding2.js
 create mode 100644 js/src/jit-test/tests/basic/testReconstructImacroPCStack.js
 create mode 100644 js/src/jit-test/tests/basic/testRegExpTest.js
 create mode 100644 js/src/jit-test/tests/basic/testScriptGetter_JSOP_CALLPROP.js
 create mode 100644 js/src/jit-test/tests/basic/testShiftLeft.js
 create mode 100644 js/src/jit-test/tests/basic/testShiftRightArithmetic.js
 create mode 100644 js/src/jit-test/tests/basic/testSideExitInConstructor.js
 create mode 100644 js/src/jit-test/tests/basic/testSlowNativeBail.js
 create mode 100644 js/src/jit-test/tests/basic/testStackQuotaExhausted.js
 create mode 100644 js/src/jit-test/tests/closures/bug540136.js
 create mode 100644 js/src/jit-test/tests/closures/bug540242.js
 create mode 100644 js/src/jit-test/tests/closures/bug540243.js
 create mode 100644 js/src/jit-test/tests/closures/bug541239.js
 create mode 100644 js/src/jit-test/tests/closures/lambda.js
 create mode 100644 js/src/jit-test/tests/closures/setname-inner-heavy.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug554580-5.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug555155.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug555543.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug556525.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/eif-trap-newvar.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/eif-trap-typechange.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/eif-trap.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/simple-trap-1.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/simple-trap-2.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/simple-untrap.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-force-return-1.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-force-return-2.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-own-callsite.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-parent-from-trap.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-parent.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-self-as-parent.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-self-from-trap.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/trap-self.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/untrap-own-trapsite.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug563000/untrap-self.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug573433.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug580884.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug582286.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug583158.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug585341.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug588338.js
 create mode 100644 js/src/jit-test/tests/jaeger/bug588363-2.js
 create mode 100644 js/src/jit-test/tests/jaeger/crash-on-compare.js
 create mode 100644 js/src/jit-test/tests/jaeger/fused-eq-ifeq.js
 create mode 100644 js/src/jit-test/tests/pic/bug558099.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-3d-morph.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-3d-raytrace.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-access-binary-trees.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-access-fannkuch.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-access-nbody.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-access-nsieve.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-bitops-3bit-bits-in-byte.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-bitops-bits-in-byte.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-bitops-bitwise-and.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-bitops-nsieve-bits.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-controlflow-recursive.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-date-format-tofte.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-date-format-xparb.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-math-partial-sums.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-mont.js
 create mode 100644 js/src/jit-test/tests/sunspider/check-string-tagcloud.js
 create mode 100644 js/src/tests/js1_8_1/jit/browser.js
 create mode 100644 js/src/tests/js1_8_1/jit/jstests.list
 create mode 100644 js/src/tests/js1_8_1/jit/regress-451673.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-451974-01.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-451974-02.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-452498-01.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-458838.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-462459-01.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-462459-02.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-462459-03.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-462459-04.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-462459-05.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-462459-06.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-462459-07.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-462459-08.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-462459-09.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-462459-10.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-462459-11.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-462459-12.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-469927.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-470739.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-471635.js
 create mode 100644 js/src/tests/js1_8_1/jit/regress-489682.js
 create mode 100644 js/src/tests/js1_8_1/jit/shell.js

diff --git a/js/src/jit-test/README b/js/src/jit-test/README
new file mode 100644
index 00000000000..ddde38dc962
--- /dev/null
+++ b/js/src/jit-test/README
@@ -0,0 +1,74 @@
+JS Trace Test Suite
+
+* PURPOSE
+
+This is a test suite for testing TraceMonkey. All tests are run in the JS shell
+with tracing enabled (-j).
+
+* REQUIREMENTS
+
+Python 2.5. This is already a standard requirement for building our tree.
+
+* RUNNING THE TESTS
+
+Basic usage:
+
+    python jit_test.py <path-to-js-shell>
+
+The progress bar shows [#tests passed, #tests failed, #tests run] at the left.
+If all tests pass, the output is 'PASSED ALL'. The test suite can be interrupted
+at any time with Ctrl+C and partial results will be printed.
+
+To run only the basic tests, not including the slow tests:
+
+    python jit_test.py <path-to-js-shell> basic
+
+For more options:
+
+    python jit_test.py -h
+
+* CREATING NEW TESTS
+
+Simply create a JS file under the 'tests/' directory. Most tests should go in
+'tests/basic/'.
+
+All tests are run with 'lib/prolog.js' included first on the command line. The
+command line also creates a global variable 'libdir' that is set to the path
+of the 'lib' directory. To include a file 'foo.js' from the lib directory in a 
+test case:
+
+    load(libdir + 'foo.js')
+
+* TEST METALINES
+
+The first line of a test case can contain a special comment controlling how the
+test is run. For example:
+
+    // |jit-test| allow-oom;
+
+The general format in EBNF is:
+
+    metaline  ::= cookie { item ";" }
+    cookie    ::= "|jit-test|"
+    item      ::= flag | attribute
+
+    flag      ::= "slow" | "allow-oom"
+
+    attribute ::= name ":" value
+    name      ::= "TMFLAGS" | "error"
+    value     ::= <string>
+
+The metaline may appear anywhere in the first line of the file: this allows it
+to be placed inside any kind of comment.
+
+The meaning of the items:
+
+    slow         Test runs slowly. Do not run if the --no-slow option is given.
+    allow-oom    If the test runs out of memory, it counts as passing.
+    valgrind     Run test under valgrind.
+
+    error        The test should be considered to pass iff it throws the
+                 given JS exception.
+    TMFLAGS      Set the environment variable TMFLAGS to the given value.
+
+* END
diff --git a/js/src/jit-test/lib/prolog.js b/js/src/jit-test/lib/prolog.js
new file mode 100644
index 00000000000..5d577b39bda
--- /dev/null
+++ b/js/src/jit-test/lib/prolog.js
@@ -0,0 +1,48 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+const HAVE_TM = 'tracemonkey' in this;
+
+const HOTLOOP = HAVE_TM ? tracemonkey.HOTLOOP : 8;
+const RECORDLOOP = HOTLOOP;
+const RUNLOOP = HOTLOOP + 1;
+
+var checkStats;
+if (HAVE_TM) {
+    checkStats = function(stats)
+    {
+        // Temporarily disabled while we work on heuristics.
+        return;
+        function jit(on)
+        {
+          if (on && !options().match(/tracejit/))
+          {
+            options('tracejit');
+          }
+          else if (!on && options().match(/tracejit/))
+          {
+            options('tracejit');
+          }
+        }
+
+        jit(false);
+        for (var name in stats) {
+            var expected = stats[name];
+            var actual = tracemonkey[name];
+            if (expected != actual) {
+                print('Trace stats check failed: got ' + actual + ', expected ' + expected + ' for ' + name);
+            }
+        }
+        jit(true);
+    };
+} else {
+    checkStats = function() {};
+}
+
+var appendToActual = function(s) {
+    actual += s + ',';
+}
+
+if (!("gczeal" in this)) {
+  gczeal = function() { }
+}
+
diff --git a/js/src/jit-test/tests/arguments/args6.js b/js/src/jit-test/tests/arguments/args6.js
new file mode 100644
index 00000000000..a2fc60d36a8
--- /dev/null
+++ b/js/src/jit-test/tests/arguments/args6.js
@@ -0,0 +1,22 @@
+actual = '';
+expected = '6,';
+
+// tracing length
+
+var g = 0;
+
+function h(args) {
+  g = args.length;
+}
+
+function f() {
+  h(arguments);
+}
+
+for (var i = 0; i < 5; ++i) {
+  f(10, 20, 30, 40, 50, 60);
+}
+appendToActual(g);
+
+
+assertEq(actual, expected)
diff --git a/js/src/jit-test/tests/arguments/args8.js b/js/src/jit-test/tests/arguments/args8.js
new file mode 100644
index 00000000000..57938d9e231
--- /dev/null
+++ b/js/src/jit-test/tests/arguments/args8.js
@@ -0,0 +1,14 @@
+actual = '';
+expected = '[object Arguments],[object Arguments],[object Arguments],[object Arguments],[object Arguments],';
+
+function h() {
+  return arguments;
+}
+
+for (var i = 0; i < 5; ++i) {
+  var p = h(i, i*2);
+  appendToActual(p);
+}
+
+
+assertEq(actual, expected)
diff --git a/js/src/jit-test/tests/arguments/argsx-4.js b/js/src/jit-test/tests/arguments/argsx-4.js
new file mode 100644
index 00000000000..b52b14853cf
--- /dev/null
+++ b/js/src/jit-test/tests/arguments/argsx-4.js
@@ -0,0 +1,23 @@
+actual = '';
+expected = '[object Arguments] undefined undefined,[object Arguments] undefined undefined,';
+
+function f() {
+  g(arguments);
+}
+
+function g(a, b, c) {
+  h(arguments);
+  a = 1;
+  b = 2;
+  c = 3;
+  h(arguments);
+}
+
+function h(a, b, c) {
+  appendToActual(a + ' ' + b + ' ' + c);
+}
+
+f(4, 5, 6);
+
+
+assertEq(actual, expected)
diff --git a/js/src/jit-test/tests/basic/arith.js b/js/src/jit-test/tests/basic/arith.js
new file mode 100644
index 00000000000..b7f551dccd0
--- /dev/null
+++ b/js/src/jit-test/tests/basic/arith.js
@@ -0,0 +1,11 @@
+// |jit-test| TMFLAGS: full,fragprofile,treevis
+
+function arith()
+{
+  var accum = 0;
+  for (var i = 0; i < 100; i++) {
+    accum += (i * 2) - 1;
+  }
+  return accum;
+}
+assertEq(arith(), 9800);
diff --git a/js/src/jit-test/tests/basic/bug520498.js b/js/src/jit-test/tests/basic/bug520498.js
new file mode 100644
index 00000000000..55324f6f30d
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug520498.js
@@ -0,0 +1,9 @@
+var Q = 0;
+try {
+   (function f(i) { Q = i; if (i == 100000) return; f(i+1); })(1)
+} catch (e) {
+}
+
+if (Q == 100000)
+   assertEq(Q, "fail");
+
diff --git a/js/src/jit-test/tests/basic/bug522136.js b/js/src/jit-test/tests/basic/bug522136.js
new file mode 100644
index 00000000000..9267c99ccfa
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug522136.js
@@ -0,0 +1,10 @@
+var Q = 0;
+try {
+   (function f(i) { Q = i; if (i == 100000) return; f(i+1); })(1)
+} catch (e) {
+}
+
+// Exact behavior of recursion check depends on which JIT we use.
+var ok = (Q == 3000 || Q == 3001);
+assertEq(ok, true);
+
diff --git a/js/src/jit-test/tests/basic/bug528644.js b/js/src/jit-test/tests/basic/bug528644.js
new file mode 100644
index 00000000000..260e0d99590
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug528644.js
@@ -0,0 +1,16 @@
+// Don't crash
+
+function g(foo) {
+  for (a in foo) {
+  }
+}
+
+var makegen = eval("\n\
+  (function(b) {\n\
+      var h = \n\
+        eval(\"new function() { yield print(b) }\" ); \n\
+    return h\n\
+  })\n\
+");
+
+g(makegen());
diff --git a/js/src/jit-test/tests/basic/bug557841.js b/js/src/jit-test/tests/basic/bug557841.js
new file mode 100644
index 00000000000..903490e6edc
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug557841.js
@@ -0,0 +1 @@
+eval("for(a = 0; a < 4; a++) x = 1;", []);
diff --git a/js/src/jit-test/tests/basic/bug578041.js b/js/src/jit-test/tests/basic/bug578041.js
new file mode 100644
index 00000000000..7a81feb1800
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug578041.js
@@ -0,0 +1,3 @@
+__defineGetter__('x', Float32Array);
+with(this)
+    x;
diff --git a/js/src/jit-test/tests/basic/bug579740.js b/js/src/jit-test/tests/basic/bug579740.js
new file mode 100644
index 00000000000..83ee967bfd8
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug579740.js
@@ -0,0 +1,7 @@
+
+for (a = 0; a < 4; a++) {
+    new Math.round(0).t
+}
+
+/* Don't assert. */
+
diff --git a/js/src/jit-test/tests/basic/bug584499-1.js b/js/src/jit-test/tests/basic/bug584499-1.js
new file mode 100644
index 00000000000..bc989537994
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug584499-1.js
@@ -0,0 +1,6 @@
+// |jit-test| error: TypeError
+var s = "12345";
+for(var i=0; i<7; i++) {
+    print(s[i].length);
+}
+
diff --git a/js/src/jit-test/tests/basic/bug584499-2.js b/js/src/jit-test/tests/basic/bug584499-2.js
new file mode 100644
index 00000000000..bd8b0ab26f5
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug584499-2.js
@@ -0,0 +1,12 @@
+function f(x) {
+    var s = "a";
+    var last = "";
+    for (var i = 0; i < HOTLOOP + 2; i++) {
+        last = s[x];
+    }
+    return last;
+}
+
+f(0);
+
+assertEq(f(1), undefined);
diff --git a/js/src/jit-test/tests/basic/bug584565.js b/js/src/jit-test/tests/basic/bug584565.js
new file mode 100644
index 00000000000..ad7d4b47577
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug584565.js
@@ -0,0 +1,10 @@
+// Any copyright is dedicated to the Public Domain.
+// http://creativecommons.org/licenses/publicdomain/
+// Contributor: Luke Wagner <lw@mozilla.com>
+
+var x, f;
+for (var i = 0; i < 100; i++) {
+    f = function() {};
+    f.foo;
+    x = f.length;
+}
diff --git a/js/src/jit-test/tests/basic/call2.js b/js/src/jit-test/tests/basic/call2.js
new file mode 100644
index 00000000000..9e68bb20ae1
--- /dev/null
+++ b/js/src/jit-test/tests/basic/call2.js
@@ -0,0 +1,13 @@
+function g(x) {
+    if ((x & 1) == 1) return 1;
+    return 2;
+}
+
+function f(n) {
+    var q = 0;
+    for (var i = 0; i < n; i++)
+        q += g(i);
+    return q;
+}
+
+assertEq(f(1000), 1500);
diff --git a/js/src/jit-test/tests/basic/delete-named-names.js b/js/src/jit-test/tests/basic/delete-named-names.js
new file mode 100644
index 00000000000..1e0ac407321
--- /dev/null
+++ b/js/src/jit-test/tests/basic/delete-named-names.js
@@ -0,0 +1,17 @@
+var a = ['p', 'q', 'r', 's', 't'];
+var o = {p:1, q:2, r:3, s:4, t:5};
+for (var i in o) {
+    delete o.p;
+    delete o.q;
+    delete o.r;
+    delete o.s;
+    delete o.t;
+}
+for each (var i in a)
+    assertEq(o.hasOwnProperty(i), false);
+
+checkStats({
+    recorderAborted:0,
+    traceCompleted:1,
+    sideExitIntoInterpreter:1
+});
diff --git a/js/src/jit-test/tests/basic/jitstatsArchFlags.js b/js/src/jit-test/tests/basic/jitstatsArchFlags.js
new file mode 100644
index 00000000000..a4ec0c4ee4b
--- /dev/null
+++ b/js/src/jit-test/tests/basic/jitstatsArchFlags.js
@@ -0,0 +1,14 @@
+// Make sure the arch flags are valid on startup, even if nothing has
+// been traced yet. We don't know what arch the user is building on,
+// but presumably we want at least 1 flag to be set on all supported
+// platforms.
+
+if (HAVE_TM) {
+  assertEq(jitstats.archIsIA32 ||
+	   jitstats.archIs64BIT ||
+	   jitstats.archIsARM ||
+	   jitstats.archIsSPARC ||
+	   jitstats.archIsPPC ||
+	   jitstats.archIsAMD64,
+	   1);
+ }
diff --git a/js/src/jit-test/tests/basic/parseIntTests.js b/js/src/jit-test/tests/basic/parseIntTests.js
new file mode 100644
index 00000000000..c8ecb366556
--- /dev/null
+++ b/js/src/jit-test/tests/basic/parseIntTests.js
@@ -0,0 +1,23 @@
+function parseIntHelper(n) {
+    var a;
+    for (var i = 0; i < 5; i++)
+      a = parseInt(n);
+    return a;
+}
+function doParseIntTests() {
+    var inputs = [0, -0, .1, -.1, .7, -.7, 1.3, -1.3];
+    var outputs = new Array(8);
+    //avoid jit, unrolled
+    outputs[0] = outputs[1] = outputs[2] = outputs[4] = 0;
+    outputs[3] = outputs[5] = -0;
+    outputs[6] = 1;
+    outputs[7] = -1;
+    for (var i = 0; i < 8; i++) {
+        var testfn = new Function('return parseIntHelper(' + uneval(inputs[i]) + ');');
+        assertEq(testfn(), outputs[i]);
+    }
+}
+doParseIntTests();
+
+assertEq(parseInt("08"), 0);
+assertEq(parseInt("09"), 0);
diff --git a/js/src/jit-test/tests/basic/strictParseIntOctal.js b/js/src/jit-test/tests/basic/strictParseIntOctal.js
new file mode 100644
index 00000000000..536d2d7dd0c
--- /dev/null
+++ b/js/src/jit-test/tests/basic/strictParseIntOctal.js
@@ -0,0 +1,16 @@
+"use strict";
+
+assertEq(parseInt("08"), 0);
+assertEq(parseInt("09"), 0);
+assertEq(parseInt("014"), 12);
+assertEq(parseInt("0xA"), 10);
+assertEq(parseInt("00123"), 83);
+
+for (var i = 0; i < 5; i++)
+{
+  assertEq(parseInt("08"), 0);
+  assertEq(parseInt("09"), 0);
+  assertEq(parseInt("014"), 12);
+  assertEq(parseInt("0xA"), 10);
+  assertEq(parseInt("00123"), 83);
+}
diff --git a/js/src/jit-test/tests/basic/testAssignmentThatIgnoresSetterRetval.js b/js/src/jit-test/tests/basic/testAssignmentThatIgnoresSetterRetval.js
new file mode 100644
index 00000000000..1c59113482d
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testAssignmentThatIgnoresSetterRetval.js
@@ -0,0 +1,10 @@
+var o = {
+    set x(v) {
+        return 42;
+    }
+};
+
+for (var i = 0; i < 10; ++i) {
+    var z = o.x = "choose me";
+    assertEq(z, "choose me");
+}
diff --git a/js/src/jit-test/tests/basic/testBug458838.js b/js/src/jit-test/tests/basic/testBug458838.js
new file mode 100644
index 00000000000..cd1e05cf77b
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testBug458838.js
@@ -0,0 +1,19 @@
+var escape;
+function testBug458838() {
+    var a = 1;
+    function g() {
+        var b = 0
+            for (var i = 0; i < 10; ++i) {
+                b += a;
+            }
+        return b;
+    }
+
+    return g();
+}
+assertEq(testBug458838(), 10);
+checkStats({
+  recorderStarted: 1,
+  recorderAborted: 0,
+  traceCompleted: 1
+});
diff --git a/js/src/jit-test/tests/basic/testBug504520.js b/js/src/jit-test/tests/basic/testBug504520.js
new file mode 100644
index 00000000000..73e2e3013fb
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testBug504520.js
@@ -0,0 +1,11 @@
+function testBug504520() {
+    // A bug involving comparisons.
+    var arr = [1/0, 1/0, 1/0, 1/0, 1/0, 1/0, 1/0, 1/0, 1/0, 0];
+    assertEq(arr.length > RUNLOOP, true);
+
+    var s = '';
+    for (var i = 0; i < arr.length; i++)
+        arr[i] >= 1/0 ? null : (s += i);
+    assertEq(s, '9');
+}
+testBug504520();
diff --git a/js/src/jit-test/tests/basic/testBug504520Harder.js b/js/src/jit-test/tests/basic/testBug504520Harder.js
new file mode 100644
index 00000000000..0a63ebf4075
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testBug504520Harder.js
@@ -0,0 +1,33 @@
+function testBug504520Harder() {
+    // test 1024 similar cases
+    var vals = [1/0, -1/0, 0, 0/0];
+    var ops = ["===", "!==", "==", "!=", "<", ">", "<=", ">="];
+    for each (var x in vals) {
+        for each (var y in vals) {
+            for each (var op in ops) {
+                for each (var z in vals) {
+                    // Assume eval is correct. This depends on the global
+                    // Infinity property not having been reassigned.
+                    var xz = eval(x + op + z);
+                    var yz = eval(y + op + z);
+
+                    var arr = [x, x, x, x, x, x, x, x, x, y];
+                    assertEq(arr.length > RUNLOOP, true);
+                    var expected = [xz, xz, xz, xz, xz, xz, xz, xz, xz, yz];
+
+                    // ?: looks superfluous but that's what we're testing here
+                    var fun = eval(
+                        '(function (arr, results) {\n' +
+                        '    for (let i = 0; i < arr.length; i++)\n' +
+                        '        results.push(arr[i]' + op + z + ' ? "true" : "false");\n' +
+                        '});\n');
+                    var actual = [];
+                    fun(arr, actual);
+		    print(x, y, op, z);
+                    assertEq("" + actual, "" + expected);
+                }
+            }
+        }
+    }
+}
+testBug504520Harder();
diff --git a/js/src/jit-test/tests/basic/testBug552248.js b/js/src/jit-test/tests/basic/testBug552248.js
new file mode 100644
index 00000000000..28782b665bb
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testBug552248.js
@@ -0,0 +1,36 @@
+setDebug(true);
+var a = new Array();
+
+function i(save) {
+    var x = 9;
+    evalInFrame(0, "a.push(x)", save);
+    evalInFrame(1, "a.push(z)", save);
+    evalInFrame(2, "a.push(z)", save);
+    evalInFrame(3, "a.push(y)", save);
+    evalInFrame(4, "a.push(x)", save);
+}
+
+function h() {
+    var z = 5;
+    evalInFrame(0, "a.push(z)");
+    evalInFrame(1, "a.push(y)");
+    evalInFrame(2, "a.push(x)");
+    evalInFrame(0, "i(false)");
+    evalInFrame(0, "a.push(z)", true);
+    evalInFrame(1, "a.push(y)", true);
+    evalInFrame(2, "a.push(x)", true);
+    evalInFrame(0, "i(true)", true);
+}
+
+function g() {
+    var y = 4;
+    h();
+}
+
+function f() {
+    var x = 3;
+    g();
+}
+
+f();
+assertEq(a+'', [5, 4, 3, 9, 5, 5, 4, 3, 5, 4, 3, 9, 5, 5, 4, 3]+'');
diff --git a/js/src/jit-test/tests/basic/testBug579602.js b/js/src/jit-test/tests/basic/testBug579602.js
new file mode 100644
index 00000000000..5871c24d46e
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testBug579602.js
@@ -0,0 +1,21 @@
+// don't panic
+
+f = function() {
+  x = yield
+}
+rv = f()
+for (a in rv) (function() {})
+x = Proxy.create((function() {
+  return {
+    defineProperty: gc
+  }
+})(), x)
+with({
+  d: (({
+    x: Object.defineProperty(x, "", ({
+      set: Array.e
+    }))
+  }))
+}) {}
+
+// don't crash
diff --git a/js/src/jit-test/tests/basic/testBug579646.js b/js/src/jit-test/tests/basic/testBug579646.js
new file mode 100644
index 00000000000..d034410f9cc
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testBug579646.js
@@ -0,0 +1,22 @@
+if (typeof gczeal != "function")
+    gczeal = function() {}
+
+for (a = 0; a < 9; a++)
+    for (b = 0; b < 1; b++)
+        for (c = 0; c < 2; c++)
+            gczeal();
+
+for each(e in [NaN])
+    for (d = 0; d < 1; d++)
+        z = 0;
+
+for (w in [0, 0])
+    {}
+
+x = 0;
+
+for (e = 0; e < 3; e++)
+    for (f = 0; f < 4; f++)
+        x = -x
+
+// don't crash
diff --git a/js/src/jit-test/tests/basic/testBug584650.js b/js/src/jit-test/tests/basic/testBug584650.js
new file mode 100644
index 00000000000..b6c9d8ab7fd
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testBug584650.js
@@ -0,0 +1,9 @@
+if (typeof gczeal != "function")
+    gczeal = function() {}
+
+// don't crash
+x = (evalcx('lazy'))
+x.watch("", function () {})
+gczeal(1)
+for (w in x) {}
+
diff --git a/js/src/jit-test/tests/basic/testBug597736.js b/js/src/jit-test/tests/basic/testBug597736.js
new file mode 100644
index 00000000000..ded33842776
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testBug597736.js
@@ -0,0 +1,32 @@
+function leak_test() {
+    // Create a reference loop function->script->traceFragment->object->function
+    // that GC must be able to break. To embedd object into the fragment the
+    // code use prototype chain of depth 2 which caches obj.__proto__.__proto__
+    // into the fragment.
+
+    // To make sure that we have no references to the function f after this
+    // function returns due via the conservative scan of the native stack we
+    // loop here multiple times overwriting the stack and registers with new garabge.
+    for (var j = 0; j != 8; ++j) {
+	var f = Function("a", "var s = 0; for (var i = 0; i != 100; ++i) s += a.b; return s;");
+	var c = {b: 1, f: f, leakDetection: makeFinalizeObserver()};
+	f({ __proto__: { __proto__: c}});
+	f = c = a = null;
+	gc();
+    }
+}
+
+function test()
+{
+    if (typeof finalizeCount != "function")
+	return;
+
+    var base = finalizeCount();
+    leak_test();
+    gc();
+    gc();
+    var n = finalizeCount();
+    assertEq(base + 4 < finalizeCount(), true, "Some finalizations must happen");
+}
+
+test();
diff --git a/js/src/jit-test/tests/basic/testEliminatedGuardWithinAnchor.js b/js/src/jit-test/tests/basic/testEliminatedGuardWithinAnchor.js
new file mode 100644
index 00000000000..cc80e779c37
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testEliminatedGuardWithinAnchor.js
@@ -0,0 +1,12 @@
+function testEliminatedGuardWithinAnchor() {
+    for (let i = 0; i < 5; ++i) { i / (i * i); }
+    return "ok";
+}
+
+assertEq(testEliminatedGuardWithinAnchor(), "ok");
+
+if (HAVE_TM) {
+    checkStats({
+        sideExitIntoInterpreter: (jitstats.archIsARM ? 1 : 3)
+    });
+}
diff --git a/js/src/jit-test/tests/basic/testHoleInDenseArray.js b/js/src/jit-test/tests/basic/testHoleInDenseArray.js
new file mode 100644
index 00000000000..ba7a2c01e16
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testHoleInDenseArray.js
@@ -0,0 +1,18 @@
+var s;
+
+function f(i) {
+    if (i > 4) /* side exit when arr[i] changes from bool to undefined (via a hole) */
+        assertEq(s, undefined);
+    else
+        assertEq(s, false);
+    return 1;
+}
+
+/* trailing 'true' ensures array has capacity >= 10 */
+var arr = [ false, false, false, false, false, , , , , , true ];
+
+for (var i = 0; i < 10; ++i) {
+    (s = arr[i]) + f(i);
+}
+
+checkStats({ traceTriggered: 2, sideExitIntoInterpreter: 2 })
diff --git a/js/src/jit-test/tests/basic/testIntOverflow.js b/js/src/jit-test/tests/basic/testIntOverflow.js
new file mode 100644
index 00000000000..712ef0c6529
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testIntOverflow.js
@@ -0,0 +1,15 @@
+function testIntOverflow() {
+    // int32_max - 7
+    var ival = 2147483647 - 7;
+    for (var i = 0; i < 30; i++) {
+        ival += 30;
+    }
+    return (ival < 2147483647);
+}
+assertEq(testIntOverflow(), false);
+checkStats({
+    recorderStarted: 1,
+    recorderAborted: 0,
+    traceCompleted: 1,
+    traceTriggered: 1,
+});
diff --git a/js/src/jit-test/tests/basic/testMethodInitSafety.js b/js/src/jit-test/tests/basic/testMethodInitSafety.js
new file mode 100644
index 00000000000..ebd6309bdf9
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testMethodInitSafety.js
@@ -0,0 +1,14 @@
+function testMethodInitSafety() {
+    function f() { return 'fail'; }
+    function g() { return 'ok'; }
+
+    var s;
+    var arr = [f, f, f, f, g];
+    //assertEq(arr.length > RUNLOOP, true);
+    for (var i = 0; i < arr.length; i++) {
+        var x = {m: arr[i]};
+        s = x.m();
+    }
+    return s;
+}
+assertEq(testMethodInitSafety(), "ok");
diff --git a/js/src/jit-test/tests/basic/testNativeArgsRooting.js b/js/src/jit-test/tests/basic/testNativeArgsRooting.js
new file mode 100644
index 00000000000..1ce8259f2d4
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testNativeArgsRooting.js
@@ -0,0 +1,14 @@
+if ('gczeal' in this)
+(function () {
+   (eval("\
+       (function () {\
+           for (var y = 0; y < 16; ++y) {\
+               if (y % 3 == 2) {\
+                   gczeal(1);\
+               } else {\
+                   print(0 / 0);\
+               }\
+           }\
+       });\
+   "))()
+})();
diff --git a/js/src/jit-test/tests/basic/testNestedDeepBail.js b/js/src/jit-test/tests/basic/testNestedDeepBail.js
new file mode 100644
index 00000000000..8e59b04cdaa
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testNestedDeepBail.js
@@ -0,0 +1,20 @@
+var _quit;
+function testNestedDeepBail()
+{
+    _quit = false;
+    function loop() {
+        for (var i = 0; i < 4; i++)
+            ;
+    }
+    loop();
+
+    function f() {
+        loop();
+        _quit = true;
+    }
+
+    var stk = [[1], [], [], [], []];
+    while (!_quit)
+        stk.pop().forEach(f);
+}
+testNestedDeepBail();
diff --git a/js/src/jit-test/tests/basic/testNestedExitStackOuter.js b/js/src/jit-test/tests/basic/testNestedExitStackOuter.js
new file mode 100644
index 00000000000..88b795e7cbc
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testNestedExitStackOuter.js
@@ -0,0 +1,29 @@
+// Test stack reconstruction after a nested exit
+function testNestedExitStackInner(j, counter) {
+  ++counter;
+  var b = 0;
+  for (var i = 1; i <= RUNLOOP; i++) {
+    ++b;
+    var a;
+    // Make sure that once everything has been traced we suddenly switch to
+    // a different control flow the first time we run the outermost tree,
+    // triggering a side exit.
+    if (j < RUNLOOP)
+      a = 1;
+    else
+      a = 0;
+    ++b;
+    b += a;
+  }
+  return counter + b;
+}
+function testNestedExitStackOuter() {
+  var counter = 0;
+  for (var j = 1; j <= RUNLOOP; ++j) {
+    for (var k = 1; k <= RUNLOOP; ++k) {
+      counter = testNestedExitStackInner(j, counter);
+    }
+  }
+  return counter;
+}
+//assertEq(testNestedExitStackOuter(), 81);
diff --git a/js/src/jit-test/tests/basic/testNewArrayCount.js b/js/src/jit-test/tests/basic/testNewArrayCount.js
new file mode 100644
index 00000000000..cb7e6d9843c
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testNewArrayCount.js
@@ -0,0 +1,12 @@
+function testNewArrayCount()
+{
+  function count(a) { var n = 0; for (var p in a) n++; return n; }
+  var a = [];
+  for (var i = 0; i < 5; i++)
+    a = [0];
+  assertEq(count(a), 1);
+  for (var i = 0; i < 5; i++)
+    a = [0, , 2];
+  assertEq(count(a), 2);
+}
+testNewArrayCount();
diff --git a/js/src/jit-test/tests/basic/testNewArrayCount2.js b/js/src/jit-test/tests/basic/testNewArrayCount2.js
new file mode 100644
index 00000000000..6318e4c25f3
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testNewArrayCount2.js
@@ -0,0 +1,8 @@
+function testNewArrayCount2() {
+    function count(a) { var n = 0; for (var p in a) n++; return n; }
+    var x = 0;
+    for (var i = 0; i < 10; ++i)
+        x = count(new Array(1,2,3));
+    return x;
+}
+assertEq(testNewArrayCount2(), 3);
diff --git a/js/src/jit-test/tests/basic/testProxyConstructors.js b/js/src/jit-test/tests/basic/testProxyConstructors.js
new file mode 100644
index 00000000000..e716b361ef0
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testProxyConstructors.js
@@ -0,0 +1,9 @@
+// proxies can return primitives
+assertEq(new (Proxy.createFunction({}, function(){}, function(){})), undefined);
+
+x = Proxy.createFunction((function () {}), Uint16Array, wrap)
+new(wrap(x))
+
+// proxies can return the callee
+var x = Proxy.createFunction({}, function (q) { return q; });
+new x(x);
diff --git a/js/src/jit-test/tests/basic/testPutOnEmptyArgsObject.js b/js/src/jit-test/tests/basic/testPutOnEmptyArgsObject.js
new file mode 100644
index 00000000000..b230897857e
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testPutOnEmptyArgsObject.js
@@ -0,0 +1,16 @@
+var g;
+
+function h() {
+    return arguments.length;
+}
+
+function f() {
+    var args = arguments;
+    g = function() { return h.apply(this, args); }
+}
+
+for (var i = 0; i < 10; ++i) {
+    f();
+}
+
+assertEq(g(), 0);
diff --git a/js/src/jit-test/tests/basic/testRebranding2.js b/js/src/jit-test/tests/basic/testRebranding2.js
new file mode 100644
index 00000000000..2bf26eeaff5
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testRebranding2.js
@@ -0,0 +1,21 @@
+delete q;
+delete g;
+delete h;
+delete a;
+delete f;
+
+function testRebranding2() {
+    // Same as testRebranding, but the object to be rebranded isn't the global.
+    var x = "FAIL";
+    function g(){}
+    function h(){ x = "ok"; }
+    var obj = {m: g};
+    var arr = [g, g, g, g, h];
+    //assertEq(arr.length > RUNLOOP, true);
+    for (var i = 0; i < 5; i++) {
+        obj.m = arr[i];
+        obj.m();
+    }
+    return x;
+}
+assertEq(testRebranding2(), "ok");
diff --git a/js/src/jit-test/tests/basic/testReconstructImacroPCStack.js b/js/src/jit-test/tests/basic/testReconstructImacroPCStack.js
new file mode 100644
index 00000000000..2dc51508d4f
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testReconstructImacroPCStack.js
@@ -0,0 +1,28 @@
+x = Proxy.create((function () {
+    return {
+        get: function () {}
+    }
+}()), Object.e)
+
+var hit = false;
+
+try {
+    Function("\
+      for(var a = 0; a < 2; ++a) {\
+        if (a == 0) {}\
+        else {\
+          x > x\
+        }\
+      }\
+    ")()
+} catch (e) {
+    hit = true;
+
+    var str = String(e);
+    var match = (str == "TypeError: x is not a function" ||
+                 str == "TypeError: can't convert x to number");
+
+    assertEq(match, true);
+}
+
+assertEq(hit, true);
diff --git a/js/src/jit-test/tests/basic/testRegExpTest.js b/js/src/jit-test/tests/basic/testRegExpTest.js
new file mode 100644
index 00000000000..78917ba9be3
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testRegExpTest.js
@@ -0,0 +1,10 @@
+// |jit-test| TMFLAGS: full,fragprofile,treevis; valgrind
+
+function testRegExpTest() {
+    var r = /abc/;
+    var flag = false;
+    for (var i = 0; i < 10; ++i)
+        flag = r.test("abc");
+    return flag;
+}
+assertEq(testRegExpTest(), true);
diff --git a/js/src/jit-test/tests/basic/testScriptGetter_JSOP_CALLPROP.js b/js/src/jit-test/tests/basic/testScriptGetter_JSOP_CALLPROP.js
new file mode 100644
index 00000000000..14574b146bf
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testScriptGetter_JSOP_CALLPROP.js
@@ -0,0 +1,11 @@
+var a = {_val: 'q',
+	 get p() { return f; }};
+
+function f() { return this._val; }
+
+var g = '';
+for (var i = 0; i < 9; i++)
+    g += a.p();
+assertEq(g, 'qqqqqqqqq');
+
+checkStats({recorderStarted: 1, recorderAborted: 0, traceCompleted: 1, traceTriggered: 1});
diff --git a/js/src/jit-test/tests/basic/testShiftLeft.js b/js/src/jit-test/tests/basic/testShiftLeft.js
new file mode 100644
index 00000000000..4a7f5d98289
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testShiftLeft.js
@@ -0,0 +1,38 @@
+// |jit-test| TMFLAGS: full,fragprofile,treevis; valgrind
+
+/* Test the proper operation of the left shift operator. This is especially
+ * important on ARM as an explicit mask is required at the native instruction
+ * level. */
+
+load(libdir + 'range.js');
+
+function testShiftLeft()
+{
+    var r = [];
+    var i = 0;
+    var j = 0;
+
+    var shifts = [0,1,7,8,15,16,23,24,31];
+
+    /* Samples from the simple shift range. */
+    for (i = 0; i < shifts.length; i++)
+        r[j++] = 1 << shifts[i];
+
+    /* Samples outside the normal shift range. */
+    for (i = 0; i < shifts.length; i++)
+        r[j++] = 1 << (shifts[i] + 32);
+
+    /* Samples far outside the normal shift range. */
+    for (i = 0; i < shifts.length; i++)
+        r[j++] = 1 << (shifts[i] + 224);
+    for (i = 0; i < shifts.length; i++)
+        r[j++] = 1 << (shifts[i] + 256);
+
+    return r.join(",");
+}
+
+assertEq(testShiftLeft(), 
+	 "1,2,128,256,32768,65536,8388608,16777216,-2147483648,"+
+	 "1,2,128,256,32768,65536,8388608,16777216,-2147483648,"+
+	 "1,2,128,256,32768,65536,8388608,16777216,-2147483648,"+
+	 "1,2,128,256,32768,65536,8388608,16777216,-2147483648");
diff --git a/js/src/jit-test/tests/basic/testShiftRightArithmetic.js b/js/src/jit-test/tests/basic/testShiftRightArithmetic.js
new file mode 100644
index 00000000000..7268dc0bad3
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testShiftRightArithmetic.js
@@ -0,0 +1,44 @@
+/* Test the proper operation of the arithmetic right shift operator. This is
+ * especially important on ARM as an explicit mask is required at the native
+ * instruction level. */
+
+load(libdir + 'range.js');
+
+/* Test different combinations of literals/variables. */
+var s = 4;
+var t = 100;
+assertEq(42 >> s, 2);
+assertEq(s >> 1, 2);
+assertEq(23 >> 3, 2);
+assertEq(t >> s, 6);
+
+
+function testShiftRightArithmetic()
+{
+    var r = [];
+    var i = 0;
+    var j = 0;
+
+    var shifts = [0,1,7,8,15,16,23,24,31];
+
+    /* Samples from the simple shift range. */
+    for (i = 0; i < shifts.length; i++)
+        r[j++] = -2147483648 >> shifts[i];
+
+    /* Samples outside the normal shift range. */
+    for (i = 0; i < shifts.length; i++)
+        r[j++] = -2147483648 >> (shifts[i] + 32);
+
+    /* Samples far outside the normal shift range. */
+    for (i = 0; i < shifts.length; i++)
+        r[j++] = -2147483648 >> (shifts[i] + 224);
+    for (i = 0; i < shifts.length; i++)
+        r[j++] = -2147483648 >> (shifts[i] + 256);
+
+    return r.join(",");
+}
+assertEq(testShiftRightArithmetic(), 
+	 "-2147483648,-1073741824,-16777216,-8388608,-65536,-32768,-256,-128,-1,"+
+	 "-2147483648,-1073741824,-16777216,-8388608,-65536,-32768,-256,-128,-1,"+
+	 "-2147483648,-1073741824,-16777216,-8388608,-65536,-32768,-256,-128,-1,"+
+	 "-2147483648,-1073741824,-16777216,-8388608,-65536,-32768,-256,-128,-1");
diff --git a/js/src/jit-test/tests/basic/testSideExitInConstructor.js b/js/src/jit-test/tests/basic/testSideExitInConstructor.js
new file mode 100644
index 00000000000..d46543ef7bd
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testSideExitInConstructor.js
@@ -0,0 +1,39 @@
+// |jit-test| TMFLAGS: full,fragprofile,treevis; valgrind
+
+function testSideExitInConstructor() {
+    var FCKConfig = {};
+    FCKConfig.CoreStyles =
+    {
+        'Bold': { },
+        'Italic': { },
+        'FontFace': { },
+        'Size' :
+        {
+        Overrides: [ ]
+        },
+
+        'Color' :
+        {
+        Element: '',
+        Styles: {  },
+        Overrides: [  ]
+        },
+        'BackColor': {
+        Element : '',
+        Styles : { 'background-color' : '' }
+        },
+
+    };
+    var FCKStyle = function(A) {
+        A.Element;
+    };
+
+    var pass = true;
+    for (var s in FCKConfig.CoreStyles) {
+        var x = new FCKStyle(FCKConfig.CoreStyles[s]);
+        if (!x)
+            pass = false;
+    }
+    return pass;
+}
+assertEq(testSideExitInConstructor(), true);
diff --git a/js/src/jit-test/tests/basic/testSlowNativeBail.js b/js/src/jit-test/tests/basic/testSlowNativeBail.js
new file mode 100644
index 00000000000..f7a1443a71a
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testSlowNativeBail.js
@@ -0,0 +1,10 @@
+function testSlowNativeBail() {
+    var a = ['0', '1', '2', '3', '+'];
+    try {
+	for (var i = 0; i < a.length; i++)
+	    new RegExp(a[i]);
+    } catch (exc) {
+        assertEq(""+exc, "SyntaxError: invalid quantifier");
+    }
+}
+testSlowNativeBail();
diff --git a/js/src/jit-test/tests/basic/testStackQuotaExhausted.js b/js/src/jit-test/tests/basic/testStackQuotaExhausted.js
new file mode 100644
index 00000000000..f65957a74b7
--- /dev/null
+++ b/js/src/jit-test/tests/basic/testStackQuotaExhausted.js
@@ -0,0 +1,29 @@
+const numFatArgs = Math.pow(2,19) - 1024;
+
+function fun(x) {
+    if (x <= 0)
+        return 0;
+    return fun(x-1);
+}
+
+function fatStack() {
+    return fun(10000);
+}
+
+function assertRightFailure(e) {
+    assertEq(e.toString() == "InternalError: script stack space quota is exhausted" ||
+             e.toString() == "InternalError: too much recursion",
+	     true);
+}
+
+exception = false;
+try {
+    fatStack.apply(null, new Array(numFatArgs));
+} catch (e) {
+    assertRightFailure(e);
+    exception = true;
+}
+assertEq(exception, true);
+
+// No more trace recursion w/ JM
+checkStats({traceCompleted:0});
diff --git a/js/src/jit-test/tests/closures/bug540136.js b/js/src/jit-test/tests/closures/bug540136.js
new file mode 100644
index 00000000000..54b57713a7f
--- /dev/null
+++ b/js/src/jit-test/tests/closures/bug540136.js
@@ -0,0 +1,17 @@
+// |jit-test| error: TypeError
+
+(eval("\
+ (function () {\
+   for (var[x] = function(){} in \
+     (function m(a) {\
+       if (a < 1) {\
+         x;\
+         return\
+       }\
+       return m(a - 1) + m(a - 2)\
+     })(7)\
+     (eval(\"\"))\
+   )\
+   ([])\
+ })\
+"))()
diff --git a/js/src/jit-test/tests/closures/bug540242.js b/js/src/jit-test/tests/closures/bug540242.js
new file mode 100644
index 00000000000..56c1a5a3143
--- /dev/null
+++ b/js/src/jit-test/tests/closures/bug540242.js
@@ -0,0 +1,17 @@
+for (j = 0; j < 1; j++) {
+ var f = eval("\
+   (function() {\
+     for (var a = 0; a < 8; ++a) {\
+       if (a % 3 == 2) {\
+         eval(\"\
+           for(b in[0,0,0,0]) {\
+             print()\
+           }\
+         \")\
+       }\
+       gc()\
+     }\
+   })\
+ ");
+ f()
+}
diff --git a/js/src/jit-test/tests/closures/bug540243.js b/js/src/jit-test/tests/closures/bug540243.js
new file mode 100644
index 00000000000..07faa26b6e7
--- /dev/null
+++ b/js/src/jit-test/tests/closures/bug540243.js
@@ -0,0 +1,10 @@
+for (a in (eval("\
+  (function() {\
+    return function() {\
+      yield ((function() {\
+        return d\
+      })())\
+    } ();\
+  var d = []\
+  })\
+"))());
diff --git a/js/src/jit-test/tests/closures/bug541239.js b/js/src/jit-test/tests/closures/bug541239.js
new file mode 100644
index 00000000000..32e3af1565b
--- /dev/null
+++ b/js/src/jit-test/tests/closures/bug541239.js
@@ -0,0 +1,16 @@
+function m() {
+ var d = 73;
+
+ return (eval("\n\
+   (function() {\n\
+     return function() {\n\
+       yield ((function() {\n\
+         print(d);\n\
+         return d\n\
+       })())\n\
+     } ();\n\
+   })\n\
+ "))();
+}
+
+m().next();
diff --git a/js/src/jit-test/tests/closures/lambda.js b/js/src/jit-test/tests/closures/lambda.js
new file mode 100644
index 00000000000..fd7cbd16ed7
--- /dev/null
+++ b/js/src/jit-test/tests/closures/lambda.js
@@ -0,0 +1,27 @@
+function f() {
+  var k = 0;
+  
+  var g = function() {
+    return ++k;
+  }
+
+  return g;
+}
+
+function h() {
+  for (var i = 0; i < 10; ++i) {
+    var vf = f();
+    assertEq(vf(), 1);
+    assertEq(vf(), 2);
+    for (var j = 0; j < 10; ++j) {
+      assertEq(vf(), j + 3);
+    }
+  }
+}
+
+h();
+
+checkStats({
+  recorderAborted: 8,      // Inner tree is trying to grow
+});
+
diff --git a/js/src/jit-test/tests/closures/setname-inner-heavy.js b/js/src/jit-test/tests/closures/setname-inner-heavy.js
new file mode 100644
index 00000000000..9c1919dc2f3
--- /dev/null
+++ b/js/src/jit-test/tests/closures/setname-inner-heavy.js
@@ -0,0 +1,18 @@
+actual = '';
+expected = 'undefined,';
+
+function f() { 
+    (eval("\
+        (function () {\
+            for (var z = 0; z < 2; ++z) {\
+                x = ''\
+            }\
+        })\
+    "))();
+}
+__defineSetter__("x", eval)
+f()
+appendToActual(x);
+
+
+assertEq(actual, expected)
diff --git a/js/src/jit-test/tests/jaeger/bug554580-5.js b/js/src/jit-test/tests/jaeger/bug554580-5.js
new file mode 100644
index 00000000000..1d3ee522b07
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug554580-5.js
@@ -0,0 +1,20 @@
+(function() {
+  (function g(m, n) {
+    if (m = n) {
+      return eval("x=this")
+    }
+    g(m, 1)[[]]
+  })()
+})()
+Function("\
+  for (let b in [0]) {\
+    for (var k = 0; k < 6; ++k) {\
+      if (k == 1) {\
+        print(x)\
+      }\
+    }\
+  }\
+")()
+
+/* Don't crash/assert. */
+
diff --git a/js/src/jit-test/tests/jaeger/bug555155.js b/js/src/jit-test/tests/jaeger/bug555155.js
new file mode 100644
index 00000000000..db7b57aa1bc
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug555155.js
@@ -0,0 +1,12 @@
+// |jit-test| error: undefined
+(function() {
+  throw (function f(a, b) {
+    if (a.h == b) {
+      return eval("((function(){return 1})())!=this")
+    }
+    f(b)
+  })([], 0)
+})()
+
+/* Don't assert/crash. */
+
diff --git a/js/src/jit-test/tests/jaeger/bug555543.js b/js/src/jit-test/tests/jaeger/bug555543.js
new file mode 100644
index 00000000000..b641c1b5832
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug555543.js
@@ -0,0 +1,8 @@
+(function() {
+  for each(let z in [new String(''), new String('q'), new String('')]) {
+    if (uneval() < z) (function(){})
+  }
+})()
+
+/* Don't assert/crash. */
+
diff --git a/js/src/jit-test/tests/jaeger/bug556525.js b/js/src/jit-test/tests/jaeger/bug556525.js
new file mode 100644
index 00000000000..0b59f3274b0
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug556525.js
@@ -0,0 +1,5 @@
+for each(x in [new Number])
+    x.__proto__ = []
+++x[x]
+
+// don't assert
diff --git a/js/src/jit-test/tests/jaeger/bug563000/eif-trap-newvar.js b/js/src/jit-test/tests/jaeger/bug563000/eif-trap-newvar.js
new file mode 100644
index 00000000000..2cde4fde8a9
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/eif-trap-newvar.js
@@ -0,0 +1,9 @@
+setDebug(true);
+
+function nop(){}
+function caller(obj) {
+  assertJit();
+  return x;
+}
+trap(caller, 7, "var x = 'success'; nop()");
+assertEq(caller(this), "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/eif-trap-typechange.js b/js/src/jit-test/tests/jaeger/bug563000/eif-trap-typechange.js
new file mode 100644
index 00000000000..11f2ff0a659
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/eif-trap-typechange.js
@@ -0,0 +1,10 @@
+setDebug(true);
+
+function nop(){}
+function caller(obj) {
+  assertJit();
+  var x = ({ dana : "zuul" });
+  return x;
+}
+trap(caller, 23, "x = 'success'; nop()");
+assertEq(caller(this), "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/eif-trap.js b/js/src/jit-test/tests/jaeger/bug563000/eif-trap.js
new file mode 100644
index 00000000000..9eeb76d07eb
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/eif-trap.js
@@ -0,0 +1,10 @@
+setDebug(true);
+
+function nop(){}
+function caller(obj) {
+  assertJit();
+  var x = "failure";
+  return x;
+}
+trap(caller, 14, "x = 'success'; nop()");
+assertEq(caller(this), "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/simple-trap-1.js b/js/src/jit-test/tests/jaeger/bug563000/simple-trap-1.js
new file mode 100644
index 00000000000..266db65090d
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/simple-trap-1.js
@@ -0,0 +1,9 @@
+setDebug(true);
+var x = "failure";
+function main() { x = "success"; }
+
+/* The JSOP_STOP in a. */
+trap(main, 8, "");
+main();
+
+assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/simple-trap-2.js b/js/src/jit-test/tests/jaeger/bug563000/simple-trap-2.js
new file mode 100644
index 00000000000..db7e4b82b2a
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/simple-trap-2.js
@@ -0,0 +1,10 @@
+setDebug(true);
+var x = "notset";
+function main() { x = "failure"; }
+function success() { x = "success"; }
+
+/* The JSOP_STOP in a. */
+trap(main, 7, "success()");
+main();
+
+assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/simple-untrap.js b/js/src/jit-test/tests/jaeger/bug563000/simple-untrap.js
new file mode 100644
index 00000000000..2f89f58bc3d
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/simple-untrap.js
@@ -0,0 +1,11 @@
+setDebug(true);
+var x = "notset";
+function main() { x = "success"; }
+function failure() { x = "failure"; }
+
+/* The JSOP_STOP in a. */
+trap(main, 8, "failure()");
+untrap(main, 8);
+main();
+
+assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-force-return-1.js b/js/src/jit-test/tests/jaeger/bug563000/trap-force-return-1.js
new file mode 100644
index 00000000000..1d19aeebeb1
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/trap-force-return-1.js
@@ -0,0 +1,7 @@
+setDebug(true);
+function main() {
+  return "failure";
+}
+/* JSOP_RETURN in main. */
+trap(main, 3, "'success'");
+assertEq(main(), "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-force-return-2.js b/js/src/jit-test/tests/jaeger/bug563000/trap-force-return-2.js
new file mode 100644
index 00000000000..b2b516826a9
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/trap-force-return-2.js
@@ -0,0 +1,7 @@
+setDebug(true);
+function main() {
+  return 1;
+}
+/* JSOP_RETURN in main. */
+trap(main, 1, "0");
+assertEq(main(), 0);
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-own-callsite.js b/js/src/jit-test/tests/jaeger/bug563000/trap-own-callsite.js
new file mode 100644
index 00000000000..18378b7808f
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/trap-own-callsite.js
@@ -0,0 +1,15 @@
+setDebug(true);
+x = "notset";
+function myparent(nested) {
+  if (nested) {
+    /* myparent call in myparent. */
+    trap(myparent, 39, "failure()");
+  } else {
+    x = "success";   
+    myparent(true);
+  }
+}
+function failure() { x = "failure"; }
+
+myparent(false);
+assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-parent-from-trap.js b/js/src/jit-test/tests/jaeger/bug563000/trap-parent-from-trap.js
new file mode 100644
index 00000000000..d6ded288128
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/trap-parent-from-trap.js
@@ -0,0 +1,21 @@
+setDebug(true);
+x = "notset";
+
+function child() {
+  x = "failure1";
+  /* JSOP_STOP in parent. */
+  trap(parent, 10, "success()");
+}
+
+function parent() {
+  x = "failure2";
+}
+/* First op in parent. */
+trap(parent, 0, "child()");
+
+function success() {
+  x = "success";
+}
+
+parent();
+assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-parent.js b/js/src/jit-test/tests/jaeger/bug563000/trap-parent.js
new file mode 100644
index 00000000000..2209f946af9
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/trap-parent.js
@@ -0,0 +1,16 @@
+setDebug(true);
+x = "notset";
+function child() {
+  /* JSOP_STOP in parent. */
+  trap(parent, 17, "success()");
+}
+function parent() {
+  child();
+  x = "failure";
+}
+function success() {
+  x = "success";
+}
+
+parent()
+assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-self-as-parent.js b/js/src/jit-test/tests/jaeger/bug563000/trap-self-as-parent.js
new file mode 100644
index 00000000000..65d3e73135e
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/trap-self-as-parent.js
@@ -0,0 +1,18 @@
+setDebug(true);
+x = "notset";
+
+function myparent(nested) {
+  if (nested) {
+    /* noop call in myparent */
+    trap(myparent, 50, "success()");
+  } else {
+    myparent(true);
+    x = "failure";
+    noop();
+  }
+}
+function noop() { }
+function success() { x = "success"; }
+
+myparent();
+assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-self-from-trap.js b/js/src/jit-test/tests/jaeger/bug563000/trap-self-from-trap.js
new file mode 100644
index 00000000000..8a9caaaafda
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/trap-self-from-trap.js
@@ -0,0 +1,23 @@
+setDebug(true);
+x = "notset";
+
+function doNothing() { }
+
+function myparent(nested) {
+  if (nested) {
+    /* JSOP_CALL to doNothing in myparent with nested = true. */
+    trap(myparent, 24, "success()");
+    doNothing();
+  } else {
+    doNothing();
+  }
+}
+/* JSOP_CALL to doNothing in myparent with nested = false. */
+trap(myparent, 35, "myparent(true)");
+
+function success() {
+  x = "success";
+}
+
+myparent(false);
+assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/trap-self.js b/js/src/jit-test/tests/jaeger/bug563000/trap-self.js
new file mode 100644
index 00000000000..9b94fd1c8cc
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/trap-self.js
@@ -0,0 +1,11 @@
+setDebug(true);
+x = "notset";
+function main() {
+  /* The JSOP_STOP in a. */
+  trap(main, 25, "success()");
+  x = "failure";
+}
+function success() { x = "success"; }
+
+main();
+assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/untrap-own-trapsite.js b/js/src/jit-test/tests/jaeger/bug563000/untrap-own-trapsite.js
new file mode 100644
index 00000000000..e4dd9d7dc97
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/untrap-own-trapsite.js
@@ -0,0 +1,15 @@
+setDebug(true);
+x = "notset";
+function child() {
+  /* JSOP_STOP in parent */
+  untrap(parent, 10);
+  x = "success";
+}
+function parent() {
+  x = "failure";
+}
+/* JSOP_STOP in parent */
+trap(parent, 10, "child()");
+
+parent();
+assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug563000/untrap-self.js b/js/src/jit-test/tests/jaeger/bug563000/untrap-self.js
new file mode 100644
index 00000000000..4c18db52e8e
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug563000/untrap-self.js
@@ -0,0 +1,13 @@
+setDebug(true);
+x = "notset";
+function main() {
+  /* JSOP_STOP in main. */
+  untrap(main, 23);
+  x = "success";
+}
+function failure() { x = "failure"; }
+
+/* JSOP_STOP in main. */
+trap(main, 23, "failure()");
+main();
+assertEq(x, "success");
diff --git a/js/src/jit-test/tests/jaeger/bug573433.js b/js/src/jit-test/tests/jaeger/bug573433.js
new file mode 100644
index 00000000000..aa39022bb74
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug573433.js
@@ -0,0 +1,7 @@
+// |jit-test| error: TypeError
+function f() {
+  eval("(function() \n{\nfor(x in[])\n{}\n})");
+  ("")()
+}
+f()
+
diff --git a/js/src/jit-test/tests/jaeger/bug580884.js b/js/src/jit-test/tests/jaeger/bug580884.js
new file mode 100644
index 00000000000..b7a26f70566
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug580884.js
@@ -0,0 +1,8 @@
+// |jit-test| error: ReferenceError
+for (let a in [0])
+a = e
+for (let a in [0])
+(function () {
+    a
+})
+
diff --git a/js/src/jit-test/tests/jaeger/bug582286.js b/js/src/jit-test/tests/jaeger/bug582286.js
new file mode 100644
index 00000000000..094366a3c79
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug582286.js
@@ -0,0 +1,3 @@
+evalcx("function s(){}",evalcx('lazy'))
+
+
diff --git a/js/src/jit-test/tests/jaeger/bug583158.js b/js/src/jit-test/tests/jaeger/bug583158.js
new file mode 100644
index 00000000000..6d8c124487d
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug583158.js
@@ -0,0 +1,9 @@
+// |jit-test| error: ReferenceError
+function g() {
+  var rv = (function() {
+    this << 1
+  })()
+  if (a) (function() {})
+}
+g()
+
diff --git a/js/src/jit-test/tests/jaeger/bug585341.js b/js/src/jit-test/tests/jaeger/bug585341.js
new file mode 100644
index 00000000000..fb96b92c3c3
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug585341.js
@@ -0,0 +1,6 @@
+__defineGetter__("x", Float64Array)
+Function("\
+  with(this) {\
+    eval(\"x\")\
+  }\
+")()
diff --git a/js/src/jit-test/tests/jaeger/bug588338.js b/js/src/jit-test/tests/jaeger/bug588338.js
new file mode 100644
index 00000000000..65c30952077
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug588338.js
@@ -0,0 +1,14 @@
+// |jit-test| error: <x/> is not a function
+function f() { (e)
+} (x = Proxy.createFunction((function(x) {
+  return {
+    get: function(r, b) {
+      return x[b]
+    }
+  }
+})(/x/), wrap))
+for (z = 0; z < 100; x.unwatch(), z++)
+for (e in [0]) {
+  gczeal(2)
+} ( <x/>)("")
+
diff --git a/js/src/jit-test/tests/jaeger/bug588363-2.js b/js/src/jit-test/tests/jaeger/bug588363-2.js
new file mode 100644
index 00000000000..5550be3ea8d
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/bug588363-2.js
@@ -0,0 +1,7 @@
+with(evalcx('')) {
+    delete eval;
+    eval("x", this.__defineGetter__("x", Function));
+}
+
+/* Don't assert or crash. */
+
diff --git a/js/src/jit-test/tests/jaeger/crash-on-compare.js b/js/src/jit-test/tests/jaeger/crash-on-compare.js
new file mode 100644
index 00000000000..5abd7aa045e
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/crash-on-compare.js
@@ -0,0 +1 @@
+assertEq(Infinity >= Infinity ? true : false, true);
diff --git a/js/src/jit-test/tests/jaeger/fused-eq-ifeq.js b/js/src/jit-test/tests/jaeger/fused-eq-ifeq.js
new file mode 100644
index 00000000000..b5d2bf2f61b
--- /dev/null
+++ b/js/src/jit-test/tests/jaeger/fused-eq-ifeq.js
@@ -0,0 +1,6 @@
+function ack(m,n){
+   if (m==0) { return n+1; }
+   if (n==0) { return ack(m-1,1); }
+   return ack(m-1, ack(m,n-1) );
+}
+assertEq(ack(3, 3), 61);
diff --git a/js/src/jit-test/tests/pic/bug558099.js b/js/src/jit-test/tests/pic/bug558099.js
new file mode 100644
index 00000000000..5d8c68fa590
--- /dev/null
+++ b/js/src/jit-test/tests/pic/bug558099.js
@@ -0,0 +1,60 @@
+(function()[function() function() function() function() function() function() {}]);
+foo = [{
+  text: "(function(){if(d){(1)}})",
+  s: function() {},
+  test: function() {
+    try {
+      f
+    } catch(e) {}
+  }
+},
+{
+  text: "(function(){t})",
+  s: function() {},
+  test: function() {}
+},
+{
+  text: "(function(){if(0){}})",
+  s: function() {},
+  test: function() {}
+},
+{
+  text: "(function(){if(1){}(2)})",
+  s: function() {},
+  test: function() {}
+},
+{
+  text: "(function(){g})",
+  b: function() {},
+  test: function() {}
+},
+{
+  text: "(function(){})",
+  s: function() {},
+  test: function() {}
+},
+{
+  text: "(function(){1})",
+  s: function() {},
+  test: function() {}
+}]; (function() {
+  for (i = 0; i < foo.length; ++i) {
+    a = foo[i]
+    text = a.text
+    eval(text.replace(/@/, ""));
+    if (a.test()) {}
+  }
+} ());
+s = [function() function() function() function() function() function() {}]
+[function() function() function() function() {}];
+(function() { [function() function() {}] });
+(function() {});
+(eval("\
+  (function(){\
+    for each(d in[\
+      0,0,0,0,0,0,0,0,0,0,0,0,0,null,NaN,1,Boolean(false),Boolean(false)\
+    ]){\
+      [].filter(new Function,gczeal(2))\
+    }\
+  })\
+"))();
diff --git a/js/src/jit-test/tests/sunspider/check-3d-morph.js b/js/src/jit-test/tests/sunspider/check-3d-morph.js
new file mode 100644
index 00000000000..3fabdc70f61
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-3d-morph.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+var loops = 15
+var nx = 120
+var nz = 120
+
+function morph(a, f) {
+    var PI2nx = Math.PI * 8/nx
+    var sin = Math.sin
+    var f30 = -(50 * sin(f*Math.PI*2))
+    
+    for (var i = 0; i < nz; ++i) {
+        for (var j = 0; j < nx; ++j) {
+            a[3*(i*nx+j)+1]    = sin((j-1) * PI2nx ) * -f30
+        }
+    }
+}
+
+    
+var a = Array()
+for (var i=0; i < nx*nz*3; ++i) 
+    a[i] = 0
+
+for (var i = 0; i < loops; ++i) {
+    morph(a, i/loops)
+}
+
+testOutput = 0;
+for (var i = 0; i < nx; i++)
+    testOutput += a[3*(i*nx+i)+1];
+a = null;
+
+/* not based on any mathematical error calculation.*/
+acceptableDelta = 4e-15
+
+assertEq((testOutput - 6.394884621840902e-14) < acceptableDelta, true);
diff --git a/js/src/jit-test/tests/sunspider/check-3d-raytrace.js b/js/src/jit-test/tests/sunspider/check-3d-raytrace.js
new file mode 100644
index 00000000000..5e020608c0e
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-3d-raytrace.js
@@ -0,0 +1,443 @@
+/*
+ * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+function createVector(x,y,z) {
+    return new Array(x,y,z);
+}
+
+function sqrLengthVector(self) {
+    return self[0] * self[0] + self[1] * self[1] + self[2] * self[2];
+}
+
+function lengthVector(self) {
+    return Math.sqrt(self[0] * self[0] + self[1] * self[1] + self[2] * self[2]);
+}
+
+function addVector(self, v) {
+    self[0] += v[0];
+    self[1] += v[1];
+    self[2] += v[2];
+    return self;
+}
+
+function subVector(self, v) {
+    self[0] -= v[0];
+    self[1] -= v[1];
+    self[2] -= v[2];
+    return self;
+}
+
+function scaleVector(self, scale) {
+    self[0] *= scale;
+    self[1] *= scale;
+    self[2] *= scale;
+    return self;
+}
+
+function normaliseVector(self) {
+    var len = Math.sqrt(self[0] * self[0] + self[1] * self[1] + self[2] * self[2]);
+    self[0] /= len;
+    self[1] /= len;
+    self[2] /= len;
+    return self;
+}
+
+function add(v1, v2) {
+    return new Array(v1[0] + v2[0], v1[1] + v2[1], v1[2] + v2[2]);
+}
+
+function sub(v1, v2) {
+    return new Array(v1[0] - v2[0], v1[1] - v2[1], v1[2] - v2[2]);
+}
+
+function scalev(v1, v2) {
+    return new Array(v1[0] * v2[0], v1[1] * v2[1], v1[2] * v2[2]);
+}
+
+function dot(v1, v2) {
+    return v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2];
+}
+
+function scale(v, scale) {
+    return [v[0] * scale, v[1] * scale, v[2] * scale];
+}
+
+function cross(v1, v2) {
+    return [v1[1] * v2[2] - v1[2] * v2[1], 
+            v1[2] * v2[0] - v1[0] * v2[2],
+            v1[0] * v2[1] - v1[1] * v2[0]];
+
+}
+
+function normalise(v) {
+    var len = lengthVector(v);
+    return [v[0] / len, v[1] / len, v[2] / len];
+}
+
+function transformMatrix(self, v) {
+    var vals = self;
+    var x  = vals[0] * v[0] + vals[1] * v[1] + vals[2] * v[2] + vals[3];
+    var y  = vals[4] * v[0] + vals[5] * v[1] + vals[6] * v[2] + vals[7];
+    var z  = vals[8] * v[0] + vals[9] * v[1] + vals[10] * v[2] + vals[11];
+    return [x, y, z];
+}
+
+function invertMatrix(self) {
+    var temp = new Array(16);
+    var tx = -self[3];
+    var ty = -self[7];
+    var tz = -self[11];
+    for (h = 0; h < 3; h++) 
+        for (v = 0; v < 3; v++) 
+            temp[h + v * 4] = self[v + h * 4];
+    for (i = 0; i < 11; i++)
+        self[i] = temp[i];
+    self[3] = tx * self[0] + ty * self[1] + tz * self[2];
+    self[7] = tx * self[4] + ty * self[5] + tz * self[6];
+    self[11] = tx * self[8] + ty * self[9] + tz * self[10];
+    return self;
+}
+
+
+// Triangle intersection using barycentric coord method
+function Triangle(p1, p2, p3) {
+    var edge1 = sub(p3, p1);
+    var edge2 = sub(p2, p1);
+    var normal = cross(edge1, edge2);
+    if (Math.abs(normal[0]) > Math.abs(normal[1]))
+        if (Math.abs(normal[0]) > Math.abs(normal[2]))
+            this.axis = 0; 
+        else 
+            this.axis = 2;
+    else
+        if (Math.abs(normal[1]) > Math.abs(normal[2])) 
+            this.axis = 1;
+        else 
+            this.axis = 2;
+    var u = (this.axis + 1) % 3;
+    var v = (this.axis + 2) % 3;
+    var u1 = edge1[u];
+    var v1 = edge1[v];
+    
+    var u2 = edge2[u];
+    var v2 = edge2[v];
+    this.normal = normalise(normal);
+    this.nu = normal[u] / normal[this.axis];
+    this.nv = normal[v] / normal[this.axis];
+    this.nd = dot(normal, p1) / normal[this.axis];
+    var det = u1 * v2 - v1 * u2;
+    this.eu = p1[u];
+    this.ev = p1[v]; 
+    this.nu1 = u1 / det;
+    this.nv1 = -v1 / det;
+    this.nu2 = v2 / det;
+    this.nv2 = -u2 / det; 
+    this.material = [0.7, 0.7, 0.7];
+}
+
+Triangle.prototype.intersect = function(orig, dir, near, far) {
+    var u = (this.axis + 1) % 3;
+    var v = (this.axis + 2) % 3;
+    var d = dir[this.axis] + this.nu * dir[u] + this.nv * dir[v];
+    var t = (this.nd - orig[this.axis] - this.nu * orig[u] - this.nv * orig[v]) / d;
+    if (t < near || t > far)
+        return null;
+    var Pu = orig[u] + t * dir[u] - this.eu;
+    var Pv = orig[v] + t * dir[v] - this.ev;
+    var a2 = Pv * this.nu1 + Pu * this.nv1;
+    if (a2 < 0) 
+        return null;
+    var a3 = Pu * this.nu2 + Pv * this.nv2;
+    if (a3 < 0) 
+        return null;
+
+    if ((a2 + a3) > 1) 
+        return null;
+    return t;
+}
+
+function Scene(a_triangles) {
+    this.triangles = a_triangles;
+    this.lights = [];
+    this.ambient = [0,0,0];
+    this.background = [0.8,0.8,1];
+}
+var zero = new Array(0,0,0);
+
+Scene.prototype.intersect = function(origin, dir, near, far) {
+    var closest = null;
+    for (i = 0; i < this.triangles.length; i++) {
+        var triangle = this.triangles[i];   
+        var d = triangle.intersect(origin, dir, near, far);
+        if (d == null || d > far || d < near)
+            continue;
+        far = d;
+        closest = triangle;
+    }
+    
+    if (!closest)
+        return [this.background[0],this.background[1],this.background[2]];
+        
+    var normal = closest.normal;
+    var hit = add(origin, scale(dir, far)); 
+    if (dot(dir, normal) > 0)
+        normal = [-normal[0], -normal[1], -normal[2]];
+    
+    var colour = null;
+    if (closest.shader) {
+        colour = closest.shader(closest, hit, dir);
+    } else {
+        colour = closest.material;
+    }
+    
+    // do reflection
+    var reflected = null;
+    if (colour.reflection > 0.001) {
+        var reflection = addVector(scale(normal, -2*dot(dir, normal)), dir);
+        reflected = this.intersect(hit, reflection, 0.0001, 1000000);
+        if (colour.reflection >= 0.999999)
+            return reflected;
+    }
+    
+    var l = [this.ambient[0], this.ambient[1], this.ambient[2]];
+    for (var i = 0; i < this.lights.length; i++) {
+        var light = this.lights[i];
+        var toLight = sub(light, hit);
+        var distance = lengthVector(toLight);
+        scaleVector(toLight, 1.0/distance);
+        distance -= 0.0001;
+        if (this.blocked(hit, toLight, distance))
+            continue;
+        var nl = dot(normal, toLight);
+        if (nl > 0)
+            addVector(l, scale(light.colour, nl));
+    }
+    l = scalev(l, colour);
+    if (reflected) {
+        l = addVector(scaleVector(l, 1 - colour.reflection), scaleVector(reflected, colour.reflection));
+    }
+    return l;
+}
+
+Scene.prototype.blocked = function(O, D, far) {
+    var near = 0.0001;
+    var closest = null;
+    for (i = 0; i < this.triangles.length; i++) {
+        var triangle = this.triangles[i];   
+        var d = triangle.intersect(O, D, near, far);
+        if (d == null || d > far || d < near)
+            continue;
+        return true;
+    }
+    
+    return false;
+}
+
+
+// this camera code is from notes i made ages ago, it is from *somewhere* -- i cannot remember where
+// that somewhere is
+function Camera(origin, lookat, up) {
+    var zaxis = normaliseVector(subVector(lookat, origin));
+    var xaxis = normaliseVector(cross(up, zaxis));
+    var yaxis = normaliseVector(cross(xaxis, subVector([0,0,0], zaxis)));
+    var m = new Array(16);
+    m[0] = xaxis[0]; m[1] = xaxis[1]; m[2] = xaxis[2];
+    m[4] = yaxis[0]; m[5] = yaxis[1]; m[6] = yaxis[2];
+    m[8] = zaxis[0]; m[9] = zaxis[1]; m[10] = zaxis[2];
+    invertMatrix(m);
+    m[3] = 0; m[7] = 0; m[11] = 0;
+    this.origin = origin;
+    this.directions = new Array(4);
+    this.directions[0] = normalise([-0.7,  0.7, 1]);
+    this.directions[1] = normalise([ 0.7,  0.7, 1]);
+    this.directions[2] = normalise([ 0.7, -0.7, 1]);
+    this.directions[3] = normalise([-0.7, -0.7, 1]);
+    this.directions[0] = transformMatrix(m, this.directions[0]);
+    this.directions[1] = transformMatrix(m, this.directions[1]);
+    this.directions[2] = transformMatrix(m, this.directions[2]);
+    this.directions[3] = transformMatrix(m, this.directions[3]);
+}
+
+Camera.prototype.generateRayPair = function(y) {
+    rays = new Array(new Object(), new Object());
+    rays[0].origin = this.origin;
+    rays[1].origin = this.origin;
+    rays[0].dir = addVector(scale(this.directions[0], y), scale(this.directions[3], 1 - y));
+    rays[1].dir = addVector(scale(this.directions[1], y), scale(this.directions[2], 1 - y));
+    return rays;
+}
+
+function renderRows(camera, scene, pixels, width, height, starty, stopy) {
+    for (var y = starty; y < stopy; y++) {
+        var rays = camera.generateRayPair(y / height);
+        for (var x = 0; x < width; x++) {
+            var xp = x / width;
+            var origin = addVector(scale(rays[0].origin, xp), scale(rays[1].origin, 1 - xp));
+            var dir = normaliseVector(addVector(scale(rays[0].dir, xp), scale(rays[1].dir, 1 - xp)));
+            var l = scene.intersect(origin, dir);
+            pixels[y][x] = l;
+        }
+    }
+}
+
+Camera.prototype.render = function(scene, pixels, width, height) {
+    var cam = this;
+    var row = 0;
+    renderRows(cam, scene, pixels, width, height, 0, height);
+}
+
+
+
+function raytraceScene()
+{
+    var startDate = new Date().getTime();
+    var numTriangles = 2 * 6;
+    var triangles = new Array();//numTriangles);
+    var tfl = createVector(-10,  10, -10);
+    var tfr = createVector( 10,  10, -10);
+    var tbl = createVector(-10,  10,  10);
+    var tbr = createVector( 10,  10,  10);
+    var bfl = createVector(-10, -10, -10);
+    var bfr = createVector( 10, -10, -10);
+    var bbl = createVector(-10, -10,  10);
+    var bbr = createVector( 10, -10,  10);
+    
+    // cube!!!
+    // front
+    var i = 0;
+    
+    triangles[i++] = new Triangle(tfl, tfr, bfr);
+    triangles[i++] = new Triangle(tfl, bfr, bfl);
+    // back
+    triangles[i++] = new Triangle(tbl, tbr, bbr);
+    triangles[i++] = new Triangle(tbl, bbr, bbl);
+    //        triangles[i-1].material = [0.7,0.2,0.2];
+    //            triangles[i-1].material.reflection = 0.8;
+    // left
+    triangles[i++] = new Triangle(tbl, tfl, bbl);
+    //            triangles[i-1].reflection = 0.6;
+    triangles[i++] = new Triangle(tfl, bfl, bbl);
+    //            triangles[i-1].reflection = 0.6;
+    // right
+    triangles[i++] = new Triangle(tbr, tfr, bbr);
+    triangles[i++] = new Triangle(tfr, bfr, bbr);
+    // top
+    triangles[i++] = new Triangle(tbl, tbr, tfr);
+    triangles[i++] = new Triangle(tbl, tfr, tfl);
+    // bottom
+    triangles[i++] = new Triangle(bbl, bbr, bfr);
+    triangles[i++] = new Triangle(bbl, bfr, bfl);
+    
+    //Floor!!!!
+    var green = createVector(0.0, 0.4, 0.0);
+    var grey = createVector(0.4, 0.4, 0.4);
+    grey.reflection = 1.0;
+    var floorShader = function(tri, pos, view) {
+        var x = ((pos[0]/32) % 2 + 2) % 2;
+        var z = ((pos[2]/32 + 0.3) % 2 + 2) % 2;
+        if (x < 1 != z < 1) {
+            //in the real world we use the fresnel term...
+            //    var angle = 1-dot(view, tri.normal);
+            //   angle *= angle;
+            //  angle *= angle;
+            // angle *= angle;
+            //grey.reflection = angle;
+            return grey;
+        } else 
+            return green;
+    }
+    var ffl = createVector(-1000, -30, -1000);
+    var ffr = createVector( 1000, -30, -1000);
+    var fbl = createVector(-1000, -30,  1000);
+    var fbr = createVector( 1000, -30,  1000);
+    triangles[i++] = new Triangle(fbl, fbr, ffr);
+    triangles[i-1].shader = floorShader;
+    triangles[i++] = new Triangle(fbl, ffr, ffl);
+    triangles[i-1].shader = floorShader;
+    
+    var _scene = new Scene(triangles);
+    _scene.lights[0] = createVector(20, 38, -22);
+    _scene.lights[0].colour = createVector(0.7, 0.3, 0.3);
+    _scene.lights[1] = createVector(-23, 40, 17);
+    _scene.lights[1].colour = createVector(0.7, 0.3, 0.3);
+    _scene.lights[2] = createVector(23, 20, 17);
+    _scene.lights[2].colour = createVector(0.7, 0.7, 0.7);
+    _scene.ambient = createVector(0.1, 0.1, 0.1);
+    //  _scene.background = createVector(0.7, 0.7, 1.0);
+    
+    var size = 30;
+    var pixels = new Array();
+    for (var y = 0; y < size; y++) {
+        pixels[y] = new Array();
+        for (var x = 0; x < size; x++) {
+            pixels[y][x] = 0;
+        }
+    }
+
+    var _camera = new Camera(createVector(-40, 40, 40), createVector(0, 0, 0), createVector(0, 1, 0));
+    _camera.render(_scene, pixels, size, size);
+
+    return pixels;
+}
+
+function arrayToCanvasCommands(pixels)
+{
+    var s = '<canvas id="renderCanvas" width="30px" height="30px"></canvas><scr' + 'ipt>\nvar pixels = [';
+    var size = 30;
+    for (var y = 0; y < size; y++) {
+        s += "[";
+        for (var x = 0; x < size; x++) {
+            s += "[" + pixels[y][x] + "],";
+        }
+        s+= "],";
+    }
+    s += '];\n    var canvas = document.getElementById("renderCanvas").getContext("2d");\n\
+\n\
+\n\
+    var size = 30;\n\
+    canvas.fillStyle = "red";\n\
+    canvas.fillRect(0, 0, size, size);\n\
+    canvas.scale(1, -1);\n\
+    canvas.translate(0, -size);\n\
+\n\
+    if (!canvas.setFillColor)\n\
+        canvas.setFillColor = function(r, g, b, a) {\n\
+            this.fillStyle = "rgb("+[Math.floor(r * 255), Math.floor(g * 255), Math.floor(b * 255)]+")";\n\
+    }\n\
+\n\
+for (var y = 0; y < size; y++) {\n\
+  for (var x = 0; x < size; x++) {\n\
+    var l = pixels[y][x];\n\
+    canvas.setFillColor(l[0], l[1], l[2], 1);\n\
+    canvas.fillRect(x, y, 1, 1);\n\
+  }\n\
+}</scr' + 'ipt>';
+
+    return s;
+}
+
+testOutput = arrayToCanvasCommands(raytraceScene());
+expected = '<canvas id="renderCanvas" width="30px" height="30px"></canvas><script>\nvar pixels = [[[0,0.22646733835486615,0],[0,0.22917348499592718,0],[0,0.23178836719862694,0],[0,0.23429286876882874,0],[0,0.23666708243914814,0],[0,0.2388906159889881,0],[0,0.3260187640505792,0],[0,0.33121005205394954,0],[0,0.3363076586511704,0],[0,0.3412818000213254,0],[0,0.34610095331648705,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.369829536245317,0],[0,0.3725822614817006,0],[0,0.37489560357280544,0],[0,0.37673658797290227,0],[0,0.3780753374916205,0],[0,0.378886188721004,0],[0,0.3791488586269958,0],[0,0.3788495731470844,0],[0,0.3779820527845238,0],[0,0.37654824729910663,0],[0,0.4585834760044105,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0,0.22925665044954321,0],[0,0.2320573979410493,0],[0,0.23474822091583247,0],[0,0.2373069549209832,0],[0,0.2397107002896524,0],[0,0.15436982463108695,0],[0,0.15568628300351414,0],[0,0.33780762567168454,0],[0,0.3431766295062631,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.24744701364085558,0.14604872013179526,0.14604872013179526],[0,0.3743786742105677,0],[0,0.37742123153478285,0],[0,0.3799794006700716,0],[0,0.38201209682126785,0],[0,0.38348180518082586,0],[0,0.384356168843629,0],[0,0.3846096564538848,0],[0,0.3842251672467923,0],[0,0.3831954061706588,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0,0.23215413887706876,0],[0,0.2350440502458203,0],[0,0.23780113739316563,0],[0,0.24039973450409946,0],[0,0.24281359296637,0],[0,0.15528082901621987,0],[0,0.15653052853852803,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.24335890550700673,0.1442966737887172,0.1442966737887172],[0.21191595684264103,0.13082112436113186,0.13082112436113186],[0.27664813175852776,0.2248217713585563,0.2248217713585563],[0,0.3823836235518836,0],[0,0.3852234408034573,0],[0,0.38747642030616,0],[0,0.3890951276817348,0],[0,0.39003853152190077,0],[0,0.39027440447223904,0],[0,0.3897816153712006,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.23811367607569112,0],[0,0.240922314629212,0],[0,0.2435404294800615,0],[0,0.24593811382698388,0],[0,0.1559883317159253,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.233189785862315,0.13993847965527784,0.13993847965527784],[0.2095470195339134,0.1298058655145343,0.1298058655145343],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.2414541261336147,0.19927150247084813,0.19927150247084813],[0.30463716829842996,0.25698429422662805,0.25698429422662805],[0,0.39057010876231657,0],[0,0.39307456071571556,0],[0,0.394860705064173,0],[0,0.3958762994996104,0],[0,0.3960806578453934,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.24123643784061885,0],[0,0.24407545031211067,0],[0,0.24668523203085055,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.20428988349740462,0.1275528072131734,0.1275528072131734],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.2553534506258493,0.21540752629099336,0.21540752629099336],[0.8,0.8,1],[0,0.39871352471166227,0],[0,0.40068391900131317,0],[0,0.4017699848209471,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.24436322334505386,0],[0,0.24745253188899904,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0,0.40943101981787544,0],[0,0.41179341435345673,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.24398601063610253,0],[0,0.24734388131046534,0],[0,0.2504039497369661,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.8,0.8,1],[0,0.41015054936419404,0],[0,0.4139256751539831,0],[0,0.5176011801301246,0],[0,0.5175400296826781,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.23925831942915582,0],[0,0.2431514340750372,0],[0,0.24679679895694717,0],[0,0.25013656179204347,0],[0,0.25311244537612027,0],[0,0.2556680399787405,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.06999999999999999,0.06999999999999999,0.06999999999999999],[0.8,0.8,1],[0,0.4078259849771481,0],[0,0.4131357292874544,0],[0,0.5218814714518779,0],[0,0.5233124012306586,0],[0,0.522962771547786,0],[0,0.5207522057325761,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.47311372545546515,0],[0,0.4614041416827006,0],],[[0,0.21490764011046362,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.2331842261176049,0],[0,0.23755980367223836,0],[0,0.24175353358196602,0],[0,0.24570333061205787,0],[0,0.24934343472275186,0],[0,0.252606535195386,0],[0,0.25542647135913205,0],[0,0.25774138056580276,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.04000000000000001,0],[0,0.2913399551219817,0],[0,0.40821549181429595,0],[0,0.5226526471916983,0],[0,0.5257809891986108,0],[0,0.5270304637173788,0],[0,0.5262436797403963,0],[0,0.5233412343635394,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.48095949311801045,0],[0,0.46869626187306984,0],[0,0.4558873544509206,0],],[[0,0.21129537920439745,0],[0,0.2160838834157171,0],[0,0.22090682198375836,0],[0.8,0.8,1],[0,0.23049540839949767,0],[0,0.23516114626695328,0],[0,0.23966144813312718,0],[0,0.24392754707957162,0],[0,0.24788516106908107,0],[0,0.25145680804980497,0],[0,0.2545649373510444,0],[0,0.2571357591990073,0],[0,0.2591035093142245,0],[0,0.15255606913369724,0],[0,0.15301134862115395,0],[0.19736821241316202,0.12458637674849803,0.12458637674849803],[0,0.40504494009802183,0],[0,0.4123372862951718,0],[0,0.4183003766375901,0],[0,0.5268338036458257,0],[0,0.5277169309488912,0],[0,0.5263102439245335,0],[0,0.5225497158196737,0],[0,0.5164937589802646,0],[0.8,0.8,1],[0,0.49832248210805585,0],[0,0.4868414893043067,0],[0,0.47425805574715646,0],[0,0.46093994347307254,0],[0,0.4472184699099014,0],],[[0,0.20695133260602822,0],[0,0.21189973891969208,0],[0,0.21691233850171843,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.23191357418198488,0],[0,0.23671451069678634,0],[0,0.24129830018648707,0],[0,0.24558190818576656,0],[0,0.24947677854650704,0],[0,0.2528923625850763,0],[0,0.1528305739035691,0],[0,0.1542326299051252,0],[0.8,0.8,1],[0.19785925315493239,0.12479682278068532,0.12479682278068532],[0.2081375194488818,0.12920179404952076,0.12920179404952076],[0.2240887656214228,0.18514359742568504,0.18514359742568504],[0,0.4135020430625767,0],[0,0.4192949763868133,0],[0,0.42324582463394744,0],[0,0.524175088930771,0],[0,0.5219574826556216,0],[0,0.5172050501700545,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.4895533585416516,0],[0,0.4770140400123619,0],[0,0.4635030619052592,0],[0,0.44941365075166806,0],[0,0.43508467272477774,0],],[[0,0.20179362237895174,0],[0,0.20685458951965674,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.23760464753632676,0],[0,0.24220528986272394,0],[0,0.2464227921634767,0],[0,0.2501524694953926,0],[0,0.15461153696054686,0],[0.18550977568907606,0.11950418958103261,0.11950418958103261],[0.1973204644052136,0.12456591331652012,0.12456591331652012],[0.2088287796802108,0.12949804843437607,0.12949804843437607],[0.21976471724250635,0.134184878818217,0.134184878818217],[0.23568458491329167,0.19345433251780333,0.19345433251780333],[0.23236149715622312,0.19397984285078584,0.19397984285078584],[0.22707008733584053,0.19247800386744748,0.19247800386744748],[0,0.41921793505330557,0],[0,0.42018199893505187,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.4624620672233052,0],[0,0.4484080186022647,0],[0,0.43394937018864516,0],[0,0.4194117002954933,0],],[[0,0.195751560483372,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.4179362030887152,0],[0.8,0.8,1],[0.18284994643317204,0.11836426275707375,0.11836426275707375],[0.19559717882822145,0.12382736235495205,0.12382736235495205],[0.20829587479733996,0.1292696606274314,0.1292696606274314],[0.22064479825066774,0.13456205639314334,0.13456205639314334],[0.2323223325492669,0.13956671394968584,0.13956671394968584],[0.24724443467900797,0.20148878770701636,0.20148878770701636],[0.24548491352821342,0.20390487818440434,0.20390487818440434],[0.24239083545814452,0.20490715724849212,0.20490715724849212],[0.23580267356471662,0.2022853173521094,0.2022853173521094],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.42907468966717865,0],[0,0.4147140942539032,0],[0.8,0.8,1],],[[0.8,0.8,1],[0,0.19385093619429258,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.40369350610660937,0],[0,0.4158360873491173,0],[0.19261301561109398,0.12254843526189743,0.12254843526189743],[0.20636000368544563,0.1284400015794767,0.1284400015794767],[0.22006309132254379,0.13431275342394736,0.13431275342394736],[0.23336548922639505,0.14001378109702645,0.14001378109702645],[0.24588206119264946,0.1453780262254212,0.1453780262254212],[0.2585904923823373,0.20905557193769056,0.20905557193769056],[0.2583880059856603,0.21340384806404408,0.21340384806404408],[0.2579257731612357,0.21738553706566144,0.21738553706566144],[0.25469196497831764,0.21843261169087974,0.21843261169087974],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.4196956387047621,0],[0,0.40600233966188104,0],[0.8,0.8,1],[0.8,0.8,1],],[[0,0.18086678377768206,0],[0,0.29820732165845826,0],[0,0.3078671511008362,0],[0,0.31797632104786633,0],[0,0.3285185113204014,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.3740646417282967,0],[0,0.38583856211873363,0],[0,0.39747405235976174,0],[0.2029477686069114,0.12697761511724776,0.12697761511724776],[0.21781735307317274,0.1333502941742169,0.1333502941742169],[0.2326566051026994,0.13970997361544257,0.13970997361544257],[0.2470420370437997,0.145875158733057,0.145875158733057],[0.9125534455486627,0.5106731929990184,0.5106731929990184],[0.26957187383368114,0.21599310805975738,0.21599310805975738],[0.2707166126603939,0.2221190287629908,0.2221190287629908],[0.2730659500911373,0.22930539474084957,0.22930539474084957],[0.27432898752113144,0.23520013372187343,0.23520013372187343],[0,0.370913970040732,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.41728826192115065,0],[0,0.4053708259838642,0],[0,0.39282677897301016,0],[0,0.37998757881530154,0],[0,0.3671261088322657,0],[0.8,0.8,1],],[[0,0.2734507658091365,0],[0,0.28211354268150884,0],[0,0.29120495530846624,0],[0,0.3007197072254542,0],[0,0.31064069882287787,0],[0,0.32093517914620384,0],[0,0.3315502317284035,0],[0,0.34240777559380986,0],[0,0.35339949423457706,0],[0,0.3643824114196257,0],[0,0.3751761555363945,0],[0.21384735597314658,0.13164886684563426,0.13164886684563426],[0.2299739346154931,0.1385602576923542,0.1385602576923542],[0.24609657496992726,0.1454699607013974,0.1454699607013974],[0.9085781768104235,0.508698320758555,0.508698320758555],[0.9154549906081679,0.5170357163338555,0.5170357163338555],[0.9205088622142807,0.5252164494222175,0.5252164494222175],[0.28215745535360465,0.22973861951523428,0.22973861951523428],[0.2871003088909314,0.23996159648606105,0.23996159648606105],[0.29363706106359355,0.2515193872815144,0.2515193872815144],[0,0.41902122210815307,0],[0,0.41310298499553366,0],[0,0.40544274823125576,0],[0,0.396335311262737,0],[0,0.3861118369914827,0],[0,0.37510764377615097,0],[0,0.3636351145776063,0],[0,0.35196551120236436,0],[0,0.3403202703614798,0],[0,0.32887008288221503,0],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.28175542273932297,0],[0,0.29085225965171946,0],[0,0.3002718747152153,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.3493460616221397,0],[0.22528651843925174,0.1365513650453936,0.1365513650453936],[0.884020287542635,0.49068080880618953,0.49068080880618953],[0.8974534722142382,0.5016001274737849,0.5016001274737849],[0.9089511260291274,0.5124192313516149,0.5124192313516149],[0.918724776273931,0.5233733004162796,0.5233733004162796],[0.9271769325614658,0.5348099989058438,0.5348099989058438],[0.9348913571357613,0.5471866228466732,0.5471866228466732],[0.9425953513779031,0.5610467455399599,0.5610467455399599],[0.31111289810529186,0.2659003418574735,0.2659003418574735],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.36238100335464446,0],[0,0.353165370752559,0],[0,0.3433460721377995,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.269553510147819,0],[0,0.2779247384646558,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.862863795871991,0.4769708653359615,0.4769708653359615],[0.8809280461363547,0.48977541774660666,0.48977541774660666],[0.8970168973464191,0.5025218831442017,0.5025218831442017],[0.911183718592768,0.5154210174684783,0.5154210174684783],[0.923749369873305,0.5288572912288372,0.5288572912288372],[0.9353543113230034,0.5434323975814477,0.5434323975814477],[0.9469976115499875,0.5600089248350288,0.5600089248350288],[0.9600573266066551,0.5797476044207045,0.5797476044207045],[0.976264515309917,0.6041064704498702,0.6041064704498702],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.31964250752889856,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0,0.22050019052313752,0],[0,0.22681553981028935,0],[0,0.23339203717763343,0],[0,0.240214496679792,0],[0,0.24725746972595297,0],[0,0.25448250911433834,0],[0,0.26183515020613984,0],[0,0.26924183890499,0],[0,0.27660721846944913,0],[0,0.2838124066288337,0],[0,0.290715098224911,0],[0,0.2971524154784058,0],[0,0.3029472623689724,0],[0,0.3079184123129743,0],[0.9166547694971252,0.5166323224598249,0.5166323224598249],[0.9306991201883348,0.5311982918579957,0.5311982918579957],[0.942986803591991,0.5467760342781277,0.5467760342781277],[0,0.3165578521241011,0],[0,0.31548839579667104,0],[0,0.3131368632708015,0],[0.8,0.8,1],[0,0.30500137342777356,0],[0,0.29951030523776406,0],[0,0.29329773299429385,0],[0,0.28653936257609475,0],[0,0.27940222592749825,0],[0.8,0.8,1],[0,0.26457440761040923,0],[0,0.2571216942588568,0],[0,0.24976474642245705,0],],[[0.8,0.8,1],[0,0.20714814874471174,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.23670584867979186,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.2653456430194066,0],[0,0.2698801253354915,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.2797697633705014,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.2652596644585568,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.23044738434960232,0],[0.8,0.8,1],],[[0.8,0.8,1],[0,0.1874620478256095,0],[0,0.19215316230371715,0],[0,0.19696169224108015,0],[0,0.20186087426658073,0],[0,0.20681514030842463,0],[0,0.2117788084075138,0],[0,0.21669500719585458,0],[0,0.22149508562026893,0],[0,0.22609882383824634,0],[0,0.23041578943560334,0],[0,0.23434813805418903,0],[0,0.23779500435424242,0],[0,0.240658357082728,0],[0.8,0.8,1],[0,0.24429776275232565,0],[0,0.24495325891611666,0],[0,0.24479455500778916,0],[0,0.24382873003864916,0],[0.8,0.8,1],[0,0.23963973129383997,0],[0,0.23655408649128906,0],[0,0.23292473874860314,0],[0,0.2288489260033022,0],[0.8,0.8,1],[0,0.21974417921637143,0],[0,0.21489400490094954,0],[0,0.20994923454342304,0],[0,0.20497430079270745,0],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.1797204574749079,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.19516287408734248,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.2074862652007326,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.20573701126457444,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.19259287153244908,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.17697513874785395,0],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.1614935034375082,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.17936757268974335,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.17026872079690972,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0,0.12879641411423945,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.1358377385211167,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.1546643297719027,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.1559650385862031,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.14211514071040432,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.13513052327523242,0],],[[0,0.11212384156112787,0],[0.8,0.8,1],[0,0.11564325792725064,0],[0,0.1174011949544484,0],[0.8,0.8,1],[0,0.12084571295779206,0],[0,0.12249918688067803,0],[0,0.1240816293005488,0],[0,0.12557222890553357,0],[0.8,0.8,1],[0,0.12819024296879525,0],[0,0.12927368617900967,0],[0.8,0.8,1],[0,0.13088813449481448,0],[0,0.13138603838942955,0],[0.8,0.8,1],[0,0.13170953912018962,0],[0.8,0.8,1],[0,0.13112114069722186,0],[0,0.13049815823500216,0],[0.8,0.8,1],[0,0.12866048872503766,0],[0,0.1274822855623644,0],[0.8,0.8,1],[0,0.1247126669400825,0],[0,0.12316534788101306,0],[0,0.12153830315457151,0],[0,0.11985151859147432,0],[0.8,0.8,1],[0,0.11637011656642021,0],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.104782462250846,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.1094376687357348,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0,0.0830756783895465,0],[0.8,0.8,1],[0,0.08474229354589341,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.08702004690763979,0],[0.8,0.8,1],[0,0.08829471061229066,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.0896722795161435,0],[0.8,0.8,1],[0,0.0901512080809384,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.09012955842093213,0],[0.8,0.8,1],[0,0.08962319641070081,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.08821080590025861,0],[0.8,0.8,1],[0,0.08691857775431859,0],[0.8,0.8,1],[0.8,0.8,1],[0,0.08462346811430875,0],[0.8,0.8,1],[0,0.08295071578903558,0],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.06935458357760912,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.07223735845162484,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0,0.07191875490542338,0],[0,0.07163456254931609,0],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],[[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],[0.8,0.8,1],],];\n    var canvas = document.getElementById("renderCanvas").getContext("2d");\n\n\n    var size = 30;\n    canvas.fillStyle = "red";\n    canvas.fillRect(0, 0, size, size);\n    canvas.scale(1, -1);\n    canvas.translate(0, -size);\n\n    if (!canvas.setFillColor)\n        canvas.setFillColor = function(r, g, b, a) {\n            this.fillStyle = "rgb("+[Math.floor(r * 255), Math.floor(g * 255), Math.floor(b * 255)]+")";\n    }\n\nfor (var y = 0; y < size; y++) {\n  for (var x = 0; x < size; x++) {\n    var l = pixels[y][x];\n    canvas.setFillColor(l[0], l[1], l[2], 1);\n    canvas.fillRect(x, y, 1, 1);\n  }\n}</script>';
+assertEq(testOutput, expected)
diff --git a/js/src/jit-test/tests/sunspider/check-access-binary-trees.js b/js/src/jit-test/tests/sunspider/check-access-binary-trees.js
new file mode 100644
index 00000000000..e10961a010c
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-access-binary-trees.js
@@ -0,0 +1,52 @@
+/* The Great Computer Language Shootout
+   http://shootout.alioth.debian.org/
+   contributed by Isaac Gouy */
+
+function TreeNode(left,right,item){
+   this.left = left;
+   this.right = right;
+   this.item = item;
+}
+
+TreeNode.prototype.itemCheck = function(){
+   if (this.left==null) return this.item;
+   else return this.item + this.left.itemCheck() - this.right.itemCheck();
+}
+
+function bottomUpTree(item,depth){
+   if (depth>0){
+      return new TreeNode(
+          bottomUpTree(2*item-1, depth-1)
+         ,bottomUpTree(2*item, depth-1)
+         ,item
+      );
+   }
+   else {
+      return new TreeNode(null,null,item);
+   }
+}
+
+var ret;
+
+for ( var n = 4; n <= 7; n += 1 ) {
+    var minDepth = 4;
+    var maxDepth = Math.max(minDepth + 2, n);
+    var stretchDepth = maxDepth + 1;
+    
+    var check = bottomUpTree(0,stretchDepth).itemCheck();
+    
+    var longLivedTree = bottomUpTree(0,maxDepth);
+    for (var depth=minDepth; depth<=maxDepth; depth+=2){
+        var iterations = 1 << (maxDepth - depth + minDepth);
+
+        check = 0;
+        for (var i=1; i<=iterations; i++){
+            check += bottomUpTree(i,depth).itemCheck();
+            check += bottomUpTree(-i,depth).itemCheck();
+        }
+    }
+
+    ret = longLivedTree.itemCheck();
+}
+
+assertEq(ret, -1)
diff --git a/js/src/jit-test/tests/sunspider/check-access-fannkuch.js b/js/src/jit-test/tests/sunspider/check-access-fannkuch.js
new file mode 100644
index 00000000000..d2bb98dcc3e
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-access-fannkuch.js
@@ -0,0 +1,66 @@
+/* The Great Computer Language Shootout
+   http://shootout.alioth.debian.org/
+   contributed by Isaac Gouy */
+
+function fannkuch(n) {
+   var check = 0;
+   var perm = Array(n);
+   var perm1 = Array(n);
+   var count = Array(n);
+   var maxPerm = Array(n);
+   var maxFlipsCount = 0;
+   var m = n - 1;
+
+   for (var i = 0; i < n; i++) perm1[i] = i;
+   var r = n;
+
+   while (true) {
+      // write-out the first 30 permutations
+      if (check < 30){
+         var s = "";
+         for(var i=0; i<n; i++) s += (perm1[i]+1).toString();
+         check++;
+      }
+
+      while (r != 1) { count[r - 1] = r; r--; }
+      if (!(perm1[0] == 0 || perm1[m] == m)) {
+         for (var i = 0; i < n; i++) perm[i] = perm1[i];
+
+         var flipsCount = 0;
+         var k;
+
+         while (!((k = perm[0]) == 0)) {
+            var k2 = (k + 1) >> 1;
+            for (var i = 0; i < k2; i++) {
+               var temp = perm[i]; perm[i] = perm[k - i]; perm[k - i] = temp;
+            }
+            flipsCount++;
+         }
+
+         if (flipsCount > maxFlipsCount) {
+            maxFlipsCount = flipsCount;
+            for (var i = 0; i < n; i++) maxPerm[i] = perm1[i];
+         }
+      }
+
+      while (true) {
+         if (r == n) return maxFlipsCount;
+         var perm0 = perm1[0];
+         var i = 0;
+         while (i < r) {
+            var j = i + 1;
+            perm1[i] = perm1[j];
+            i = j;
+         }
+         perm1[r] = perm0;
+
+         count[r] = count[r] - 1;
+         if (count[r] > 0) break;
+         r++;
+      }
+   }
+}
+
+var n = 8;
+var ret = fannkuch(n);
+assertEq(ret, 22)
diff --git a/js/src/jit-test/tests/sunspider/check-access-nbody.js b/js/src/jit-test/tests/sunspider/check-access-nbody.js
new file mode 100644
index 00000000000..5bcfd59a406
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-access-nbody.js
@@ -0,0 +1,171 @@
+/* The Great Computer Language Shootout
+   http://shootout.alioth.debian.org/
+   contributed by Isaac Gouy */
+
+var PI = 3.141592653589793;
+var SOLAR_MASS = 4 * PI * PI;
+var DAYS_PER_YEAR = 365.24;
+
+function Body(x,y,z,vx,vy,vz,mass){
+   this.x = x;
+   this.y = y;
+   this.z = z;
+   this.vx = vx;
+   this.vy = vy;
+   this.vz = vz;
+   this.mass = mass;
+}
+
+Body.prototype.offsetMomentum = function(px,py,pz) {
+   this.vx = -px / SOLAR_MASS;
+   this.vy = -py / SOLAR_MASS;
+   this.vz = -pz / SOLAR_MASS;
+   return this;
+}
+
+function Jupiter(){
+   return new Body(
+      4.84143144246472090e+00,
+      -1.16032004402742839e+00,
+      -1.03622044471123109e-01,
+      1.66007664274403694e-03 * DAYS_PER_YEAR,
+      7.69901118419740425e-03 * DAYS_PER_YEAR,
+      -6.90460016972063023e-05 * DAYS_PER_YEAR,
+      9.54791938424326609e-04 * SOLAR_MASS
+   );
+}
+
+function Saturn(){
+   return new Body(
+      8.34336671824457987e+00,
+      4.12479856412430479e+00,
+      -4.03523417114321381e-01,
+      -2.76742510726862411e-03 * DAYS_PER_YEAR,
+      4.99852801234917238e-03 * DAYS_PER_YEAR,
+      2.30417297573763929e-05 * DAYS_PER_YEAR,
+      2.85885980666130812e-04 * SOLAR_MASS
+   );
+}
+
+function Uranus(){
+   return new Body(
+      1.28943695621391310e+01,
+      -1.51111514016986312e+01,
+      -2.23307578892655734e-01,
+      2.96460137564761618e-03 * DAYS_PER_YEAR,
+      2.37847173959480950e-03 * DAYS_PER_YEAR,
+      -2.96589568540237556e-05 * DAYS_PER_YEAR,
+      4.36624404335156298e-05 * SOLAR_MASS
+   );
+}
+
+function Neptune(){
+   return new Body(
+      1.53796971148509165e+01,
+      -2.59193146099879641e+01,
+      1.79258772950371181e-01,
+      2.68067772490389322e-03 * DAYS_PER_YEAR,
+      1.62824170038242295e-03 * DAYS_PER_YEAR,
+      -9.51592254519715870e-05 * DAYS_PER_YEAR,
+      5.15138902046611451e-05 * SOLAR_MASS
+   );
+}
+
+function Sun(){
+   return new Body(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, SOLAR_MASS);
+}
+
+
+function NBodySystem(bodies){
+   this.bodies = bodies;
+   var px = 0.0;
+   var py = 0.0;
+   var pz = 0.0;
+   var size = this.bodies.length;
+   for (var i=0; i<size; i++){
+      var b = this.bodies[i];
+      var m = b.mass;
+      px += b.vx * m;
+      py += b.vy * m;
+      pz += b.vz * m;
+   }
+   this.bodies[0].offsetMomentum(px,py,pz);
+}
+
+NBodySystem.prototype.advance = function(dt){
+   var dx, dy, dz, distance, mag;
+   var size = this.bodies.length;
+
+   for (var i=0; i<size; i++) {
+      var bodyi = this.bodies[i];
+      for (var j=i+1; j<size; j++) {
+         var bodyj = this.bodies[j];
+         dx = bodyi.x - bodyj.x;
+         dy = bodyi.y - bodyj.y;
+         dz = bodyi.z - bodyj.z;
+
+         distance = Math.sqrt(dx*dx + dy*dy + dz*dz);
+         mag = dt / (distance * distance * distance);
+
+         bodyi.vx -= dx * bodyj.mass * mag;
+         bodyi.vy -= dy * bodyj.mass * mag;
+         bodyi.vz -= dz * bodyj.mass * mag;
+
+         bodyj.vx += dx * bodyi.mass * mag;
+         bodyj.vy += dy * bodyi.mass * mag;
+         bodyj.vz += dz * bodyi.mass * mag;
+      }
+   }
+
+   for (var i=0; i<size; i++) {
+      var body = this.bodies[i];
+      body.x += dt * body.vx;
+      body.y += dt * body.vy;
+      body.z += dt * body.vz;
+   }
+}
+
+NBodySystem.prototype.energy = function(){
+   var dx, dy, dz, distance;
+   var e = 0.0;
+   var size = this.bodies.length;
+
+   for (var i=0; i<size; i++) {
+      var bodyi = this.bodies[i];
+
+      e += 0.5 * bodyi.mass *
+         ( bodyi.vx * bodyi.vx
+         + bodyi.vy * bodyi.vy
+         + bodyi.vz * bodyi.vz );
+
+      for (var j=i+1; j<size; j++) {
+         var bodyj = this.bodies[j];
+         dx = bodyi.x - bodyj.x;
+         dy = bodyi.y - bodyj.y;
+         dz = bodyi.z - bodyj.z;
+
+         distance = Math.sqrt(dx*dx + dy*dy + dz*dz);
+         e -= (bodyi.mass * bodyj.mass) / distance;
+      }
+   }
+   return e;
+}
+
+var ret;
+
+for ( var n = 3; n <= 24; n *= 2 ) {
+    (function(){
+        var bodies = new NBodySystem( Array(
+           Sun(),Jupiter(),Saturn(),Uranus(),Neptune()
+        ));
+        var max = n * 100;
+        
+        ret = bodies.energy();
+        for (var i=0; i<max; i++){
+            bodies.advance(0.01);
+        }
+        ret = bodies.energy();
+    })();
+}
+
+assertEq(ret, -0.16906933525822856)
diff --git a/js/src/jit-test/tests/sunspider/check-access-nsieve.js b/js/src/jit-test/tests/sunspider/check-access-nsieve.js
new file mode 100644
index 00000000000..f8b6f693df9
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-access-nsieve.js
@@ -0,0 +1,40 @@
+// The Great Computer Language Shootout
+// http://shootout.alioth.debian.org/
+//
+// modified by Isaac Gouy
+
+function pad(number,width){
+   var s = number.toString();
+   var prefixWidth = width - s.length;
+   if (prefixWidth>0){
+      for (var i=1; i<=prefixWidth; i++) s = " " + s;
+   }
+   return s;
+}
+
+function nsieve(m, isPrime){
+   var i, k, count;
+
+   for (i=2; i<=m; i++) { isPrime[i] = true; }
+   count = 0;
+
+   for (i=2; i<=m; i++){
+      if (isPrime[i]) {
+         for (k=i+i; k<=m; k+=i) isPrime[k] = false;
+         count++;
+      }
+   }
+   return count;
+}
+
+var ret = 0;
+function sieve() {
+    for (var i = 1; i <= 3; i++ ) {
+        var m = (1<<i)*10000;
+        var flags = Array(m+1);
+        ret += nsieve(m, flags);
+    }
+}
+
+sieve();
+assertEq(ret, 14302)
diff --git a/js/src/jit-test/tests/sunspider/check-bitops-3bit-bits-in-byte.js b/js/src/jit-test/tests/sunspider/check-bitops-3bit-bits-in-byte.js
new file mode 100644
index 00000000000..39bf060d02c
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-bitops-3bit-bits-in-byte.js
@@ -0,0 +1,35 @@
+// Copyright (c) 2004 by Arthur Langereis (arthur_ext at domain xfinitegames, tld com
+
+// 1 op = 6 ANDs, 3 SHRs, 3 SHLs, 4 assigns, 2 ADDs
+// O(1)
+function fast3bitlookup(b) {
+var c, bi3b = 0xE994; // 0b1110 1001 1001 0100; // 3 2 2 1  2 1 1 0
+c  = 3 & (bi3b >> ((b << 1) & 14));
+c += 3 & (bi3b >> ((b >> 2) & 14));
+c += 3 & (bi3b >> ((b >> 5) & 6));
+return c;
+
+/*
+lir4,0xE994; 9 instructions, no memory access, minimal register dependence, 6 shifts, 2 adds, 1 inline assign
+rlwinmr5,r3,1,28,30
+rlwinmr6,r3,30,28,30
+rlwinmr7,r3,27,29,30
+rlwnmr8,r4,r5,30,31
+rlwnmr9,r4,r6,30,31
+rlwnmr10,r4,r7,30,31
+addr3,r8,r9
+addr3,r3,r10
+*/
+}
+
+var ret = 0;
+function TimeFunc(func) {
+  var x, y, t;
+  for(var x=0; x<500; x++)
+  for(var y=0; y<256; y++) {
+    ret += func(y);
+  }
+}
+
+TimeFunc(fast3bitlookup);
+assertEq(ret, 512000)
diff --git a/js/src/jit-test/tests/sunspider/check-bitops-bits-in-byte.js b/js/src/jit-test/tests/sunspider/check-bitops-bits-in-byte.js
new file mode 100644
index 00000000000..8a0efdaa289
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-bitops-bits-in-byte.js
@@ -0,0 +1,24 @@
+// Copyright (c) 2004 by Arthur Langereis (arthur_ext at domain xfinitegames, tld com)
+
+
+// 1 op = 2 assigns, 16 compare/branches, 8 ANDs, (0-8) ADDs, 8 SHLs
+// O(n)
+function bitsinbyte(b) {
+var m = 1, c = 0;
+while(m<0x100) {
+if(b & m) c++;
+m <<= 1;
+}
+return c;
+}
+
+var ret = 0;
+function TimeFunc(func) {
+var x, y, t;
+for(var x=0; x<350; x++)
+for(var y=0; y<256; y++) 
+  ret += func(y);
+}
+
+TimeFunc(bitsinbyte);
+assertEq(ret, 358400)
diff --git a/js/src/jit-test/tests/sunspider/check-bitops-bitwise-and.js b/js/src/jit-test/tests/sunspider/check-bitops-bitwise-and.js
new file mode 100644
index 00000000000..5971de73eee
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-bitops-bitwise-and.js
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+bitwiseAndValue = 4294967296;
+for (var i = 0; i < 60; i++)
+    bitwiseAndValue = bitwiseAndValue & i;
+assertEq(bitwiseAndValue, 0)
diff --git a/js/src/jit-test/tests/sunspider/check-bitops-nsieve-bits.js b/js/src/jit-test/tests/sunspider/check-bitops-nsieve-bits.js
new file mode 100644
index 00000000000..1db6ff27fa2
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-bitops-nsieve-bits.js
@@ -0,0 +1,40 @@
+// The Great Computer Language Shootout
+//  http://shootout.alioth.debian.org
+//
+//  Contributed by Ian Osgood
+
+var result = [];
+
+function pad(n,width) {
+  var s = n.toString();
+  while (s.length < width) s = ' ' + s;
+  return s;
+}
+
+function primes(isPrime, n) {
+  var i, count = 0, m = 10000<<n, size = m+31>>5;
+
+  for (i=0; i<size; i++) isPrime[i] = 0xffffffff;
+
+  for (i=2; i<m; i++)
+    if (isPrime[i>>5] & 1<<(i&31)) {
+      for (var j=i+i; j<m; j+=i)
+        result.push(isPrime[j>>5] &= ~(1<<(j&31)));
+      count++;
+    }
+}
+
+function sieve() {
+    for (var i = 4; i <= 4; i++) {
+        var isPrime = new Array((10000<<i)+31>>5);
+        primes(isPrime, i);
+    }
+}
+
+sieve();
+
+var ret = 0;
+for (var i = 0; i < result.length; ++i)
+  ret += result[i];
+
+assertEq(ret, -211235557404919)
diff --git a/js/src/jit-test/tests/sunspider/check-controlflow-recursive.js b/js/src/jit-test/tests/sunspider/check-controlflow-recursive.js
new file mode 100644
index 00000000000..8ee010e9ba5
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-controlflow-recursive.js
@@ -0,0 +1,27 @@
+// The Computer Language Shootout
+// http://shootout.alioth.debian.org/
+// contributed by Isaac Gouy
+
+function ack(m,n){
+   if (m==0) { return n+1; }
+   if (n==0) { return ack(m-1,1); }
+   return ack(m-1, ack(m,n-1) );
+}
+
+function fib(n) {
+    if (n < 2){ return 1; }
+    return fib(n-2) + fib(n-1);
+}
+
+function tak(x,y,z) {
+    if (y >= x) return z;
+    return tak(tak(x-1,y,z), tak(y-1,z,x), tak(z-1,x,y));
+}
+
+var ret = 0;
+for ( var i = 3; i <= 5; i++ ) {
+    ret += ack(3,i);
+    ret += fib(17.0+i);
+    ret += tak(3*i+3,2*i+2,i+1);
+}
+assertEq(ret, 57775);
diff --git a/js/src/jit-test/tests/sunspider/check-date-format-tofte.js b/js/src/jit-test/tests/sunspider/check-date-format-tofte.js
new file mode 100644
index 00000000000..1a8bcd1e34f
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-date-format-tofte.js
@@ -0,0 +1,302 @@
+function arrayExists(array, x) {
+    for (var i = 0; i < array.length; i++) {
+        if (array[i] == x) return true;
+    }
+    return false;
+}
+
+Date.prototype.formatDate = function (input,time) {
+    // formatDate :
+    // a PHP date like function, for formatting date strings
+    // See: http://www.php.net/date
+    //
+    // input : format string
+    // time : epoch time (seconds, and optional)
+    //
+    // if time is not passed, formatting is based on 
+    // the current "this" date object's set time.
+    //
+    // supported:
+    // a, A, B, d, D, F, g, G, h, H, i, j, l (lowercase L), L, 
+    // m, M, n, O, r, s, S, t, U, w, W, y, Y, z
+    //
+    // unsupported:
+    // I (capital i), T, Z    
+
+    var switches =    ["a", "A", "B", "d", "D", "F", "g", "G", "h", "H", 
+                       "i", "j", "l", "L", "m", "M", "n", "O", "r", "s", 
+                       "S", "t", "U", "w", "W", "y", "Y", "z"];
+    var daysLong =    ["Sunday", "Monday", "Tuesday", "Wednesday", 
+                       "Thursday", "Friday", "Saturday"];
+    var daysShort =   ["Sun", "Mon", "Tue", "Wed", 
+                       "Thu", "Fri", "Sat"];
+    var monthsShort = ["Jan", "Feb", "Mar", "Apr",
+                       "May", "Jun", "Jul", "Aug", "Sep",
+                       "Oct", "Nov", "Dec"];
+    var monthsLong =  ["January", "February", "March", "April",
+                       "May", "June", "July", "August", "September",
+                       "October", "November", "December"];
+    var daysSuffix = ["st", "nd", "rd", "th", "th", "th", "th", // 1st - 7th
+                      "th", "th", "th", "th", "th", "th", "th", // 8th - 14th
+                      "th", "th", "th", "th", "th", "th", "st", // 15th - 21st
+                      "nd", "rd", "th", "th", "th", "th", "th", // 22nd - 28th
+                      "th", "th", "st"];                        // 29th - 31st
+
+    function a() {
+        // Lowercase Ante meridiem and Post meridiem
+        return self.getHours() > 11? "pm" : "am";
+    }
+    function A() {
+        // Uppercase Ante meridiem and Post meridiem
+        return self.getHours() > 11? "PM" : "AM";
+    }
+
+    function B(){
+        // Swatch internet time. code simply grabbed from ppk,
+        // since I was feeling lazy:
+        // http://www.xs4all.nl/~ppk/js/beat.html
+        var off = (self.getTimezoneOffset() + 60)*60;
+        var theSeconds = (self.getHours() * 3600) + 
+                         (self.getMinutes() * 60) + 
+                          self.getSeconds() + off;
+        var beat = Math.floor(theSeconds/86.4);
+        if (beat > 1000) beat -= 1000;
+        if (beat < 0) beat += 1000;
+        if ((""+beat).length == 1) beat = "00"+beat;
+        if ((""+beat).length == 2) beat = "0"+beat;
+        return beat;
+    }
+    
+    function d() {
+        // Day of the month, 2 digits with leading zeros
+        return new String(self.getDate()).length == 1?
+        "0"+self.getDate() : self.getDate();
+    }
+    function D() {
+        // A textual representation of a day, three letters
+        return daysShort[self.getDay()];
+    }
+    function F() {
+        // A full textual representation of a month
+        return monthsLong[self.getMonth()];
+    }
+    function g() {
+        // 12-hour format of an hour without leading zeros
+        return self.getHours() > 12? self.getHours()-12 : self.getHours();
+    }
+    function G() {
+        // 24-hour format of an hour without leading zeros
+        return self.getHours();
+    }
+    function h() {
+        // 12-hour format of an hour with leading zeros
+        if (self.getHours() > 12) {
+          var s = new String(self.getHours()-12);
+          return s.length == 1?
+          "0"+ (self.getHours()-12) : self.getHours()-12;
+        } else { 
+          var s = new String(self.getHours());
+          return s.length == 1?
+          "0"+self.getHours() : self.getHours();
+        }  
+    }
+    function H() {
+        // 24-hour format of an hour with leading zeros
+        return new String(self.getHours()).length == 1?
+        "0"+self.getHours() : self.getHours();
+    }
+    function i() {
+        // Minutes with leading zeros
+        return new String(self.getMinutes()).length == 1? 
+        "0"+self.getMinutes() : self.getMinutes(); 
+    }
+    function j() {
+        // Day of the month without leading zeros
+        return self.getDate();
+    }    
+    function l() {
+        // A full textual representation of the day of the week
+        return daysLong[self.getDay()];
+    }
+    function L() {
+        // leap year or not. 1 if leap year, 0 if not.
+        // the logic should match iso's 8601 standard.
+        var y_ = Y();
+        if (         
+            (y_ % 4 == 0 && y_ % 100 != 0) ||
+            (y_ % 4 == 0 && y_ % 100 == 0 && y_ % 400 == 0)
+            ) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+    function m() {
+        // Numeric representation of a month, with leading zeros
+        return self.getMonth() < 9?
+        "0"+(self.getMonth()+1) : 
+        self.getMonth()+1;
+    }
+    function M() {
+        // A short textual representation of a month, three letters
+        return monthsShort[self.getMonth()];
+    }
+    function n() {
+        // Numeric representation of a month, without leading zeros
+        return self.getMonth()+1;
+    }
+    function O() {
+        // Difference to Greenwich time (GMT) in hours
+        var os = Math.abs(self.getTimezoneOffset());
+        var h = ""+Math.floor(os/60);
+        var m = ""+(os%60);
+        h.length == 1? h = "0"+h:1;
+        m.length == 1? m = "0"+m:1;
+        return self.getTimezoneOffset() < 0 ? "+"+h+m : "-"+h+m;
+    }
+    function r() {
+        // RFC 822 formatted date
+        var r; // result
+        //  Thu    ,     21          Dec         2000
+        r = D() + ", " + j() + " " + M() + " " + Y() +
+        //        16     :    01     :    07          +0200
+            " " + H() + ":" + i() + ":" + s() + " " + O();
+        return r;
+    }
+    function S() {
+        // English ordinal suffix for the day of the month, 2 characters
+        return daysSuffix[self.getDate()-1];
+    }
+    function s() {
+        // Seconds, with leading zeros
+        return new String(self.getSeconds()).length == 1?
+        "0"+self.getSeconds() : self.getSeconds();
+    }
+    function t() {
+
+        // thanks to Matt Bannon for some much needed code-fixes here!
+        var daysinmonths = [null,31,28,31,30,31,30,31,31,30,31,30,31];
+        if (L()==1 && n()==2) return 29; // leap day
+        return daysinmonths[n()];
+    }
+    function U() {
+        // Seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
+        return Math.round(self.getTime()/1000);
+    }
+    function W() {
+        // Weeknumber, as per ISO specification:
+        // http://www.cl.cam.ac.uk/~mgk25/iso-time.html
+        
+        // if the day is three days before newyears eve,
+        // there's a chance it's "week 1" of next year.
+        // here we check for that.
+        var beforeNY = 364+L() - z();
+        var afterNY  = z();
+        var weekday = w()!=0?w()-1:6; // makes sunday (0), into 6.
+        if (beforeNY <= 2 && weekday <= 2-beforeNY) {
+            return 1;
+        }
+        // similarly, if the day is within threedays of newyears
+        // there's a chance it belongs in the old year.
+        var ny = new Date("January 1 " + Y() + " 00:00:00");
+        var nyDay = ny.getDay()!=0?ny.getDay()-1:6;
+        if (
+            (afterNY <= 2) && 
+            (nyDay >=4)  && 
+            (afterNY >= (6-nyDay))
+            ) {
+            // Since I'm not sure we can just always return 53,
+            // i call the function here again, using the last day
+            // of the previous year, as the date, and then just
+            // return that week.
+            var prevNY = new Date("December 31 " + (Y()-1) + " 00:00:00");
+            return prevNY.formatDate("W");
+        }
+        
+        // week 1, is the week that has the first thursday in it.
+        // note that this value is not zero index.
+        if (nyDay <= 3) {
+            // first day of the year fell on a thursday, or earlier.
+            return 1 + Math.floor( ( z() + nyDay ) / 7 );
+        } else {
+            // first day of the year fell on a friday, or later.
+            return 1 + Math.floor( ( z() - ( 7 - nyDay ) ) / 7 );
+        }
+    }
+    function w() {
+        // Numeric representation of the day of the week
+        return self.getDay();
+    }
+    
+    function Y() {
+        // A full numeric representation of a year, 4 digits
+
+        // we first check, if getFullYear is supported. if it
+        // is, we just use that. ppks code is nice, but wont
+        // work with dates outside 1900-2038, or something like that
+        if (self.getFullYear) {
+            var newDate = new Date("January 1 2001 00:00:00 +0000");
+            var x = newDate .getFullYear();
+            if (x == 2001) {              
+                // i trust the method now
+                return self.getFullYear();
+            }
+        }
+        // else, do this:
+        // codes thanks to ppk:
+        // http://www.xs4all.nl/~ppk/js/introdate.html
+        var x = self.getYear();
+        var y = x % 100;
+        y += (y < 38) ? 2000 : 1900;
+        return y;
+    }
+    function y() {
+        // A two-digit representation of a year
+        var y = Y()+"";
+        return y.substring(y.length-2,y.length);
+    }
+    function z() {
+        // The day of the year, zero indexed! 0 through 366
+        var t = new Date("January 1 " + Y() + " 00:00:00");
+        var diff = self.getTime() - t.getTime();
+        return Math.floor(diff/1000/60/60/24);
+    }
+        
+    var self = this;
+    if (time) {
+        // save time
+        var prevTime = self.getTime();
+        self.setTime(time);
+    }
+    
+    var ia = input.split("");
+    var ij = 0;
+    while (ia[ij]) {
+        if (ia[ij] == "\\") {
+            // this is our way of allowing users to escape stuff
+            ia.splice(ij,1);
+        } else {
+            if (arrayExists(switches,ia[ij])) {
+                ia[ij] = eval(ia[ij] + "()");
+            }
+        }
+        ij++;
+    }
+    // reset time, back to what it was
+    if (prevTime) {
+        self.setTime(prevTime);
+    }
+    return ia.join("");
+}
+
+var date = new Date("1/1/2007 1:11:11");
+
+var ret = "";
+for (i = 0; i < 500; ++i) {
+    var shortFormat = date.formatDate("Y-m-d");
+    var longFormat = date.formatDate("l, F d, Y g:i:s A");
+    ret += shortFormat + longFormat;
+    date.setTime(date.getTime() + 84266956);
+}
+var expected = "2007-01-01Monday, January 01, 2007 1:11:11 AM2007-01-02Tuesday, January 02, 2007 0:35:37 AM2007-01-03Wednesday, January 03, 2007 0:00:04 AM2007-01-03Wednesday, January 03, 2007 11:24:31 PM2007-01-04Thursday, January 04, 2007 10:48:58 PM2007-01-05Friday, January 05, 2007 10:13:25 PM2007-01-06Saturday, January 06, 2007 9:37:52 PM2007-01-07Sunday, January 07, 2007 9:02:19 PM2007-01-08Monday, January 08, 2007 8:26:46 PM2007-01-09Tuesday, January 09, 2007 7:51:13 PM2007-01-10Wednesday, January 10, 2007 7:15:40 PM2007-01-11Thursday, January 11, 2007 6:40:07 PM2007-01-12Friday, January 12, 2007 6:04:34 PM2007-01-13Saturday, January 13, 2007 5:29:01 PM2007-01-14Sunday, January 14, 2007 4:53:28 PM2007-01-15Monday, January 15, 2007 4:17:55 PM2007-01-16Tuesday, January 16, 2007 3:42:22 PM2007-01-17Wednesday, January 17, 2007 3:06:49 PM2007-01-18Thursday, January 18, 2007 2:31:16 PM2007-01-19Friday, January 19, 2007 1:55:43 PM2007-01-20Saturday, January 20, 2007 1:20:10 PM2007-01-21Sunday, January 21, 2007 12:44:37 PM2007-01-22Monday, January 22, 2007 12:09:04 PM2007-01-23Tuesday, January 23, 2007 11:33:30 AM2007-01-24Wednesday, January 24, 2007 10:57:57 AM2007-01-25Thursday, January 25, 2007 10:22:24 AM2007-01-26Friday, January 26, 2007 9:46:51 AM2007-01-27Saturday, January 27, 2007 9:11:18 AM2007-01-28Sunday, January 28, 2007 8:35:45 AM2007-01-29Monday, January 29, 2007 8:00:12 AM2007-01-30Tuesday, January 30, 2007 7:24:39 AM2007-01-31Wednesday, January 31, 2007 6:49:06 AM2007-02-01Thursday, February 01, 2007 6:13:33 AM2007-02-02Friday, February 02, 2007 5:38:00 AM2007-02-03Saturday, February 03, 2007 5:02:27 AM2007-02-04Sunday, February 04, 2007 4:26:54 AM2007-02-05Monday, February 05, 2007 3:51:21 AM2007-02-06Tuesday, February 06, 2007 3:15:48 AM2007-02-07Wednesday, February 07, 2007 2:40:15 AM2007-02-08Thursday, February 08, 2007 2:04:42 AM2007-02-09Friday, February 09, 2007 1:29:09 AM2007-02-10Saturday, February 10, 2007 0:53:36 AM2007-02-11Sunday, February 11, 2007 0:18:03 AM2007-02-11Sunday, February 11, 2007 11:42:30 PM2007-02-12Monday, February 12, 2007 11:06:57 PM2007-02-13Tuesday, February 13, 2007 10:31:24 PM2007-02-14Wednesday, February 14, 2007 9:55:50 PM2007-02-15Thursday, February 15, 2007 9:20:17 PM2007-02-16Friday, February 16, 2007 8:44:44 PM2007-02-17Saturday, February 17, 2007 8:09:11 PM2007-02-18Sunday, February 18, 2007 7:33:38 PM2007-02-19Monday, February 19, 2007 6:58:05 PM2007-02-20Tuesday, February 20, 2007 6:22:32 PM2007-02-21Wednesday, February 21, 2007 5:46:59 PM2007-02-22Thursday, February 22, 2007 5:11:26 PM2007-02-23Friday, February 23, 2007 4:35:53 PM2007-02-24Saturday, February 24, 2007 4:00:20 PM2007-02-25Sunday, February 25, 2007 3:24:47 PM2007-02-26Monday, February 26, 2007 2:49:14 PM2007-02-27Tuesday, February 27, 2007 2:13:41 PM2007-02-28Wednesday, February 28, 2007 1:38:08 PM2007-03-01Thursday, March 01, 2007 1:02:35 PM2007-03-02Friday, March 02, 2007 12:27:02 PM2007-03-03Saturday, March 03, 2007 11:51:29 AM2007-03-04Sunday, March 04, 2007 11:15:56 AM2007-03-05Monday, March 05, 2007 10:40:23 AM2007-03-06Tuesday, March 06, 2007 10:04:50 AM2007-03-07Wednesday, March 07, 2007 9:29:17 AM2007-03-08Thursday, March 08, 2007 8:53:44 AM2007-03-09Friday, March 09, 2007 8:18:10 AM2007-03-10Saturday, March 10, 2007 7:42:37 AM2007-03-11Sunday, March 11, 2007 8:07:04 AM2007-03-12Monday, March 12, 2007 7:31:31 AM2007-03-13Tuesday, March 13, 2007 6:55:58 AM2007-03-14Wednesday, March 14, 2007 6:20:25 AM2007-03-15Thursday, March 15, 2007 5:44:52 AM2007-03-16Friday, March 16, 2007 5:09:19 AM2007-03-17Saturday, March 17, 2007 4:33:46 AM2007-03-18Sunday, March 18, 2007 3:58:13 AM2007-03-19Monday, March 19, 2007 3:22:40 AM2007-03-20Tuesday, March 20, 2007 2:47:07 AM2007-03-21Wednesday, March 21, 2007 2:11:34 AM2007-03-22Thursday, March 22, 2007 1:36:01 AM2007-03-23Friday, March 23, 2007 1:00:28 AM2007-03-24Saturday, March 24, 2007 0:24:55 AM2007-03-24Saturday, March 24, 2007 11:49:22 PM2007-03-25Sunday, March 25, 2007 11:13:49 PM2007-03-26Monday, March 26, 2007 10:38:16 PM2007-03-27Tuesday, March 27, 2007 10:02:43 PM2007-03-28Wednesday, March 28, 2007 9:27:10 PM2007-03-29Thursday, March 29, 2007 8:51:37 PM2007-03-30Friday, March 30, 2007 8:16:03 PM2007-03-31Saturday, March 31, 2007 7:40:30 PM2007-04-01Sunday, April 01, 2007 7:04:57 PM2007-04-02Monday, April 02, 2007 6:29:24 PM2007-04-03Tuesday, April 03, 2007 5:53:51 PM2007-04-04Wednesday, April 04, 2007 5:18:18 PM2007-04-05Thursday, April 05, 2007 4:42:45 PM2007-04-06Friday, April 06, 2007 4:07:12 PM2007-04-07Saturday, April 07, 2007 3:31:39 PM2007-04-08Sunday, April 08, 2007 2:56:06 PM2007-04-09Monday, April 09, 2007 2:20:33 PM2007-04-10Tuesday, April 10, 2007 1:45:00 PM2007-04-11Wednesday, April 11, 2007 1:09:27 PM2007-04-12Thursday, April 12, 2007 12:33:54 PM2007-04-13Friday, April 13, 2007 11:58:21 AM2007-04-14Saturday, April 14, 2007 11:22:48 AM2007-04-15Sunday, April 15, 2007 10:47:15 AM2007-04-16Monday, April 16, 2007 10:11:42 AM2007-04-17Tuesday, April 17, 2007 9:36:09 AM2007-04-18Wednesday, April 18, 2007 9:00:36 AM2007-04-19Thursday, April 19, 2007 8:25:03 AM2007-04-20Friday, April 20, 2007 7:49:30 AM2007-04-21Saturday, April 21, 2007 7:13:57 AM2007-04-22Sunday, April 22, 2007 6:38:23 AM2007-04-23Monday, April 23, 2007 6:02:50 AM2007-04-24Tuesday, April 24, 2007 5:27:17 AM2007-04-25Wednesday, April 25, 2007 4:51:44 AM2007-04-26Thursday, April 26, 2007 4:16:11 AM2007-04-27Friday, April 27, 2007 3:40:38 AM2007-04-28Saturday, April 28, 2007 3:05:05 AM2007-04-29Sunday, April 29, 2007 2:29:32 AM2007-04-30Monday, April 30, 2007 1:53:59 AM2007-05-01Tuesday, May 01, 2007 1:18:26 AM2007-05-02Wednesday, May 02, 2007 0:42:53 AM2007-05-03Thursday, May 03, 2007 0:07:20 AM2007-05-03Thursday, May 03, 2007 11:31:47 PM2007-05-04Friday, May 04, 2007 10:56:14 PM2007-05-05Saturday, May 05, 2007 10:20:41 PM2007-05-06Sunday, May 06, 2007 9:45:08 PM2007-05-07Monday, May 07, 2007 9:09:35 PM2007-05-08Tuesday, May 08, 2007 8:34:02 PM2007-05-09Wednesday, May 09, 2007 7:58:29 PM2007-05-10Thursday, May 10, 2007 7:22:56 PM2007-05-11Friday, May 11, 2007 6:47:23 PM2007-05-12Saturday, May 12, 2007 6:11:50 PM2007-05-13Sunday, May 13, 2007 5:36:17 PM2007-05-14Monday, May 14, 2007 5:00:43 PM2007-05-15Tuesday, May 15, 2007 4:25:10 PM2007-05-16Wednesday, May 16, 2007 3:49:37 PM2007-05-17Thursday, May 17, 2007 3:14:04 PM2007-05-18Friday, May 18, 2007 2:38:31 PM2007-05-19Saturday, May 19, 2007 2:02:58 PM2007-05-20Sunday, May 20, 2007 1:27:25 PM2007-05-21Monday, May 21, 2007 12:51:52 PM2007-05-22Tuesday, May 22, 2007 12:16:19 PM2007-05-23Wednesday, May 23, 2007 11:40:46 AM2007-05-24Thursday, May 24, 2007 11:05:13 AM2007-05-25Friday, May 25, 2007 10:29:40 AM2007-05-26Saturday, May 26, 2007 9:54:07 AM2007-05-27Sunday, May 27, 2007 9:18:34 AM2007-05-28Monday, May 28, 2007 8:43:01 AM2007-05-29Tuesday, May 29, 2007 8:07:28 AM2007-05-30Wednesday, May 30, 2007 7:31:55 AM2007-05-31Thursday, May 31, 2007 6:56:22 AM2007-06-01Friday, June 01, 2007 6:20:49 AM2007-06-02Saturday, June 02, 2007 5:45:16 AM2007-06-03Sunday, June 03, 2007 5:09:43 AM2007-06-04Monday, June 04, 2007 4:34:10 AM2007-06-05Tuesday, June 05, 2007 3:58:37 AM2007-06-06Wednesday, June 06, 2007 3:23:03 AM2007-06-07Thursday, June 07, 2007 2:47:30 AM2007-06-08Friday, June 08, 2007 2:11:57 AM2007-06-09Saturday, June 09, 2007 1:36:24 AM2007-06-10Sunday, June 10, 2007 1:00:51 AM2007-06-11Monday, June 11, 2007 0:25:18 AM2007-06-11Monday, June 11, 2007 11:49:45 PM2007-06-12Tuesday, June 12, 2007 11:14:12 PM2007-06-13Wednesday, June 13, 2007 10:38:39 PM2007-06-14Thursday, June 14, 2007 10:03:06 PM2007-06-15Friday, June 15, 2007 9:27:33 PM2007-06-16Saturday, June 16, 2007 8:52:00 PM2007-06-17Sunday, June 17, 2007 8:16:27 PM2007-06-18Monday, June 18, 2007 7:40:54 PM2007-06-19Tuesday, June 19, 2007 7:05:21 PM2007-06-20Wednesday, June 20, 2007 6:29:48 PM2007-06-21Thursday, June 21, 2007 5:54:15 PM2007-06-22Friday, June 22, 2007 5:18:42 PM2007-06-23Saturday, June 23, 2007 4:43:09 PM2007-06-24Sunday, June 24, 2007 4:07:36 PM2007-06-25Monday, June 25, 2007 3:32:03 PM2007-06-26Tuesday, June 26, 2007 2:56:30 PM2007-06-27Wednesday, June 27, 2007 2:20:56 PM2007-06-28Thursday, June 28, 2007 1:45:23 PM2007-06-29Friday, June 29, 2007 1:09:50 PM2007-06-30Saturday, June 30, 2007 12:34:17 PM2007-07-01Sunday, July 01, 2007 11:58:44 AM2007-07-02Monday, July 02, 2007 11:23:11 AM2007-07-03Tuesday, July 03, 2007 10:47:38 AM2007-07-04Wednesday, July 04, 2007 10:12:05 AM2007-07-05Thursday, July 05, 2007 9:36:32 AM2007-07-06Friday, July 06, 2007 9:00:59 AM2007-07-07Saturday, July 07, 2007 8:25:26 AM2007-07-08Sunday, July 08, 2007 7:49:53 AM2007-07-09Monday, July 09, 2007 7:14:20 AM2007-07-10Tuesday, July 10, 2007 6:38:47 AM2007-07-11Wednesday, July 11, 2007 6:03:14 AM2007-07-12Thursday, July 12, 2007 5:27:41 AM2007-07-13Friday, July 13, 2007 4:52:08 AM2007-07-14Saturday, July 14, 2007 4:16:35 AM2007-07-15Sunday, July 15, 2007 3:41:02 AM2007-07-16Monday, July 16, 2007 3:05:29 AM2007-07-17Tuesday, July 17, 2007 2:29:56 AM2007-07-18Wednesday, July 18, 2007 1:54:23 AM2007-07-19Thursday, July 19, 2007 1:18:50 AM2007-07-20Friday, July 20, 2007 0:43:16 AM2007-07-21Saturday, July 21, 2007 0:07:43 AM2007-07-21Saturday, July 21, 2007 11:32:10 PM2007-07-22Sunday, July 22, 2007 10:56:37 PM2007-07-23Monday, July 23, 2007 10:21:04 PM2007-07-24Tuesday, July 24, 2007 9:45:31 PM2007-07-25Wednesday, July 25, 2007 9:09:58 PM2007-07-26Thursday, July 26, 2007 8:34:25 PM2007-07-27Friday, July 27, 2007 7:58:52 PM2007-07-28Saturday, July 28, 2007 7:23:19 PM2007-07-29Sunday, July 29, 2007 6:47:46 PM2007-07-30Monday, July 30, 2007 6:12:13 PM2007-07-31Tuesday, July 31, 2007 5:36:40 PM2007-08-01Wednesday, August 01, 2007 5:01:07 PM2007-08-02Thursday, August 02, 2007 4:25:34 PM2007-08-03Friday, August 03, 2007 3:50:01 PM2007-08-04Saturday, August 04, 2007 3:14:28 PM2007-08-05Sunday, August 05, 2007 2:38:55 PM2007-08-06Monday, August 06, 2007 2:03:22 PM2007-08-07Tuesday, August 07, 2007 1:27:49 PM2007-08-08Wednesday, August 08, 2007 12:52:16 PM2007-08-09Thursday, August 09, 2007 12:16:43 PM2007-08-10Friday, August 10, 2007 11:41:10 AM2007-08-11Saturday, August 11, 2007 11:05:36 AM2007-08-12Sunday, August 12, 2007 10:30:03 AM2007-08-13Monday, August 13, 2007 9:54:30 AM2007-08-14Tuesday, August 14, 2007 9:18:57 AM2007-08-15Wednesday, August 15, 2007 8:43:24 AM2007-08-16Thursday, August 16, 2007 8:07:51 AM2007-08-17Friday, August 17, 2007 7:32:18 AM2007-08-18Saturday, August 18, 2007 6:56:45 AM2007-08-19Sunday, August 19, 2007 6:21:12 AM2007-08-20Monday, August 20, 2007 5:45:39 AM2007-08-21Tuesday, August 21, 2007 5:10:06 AM2007-08-22Wednesday, August 22, 2007 4:34:33 AM2007-08-23Thursday, August 23, 2007 3:59:00 AM2007-08-24Friday, August 24, 2007 3:23:27 AM2007-08-25Saturday, August 25, 2007 2:47:54 AM2007-08-26Sunday, August 26, 2007 2:12:21 AM2007-08-27Monday, August 27, 2007 1:36:48 AM2007-08-28Tuesday, August 28, 2007 1:01:15 AM2007-08-29Wednesday, August 29, 2007 0:25:42 AM2007-08-29Wednesday, August 29, 2007 11:50:09 PM2007-08-30Thursday, August 30, 2007 11:14:36 PM2007-08-31Friday, August 31, 2007 10:39:03 PM2007-09-01Saturday, September 01, 2007 10:03:30 PM2007-09-02Sunday, September 02, 2007 9:27:56 PM2007-09-03Monday, September 03, 2007 8:52:23 PM2007-09-04Tuesday, September 04, 2007 8:16:50 PM2007-09-05Wednesday, September 05, 2007 7:41:17 PM2007-09-06Thursday, September 06, 2007 7:05:44 PM2007-09-07Friday, September 07, 2007 6:30:11 PM2007-09-08Saturday, September 08, 2007 5:54:38 PM2007-09-09Sunday, September 09, 2007 5:19:05 PM2007-09-10Monday, September 10, 2007 4:43:32 PM2007-09-11Tuesday, September 11, 2007 4:07:59 PM2007-09-12Wednesday, September 12, 2007 3:32:26 PM2007-09-13Thursday, September 13, 2007 2:56:53 PM2007-09-14Friday, September 14, 2007 2:21:20 PM2007-09-15Saturday, September 15, 2007 1:45:47 PM2007-09-16Sunday, September 16, 2007 1:10:14 PM2007-09-17Monday, September 17, 2007 12:34:41 PM2007-09-18Tuesday, September 18, 2007 11:59:08 AM2007-09-19Wednesday, September 19, 2007 11:23:35 AM2007-09-20Thursday, September 20, 2007 10:48:02 AM2007-09-21Friday, September 21, 2007 10:12:29 AM2007-09-22Saturday, September 22, 2007 9:36:56 AM2007-09-23Sunday, September 23, 2007 9:01:23 AM2007-09-24Monday, September 24, 2007 8:25:49 AM2007-09-25Tuesday, September 25, 2007 7:50:16 AM2007-09-26Wednesday, September 26, 2007 7:14:43 AM2007-09-27Thursday, September 27, 2007 6:39:10 AM2007-09-28Friday, September 28, 2007 6:03:37 AM2007-09-29Saturday, September 29, 2007 5:28:04 AM2007-09-30Sunday, September 30, 2007 4:52:31 AM2007-10-01Monday, October 01, 2007 4:16:58 AM2007-10-02Tuesday, October 02, 2007 3:41:25 AM2007-10-03Wednesday, October 03, 2007 3:05:52 AM2007-10-04Thursday, October 04, 2007 2:30:19 AM2007-10-05Friday, October 05, 2007 1:54:46 AM2007-10-06Saturday, October 06, 2007 1:19:13 AM2007-10-07Sunday, October 07, 2007 0:43:40 AM2007-10-08Monday, October 08, 2007 0:08:07 AM2007-10-08Monday, October 08, 2007 11:32:34 PM2007-10-09Tuesday, October 09, 2007 10:57:01 PM2007-10-10Wednesday, October 10, 2007 10:21:28 PM2007-10-11Thursday, October 11, 2007 9:45:55 PM2007-10-12Friday, October 12, 2007 9:10:22 PM2007-10-13Saturday, October 13, 2007 8:34:49 PM2007-10-14Sunday, October 14, 2007 7:59:16 PM2007-10-15Monday, October 15, 2007 7:23:43 PM2007-10-16Tuesday, October 16, 2007 6:48:09 PM2007-10-17Wednesday, October 17, 2007 6:12:36 PM2007-10-18Thursday, October 18, 2007 5:37:03 PM2007-10-19Friday, October 19, 2007 5:01:30 PM2007-10-20Saturday, October 20, 2007 4:25:57 PM2007-10-21Sunday, October 21, 2007 3:50:24 PM2007-10-22Monday, October 22, 2007 3:14:51 PM2007-10-23Tuesday, October 23, 2007 2:39:18 PM2007-10-24Wednesday, October 24, 2007 2:03:45 PM2007-10-25Thursday, October 25, 2007 1:28:12 PM2007-10-26Friday, October 26, 2007 12:52:39 PM2007-10-27Saturday, October 27, 2007 12:17:06 PM2007-10-28Sunday, October 28, 2007 11:41:33 AM2007-10-29Monday, October 29, 2007 11:06:00 AM2007-10-30Tuesday, October 30, 2007 10:30:27 AM2007-10-31Wednesday, October 31, 2007 9:54:54 AM2007-11-01Thursday, November 01, 2007 9:19:21 AM2007-11-02Friday, November 02, 2007 8:43:48 AM2007-11-03Saturday, November 03, 2007 8:08:15 AM2007-11-04Sunday, November 04, 2007 6:32:42 AM2007-11-05Monday, November 05, 2007 5:57:09 AM2007-11-06Tuesday, November 06, 2007 5:21:36 AM2007-11-07Wednesday, November 07, 2007 4:46:03 AM2007-11-08Thursday, November 08, 2007 4:10:29 AM2007-11-09Friday, November 09, 2007 3:34:56 AM2007-11-10Saturday, November 10, 2007 2:59:23 AM2007-11-11Sunday, November 11, 2007 2:23:50 AM2007-11-12Monday, November 12, 2007 1:48:17 AM2007-11-13Tuesday, November 13, 2007 1:12:44 AM2007-11-14Wednesday, November 14, 2007 0:37:11 AM2007-11-15Thursday, November 15, 2007 0:01:38 AM2007-11-15Thursday, November 15, 2007 11:26:05 PM2007-11-16Friday, November 16, 2007 10:50:32 PM2007-11-17Saturday, November 17, 2007 10:14:59 PM2007-11-18Sunday, November 18, 2007 9:39:26 PM2007-11-19Monday, November 19, 2007 9:03:53 PM2007-11-20Tuesday, November 20, 2007 8:28:20 PM2007-11-21Wednesday, November 21, 2007 7:52:47 PM2007-11-22Thursday, November 22, 2007 7:17:14 PM2007-11-23Friday, November 23, 2007 6:41:41 PM2007-11-24Saturday, November 24, 2007 6:06:08 PM2007-11-25Sunday, November 25, 2007 5:30:35 PM2007-11-26Monday, November 26, 2007 4:55:02 PM2007-11-27Tuesday, November 27, 2007 4:19:29 PM2007-11-28Wednesday, November 28, 2007 3:43:56 PM2007-11-29Thursday, November 29, 2007 3:08:22 PM2007-11-30Friday, November 30, 2007 2:32:49 PM2007-12-01Saturday, December 01, 2007 1:57:16 PM2007-12-02Sunday, December 02, 2007 1:21:43 PM2007-12-03Monday, December 03, 2007 12:46:10 PM2007-12-04Tuesday, December 04, 2007 12:10:37 PM2007-12-05Wednesday, December 05, 2007 11:35:04 AM2007-12-06Thursday, December 06, 2007 10:59:31 AM2007-12-07Friday, December 07, 2007 10:23:58 AM2007-12-08Saturday, December 08, 2007 9:48:25 AM2007-12-09Sunday, December 09, 2007 9:12:52 AM2007-12-10Monday, December 10, 2007 8:37:19 AM2007-12-11Tuesday, December 11, 2007 8:01:46 AM2007-12-12Wednesday, December 12, 2007 7:26:13 AM2007-12-13Thursday, December 13, 2007 6:50:40 AM2007-12-14Friday, December 14, 2007 6:15:07 AM2007-12-15Saturday, December 15, 2007 5:39:34 AM2007-12-16Sunday, December 16, 2007 5:04:01 AM2007-12-17Monday, December 17, 2007 4:28:28 AM2007-12-18Tuesday, December 18, 2007 3:52:55 AM2007-12-19Wednesday, December 19, 2007 3:17:22 AM2007-12-20Thursday, December 20, 2007 2:41:49 AM2007-12-21Friday, December 21, 2007 2:06:16 AM2007-12-22Saturday, December 22, 2007 1:30:42 AM2007-12-23Sunday, December 23, 2007 0:55:09 AM2007-12-24Monday, December 24, 2007 0:19:36 AM2007-12-24Monday, December 24, 2007 11:44:03 PM2007-12-25Tuesday, December 25, 2007 11:08:30 PM2007-12-26Wednesday, December 26, 2007 10:32:57 PM2007-12-27Thursday, December 27, 2007 9:57:24 PM2007-12-28Friday, December 28, 2007 9:21:51 PM2007-12-29Saturday, December 29, 2007 8:46:18 PM2007-12-30Sunday, December 30, 2007 8:10:45 PM2007-12-31Monday, December 31, 2007 7:35:12 PM2008-01-01Tuesday, January 01, 2008 6:59:39 PM2008-01-02Wednesday, January 02, 2008 6:24:06 PM2008-01-03Thursday, January 03, 2008 5:48:33 PM2008-01-04Friday, January 04, 2008 5:13:00 PM2008-01-05Saturday, January 05, 2008 4:37:27 PM2008-01-06Sunday, January 06, 2008 4:01:54 PM2008-01-07Monday, January 07, 2008 3:26:21 PM2008-01-08Tuesday, January 08, 2008 2:50:48 PM2008-01-09Wednesday, January 09, 2008 2:15:15 PM2008-01-10Thursday, January 10, 2008 1:39:42 PM2008-01-11Friday, January 11, 2008 1:04:09 PM2008-01-12Saturday, January 12, 2008 12:28:36 PM2008-01-13Sunday, January 13, 2008 11:53:02 AM2008-01-14Monday, January 14, 2008 11:17:29 AM2008-01-15Tuesday, January 15, 2008 10:41:56 AM2008-01-16Wednesday, January 16, 2008 10:06:23 AM2008-01-17Thursday, January 17, 2008 9:30:50 AM2008-01-18Friday, January 18, 2008 8:55:17 AM2008-01-19Saturday, January 19, 2008 8:19:44 AM2008-01-20Sunday, January 20, 2008 7:44:11 AM2008-01-21Monday, January 21, 2008 7:08:38 AM2008-01-22Tuesday, January 22, 2008 6:33:05 AM2008-01-23Wednesday, January 23, 2008 5:57:32 AM2008-01-24Thursday, January 24, 2008 5:21:59 AM2008-01-25Friday, January 25, 2008 4:46:26 AM2008-01-26Saturday, January 26, 2008 4:10:53 AM2008-01-27Sunday, January 27, 2008 3:35:20 AM2008-01-28Monday, January 28, 2008 2:59:47 AM2008-01-29Tuesday, January 29, 2008 2:24:14 AM2008-01-30Wednesday, January 30, 2008 1:48:41 AM2008-01-31Thursday, January 31, 2008 1:13:08 AM2008-02-01Friday, February 01, 2008 0:37:35 AM2008-02-02Saturday, February 02, 2008 0:02:02 AM2008-02-02Saturday, February 02, 2008 11:26:29 PM2008-02-03Sunday, February 03, 2008 10:50:56 PM2008-02-04Monday, February 04, 2008 10:15:22 PM2008-02-05Tuesday, February 05, 2008 9:39:49 PM2008-02-06Wednesday, February 06, 2008 9:04:16 PM2008-02-07Thursday, February 07, 2008 8:28:43 PM2008-02-08Friday, February 08, 2008 7:53:10 PM2008-02-09Saturday, February 09, 2008 7:17:37 PM2008-02-10Sunday, February 10, 2008 6:42:04 PM2008-02-11Monday, February 11, 2008 6:06:31 PM2008-02-12Tuesday, February 12, 2008 5:30:58 PM2008-02-13Wednesday, February 13, 2008 4:55:25 PM2008-02-14Thursday, February 14, 2008 4:19:52 PM2008-02-15Friday, February 15, 2008 3:44:19 PM2008-02-16Saturday, February 16, 2008 3:08:46 PM2008-02-17Sunday, February 17, 2008 2:33:13 PM2008-02-18Monday, February 18, 2008 1:57:40 PM2008-02-19Tuesday, February 19, 2008 1:22:07 PM2008-02-20Wednesday, February 20, 2008 12:46:34 PM2008-02-21Thursday, February 21, 2008 12:11:01 PM2008-02-22Friday, February 22, 2008 11:35:28 AM2008-02-23Saturday, February 23, 2008 10:59:55 AM2008-02-24Sunday, February 24, 2008 10:24:22 AM2008-02-25Monday, February 25, 2008 9:48:49 AM2008-02-26Tuesday, February 26, 2008 9:13:15 AM2008-02-27Wednesday, February 27, 2008 8:37:42 AM2008-02-28Thursday, February 28, 2008 8:02:09 AM2008-02-29Friday, February 29, 2008 7:26:36 AM2008-03-01Saturday, March 01, 2008 6:51:03 AM2008-03-02Sunday, March 02, 2008 6:15:30 AM2008-03-03Monday, March 03, 2008 5:39:57 AM2008-03-04Tuesday, March 04, 2008 5:04:24 AM2008-03-05Wednesday, March 05, 2008 4:28:51 AM2008-03-06Thursday, March 06, 2008 3:53:18 AM2008-03-07Friday, March 07, 2008 3:17:45 AM2008-03-08Saturday, March 08, 2008 2:42:12 AM2008-03-09Sunday, March 09, 2008 3:06:39 AM2008-03-10Monday, March 10, 2008 2:31:06 AM2008-03-11Tuesday, March 11, 2008 1:55:33 AM2008-03-12Wednesday, March 12, 2008 1:20:00 AM2008-03-13Thursday, March 13, 2008 0:44:27 AM2008-03-14Friday, March 14, 2008 0:08:54 AM2008-03-14Friday, March 14, 2008 11:33:21 PM2008-03-15Saturday, March 15, 2008 10:57:48 PM2008-03-16Sunday, March 16, 2008 10:22:15 PM2008-03-17Monday, March 17, 2008 9:46:42 PM2008-03-18Tuesday, March 18, 2008 9:11:09 PM2008-03-19Wednesday, March 19, 2008 8:35:35 PM2008-03-20Thursday, March 20, 2008 8:00:02 PM2008-03-21Friday, March 21, 2008 7:24:29 PM2008-03-22Saturday, March 22, 2008 6:48:56 PM2008-03-23Sunday, March 23, 2008 6:13:23 PM2008-03-24Monday, March 24, 2008 5:37:50 PM2008-03-25Tuesday, March 25, 2008 5:02:17 PM2008-03-26Wednesday, March 26, 2008 4:26:44 PM2008-03-27Thursday, March 27, 2008 3:51:11 PM2008-03-28Friday, March 28, 2008 3:15:38 PM2008-03-29Saturday, March 29, 2008 2:40:05 PM2008-03-30Sunday, March 30, 2008 2:04:32 PM2008-03-31Monday, March 31, 2008 1:28:59 PM2008-04-01Tuesday, April 01, 2008 12:53:26 PM2008-04-02Wednesday, April 02, 2008 12:17:53 PM2008-04-03Thursday, April 03, 2008 11:42:20 AM2008-04-04Friday, April 04, 2008 11:06:47 AM2008-04-05Saturday, April 05, 2008 10:31:14 AM2008-04-06Sunday, April 06, 2008 9:55:41 AM2008-04-07Monday, April 07, 2008 9:20:08 AM2008-04-08Tuesday, April 08, 2008 8:44:35 AM2008-04-09Wednesday, April 09, 2008 8:09:02 AM2008-04-10Thursday, April 10, 2008 7:33:29 AM2008-04-11Friday, April 11, 2008 6:57:55 AM2008-04-12Saturday, April 12, 2008 6:22:22 AM2008-04-13Sunday, April 13, 2008 5:46:49 AM2008-04-14Monday, April 14, 2008 5:11:16 AM2008-04-15Tuesday, April 15, 2008 4:35:43 AM2008-04-16Wednesday, April 16, 2008 4:00:10 AM2008-04-17Thursday, April 17, 2008 3:24:37 AM2008-04-18Friday, April 18, 2008 2:49:04 AM2008-04-19Saturday, April 19, 2008 2:13:31 AM2008-04-20Sunday, April 20, 2008 1:37:58 AM2008-04-21Monday, April 21, 2008 1:02:25 AM2008-04-22Tuesday, April 22, 2008 0:26:52 AM2008-04-22Tuesday, April 22, 2008 11:51:19 PM2008-04-23Wednesday, April 23, 2008 11:15:46 PM2008-04-24Thursday, April 24, 2008 10:40:13 PM2008-04-25Friday, April 25, 2008 10:04:40 PM2008-04-26Saturday, April 26, 2008 9:29:07 PM2008-04-27Sunday, April 27, 2008 8:53:34 PM2008-04-28Monday, April 28, 2008 8:18:01 PM2008-04-29Tuesday, April 29, 2008 7:42:28 PM2008-04-30Wednesday, April 30, 2008 7:06:55 PM2008-05-01Thursday, May 01, 2008 6:31:22 PM"
+assertEq(ret, expected);
diff --git a/js/src/jit-test/tests/sunspider/check-date-format-xparb.js b/js/src/jit-test/tests/sunspider/check-date-format-xparb.js
new file mode 100644
index 00000000000..41f44fed50c
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-date-format-xparb.js
@@ -0,0 +1,422 @@
+/*
+ * Copyright (C) 2004 Baron Schwartz <baron at sequent dot org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, version 2.1.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+ * details.
+ */
+
+Date.parseFunctions = {count:0};
+Date.parseRegexes = [];
+Date.formatFunctions = {count:0};
+
+Date.prototype.dateFormat = function(format) {
+    if (Date.formatFunctions[format] == null) {
+        Date.createNewFormat(format);
+    }
+    var func = Date.formatFunctions[format];
+    return this[func]();
+}
+
+Date.createNewFormat = function(format) {
+    var funcName = "format" + Date.formatFunctions.count++;
+    Date.formatFunctions[format] = funcName;
+    var code = "Date.prototype." + funcName + " = function(){return ";
+    var special = false;
+    var ch = '';
+    for (var i = 0; i < format.length; ++i) {
+        ch = format.charAt(i);
+        if (!special && ch == "\\") {
+            special = true;
+        }
+        else if (special) {
+            special = false;
+            code += "'" + String.escape(ch) + "' + ";
+        }
+        else {
+            code += Date.getFormatCode(ch);
+        }
+    }
+    eval(code.substring(0, code.length - 3) + ";}");
+}
+
+Date.getFormatCode = function(character) {
+    switch (character) {
+    case "d":
+        return "String.leftPad(this.getDate(), 2, '0') + ";
+    case "D":
+        return "Date.dayNames[this.getDay()].substring(0, 3) + ";
+    case "j":
+        return "this.getDate() + ";
+    case "l":
+        return "Date.dayNames[this.getDay()] + ";
+    case "S":
+        return "this.getSuffix() + ";
+    case "w":
+        return "this.getDay() + ";
+    case "z":
+        return "this.getDayOfYear() + ";
+    case "W":
+        return "this.getWeekOfYear() + ";
+    case "F":
+        return "Date.monthNames[this.getMonth()] + ";
+    case "m":
+        return "String.leftPad(this.getMonth() + 1, 2, '0') + ";
+    case "M":
+        return "Date.monthNames[this.getMonth()].substring(0, 3) + ";
+    case "n":
+        return "(this.getMonth() + 1) + ";
+    case "t":
+        return "this.getDaysInMonth() + ";
+    case "L":
+        return "(this.isLeapYear() ? 1 : 0) + ";
+    case "Y":
+        return "this.getFullYear() + ";
+    case "y":
+        return "('' + this.getFullYear()).substring(2, 4) + ";
+    case "a":
+        return "(this.getHours() < 12 ? 'am' : 'pm') + ";
+    case "A":
+        return "(this.getHours() < 12 ? 'AM' : 'PM') + ";
+    case "g":
+        return "((this.getHours() %12) ? this.getHours() % 12 : 12) + ";
+    case "G":
+        return "this.getHours() + ";
+    case "h":
+        return "String.leftPad((this.getHours() %12) ? this.getHours() % 12 : 12, 2, '0') + ";
+    case "H":
+        return "String.leftPad(this.getHours(), 2, '0') + ";
+    case "i":
+        return "String.leftPad(this.getMinutes(), 2, '0') + ";
+    case "s":
+        return "String.leftPad(this.getSeconds(), 2, '0') + ";
+    case "O":
+        return "this.getGMTOffset() + ";
+    case "T":
+        return "this.getTimezone() + ";
+    case "Z":
+        return "(this.getTimezoneOffset() * -60) + ";
+    default:
+        return "'" + String.escape(character) + "' + ";
+    }
+}
+
+Date.parseDate = function(input, format) {
+    if (Date.parseFunctions[format] == null) {
+        Date.createParser(format);
+    }
+    var func = Date.parseFunctions[format];
+    return Date[func](input);
+}
+
+Date.createParser = function(format) {
+    var funcName = "parse" + Date.parseFunctions.count++;
+    var regexNum = Date.parseRegexes.length;
+    var currentGroup = 1;
+    Date.parseFunctions[format] = funcName;
+
+    var code = "Date." + funcName + " = function(input){\n"
+        + "var y = -1, m = -1, d = -1, h = -1, i = -1, s = -1;\n"
+        + "var d = new Date();\n"
+        + "y = d.getFullYear();\n"
+        + "m = d.getMonth();\n"
+        + "d = d.getDate();\n"
+        + "var results = input.match(Date.parseRegexes[" + regexNum + "]);\n"
+        + "if (results && results.length > 0) {"
+    var regex = "";
+
+    var special = false;
+    var ch = '';
+    for (var i = 0; i < format.length; ++i) {
+        ch = format.charAt(i);
+        if (!special && ch == "\\") {
+            special = true;
+        }
+        else if (special) {
+            special = false;
+            regex += String.escape(ch);
+        }
+        else {
+            obj = Date.formatCodeToRegex(ch, currentGroup);
+            currentGroup += obj.g;
+            regex += obj.s;
+            if (obj.g && obj.c) {
+                code += obj.c;
+            }
+        }
+    }
+
+    code += "if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0 && s >= 0)\n"
+        + "{return new Date(y, m, d, h, i, s);}\n"
+        + "else if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0)\n"
+        + "{return new Date(y, m, d, h, i);}\n"
+        + "else if (y > 0 && m >= 0 && d > 0 && h >= 0)\n"
+        + "{return new Date(y, m, d, h);}\n"
+        + "else if (y > 0 && m >= 0 && d > 0)\n"
+        + "{return new Date(y, m, d);}\n"
+        + "else if (y > 0 && m >= 0)\n"
+        + "{return new Date(y, m);}\n"
+        + "else if (y > 0)\n"
+        + "{return new Date(y);}\n"
+        + "}return null;}";
+
+    Date.parseRegexes[regexNum] = new RegExp("^" + regex + "$");
+    eval(code);
+}
+
+Date.formatCodeToRegex = function(character, currentGroup) {
+    switch (character) {
+    case "D":
+        return {g:0,
+        c:null,
+        s:"(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)"};
+    case "j":
+    case "d":
+        return {g:1,
+            c:"d = parseInt(results[" + currentGroup + "], 10);\n",
+            s:"(\\d{1,2})"};
+    case "l":
+        return {g:0,
+            c:null,
+            s:"(?:" + Date.dayNames.join("|") + ")"};
+    case "S":
+        return {g:0,
+            c:null,
+            s:"(?:st|nd|rd|th)"};
+    case "w":
+        return {g:0,
+            c:null,
+            s:"\\d"};
+    case "z":
+        return {g:0,
+            c:null,
+            s:"(?:\\d{1,3})"};
+    case "W":
+        return {g:0,
+            c:null,
+            s:"(?:\\d{2})"};
+    case "F":
+        return {g:1,
+            c:"m = parseInt(Date.monthNumbers[results[" + currentGroup + "].substring(0, 3)], 10);\n",
+            s:"(" + Date.monthNames.join("|") + ")"};
+    case "M":
+        return {g:1,
+            c:"m = parseInt(Date.monthNumbers[results[" + currentGroup + "]], 10);\n",
+            s:"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)"};
+    case "n":
+    case "m":
+        return {g:1,
+            c:"m = parseInt(results[" + currentGroup + "], 10) - 1;\n",
+            s:"(\\d{1,2})"};
+    case "t":
+        return {g:0,
+            c:null,
+            s:"\\d{1,2}"};
+    case "L":
+        return {g:0,
+            c:null,
+            s:"(?:1|0)"};
+    case "Y":
+        return {g:1,
+            c:"y = parseInt(results[" + currentGroup + "], 10);\n",
+            s:"(\\d{4})"};
+    case "y":
+        return {g:1,
+            c:"var ty = parseInt(results[" + currentGroup + "], 10);\n"
+                + "y = ty > Date.y2kYear ? 1900 + ty : 2000 + ty;\n",
+            s:"(\\d{1,2})"};
+    case "a":
+        return {g:1,
+            c:"if (results[" + currentGroup + "] == 'am') {\n"
+                + "if (h == 12) { h = 0; }\n"
+                + "} else { if (h < 12) { h += 12; }}",
+            s:"(am|pm)"};
+    case "A":
+        return {g:1,
+            c:"if (results[" + currentGroup + "] == 'AM') {\n"
+                + "if (h == 12) { h = 0; }\n"
+                + "} else { if (h < 12) { h += 12; }}",
+            s:"(AM|PM)"};
+    case "g":
+    case "G":
+    case "h":
+    case "H":
+        return {g:1,
+            c:"h = parseInt(results[" + currentGroup + "], 10);\n",
+            s:"(\\d{1,2})"};
+    case "i":
+        return {g:1,
+            c:"i = parseInt(results[" + currentGroup + "], 10);\n",
+            s:"(\\d{2})"};
+    case "s":
+        return {g:1,
+            c:"s = parseInt(results[" + currentGroup + "], 10);\n",
+            s:"(\\d{2})"};
+    case "O":
+        return {g:0,
+            c:null,
+            s:"[+-]\\d{4}"};
+    case "T":
+        return {g:0,
+            c:null,
+            s:"[A-Z]{3}"};
+    case "Z":
+        return {g:0,
+            c:null,
+            s:"[+-]\\d{1,5}"};
+    default:
+        return {g:0,
+            c:null,
+            s:String.escape(character)};
+    }
+}
+
+Date.prototype.getTimezone = function() {
+    return this.toString().replace(
+        /^.*? ([A-Z]{3}) [0-9]{4}.*$/, "$1").replace(
+        /^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/, "$1$2$3");
+}
+
+Date.prototype.getGMTOffset = function() {
+    return (this.getTimezoneOffset() > 0 ? "-" : "+")
+        + String.leftPad(Math.floor(this.getTimezoneOffset() / 60), 2, "0")
+        + String.leftPad(this.getTimezoneOffset() % 60, 2, "0");
+}
+
+Date.prototype.getDayOfYear = function() {
+    var num = 0;
+    Date.daysInMonth[1] = this.isLeapYear() ? 29 : 28;
+    for (var i = 0; i < this.getMonth(); ++i) {
+        num += Date.daysInMonth[i];
+    }
+    return num + this.getDate() - 1;
+}
+
+Date.prototype.getWeekOfYear = function() {
+    // Skip to Thursday of this week
+    var now = this.getDayOfYear() + (4 - this.getDay());
+    // Find the first Thursday of the year
+    var jan1 = new Date(this.getFullYear(), 0, 1);
+    var then = (7 - jan1.getDay() + 4);
+    document.write(then);
+    return String.leftPad(((now - then) / 7) + 1, 2, "0");
+}
+
+Date.prototype.isLeapYear = function() {
+    var year = this.getFullYear();
+    return ((year & 3) == 0 && (year % 100 || (year % 400 == 0 && year)));
+}
+
+Date.prototype.getFirstDayOfMonth = function() {
+    var day = (this.getDay() - (this.getDate() - 1)) % 7;
+    return (day < 0) ? (day + 7) : day;
+}
+
+Date.prototype.getLastDayOfMonth = function() {
+    var day = (this.getDay() + (Date.daysInMonth[this.getMonth()] - this.getDate())) % 7;
+    return (day < 0) ? (day + 7) : day;
+}
+
+Date.prototype.getDaysInMonth = function() {
+    Date.daysInMonth[1] = this.isLeapYear() ? 29 : 28;
+    return Date.daysInMonth[this.getMonth()];
+}
+
+Date.prototype.getSuffix = function() {
+    switch (this.getDate()) {
+        case 1:
+        case 21:
+        case 31:
+            return "st";
+        case 2:
+        case 22:
+            return "nd";
+        case 3:
+        case 23:
+            return "rd";
+        default:
+            return "th";
+    }
+}
+
+String.escape = function(string) {
+    return string.replace(/('|\\)/g, "\\$1");
+}
+
+String.leftPad = function (val, size, ch) {
+    var result = new String(val);
+    if (ch == null) {
+        ch = " ";
+    }
+    while (result.length < size) {
+        result = ch + result;
+    }
+    return result;
+}
+
+Date.daysInMonth = [31,28,31,30,31,30,31,31,30,31,30,31];
+Date.monthNames =
+   ["January",
+    "February",
+    "March",
+    "April",
+    "May",
+    "June",
+    "July",
+    "August",
+    "September",
+    "October",
+    "November",
+    "December"];
+Date.dayNames =
+   ["Sunday",
+    "Monday",
+    "Tuesday",
+    "Wednesday",
+    "Thursday",
+    "Friday",
+    "Saturday"];
+Date.y2kYear = 50;
+Date.monthNumbers = {
+    Jan:0,
+    Feb:1,
+    Mar:2,
+    Apr:3,
+    May:4,
+    Jun:5,
+    Jul:6,
+    Aug:7,
+    Sep:8,
+    Oct:9,
+    Nov:10,
+    Dec:11};
+Date.patterns = {
+    ISO8601LongPattern:"Y-m-d H:i:s",
+    ISO8601ShortPattern:"Y-m-d",
+    ShortDatePattern: "n/j/Y",
+    LongDatePattern: "l, F d, Y",
+    FullDateTimePattern: "l, F d, Y g:i:s A",
+    MonthDayPattern: "F d",
+    ShortTimePattern: "g:i A",
+    LongTimePattern: "g:i:s A",
+    SortableDateTimePattern: "Y-m-d\\TH:i:s",
+    UniversalSortableDateTimePattern: "Y-m-d H:i:sO",
+    YearMonthPattern: "F, Y"};
+
+var date = new Date("1/1/2007 1:11:11");
+
+var ret;
+for (i = 0; i < 4000; ++i) {
+    var shortFormat = date.dateFormat("Y-m-d");
+    var longFormat = date.dateFormat("l, F d, Y g:i:s A");
+    ret = shortFormat + longFormat;
+    date.setTime(date.getTime() + 84266956);
+}
+
+// No exact match because the output depends on the locale's time zone. See bug 524490.
+assertEq(/^2017-09-05Tuesday, September 05, 2017 [0-9:]* AM$/.exec(ret) != null, true);
diff --git a/js/src/jit-test/tests/sunspider/check-math-partial-sums.js b/js/src/jit-test/tests/sunspider/check-math-partial-sums.js
new file mode 100644
index 00000000000..a9082702ccf
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-math-partial-sums.js
@@ -0,0 +1,41 @@
+// The Computer Language Shootout
+// http://shootout.alioth.debian.org/
+// contributed by Isaac Gouy
+
+function partial(n){
+    var a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 = 0.0;
+    var twothirds = 2.0/3.0;
+    var alt = -1.0;
+    var k2 = k3 = sk = ck = 0.0;
+    
+    for (var k = 1; k <= n; k++){
+        k2 = k*k;
+        k3 = k2*k;
+        sk = Math.sin(k);
+        ck = Math.cos(k);
+        alt = -alt;
+        
+        a1 += Math.pow(twothirds,k-1);
+        a2 += Math.pow(k,-0.5);
+        a3 += 1.0/(k*(k+1.0));
+        a4 += 1.0/(k3 * sk*sk);
+        a5 += 1.0/(k3 * ck*ck);
+        a6 += 1.0/k;
+        a7 += 1.0/k2;
+        a8 += alt/k;
+        a9 += alt/(2*k -1);
+    }
+
+    return [ a1, a2, a3, a4, a5, a6, a7, a8, a9 ];
+}
+
+var actual = [];
+for (var i = 1024; i <= 16384; i *= 2)
+  Array.prototype.push.apply(actual, partial(i));
+
+var eps = 1e-12;
+var expect = [2.9999999999999987,62.555269219624684,0.9990243902439033,30.174793391263677,42.99468748637077,7.509175672278132,1.6439579810301654,0.6926591377284127,0.785154022830656,2.9999999999999987,89.06036157695789,0.9995119570522216,30.30796333494624,42.99485339033617,8.202078771817716,1.6444459047881168,0.6929030995395857,0.7852760930922243,2.9999999999999987,126.54745783224483,0.999755918965097,30.314167756318135,42.994888939123,8.89510389696629,1.6446899560231332,0.6930251251486118,0.7853371282421086,2.9999999999999987,179.56450569047874,0.9998779445868421,30.314499725429847,42.99489723774016,9.588190046095265,1.644812003986005,0.693086149128997,0.785367645819433,2.9999999999999987,254.54355172132264,0.9999389685688135,30.31451920492601,42.99489939769195,10.281306710008463,1.6448730335545856,0.6931166639131536,0.7853829046083998];
+
+assertEq(actual.length, expect.length);
+for (var i = 0; i < expect.length; ++i)
+  assertEq(Math.abs(actual[i] - expect[i]) < eps, true);
diff --git a/js/src/jit-test/tests/sunspider/check-mont.js b/js/src/jit-test/tests/sunspider/check-mont.js
new file mode 100644
index 00000000000..c31491c3689
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-mont.js
@@ -0,0 +1,119 @@
+// regression test for Bug 452008 - TM: SRP in Clipperz crypto library fails when JIT (TraceMonkey) is enabled. 
+
+var x = [9385, 32112, 25383, 16317, 30138, 14565, 17812, 24500, 2719, 30174, 3546, 9096, 15352, 19120, 20648, 14334, 7426, 0, 0, 0];
+var n = [27875, 25925, 30422, 12227, 27798, 32170, 10873, 21748, 30629, 26296, 20697, 5125, 4815, 2221, 14392, 23369, 5560, 2, 0, 0];
+var np = 18229;
+var expected = [18770, 31456, 17999, 32635, 27508, 29131, 2856, 16233, 5439, 27580, 7093, 18192, 30804, 5472, 8529, 28649, 14852, 0, 0, 0];
+
+//globals
+bpe=0;         //bits stored per array element
+mask=0;        //AND this with an array element to chop it down to bpe bits
+
+//initialize the global variables
+for (bpe=0; (1<<(bpe+1)) > (1<<bpe); bpe++);  //bpe=number of bits in the mantissa on this platform
+bpe>>=1;                   //bpe=number of bits in one element of the array representing the bigInt
+mask=(1<<bpe)-1;           //AND the mask with an integer to get its bpe least significant bits
+
+
+//the following global variables are scratchpad memory to
+//reduce dynamic memory allocation in the inner loop
+sa = new Array(0); //used in mont_()
+
+//do x=y on bigInts x and y.  x must be an array at least as big as y (not counting the leading zeros in y).
+function copy_(x,y) {
+  var i;
+  var k=x.length<y.length ? x.length : y.length;
+  for (i=0;i<k;i++)
+    x[i]=y[i];
+  for (i=k;i<x.length;i++)
+    x[i]=0;
+}
+
+//do x=y on bigInt x and integer y.
+function copyInt_(x,n) {
+  var i,c;
+  for (c=n,i=0;i<x.length;i++) {
+    x[i]=c & mask;
+    c>>=bpe;
+  }
+}
+
+//is x > y? (x and y both nonnegative)
+function greater(x,y) {
+  var i;
+  var k=(x.length<y.length) ? x.length : y.length;
+
+  for (i=x.length;i<y.length;i++)
+    if (y[i])
+      return 0;  //y has more digits
+
+  for (i=y.length;i<x.length;i++)
+    if (x[i])
+      return 1;  //x has more digits
+
+  for (i=k-1;i>=0;i--)
+    if (x[i]>y[i])
+      return 1;
+    else if (x[i]<y[i])
+      return 0;
+  return 0;
+}
+
+
+//do x=x*y*Ri mod n for bigInts x,y,n,
+//  where Ri = 2**(-kn*bpe) mod n, and kn is the
+//  number of elements in the n array, not
+//  counting leading zeros.
+//x must be large enough to hold the answer.
+//It's OK if x and y are the same variable.
+//must have:
+//  x,y < n
+//  n is odd
+//  np = -(n^(-1)) mod radix
+function mont_(x,y,n,np) {
+  var i,j,c,ui,t;
+  var kn=n.length;
+  var ky=y.length;
+
+  if (sa.length!=kn)
+    sa=new Array(kn);
+
+  for (;kn>0 && n[kn-1]==0;kn--); //ignore leading zeros of n
+  for (;ky>0 && y[ky-1]==0;ky--); //ignore leading zeros of y
+
+  copyInt_(sa,0);
+
+  //the following loop consumes 95% of the runtime for randTruePrime_() and powMod_() for large keys
+  for (i=0; i<kn; i++) {
+    t=sa[0]+x[i]*y[0];
+    ui=((t & mask) * np) & mask;  //the inner "& mask" is needed on Macintosh MSIE, but not windows MSIE
+    c=(t+ui*n[0]) >> bpe;
+    t=x[i];
+
+    //do sa=(sa+x[i]*y+ui*n)/b   where b=2**bpe
+    for (j=1;j<ky;j++) {
+      c+=sa[j]+t*y[j]+ui*n[j];
+      sa[j-1]=c & mask;
+      c>>=bpe;
+    }
+    for (;j<kn;j++) {
+      c+=sa[j]+ui*n[j];
+      sa[j-1]=c & mask;
+      c>>=bpe;
+    }
+    sa[j-1]=c & mask;
+  }
+
+  if (!greater(n,sa))
+    sub_(sa,n);
+  copy_(x,sa);
+}
+
+mont_(x, x, n, np);
+
+var passed = expected.length == x.length;
+for (var i = 0; i < expected.length; i++) {
+  if (passed)
+    passed = expected[i] == x[i];
+}
+assertEq(passed, true);
diff --git a/js/src/jit-test/tests/sunspider/check-string-tagcloud.js b/js/src/jit-test/tests/sunspider/check-string-tagcloud.js
new file mode 100644
index 00000000000..f446e46ed5c
--- /dev/null
+++ b/js/src/jit-test/tests/sunspider/check-string-tagcloud.js
@@ -0,0 +1,270 @@
+
+/*
+ * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+/*
+    Portions from:
+    json.js
+    2007-10-10
+
+    Public Domain
+*/
+
+// This test parses a JSON string giving tag names and popularity, and
+// generates html markup for a "tagcloud" view.
+
+if (!Object.prototype.toJSONString) {
+
+    Array.prototype.toJSONString = function (w) {
+        var a = [],     // The array holding the partial texts.
+            i,          // Loop counter.
+            l = this.length,
+            v;          // The value to be stringified.
+
+        for (i = 0; i < l; i += 1) {
+            v = this[i];
+            switch (typeof v) {
+            case 'object':
+
+                if (v && typeof v.toJSONString === 'function') {
+                    a.push(v.toJSONString(w));
+                } else {
+                    a.push('null');
+                }
+                break;
+
+            case 'string':
+            case 'number':
+            case 'boolean':
+                a.push(v.toJSONString());
+                break;
+            default:
+                a.push('null');
+            }
+        }
+
+        return '[' + a.join(',') + ']';
+    };
+
+
+    Boolean.prototype.toJSONString = function () {
+        return String(this);
+    };
+
+
+    Date.prototype.toJSONString = function () {
+
+        function f(n) {
+
+            return n < 10 ? '0' + n : n;
+        }
+
+        return '"' + this.getUTCFullYear()   + '-' +
+                   f(this.getUTCMonth() + 1) + '-' +
+                   f(this.getUTCDate())      + 'T' +
+                   f(this.getUTCHours())     + ':' +
+                   f(this.getUTCMinutes())   + ':' +
+                   f(this.getUTCSeconds())   + 'Z"';
+    };
+
+
+    Number.prototype.toJSONString = function () {
+
+        return isFinite(this) ? String(this) : 'null';
+    };
+
+
+    Object.prototype.toJSONString = function (w) {
+        var a = [],     // The array holding the partial texts.
+            k,          // The current key.
+            i,          // The loop counter.
+            v;          // The current value.
+
+        if (w) {
+            for (i = 0; i < w.length; i += 1) {
+                k = w[i];
+                if (typeof k === 'string') {
+                    v = this[k];
+                    switch (typeof v) {
+                    case 'object':
+
+                        if (v) {
+                            if (typeof v.toJSONString === 'function') {
+                                a.push(k.toJSONString() + ':' +
+                                       v.toJSONString(w));
+                            }
+                        } else {
+                            a.push(k.toJSONString() + ':null');
+                        }
+                        break;
+
+                    case 'string':
+                    case 'number':
+                    case 'boolean':
+                        a.push(k.toJSONString() + ':' + v.toJSONString());
+
+                    }
+                }
+            }
+        } else {
+
+            for (k in this) {
+                if (typeof k === 'string' &&
+                        Object.prototype.hasOwnProperty.apply(this, [k])) {
+                    v = this[k];
+                    switch (typeof v) {
+                    case 'object':
+
+                        if (v) {
+                            if (typeof v.toJSONString === 'function') {
+                                a.push(k.toJSONString() + ':' +
+                                       v.toJSONString());
+                            }
+                        } else {
+                            a.push(k.toJSONString() + ':null');
+                        }
+                        break;
+
+                    case 'string':
+                    case 'number':
+                    case 'boolean':
+                        a.push(k.toJSONString() + ':' + v.toJSONString());
+
+                    }
+                }
+            }
+        }
+
+        return '{' + a.join(',') + '}';
+    };
+
+
+    (function (s) {
+
+        var m = {
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
+        };
+
+
+        s.parseJSON = function (filter) {
+            var j;
+
+            function walk(k, v) {
+                var i, n;
+                if (v && typeof v === 'object') {
+                    for (i in v) {
+                        if (Object.prototype.hasOwnProperty.apply(v, [i])) {
+                            n = walk(i, v[i]);
+                            if (n !== undefined) {
+                                v[i] = n;
+                            }
+                        }
+                    }
+                }
+                return filter(k, v);
+            }
+
+            if (/^[\],:{}\s]*$/.test(this.replace(/\\./g, '@').
+                    replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(:?[eE][+\-]?\d+)?/g, ']').
+                    replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+                j = eval('(' + this + ')');
+
+                return typeof filter === 'function' ? walk('', j) : j;
+            }
+
+            throw new SyntaxError('parseJSON');
+        };
+
+
+        s.toJSONString = function () {
+
+            if (/["\\\x00-\x1f]/.test(this)) {
+                return '"' + this.replace(/[\x00-\x1f\\"]/g, function (a) {
+                    var c = m[a];
+                    if (c) {
+                        return c;
+                    }
+                    c = a.charCodeAt();
+                    return '\\u00' + Math.floor(c / 16).toString(16) +
+                                               (c % 16).toString(16);
+                }) + '"';
+            }
+            return '"' + this + '"';
+        };
+    })(String.prototype);
+}
+
+var tagInfoJSON = '[\n  {\n    \"tag\": "titillation",\n    \"popularity\": 4294967296\n  },\n  {\n    \"tag\": "foamless",\n    \"popularity\": 1257718401\n  },\n  {\n    \"tag\": "snarler",\n    \"popularity\": 613166183\n  },\n  {\n    \"tag\": "multangularness",\n    \"popularity\": 368304452\n  },\n  {\n    \"tag\": "Fesapo unventurous",\n    \"popularity\": 248026512\n  },\n  {\n    \"tag\": "esthesioblast",\n    \"popularity\": 179556755\n  },\n  {\n    \"tag\": "echeneidoid",\n    \"popularity\": 136641578\n  },\n  {\n    \"tag\": "embryoctony",\n    \"popularity\": 107852576\n  },\n  {\n    \"tag\": "undilatory",\n    \"popularity\": 87537981\n  },\n  {\n    \"tag\": "predisregard",\n    \"popularity\": 72630939\n  },\n  {\n    \"tag\": "allergenic",\n    \"popularity\": 61345190\n  },\n  {\n    \"tag\": "uncloudy",\n    \"popularity\": 52580571\n  },\n  {\n    \"tag\": "unforeseeably",\n    \"popularity\": 45628109\n  },\n  {\n    \"tag\": "sturniform",\n    \"popularity\": 40013489\n  },\n  {\n    \"tag\": "anesthetize",\n    \"popularity\": 35409226\n  },\n  {\n    \"tag\": "ametabolia",\n    \"popularity\": 31583050\n  },\n  {\n    \"tag\": "angiopathy",\n    \"popularity\": 28366350\n  },\n  {\n    \"tag\": "sultanaship",\n    \"popularity\": 25634218\n  },\n  {\n    \"tag\": "Frenchwise",\n    \"popularity\": 23292461\n  },\n  {\n    \"tag\": "cerviconasal",\n    \"popularity\": 21268909\n  },\n  {\n    \"tag\": "mercurialness",\n    \"popularity\": 19507481\n  },\n  {\n    \"tag\": "glutelin venditate",\n    \"popularity\": 17964042\n  },\n  {\n    \"tag\": "acred overblack",\n    \"popularity\": 16603454\n  },\n  {\n    \"tag\": "Atik",\n    \"popularity\": 15397451\n  },\n  {\n    \"tag\": "puncturer",\n    \"popularity\": 14323077\n  },\n  {\n    \"tag\": "pukatea",\n    \"popularity\": 13361525\n  },\n  {\n    \"tag\": "suberize",\n    \"popularity\": 12497261\n  },\n  {\n    \"tag\": "Godfrey",\n    \"popularity\": 11717365\n  },\n  {\n    \"tag\": "tetraptote",\n    \"popularity\": 11011011\n  },\n  {\n    \"tag\": "lucidness",\n    \"popularity\": 10369074\n  },\n  {\n    \"tag\": "tartness",\n    \"popularity\": 9783815\n  },\n  {\n    \"tag\": "axfetch",\n    \"popularity\": 9248634\n  },\n  {\n    \"tag\": "preacquittal",\n    \"popularity\": 8757877\n  },\n  {\n    \"tag\": "matris",\n    \"popularity\": 8306671\n  },\n  {\n    \"tag\": "hyphenate",\n    \"popularity\": 7890801\n  },\n  {\n    \"tag\": "semifabulous",\n    \"popularity\": 7506606\n  },\n  {\n    \"tag\": "oppressiveness",\n    \"popularity\": 7150890\n  },\n  {\n    \"tag\": "Protococcales",\n    \"popularity\": 6820856\n  },\n  {\n    \"tag\": "unpreventive",\n    \"popularity\": 6514045\n  },\n  {\n    \"tag\": "Cordia",\n    \"popularity\": 6228289\n  },\n  {\n    \"tag\": "Wakamba leaflike",\n    \"popularity\": 5961668\n  },\n  {\n    \"tag\": "dacryoma",\n    \"popularity\": 5712480\n  },\n  {\n    \"tag\": "inguinal",\n    \"popularity\": 5479211\n  },\n  {\n    \"tag\": "responseless",\n    \"popularity\": 5260507\n  },\n  {\n    \"tag\": "supplementarily",\n    \"popularity\": 5055158\n  },\n  {\n    \"tag\": "emu",\n    \"popularity\": 4862079\n  },\n  {\n    \"tag\": "countermeet",\n    \"popularity\": 4680292\n  },\n  {\n    \"tag\": "purrer",\n    \"popularity\": 4508918\n  },\n  {\n    \"tag\": "Corallinaceae",\n    \"popularity\": 4347162\n  },\n  {\n    \"tag\": "speculum",\n    \"popularity\": 4194304\n  },\n  {\n    \"tag\": "crimpness",\n    \"popularity\": 4049690\n  },\n  {\n    \"tag\": "antidetonant",\n    \"popularity\": 3912727\n  },\n  {\n    \"tag\": "topeewallah",\n    \"popularity\": 3782875\n  },\n  {\n    \"tag\": "fidalgo ballant",\n    \"popularity\": 3659640\n  },\n  {\n    \"tag\": "utriculose",\n    \"popularity\": 3542572\n  },\n  {\n    \"tag\": "testata",\n    \"popularity\": 3431259\n  },\n  {\n    \"tag\": "beltmaking",\n    \"popularity\": 3325322\n  },\n  {\n    \"tag\": "necrotype",\n    \"popularity\": 3224413\n  },\n  {\n    \"tag\": "ovistic",\n    \"popularity\": 3128215\n  },\n  {\n    \"tag\": "swindlership",\n    \"popularity\": 3036431\n  },\n  {\n    \"tag\": "augustal",\n    \"popularity\": 2948792\n  },\n  {\n    \"tag\": "Titoist",\n    \"popularity\": 2865047\n  },\n  {\n    \"tag\": "trisoctahedral",\n    \"popularity\": 2784963\n  },\n  {\n    \"tag\": "sequestrator",\n    \"popularity\": 2708327\n  },\n  {\n    \"tag\": "sideburns",\n    \"popularity\": 2634939\n  },\n  {\n    \"tag\": "paraphrasia",\n    \"popularity\": 2564616\n  },\n  {\n    \"tag\": "graminology unbay",\n    \"popularity\": 2497185\n  },\n  {\n    \"tag\": "acaridomatium emargination",\n    \"popularity\": 2432487\n  },\n  {\n    \"tag\": "roofward",\n    \"popularity\": 2370373\n  },\n  {\n    \"tag\": "lauder",\n    \"popularity\": 2310705\n  },\n  {\n    \"tag\": "subjunctive",\n    \"popularity\": 2253354\n  },\n  {\n    \"tag\": "subelongate",\n    \"popularity\": 2198199\n  },\n  {\n    \"tag\": "guacimo",\n    \"popularity\": 2145128\n  },\n  {\n    \"tag\": "cockade",\n    \"popularity\": 2094033\n  },\n  {\n    \"tag\": "misgauge",\n    \"popularity\": 2044818\n  },\n  {\n    \"tag\": "unexpensive",\n    \"popularity\": 1997388\n  },\n  {\n    \"tag\": "chebel",\n    \"popularity\": 1951657\n  },\n  {\n    \"tag\": "unpursuing",\n    \"popularity\": 1907543\n  },\n  {\n    \"tag\": "kilobar",\n    \"popularity\": 1864969\n  },\n  {\n    \"tag\": "obsecration",\n    \"popularity\": 1823863\n  },\n  {\n    \"tag\": "nacarine",\n    \"popularity\": 1784157\n  },\n  {\n    \"tag\": "spirituosity",\n    \"popularity\": 1745787\n  },\n  {\n    \"tag\": "movableness deity",\n    \"popularity\": 1708692\n  },\n  {\n    \"tag\": "exostracism",\n    \"popularity\": 1672816\n  },\n  {\n    \"tag\": "archipterygium",\n    \"popularity\": 1638104\n  },\n  {\n    \"tag\": "monostrophic",\n    \"popularity\": 1604506\n  },\n  {\n    \"tag\": "gynecide",\n    \"popularity\": 1571974\n  },\n  {\n    \"tag\": "gladden",\n    \"popularity\": 1540462\n  },\n  {\n    \"tag\": "throughbred",\n    \"popularity\": 1509927\n  },\n  {\n    \"tag\": "groper",\n    \"popularity\": 1480329\n  },\n  {\n    \"tag\": "Xenosaurus",\n    \"popularity\": 1451628\n  },\n  {\n    \"tag\": "photoetcher",\n    \"popularity\": 1423788\n  },\n  {\n    \"tag\": "glucosid",\n    \"popularity\": 1396775\n  },\n  {\n    \"tag\": "Galtonian",\n    \"popularity\": 1370555\n  },\n  {\n    \"tag\": "mesosporic",\n    \"popularity\": 1345097\n  },\n  {\n    \"tag\": "theody",\n    \"popularity\": 1320370\n  },\n  {\n    \"tag\": "zaffer",\n    \"popularity\": 1296348\n  },\n  {\n    \"tag\": "probiology",\n    \"popularity\": 1273003\n  },\n  {\n    \"tag\": "rhizomic",\n    \"popularity\": 1250308\n  },\n  {\n    \"tag\": "superphosphate",\n    \"popularity\": 1228240\n  },\n  {\n    \"tag\": "Hippolytan",\n    \"popularity\": 1206776\n  },\n  {\n    \"tag\": "garget",\n    \"popularity\": 1185892\n  },\n  {\n    \"tag\": "diploplacula",\n    \"popularity\": 1165568\n  },\n  {\n    \"tag\": "orohydrographical",\n    \"popularity\": 1145785\n  },\n  {\n    \"tag\": "enhypostatize",\n    \"popularity\": 1126521\n  },\n  {\n    \"tag\": "polisman",\n    \"popularity\": 1107759\n  },\n  {\n    \"tag\": "acetometer",\n    \"popularity\": 1089482\n  },\n  {\n    \"tag\": "unsnatched",\n    \"popularity\": 1071672\n  },\n  {\n    \"tag\": "yabber",\n    \"popularity\": 1054313\n  },\n  {\n    \"tag\": "demiwolf",\n    \"popularity\": 1037390\n  },\n  {\n    \"tag\": "chromascope",\n    \"popularity\": 1020888\n  },\n  {\n    \"tag\": "seamanship",\n    \"popularity\": 1004794\n  },\n  {\n    \"tag\": "nonfenestrated",\n    \"popularity\": 989092\n  },\n  {\n    \"tag\": "hydrophytism",\n    \"popularity\": 973771\n  },\n  {\n    \"tag\": "dotter",\n    \"popularity\": 958819\n  },\n  {\n    \"tag\": "thermoperiodism",\n    \"popularity\": 944222\n  },\n  {\n    \"tag\": "unlawyerlike",\n    \"popularity\": 929970\n  },\n  {\n    \"tag\": "enantiomeride citywards",\n    \"popularity\": 916052\n  },\n  {\n    \"tag\": "unmetallurgical",\n    \"popularity\": 902456\n  },\n  {\n    \"tag\": "prickled",\n    \"popularity\": 889174\n  },\n  {\n    \"tag\": "strangerwise manioc",\n    \"popularity\": 876195\n  },\n  {\n    \"tag\": "incisorial",\n    \"popularity\": 863510\n  },\n  {\n    \"tag\": "irrationalize",\n    \"popularity\": 851110\n  },\n  {\n    \"tag\": "nasology",\n    \"popularity\": 838987\n  },\n  {\n    \"tag\": "fatuism",\n    \"popularity\": 827131\n  },\n  {\n    \"tag\": "Huk",\n    \"popularity\": 815535\n  },\n  {\n    \"tag\": "properispomenon",\n    \"popularity\": 804192\n  },\n  {\n    \"tag\": "unpummelled",\n    \"popularity\": 793094\n  },\n  {\n    \"tag\": "technographically",\n    \"popularity\": 782233\n  },\n  {\n    \"tag\": "underfurnish",\n    \"popularity\": 771603\n  },\n  {\n    \"tag\": "sinter",\n    \"popularity\": 761198\n  },\n  {\n    \"tag\": "lateroanterior",\n    \"popularity\": 751010\n  },\n  {\n    \"tag\": "nonpersonification",\n    \"popularity\": 741034\n  },\n  {\n    \"tag\": "Sitophilus",\n    \"popularity\": 731264\n  },\n  {\n    \"tag\": "unstudded overexerted",\n    \"popularity\": 721694\n  },\n  {\n    \"tag\": "tracheation",\n    \"popularity\": 712318\n  },\n  {\n    \"tag\": "thirteenth begloze",\n    \"popularity\": 703131\n  },\n  {\n    \"tag\": "bespice",\n    \"popularity\": 694129\n  },\n  {\n    \"tag\": "doppia",\n    \"popularity\": 685305\n  },\n  {\n    \"tag\": "unadorned",\n    \"popularity\": 676656\n  },\n  {\n    \"tag\": "dovelet engraff",\n    \"popularity\": 668176\n  },\n  {\n    \"tag\": "diphyozooid",\n    \"popularity\": 659862\n  },\n  {\n    \"tag\": "mure",\n    \"popularity\": 651708\n  },\n  {\n    \"tag\": "Tripitaka",\n    \"popularity\": 643710\n  },\n  {\n    \"tag\": "Billjim",\n    \"popularity\": 635865\n  },\n  {\n    \"tag\": "pyramidical",\n    \"popularity\": 628169\n  },\n  {\n    \"tag\": "circumlocutionist",\n    \"popularity\": 620617\n  },\n  {\n    \"tag\": "slapstick",\n    \"popularity\": 613207\n  },\n  {\n    \"tag\": "preobedience",\n    \"popularity\": 605934\n  },\n  {\n    \"tag\": "unfriarlike",\n    \"popularity\": 598795\n  },\n  {\n    \"tag\": "microchromosome",\n    \"popularity\": 591786\n  },\n  {\n    \"tag\": "Orphicism",\n    \"popularity\": 584905\n  },\n  {\n    \"tag\": "peel",\n    \"popularity\": 578149\n  },\n  {\n    \"tag\": "obediential",\n    \"popularity\": 571514\n  },\n  {\n    \"tag\": "Peripatidea",\n    \"popularity\": 564997\n  },\n  {\n    \"tag\": "undoubtful",\n    \"popularity\": 558596\n  },\n  {\n    \"tag\": "lodgeable",\n    \"popularity\": 552307\n  },\n  {\n    \"tag\": "pustulated woodchat",\n    \"popularity\": 546129\n  },\n  {\n    \"tag\": "antepast",\n    \"popularity\": 540057\n  },\n  {\n    \"tag\": "sagittoid matrimoniously",\n    \"popularity\": 534091\n  },\n  {\n    \"tag\": "Albizzia",\n    \"popularity\": 528228\n  },\n  {\n    \"tag\": "Elateridae unnewness",\n    \"popularity\": 522464\n  },\n  {\n    \"tag\": "convertingness",\n    \"popularity\": 516798\n  },\n  {\n    \"tag\": "Pelew",\n    \"popularity\": 511228\n  },\n  {\n    \"tag\": "recapitulation",\n    \"popularity\": 505751\n  },\n  {\n    \"tag\": "shack",\n    \"popularity\": 500365\n  },\n  {\n    \"tag\": "unmellowed",\n    \"popularity\": 495069\n  },\n  {\n    \"tag\": "pavis capering",\n    \"popularity\": 489859\n  },\n  {\n    \"tag\": "fanfare",\n    \"popularity\": 484735\n  },\n  {\n    \"tag\": "sole",\n    \"popularity\": 479695\n  },\n  {\n    \"tag\": "subarcuate",\n    \"popularity\": 474735\n  },\n  {\n    \"tag\": "multivious",\n    \"popularity\": 469856\n  },\n  {\n    \"tag\": "squandermania",\n    \"popularity\": 465054\n  },\n  {\n    \"tag\": "scintle",\n    \"popularity\": 460329\n  },\n  {\n    \"tag\": "hash chirognomic",\n    \"popularity\": 455679\n  },\n  {\n    \"tag\": "linseed",\n    \"popularity\": 451101\n  },\n  {\n    \"tag\": "redoubtable",\n    \"popularity\": 446596\n  },\n  {\n    \"tag\": "poachy reimpact",\n    \"popularity\": 442160\n  },\n  {\n    \"tag\": "limestone",\n    \"popularity\": 437792\n  },\n  {\n    \"tag\": "serranid",\n    \"popularity\": 433492\n  },\n  {\n    \"tag\": "pohna",\n    \"popularity\": 429258\n  },\n  {\n    \"tag\": "warwolf",\n    \"popularity\": 425088\n  },\n  {\n    \"tag\": "ruthenous",\n    \"popularity\": 420981\n  },\n  {\n    \"tag\": "dover",\n    \"popularity\": 416935\n  },\n  {\n    \"tag\": "deuteroalbumose",\n    \"popularity\": 412950\n  },\n  {\n    \"tag\": "pseudoprophetic",\n    \"popularity\": 409025\n  },\n  {\n    \"tag\": "dissoluteness",\n    \"popularity\": 405157\n  },\n  {\n    \"tag\": "preinvention",\n    \"popularity\": 401347\n  },\n  {\n    \"tag\": "swagbellied",\n    \"popularity\": 397592\n  },\n  {\n    \"tag\": "Ophidia",\n    \"popularity\": 393892\n  },\n  {\n    \"tag\": "equanimity",\n    \"popularity\": 390245\n  },\n  {\n    \"tag\": "troutful",\n    \"popularity\": 386651\n  },\n  {\n    \"tag\": "uke",\n    \"popularity\": 383108\n  },\n  {\n    \"tag\": "preacquaint",\n    \"popularity\": 379616\n  },\n  {\n    \"tag\": "shoq",\n    \"popularity\": 376174\n  },\n  {\n    \"tag\": "yox",\n    \"popularity\": 372780\n  },\n  {\n    \"tag\": "unelemental",\n    \"popularity\": 369434\n  },\n  {\n    \"tag\": "Yavapai",\n    \"popularity\": 366134\n  },\n  {\n    \"tag\": "joulean",\n    \"popularity\": 362880\n  },\n  {\n    \"tag\": "dracontine",\n    \"popularity\": 359672\n  },\n  {\n    \"tag\": "hardmouth",\n    \"popularity\": 356507\n  },\n  {\n    \"tag\": "sylvanize",\n    \"popularity\": 353386\n  },\n  {\n    \"tag\": "intraparenchymatous meadowbur",\n    \"popularity\": 350308\n  },\n  {\n    \"tag\": "uncharily",\n    \"popularity\": 347271\n  },\n  {\n    \"tag\": "redtab flexibly",\n    \"popularity\": 344275\n  },\n  {\n    \"tag\": "centervelic",\n    \"popularity\": 341319\n  },\n  {\n    \"tag\": "unravellable",\n    \"popularity\": 338403\n  },\n  {\n    \"tag\": "infortunately",\n    \"popularity\": 335526\n  },\n  {\n    \"tag\": "cannel",\n    \"popularity\": 332687\n  },\n  {\n    \"tag\": "oxyblepsia",\n    \"popularity\": 329885\n  },\n  {\n    \"tag\": "Damon",\n    \"popularity\": 327120\n  },\n  {\n    \"tag\": "etherin",\n    \"popularity\": 324391\n  },\n  {\n    \"tag\": "luminal",\n    \"popularity\": 321697\n  },\n  {\n    \"tag\": "interrogatorily presbyte",\n    \"popularity\": 319038\n  },\n  {\n    \"tag\": "hemiclastic",\n    \"popularity\": 316414\n  },\n  {\n    \"tag\": "poh flush",\n    \"popularity\": 313823\n  },\n  {\n    \"tag\": "Psoroptes",\n    \"popularity\": 311265\n  },\n  {\n    \"tag\": "dispirit",\n    \"popularity\": 308740\n  },\n  {\n    \"tag\": "nashgab",\n    \"popularity\": 306246\n  },\n  {\n    \"tag\": "Aphidiinae",\n    \"popularity\": 303784\n  },\n  {\n    \"tag\": "rhapsody nonconstruction",\n    \"popularity\": 301353\n  },\n  {\n    \"tag\": "Osmond",\n    \"popularity\": 298952\n  },\n  {\n    \"tag\": "Leonis",\n    \"popularity\": 296581\n  },\n  {\n    \"tag\": "Lemnian",\n    \"popularity\": 294239\n  },\n  {\n    \"tag\": "acetonic gnathonic",\n    \"popularity\": 291926\n  },\n  {\n    \"tag\": "surculus",\n    \"popularity\": 289641\n  },\n  {\n    \"tag\": "diagonally",\n    \"popularity\": 287384\n  },\n  {\n    \"tag\": "counterpenalty",\n    \"popularity\": 285154\n  },\n  {\n    \"tag\": "Eugenie",\n    \"popularity\": 282952\n  },\n  {\n    \"tag\": "hornbook",\n    \"popularity\": 280776\n  },\n  {\n    \"tag\": "miscoin",\n    \"popularity\": 278626\n  },\n  {\n    \"tag\": "admi",\n    \"popularity\": 276501\n  },\n  {\n    \"tag\": "Tarmac",\n    \"popularity\": 274402\n  },\n  {\n    \"tag\": "inexplicable",\n    \"popularity\": 272328\n  },\n  {\n    \"tag\": "rascallion",\n    \"popularity\": 270278\n  },\n  {\n    \"tag\": "dusterman",\n    \"popularity\": 268252\n  },\n  {\n    \"tag\": "osteostomous unhoroscopic",\n    \"popularity\": 266250\n  },\n  {\n    \"tag\": "spinibulbar",\n    \"popularity\": 264271\n  },\n  {\n    \"tag\": "phototelegraphically",\n    \"popularity\": 262315\n  },\n  {\n    \"tag\": "Manihot",\n    \"popularity\": 260381\n  },\n  {\n    \"tag\": "neighborhood",\n    \"popularity\": 258470\n  },\n  {\n    \"tag\": "Vincetoxicum",\n    \"popularity\": 256581\n  },\n  {\n    \"tag\": "khirka",\n    \"popularity\": 254713\n  },\n  {\n    \"tag\": "conscriptive",\n    \"popularity\": 252866\n  },\n  {\n    \"tag\": "synechthran",\n    \"popularity\": 251040\n  },\n  {\n    \"tag\": "Guttiferales",\n    \"popularity\": 249235\n  },\n  {\n    \"tag\": "roomful",\n    \"popularity\": 247450\n  },\n  {\n    \"tag\": "germinal",\n    \"popularity\": 245685\n  },\n  {\n    \"tag\": "untraitorous",\n    \"popularity\": 243939\n  },\n  {\n    \"tag\": "nondissenting",\n    \"popularity\": 242213\n  },\n  {\n    \"tag\": "amotion",\n    \"popularity\": 240506\n  },\n  {\n    \"tag\": "badious",\n    \"popularity\": 238817\n  },\n  {\n    \"tag\": "sumpit",\n    \"popularity\": 237147\n  },\n  {\n    \"tag\": "ectozoic",\n    \"popularity\": 235496\n  },\n  {\n    \"tag\": "elvet",\n    \"popularity\": 233862\n  },\n  {\n    \"tag\": "underclerk",\n    \"popularity\": 232246\n  },\n  {\n    \"tag\": "reticency",\n    \"popularity\": 230647\n  },\n  {\n    \"tag\": "neutroclusion",\n    \"popularity\": 229065\n  },\n  {\n    \"tag\": "unbelieving",\n    \"popularity\": 227500\n  },\n  {\n    \"tag\": "histogenetic",\n    \"popularity\": 225952\n  },\n  {\n    \"tag\": "dermamyiasis",\n    \"popularity\": 224421\n  },\n  {\n    \"tag\": "telenergy",\n    \"popularity\": 222905\n  },\n  {\n    \"tag\": "axiomatic",\n    \"popularity\": 221406\n  },\n  {\n    \"tag\": "undominoed",\n    \"popularity\": 219922\n  },\n  {\n    \"tag\": "periosteoma",\n    \"popularity\": 218454\n  },\n  {\n    \"tag\": "justiciaryship",\n    \"popularity\": 217001\n  },\n  {\n    \"tag\": "autoluminescence",\n    \"popularity\": 215563\n  },\n  {\n    \"tag\": "osmous",\n    \"popularity\": 214140\n  },\n  {\n    \"tag\": "borgh",\n    \"popularity\": 212731\n  },\n  {\n    \"tag\": "bedebt",\n    \"popularity\": 211337\n  },\n  {\n    \"tag\": "considerableness adenoidism",\n    \"popularity\": 209957\n  },\n  {\n    \"tag\": "sailorizing",\n    \"popularity\": 208592\n  },\n  {\n    \"tag\": "Montauk",\n    \"popularity\": 207240\n  },\n  {\n    \"tag\": "Bridget",\n    \"popularity\": 205901\n  },\n  {\n    \"tag\": "Gekkota",\n    \"popularity\": 204577\n  },\n  {\n    \"tag\": "subcorymbose",\n    \"popularity\": 203265\n  },\n  {\n    \"tag\": "undersap",\n    \"popularity\": 201967\n  },\n  {\n    \"tag\": "poikilothermic",\n    \"popularity\": 200681\n  },\n  {\n    \"tag\": "enneatical",\n    \"popularity\": 199409\n  },\n  {\n    \"tag\": "martinetism",\n    \"popularity\": 198148\n  },\n  {\n    \"tag\": "sustanedly",\n    \"popularity\": 196901\n  },\n  {\n    \"tag\": "declaration",\n    \"popularity\": 195665\n  },\n  {\n    \"tag\": "myringoplasty",\n    \"popularity\": 194442\n  },\n  {\n    \"tag\": "Ginkgo",\n    \"popularity\": 193230\n  },\n  {\n    \"tag\": "unrecurrent",\n    \"popularity\": 192031\n  },\n  {\n    \"tag\": "proprecedent",\n    \"popularity\": 190843\n  },\n  {\n    \"tag\": "roadman",\n    \"popularity\": 189666\n  },\n  {\n    \"tag\": "elemin",\n    \"popularity\": 188501\n  },\n  {\n    \"tag\": "maggot",\n    \"popularity\": 187347\n  },\n  {\n    \"tag\": "alitrunk",\n    \"popularity\": 186204\n  },\n  {\n    \"tag\": "introspection",\n    \"popularity\": 185071\n  },\n  {\n    \"tag\": "batiker",\n    \"popularity\": 183950\n  },\n  {\n    \"tag\": "backhatch oversettle",\n    \"popularity\": 182839\n  },\n  {\n    \"tag\": "thresherman",\n    \"popularity\": 181738\n  },\n  {\n    \"tag\": "protemperance",\n    \"popularity\": 180648\n  },\n  {\n    \"tag\": "undern",\n    \"popularity\": 179568\n  },\n  {\n    \"tag\": "tweeg",\n    \"popularity\": 178498\n  },\n  {\n    \"tag\": "crosspath",\n    \"popularity\": 177438\n  },\n  {\n    \"tag\": "Tangaridae",\n    \"popularity\": 176388\n  },\n  {\n    \"tag\": "scrutation",\n    \"popularity\": 175348\n  },\n  {\n    \"tag\": "piecemaker",\n    \"popularity\": 174317\n  },\n  {\n    \"tag\": "paster",\n    \"popularity\": 173296\n  },\n  {\n    \"tag\": "unpretendingness",\n    \"popularity\": 172284\n  },\n  {\n    \"tag\": "inframundane",\n    \"popularity\": 171281\n  },\n  {\n    \"tag\": "kiblah",\n    \"popularity\": 170287\n  },\n  {\n    \"tag\": "playwrighting",\n    \"popularity\": 169302\n  },\n  {\n    \"tag\": "gonepoiesis snowslip",\n    \"popularity\": 168326\n  },\n  {\n    \"tag\": "hoodwise",\n    \"popularity\": 167359\n  },\n  {\n    \"tag\": "postseason",\n    \"popularity\": 166401\n  },\n  {\n    \"tag\": "equivocality",\n    \"popularity\": 165451\n  },\n  {\n    \"tag\": "Opiliaceae nuclease",\n    \"popularity\": 164509\n  },\n  {\n    \"tag\": "sextipara",\n    \"popularity\": 163576\n  },\n  {\n    \"tag\": "weeper",\n    \"popularity\": 162651\n  },\n  {\n    \"tag\": "frambesia",\n    \"popularity\": 161735\n  },\n  {\n    \"tag\": "answerable",\n    \"popularity\": 160826\n  },\n  {\n    \"tag\": "Trichosporum",\n    \"popularity\": 159925\n  },\n  {\n    \"tag\": "cajuputol",\n    \"popularity\": 159033\n  },\n  {\n    \"tag\": "pleomorphous",\n    \"popularity\": 158148\n  },\n  {\n    \"tag\": "aculeolate",\n    \"popularity\": 157270\n  },\n  {\n    \"tag\": "wherever",\n    \"popularity\": 156400\n  },\n  {\n    \"tag\": "collapse",\n    \"popularity\": 155538\n  },\n  {\n    \"tag\": "porky",\n    \"popularity\": 154683\n  },\n  {\n    \"tag\": "perule",\n    \"popularity\": 153836\n  },\n  {\n    \"tag\": "Nevada",\n    \"popularity\": 152996\n  },\n  {\n    \"tag\": "conalbumin",\n    \"popularity\": 152162\n  },\n  {\n    \"tag\": "tsunami",\n    \"popularity\": 151336\n  },\n  {\n    \"tag\": "Gulf",\n    \"popularity\": 150517\n  },\n  {\n    \"tag\": "hertz",\n    \"popularity\": 149705\n  },\n  {\n    \"tag\": "limmock",\n    \"popularity\": 148900\n  },\n  {\n    \"tag\": "Tartarize",\n    \"popularity\": 148101\n  },\n  {\n    \"tag\": "entosphenoid",\n    \"popularity\": 147310\n  },\n  {\n    \"tag\": "ibis",\n    \"popularity\": 146524\n  },\n  {\n    \"tag\": "unyeaned",\n    \"popularity\": 145746\n  },\n  {\n    \"tag\": "tritural",\n    \"popularity\": 144973\n  },\n  {\n    \"tag\": "hundredary",\n    \"popularity\": 144207\n  },\n  {\n    \"tag\": "stolonlike",\n    \"popularity\": 143448\n  },\n  {\n    \"tag\": "chorister",\n    \"popularity\": 142694\n  },\n  {\n    \"tag\": "mismove",\n    \"popularity\": 141947\n  },\n  {\n    \"tag\": "Andine",\n    \"popularity\": 141206\n  },\n  {\n    \"tag\": "Annette proneur escribe",\n    \"popularity\": 140471\n  },\n  {\n    \"tag\": "exoperidium",\n    \"popularity\": 139742\n  },\n  {\n    \"tag\": "disedge",\n    \"popularity\": 139019\n  },\n  {\n    \"tag\": "hypochloruria",\n    \"popularity\": 138302\n  },\n  {\n    \"tag\": "prepupa",\n    \"popularity\": 137590\n  },\n  {\n    \"tag\": "assent",\n    \"popularity\": 136884\n  },\n  {\n    \"tag\": "hydrazobenzene",\n    \"popularity\": 136184\n  },\n  {\n    \"tag\": "emballonurid",\n    \"popularity\": 135489\n  },\n  {\n    \"tag\": "roselle",\n    \"popularity\": 134800\n  },\n  {\n    \"tag\": "unifiedly",\n    \"popularity\": 134117\n  },\n  {\n    \"tag\": "clang",\n    \"popularity\": 133439\n  },\n  {\n    \"tag\": "acetolytic",\n    \"popularity\": 132766\n  },\n  {\n    \"tag\": "cladodont",\n    \"popularity\": 132098\n  },\n  {\n    \"tag\": "recoast",\n    \"popularity\": 131436\n  },\n  {\n    \"tag\": "celebrated tydie Eocarboniferous",\n    \"popularity\": 130779\n  },\n  {\n    \"tag\": "superconsciousness",\n    \"popularity\": 130127\n  },\n  {\n    \"tag\": "soberness",\n    \"popularity\": 129480\n  },\n  {\n    \"tag\": "panoramist",\n    \"popularity\": 128838\n  },\n  {\n    \"tag\": "Orbitolina",\n    \"popularity\": 128201\n  },\n  {\n    \"tag\": "overlewd",\n    \"popularity\": 127569\n  },\n  {\n    \"tag\": "demiquaver",\n    \"popularity\": 126942\n  },\n  {\n    \"tag\": "kamelaukion",\n    \"popularity\": 126319\n  },\n  {\n    \"tag\": "flancard",\n    \"popularity\": 125702\n  },\n  {\n    \"tag\": "tricuspid",\n    \"popularity\": 125089\n  },\n  {\n    \"tag\": "bepelt",\n    \"popularity\": 124480\n  },\n  {\n    \"tag\": "decuplet",\n    \"popularity\": 123877\n  },\n  {\n    \"tag\": "Rockies",\n    \"popularity\": 123278\n  },\n  {\n    \"tag\": "unforgeability",\n    \"popularity\": 122683\n  },\n  {\n    \"tag\": "mocha",\n    \"popularity\": 122093\n  },\n  {\n    \"tag\": "scrunge",\n    \"popularity\": 121507\n  },\n  {\n    \"tag\": "delighter",\n    \"popularity\": 120926\n  },\n  {\n    \"tag\": "willey Microtinae",\n    \"popularity\": 120349\n  },\n  {\n    \"tag\": "unhuntable",\n    \"popularity\": 119777\n  },\n  {\n    \"tag\": "historically",\n    \"popularity\": 119208\n  },\n  {\n    \"tag\": "vicegerentship",\n    \"popularity\": 118644\n  },\n  {\n    \"tag\": "hemangiosarcoma",\n    \"popularity\": 118084\n  },\n  {\n    \"tag\": "harpago",\n    \"popularity\": 117528\n  },\n  {\n    \"tag\": "unionoid",\n    \"popularity\": 116976\n  },\n  {\n    \"tag\": "wiseman",\n    \"popularity\": 116429\n  },\n  {\n    \"tag\": "diclinism",\n    \"popularity\": 115885\n  },\n  {\n    \"tag\": "Maud",\n    \"popularity\": 115345\n  },\n  {\n    \"tag\": "scaphocephalism",\n    \"popularity\": 114809\n  },\n  {\n    \"tag\": "obtenebration",\n    \"popularity\": 114277\n  },\n  {\n    \"tag\": "cymar predreadnought",\n    \"popularity\": 113749\n  },\n  {\n    \"tag\": "discommend",\n    \"popularity\": 113225\n  },\n  {\n    \"tag\": "crude",\n    \"popularity\": 112704\n  },\n  {\n    \"tag\": "upflash",\n    \"popularity\": 112187\n  },\n  {\n    \"tag\": "saltimbank",\n    \"popularity\": 111674\n  },\n  {\n    \"tag\": "posthysterical",\n    \"popularity\": 111165\n  },\n  {\n    \"tag\": "trample",\n    \"popularity\": 110659\n  },\n  {\n    \"tag\": "ungirthed",\n    \"popularity\": 110157\n  },\n  {\n    \"tag\": "unshakable",\n    \"popularity\": 109658\n  },\n  {\n    \"tag\": "hepatocystic",\n    \"popularity\": 109163\n  },\n  {\n    \"tag\": "psammophyte",\n    \"popularity\": 108671\n  },\n  {\n    \"tag\": "millionfold",\n    \"popularity\": 108183\n  },\n  {\n    \"tag\": "outtaste",\n    \"popularity\": 107698\n  },\n  {\n    \"tag\": "poppycockish",\n    \"popularity\": 107217\n  },\n  {\n    \"tag\": "viduine",\n    \"popularity\": 106739\n  },\n  {\n    \"tag\": "pleasureman",\n    \"popularity\": 106264\n  },\n  {\n    \"tag\": "cholesterolemia",\n    \"popularity\": 105792\n  },\n  {\n    \"tag\": "hostlerwife",\n    \"popularity\": 105324\n  },\n  {\n    \"tag\": "figure undergrass",\n    \"popularity\": 104859\n  },\n  {\n    \"tag\": "bedrape",\n    \"popularity\": 104398\n  },\n  {\n    \"tag\": "nuttishness",\n    \"popularity\": 103939\n  },\n  {\n    \"tag\": "fow",\n    \"popularity\": 103484\n  },\n  {\n    \"tag\": "rachianesthesia",\n    \"popularity\": 103031\n  },\n  {\n    \"tag\": "recruitable",\n    \"popularity\": 102582\n  },\n  {\n    \"tag\": "semianatomical Oenotheraceae",\n    \"popularity\": 102136\n  },\n  {\n    \"tag\": "extracapsular",\n    \"popularity\": 101693\n  },\n  {\n    \"tag\": "unsigneted",\n    \"popularity\": 101253\n  },\n  {\n    \"tag\": "fissural",\n    \"popularity\": 100816\n  },\n  {\n    \"tag\": "ayous",\n    \"popularity\": 100381\n  },\n  {\n    \"tag\": "crestfallenness odontograph",\n    \"popularity\": 99950\n  },\n  {\n    \"tag\": "monopodium",\n    \"popularity\": 99522\n  },\n  {\n    \"tag\": "germfree",\n    \"popularity\": 99096\n  },\n  {\n    \"tag\": "dauphin",\n    \"popularity\": 98673\n  },\n  {\n    \"tag\": "nonagesimal",\n    \"popularity\": 98254\n  },\n  {\n    \"tag\": "waterchat",\n    \"popularity\": 97836\n  },\n  {\n    \"tag\": "Entelodon",\n    \"popularity\": 97422\n  },\n  {\n    \"tag\": "semischolastic",\n    \"popularity\": 97010\n  },\n  {\n    \"tag\": "somata",\n    \"popularity\": 96602\n  },\n  {\n    \"tag\": "expositorily",\n    \"popularity\": 96195\n  },\n  {\n    \"tag\": "bass",\n    \"popularity\": 95792\n  },\n  {\n    \"tag\": "calorimetry",\n    \"popularity\": 95391\n  },\n  {\n    \"tag\": "entireness",\n    \"popularity\": 94993\n  },\n  {\n    \"tag\": "ratline soppiness",\n    \"popularity\": 94597\n  },\n  {\n    \"tag\": "shor",\n    \"popularity\": 94204\n  },\n  {\n    \"tag\": "coprecipitation",\n    \"popularity\": 93813\n  },\n  {\n    \"tag\": "unblushingly",\n    \"popularity\": 93425\n  },\n  {\n    \"tag\": "macarize",\n    \"popularity\": 93040\n  },\n  {\n    \"tag\": "scruplesomeness",\n    \"popularity\": 92657\n  },\n  {\n    \"tag\": "offsaddle",\n    \"popularity\": 92276\n  },\n  {\n    \"tag\": "hypertragical",\n    \"popularity\": 91898\n  },\n  {\n    \"tag\": "uncassock loined",\n    \"popularity\": 91522\n  },\n  {\n    \"tag\": "interlobate",\n    \"popularity\": 91149\n  },\n  {\n    \"tag\": "releasor orrisroot stoloniferously",\n    \"popularity\": 90778\n  },\n  {\n    \"tag\": "elementoid",\n    \"popularity\": 90410\n  },\n  {\n    \"tag\": "Lentilla",\n    \"popularity\": 90043\n  },\n  {\n    \"tag\": "distressing",\n    \"popularity\": 89679\n  },\n  {\n    \"tag\": "hydrodrome",\n    \"popularity\": 89318\n  },\n  {\n    \"tag\": "Jeannette",\n    \"popularity\": 88958\n  },\n  {\n    \"tag\": "Kuli",\n    \"popularity\": 88601\n  },\n  {\n    \"tag\": "taxinomist",\n    \"popularity\": 88246\n  },\n  {\n    \"tag\": "southwestwardly",\n    \"popularity\": 87894\n  },\n  {\n    \"tag\": "polyparia",\n    \"popularity\": 87543\n  },\n  {\n    \"tag\": "exmeridian",\n    \"popularity\": 87195\n  },\n  {\n    \"tag\": "splenius regimentaled",\n    \"popularity\": 86849\n  },\n  {\n    \"tag\": "Sphaeropsidaceae",\n    \"popularity\": 86505\n  },\n  {\n    \"tag\": "unbegun",\n    \"popularity\": 86163\n  },\n  {\n    \"tag\": "something",\n    \"popularity\": 85823\n  },\n  {\n    \"tag\": "contaminable nonexpulsion",\n    \"popularity\": 85486\n  },\n  {\n    \"tag\": "douser",\n    \"popularity\": 85150\n  },\n  {\n    \"tag\": "prostrike",\n    \"popularity\": 84817\n  },\n  {\n    \"tag\": "worky",\n    \"popularity\": 84485\n  },\n  {\n    \"tag\": "folliful",\n    \"popularity\": 84156\n  },\n  {\n    \"tag\": "prioracy",\n    \"popularity\": 83828\n  },\n  {\n    \"tag\": "undermentioned",\n    \"popularity\": 83503\n  },\n  {\n    \"tag\": "Judaica",\n    \"popularity\": 83179\n  },\n  {\n    \"tag\": "multifarious",\n    \"popularity\": 82858\n  },\n  {\n    \"tag\": "poogye",\n    \"popularity\": 82538\n  },\n  {\n    \"tag\": "Sparganium",\n    \"popularity\": 82221\n  },\n  {\n    \"tag\": "thurrock",\n    \"popularity\": 81905\n  },\n  {\n    \"tag\": "outblush",\n    \"popularity\": 81591\n  },\n  {\n    \"tag\": "Strophanthus supraordination",\n    \"popularity\": 81279\n  },\n  {\n    \"tag\": "gingerroot",\n    \"popularity\": 80969\n  },\n  {\n    \"tag\": "unconscient",\n    \"popularity\": 80661\n  },\n  {\n    \"tag\": "unconstitutionally",\n    \"popularity\": 80354\n  },\n  {\n    \"tag\": "plaguily",\n    \"popularity\": 80050\n  },\n  {\n    \"tag\": "waterily equatorwards",\n    \"popularity\": 79747\n  },\n  {\n    \"tag\": "nondeposition",\n    \"popularity\": 79446\n  },\n  {\n    \"tag\": "dronishly",\n    \"popularity\": 79147\n  },\n  {\n    \"tag\": "gateado",\n    \"popularity\": 78849\n  },\n  {\n    \"tag\": "dislink",\n    \"popularity\": 78553\n  },\n  {\n    \"tag\": "Joceline",\n    \"popularity\": 78259\n  },\n  {\n    \"tag\": "amphiboliferous",\n    \"popularity\": 77967\n  },\n  {\n    \"tag\": "bushrope",\n    \"popularity\": 77676\n  },\n  {\n    \"tag\": "plumicorn sulphosalicylic",\n    \"popularity\": 77387\n  },\n  {\n    \"tag\": "nonefficiency",\n    \"popularity\": 77100\n  },\n  {\n    \"tag\": "hieroscopy",\n    \"popularity\": 76815\n  },\n  {\n    \"tag\": "causativeness",\n    \"popularity\": 76531\n  },\n  {\n    \"tag\": "swird paleoeremology",\n    \"popularity\": 76249\n  },\n  {\n    \"tag\": "camphoric",\n    \"popularity\": 75968\n  },\n  {\n    \"tag\": "retaining",\n    \"popularity\": 75689\n  },\n  {\n    \"tag\": "thyreoprotein",\n    \"popularity\": 75411\n  },\n  {\n    \"tag\": "carbona",\n    \"popularity\": 75136\n  },\n  {\n    \"tag\": "protectively",\n    \"popularity\": 74861\n  },\n  {\n    \"tag\": "mosasaur",\n    \"popularity\": 74589\n  },\n  {\n    \"tag\": "reciprocator",\n    \"popularity\": 74317\n  },\n  {\n    \"tag\": "detentive",\n    \"popularity\": 74048\n  },\n  {\n    \"tag\": "supravital",\n    \"popularity\": 73780\n  },\n  {\n    \"tag\": "Vespertilionidae",\n    \"popularity\": 73513\n  },\n  {\n    \"tag\": "parka",\n    \"popularity\": 73248\n  },\n  {\n    \"tag\": "pickaway",\n    \"popularity\": 72984\n  },\n  {\n    \"tag\": "oleaceous",\n    \"popularity\": 72722\n  },\n  {\n    \"tag\": "anticogitative",\n    \"popularity\": 72462\n  },\n  {\n    \"tag\": "woe",\n    \"popularity\": 72203\n  },\n  {\n    \"tag\": "skeuomorph",\n    \"popularity\": 71945\n  },\n  {\n    \"tag\": "helpmeet",\n    \"popularity\": 71689\n  },\n  {\n    \"tag\": "Hexactinellida brickmaking",\n    \"popularity\": 71434\n  },\n  {\n    \"tag\": "resink",\n    \"popularity\": 71180\n  },\n  {\n    \"tag\": "diluter",\n    \"popularity\": 70928\n  },\n  {\n    \"tag\": "micromicron",\n    \"popularity\": 70677\n  },\n  {\n    \"tag\": "parentage",\n    \"popularity\": 70428\n  },\n  {\n    \"tag\": "galactorrhoea",\n    \"popularity\": 70180\n  },\n  {\n    \"tag\": "gey",\n    \"popularity\": 69934\n  },\n  {\n    \"tag\": "gesticulatory",\n    \"popularity\": 69689\n  },\n  {\n    \"tag\": "wergil",\n    \"popularity\": 69445\n  },\n  {\n    \"tag\": "Lecanora",\n    \"popularity\": 69202\n  },\n  {\n    \"tag\": "malanders karst",\n    \"popularity\": 68961\n  },\n  {\n    \"tag\": "vibetoite",\n    \"popularity\": 68721\n  },\n  {\n    \"tag\": "unrequitedness",\n    \"popularity\": 68483\n  },\n  {\n    \"tag\": "outwash",\n    \"popularity\": 68245\n  },\n  {\n    \"tag\": "unsacred",\n    \"popularity\": 68009\n  },\n  {\n    \"tag\": "unabetted dividend",\n    \"popularity\": 67775\n  },\n  {\n    \"tag\": "untraveling",\n    \"popularity\": 67541\n  },\n  {\n    \"tag\": "thermobattery",\n    \"popularity\": 67309\n  },\n  {\n    \"tag\": "polypragmist",\n    \"popularity\": 67078\n  },\n  {\n    \"tag\": "irrefutableness",\n    \"popularity\": 66848\n  },\n  {\n    \"tag\": "remiges",\n    \"popularity\": 66620\n  },\n  {\n    \"tag\": "implode",\n    \"popularity\": 66393\n  },\n  {\n    \"tag\": "superfluousness",\n    \"popularity\": 66166\n  },\n  {\n    \"tag\": "croakily unalleviated",\n    \"popularity\": 65942\n  },\n  {\n    \"tag\": "edicule",\n    \"popularity\": 65718\n  },\n  {\n    \"tag\": "entophytous",\n    \"popularity\": 65495\n  },\n  {\n    \"tag\": "benefactorship Toryish",\n    \"popularity\": 65274\n  },\n  {\n    \"tag\": "pseudoamateurish",\n    \"popularity\": 65054\n  },\n  {\n    \"tag\": "flueless Iguanodontoidea snipnose",\n    \"popularity\": 64835\n  },\n  {\n    \"tag\": "zealotical Zamicrus interpole",\n    \"popularity\": 64617\n  },\n  {\n    \"tag\": "whereabout",\n    \"popularity\": 64401\n  },\n  {\n    \"tag\": "benzazide",\n    \"popularity\": 64185\n  },\n  {\n    \"tag\": "pokeweed",\n    \"popularity\": 63971\n  },\n  {\n    \"tag\": "calamitoid",\n    \"popularity\": 63757\n  },\n  {\n    \"tag\": "sporozoal",\n    \"popularity\": 63545\n  },\n  {\n    \"tag\": "physcioid Welshwoman",\n    \"popularity\": 63334\n  },\n  {\n    \"tag\": "wanting",\n    \"popularity\": 63124\n  },\n  {\n    \"tag\": "unencumbering",\n    \"popularity\": 62915\n  },\n  {\n    \"tag\": "Tupi",\n    \"popularity\": 62707\n  },\n  {\n    \"tag\": "potbank",\n    \"popularity\": 62501\n  },\n  {\n    \"tag\": "bulked",\n    \"popularity\": 62295\n  },\n  {\n    \"tag\": "uparise",\n    \"popularity\": 62090\n  },\n  {\n    \"tag\": "Sudra",\n    \"popularity\": 61887\n  },\n  {\n    \"tag\": "hyperscrupulosity",\n    \"popularity\": 61684\n  },\n  {\n    \"tag\": "subterraneously unmaid",\n    \"popularity\": 61483\n  },\n  {\n    \"tag\": "poisonousness",\n    \"popularity\": 61282\n  },\n  {\n    \"tag\": "phare",\n    \"popularity\": 61083\n  },\n  {\n    \"tag\": "dicynodont",\n    \"popularity\": 60884\n  },\n  {\n    \"tag\": "chewer",\n    \"popularity\": 60687\n  },\n  {\n    \"tag\": "uliginous",\n    \"popularity\": 60490\n  },\n  {\n    \"tag\": "tinman",\n    \"popularity\": 60295\n  },\n  {\n    \"tag\": "coconut",\n    \"popularity\": 60100\n  },\n  {\n    \"tag\": "phryganeoid",\n    \"popularity\": 59907\n  },\n  {\n    \"tag\": "bismillah",\n    \"popularity\": 59714\n  },\n  {\n    \"tag\": "tautomeric",\n    \"popularity\": 59523\n  },\n  {\n    \"tag\": "jerquer",\n    \"popularity\": 59332\n  },\n  {\n    \"tag\": "Dryopithecinae",\n    \"popularity\": 59143\n  },\n  {\n    \"tag\": "ghizite",\n    \"popularity\": 58954\n  },\n  {\n    \"tag\": "unliveable",\n    \"popularity\": 58766\n  },\n  {\n    \"tag\": "craftsmaster",\n    \"popularity\": 58579\n  },\n  {\n    \"tag\": "semiscenic",\n    \"popularity\": 58394\n  },\n  {\n    \"tag\": "danaid",\n    \"popularity\": 58209\n  },\n  {\n    \"tag\": "flawful",\n    \"popularity\": 58025\n  },\n  {\n    \"tag\": "risibleness",\n    \"popularity\": 57841\n  },\n  {\n    \"tag\": "Muscovite",\n    \"popularity\": 57659\n  },\n  {\n    \"tag\": "snaringly",\n    \"popularity\": 57478\n  },\n  {\n    \"tag\": "brilliantwise",\n    \"popularity\": 57297\n  },\n  {\n    \"tag\": "plebeity",\n    \"popularity\": 57118\n  },\n  {\n    \"tag\": "historicalness",\n    \"popularity\": 56939\n  },\n  {\n    \"tag\": "piecemeal",\n    \"popularity\": 56761\n  },\n  {\n    \"tag\": "maxillipedary",\n    \"popularity\": 56584\n  },\n  {\n    \"tag\": "Hypenantron",\n    \"popularity\": 56408\n  },\n  {\n    \"tag\": "quaintness avigate",\n    \"popularity\": 56233\n  },\n  {\n    \"tag\": "ave",\n    \"popularity\": 56059\n  },\n  {\n    \"tag\": "mediaevally",\n    \"popularity\": 55885\n  },\n  {\n    \"tag\": "brucite",\n    \"popularity\": 55712\n  },\n  {\n    \"tag\": "Schwendenerian",\n    \"popularity\": 55541\n  },\n  {\n    \"tag\": "julole",\n    \"popularity\": 55370\n  },\n  {\n    \"tag\": "palaeolith",\n    \"popularity\": 55199\n  },\n  {\n    \"tag\": "cotyledonary",\n    \"popularity\": 55030\n  },\n  {\n    \"tag\": "rond",\n    \"popularity\": 54861\n  },\n  {\n    \"tag\": "boomster tassoo",\n    \"popularity\": 54694\n  },\n  {\n    \"tag\": "cattishly",\n    \"popularity\": 54527\n  },\n  {\n    \"tag\": "tonguefence",\n    \"popularity\": 54360\n  },\n  {\n    \"tag\": "hexastylar triskele",\n    \"popularity\": 54195\n  },\n  {\n    \"tag\": "ariot",\n    \"popularity\": 54030\n  },\n  {\n    \"tag\": "intarsist",\n    \"popularity\": 53867\n  },\n  {\n    \"tag\": "Oscines",\n    \"popularity\": 53704\n  },\n  {\n    \"tag\": "Spaniolize",\n    \"popularity\": 53541\n  },\n  {\n    \"tag\": "smellfungus",\n    \"popularity\": 53380\n  },\n  {\n    \"tag\": "redisplay",\n    \"popularity\": 53219\n  },\n  {\n    \"tag\": "phosphene",\n    \"popularity\": 53059\n  },\n  {\n    \"tag\": "phycomycete",\n    \"popularity\": 52900\n  },\n  {\n    \"tag\": "prophetic",\n    \"popularity\": 52741\n  },\n  {\n    \"tag\": "overtrustful",\n    \"popularity\": 52584\n  },\n  {\n    \"tag\": "pinitol",\n    \"popularity\": 52427\n  },\n  {\n    \"tag\": "asthmatic",\n    \"popularity\": 52270\n  },\n  {\n    \"tag\": "convulsive",\n    \"popularity\": 52115\n  },\n  {\n    \"tag\": "draughtswoman",\n    \"popularity\": 51960\n  },\n  {\n    \"tag\": "unetymologizable",\n    \"popularity\": 51806\n  },\n  {\n    \"tag\": "centrarchoid",\n    \"popularity\": 51652\n  },\n  {\n    \"tag\": "mesioincisal",\n    \"popularity\": 51500\n  },\n  {\n    \"tag\": "transbaikal",\n    \"popularity\": 51348\n  },\n  {\n    \"tag\": "silveriness",\n    \"popularity\": 51196\n  },\n  {\n    \"tag\": "costotomy",\n    \"popularity\": 51046\n  },\n  {\n    \"tag\": "caracore",\n    \"popularity\": 50896\n  },\n  {\n    \"tag\": "depotentiation",\n    \"popularity\": 50747\n  },\n  {\n    \"tag\": "glossoepiglottidean",\n    \"popularity\": 50598\n  },\n  {\n    \"tag\": "upswell",\n    \"popularity\": 50450\n  },\n  {\n    \"tag\": "flecnodal",\n    \"popularity\": 50303\n  },\n  {\n    \"tag\": "coventrate",\n    \"popularity\": 50157\n  },\n  {\n    \"tag\": "duchesse",\n    \"popularity\": 50011\n  },\n  {\n    \"tag\": "excisemanship trophied",\n    \"popularity\": 49866\n  },\n  {\n    \"tag\": "cytinaceous",\n    \"popularity\": 49721\n  },\n  {\n    \"tag\": "assuringly",\n    \"popularity\": 49577\n  },\n  {\n    \"tag\": "unconducted upliftitis",\n    \"popularity\": 49434\n  },\n  {\n    \"tag\": "rachicentesis",\n    \"popularity\": 49292\n  },\n  {\n    \"tag\": "antiangular",\n    \"popularity\": 49150\n  },\n  {\n    \"tag\": "advisal",\n    \"popularity\": 49008\n  },\n  {\n    \"tag\": "birdcatcher",\n    \"popularity\": 48868\n  },\n  {\n    \"tag\": "secularistic",\n    \"popularity\": 48728\n  },\n  {\n    \"tag\": "grandeeism superinformal",\n    \"popularity\": 48588\n  },\n  {\n    \"tag\": "unapprehension",\n    \"popularity\": 48449\n  },\n  {\n    \"tag\": "excipulum",\n    \"popularity\": 48311\n  },\n  {\n    \"tag\": "decimole",\n    \"popularity\": 48174\n  },\n  {\n    \"tag\": "semidrachm",\n    \"popularity\": 48037\n  },\n  {\n    \"tag\": "uvulotome",\n    \"popularity\": 47901\n  },\n  {\n    \"tag\": "Lemaneaceae",\n    \"popularity\": 47765\n  },\n  {\n    \"tag\": "corrade",\n    \"popularity\": 47630\n  },\n  {\n    \"tag\": "Kuroshio",\n    \"popularity\": 47495\n  },\n  {\n    \"tag\": "Araliophyllum",\n    \"popularity\": 47361\n  },\n  {\n    \"tag\": "victoriousness cardiosphygmograph",\n    \"popularity\": 47228\n  },\n  {\n    \"tag\": "reinvent",\n    \"popularity\": 47095\n  },\n  {\n    \"tag\": "Macrotolagus",\n    \"popularity\": 46963\n  },\n  {\n    \"tag\": "strenuousness",\n    \"popularity\": 46831\n  },\n  {\n    \"tag\": "deviability",\n    \"popularity\": 46700\n  },\n  {\n    \"tag\": "phyllospondylous",\n    \"popularity\": 46570\n  },\n  {\n    \"tag\": "bisect rudderhole",\n    \"popularity\": 46440\n  },\n  {\n    \"tag\": "crownwork",\n    \"popularity\": 46311\n  },\n  {\n    \"tag\": "Ascalabota",\n    \"popularity\": 46182\n  },\n  {\n    \"tag\": "prostatomyomectomy",\n    \"popularity\": 46054\n  },\n  {\n    \"tag\": "neurosyphilis",\n    \"popularity\": 45926\n  },\n  {\n    \"tag\": "tabloid scraplet",\n    \"popularity\": 45799\n  },\n  {\n    \"tag\": "nonmedullated servility",\n    \"popularity\": 45673\n  },\n  {\n    \"tag\": "melopoeic practicalization",\n    \"popularity\": 45547\n  },\n  {\n    \"tag\": "nonrhythmic",\n    \"popularity\": 45421\n  },\n  {\n    \"tag\": "deplorer",\n    \"popularity\": 45296\n  },\n  {\n    \"tag\": "Ophion",\n    \"popularity\": 45172\n  },\n  {\n    \"tag\": "subprioress",\n    \"popularity\": 45048\n  },\n  {\n    \"tag\": "semiregular",\n    \"popularity\": 44925\n  },\n  {\n    \"tag\": "praelection",\n    \"popularity\": 44802\n  },\n  {\n    \"tag\": "discinct",\n    \"popularity\": 44680\n  },\n  {\n    \"tag\": "preplace",\n    \"popularity\": 44558\n  },\n  {\n    \"tag\": "paternoster",\n    \"popularity\": 44437\n  },\n  {\n    \"tag\": "suboccipital",\n    \"popularity\": 44316\n  },\n  {\n    \"tag\": "Teutophil",\n    \"popularity\": 44196\n  },\n  {\n    \"tag\": "tracheole",\n    \"popularity\": 44076\n  },\n  {\n    \"tag\": "subsmile",\n    \"popularity\": 43957\n  },\n  {\n    \"tag\": "nonapostatizing",\n    \"popularity\": 43839\n  },\n  {\n    \"tag\": "cleidotomy",\n    \"popularity\": 43720\n  },\n  {\n    \"tag\": "hingle",\n    \"popularity\": 43603\n  },\n  {\n    \"tag\": "jocoque",\n    \"popularity\": 43486\n  },\n  {\n    \"tag\": "trundler notidanian",\n    \"popularity\": 43369\n  },\n  {\n    \"tag\": "strangling misdaub",\n    \"popularity\": 43253\n  },\n  {\n    \"tag\": "noncancellable",\n    \"popularity\": 43137\n  },\n  {\n    \"tag\": "lavabo",\n    \"popularity\": 43022\n  },\n  {\n    \"tag\": "lanterloo",\n    \"popularity\": 42907\n  },\n  {\n    \"tag\": "uncitizenly",\n    \"popularity\": 42793\n  },\n  {\n    \"tag\": "autoturning",\n    \"popularity\": 42679\n  },\n  {\n    \"tag\": "Haganah",\n    \"popularity\": 42566\n  },\n  {\n    \"tag\": "Glecoma",\n    \"popularity\": 42453\n  },\n  {\n    \"tag\": "membered",\n    \"popularity\": 42341\n  },\n  {\n    \"tag\": "consuetudinal",\n    \"popularity\": 42229\n  },\n  {\n    \"tag\": "gatehouse",\n    \"popularity\": 42117\n  },\n  {\n    \"tag\": "tetherball",\n    \"popularity\": 42006\n  },\n  {\n    \"tag\": "counterrevolutionist numismatical",\n    \"popularity\": 41896\n  },\n  {\n    \"tag\": "pagehood plateiasmus",\n    \"popularity\": 41786\n  },\n  {\n    \"tag\": "pelterer",\n    \"popularity\": 41676\n  },\n  {\n    \"tag\": "splenemphraxis",\n    \"popularity\": 41567\n  },\n  {\n    \"tag\": "Crypturidae",\n    \"popularity\": 41458\n  },\n  {\n    \"tag\": "caboodle",\n    \"popularity\": 41350\n  },\n  {\n    \"tag\": "Filaria",\n    \"popularity\": 41242\n  },\n  {\n    \"tag\": "noninvincibility",\n    \"popularity\": 41135\n  },\n  {\n    \"tag\": "preadvertisement",\n    \"popularity\": 41028\n  },\n  {\n    \"tag\": "bathrobe",\n    \"popularity\": 40921\n  },\n  {\n    \"tag\": "nitrifier",\n    \"popularity\": 40815\n  },\n  {\n    \"tag\": "furthermore",\n    \"popularity\": 40709\n  },\n  {\n    \"tag\": "recrate",\n    \"popularity\": 40604\n  },\n  {\n    \"tag\": "inexist",\n    \"popularity\": 40499\n  },\n  {\n    \"tag\": "Mocoan",\n    \"popularity\": 40395\n  },\n  {\n    \"tag\": "forint",\n    \"popularity\": 40291\n  },\n  {\n    \"tag\": "cardiomyoliposis",\n    \"popularity\": 40187\n  },\n  {\n    \"tag\": "channeling",\n    \"popularity\": 40084\n  },\n  {\n    \"tag\": "quebrachine",\n    \"popularity\": 39981\n  },\n  {\n    \"tag\": "magistery",\n    \"popularity\": 39879\n  },\n  {\n    \"tag\": "koko",\n    \"popularity\": 39777\n  },\n  {\n    \"tag\": "nobilify",\n    \"popularity\": 39676\n  },\n  {\n    \"tag\": "articulate taprooted",\n    \"popularity\": 39575\n  },\n  {\n    \"tag\": "cardiotonic Nicaragua",\n    \"popularity\": 39474\n  },\n  {\n    \"tag\": "assertiveness",\n    \"popularity\": 39374\n  },\n  {\n    \"tag\": "springtail",\n    \"popularity\": 39274\n  },\n  {\n    \"tag\": "spontoon",\n    \"popularity\": 39174\n  },\n  {\n    \"tag\": "plesiobiosis",\n    \"popularity\": 39075\n  },\n  {\n    \"tag\": "rooinek",\n    \"popularity\": 38976\n  },\n  {\n    \"tag\": "hairif falsehood",\n    \"popularity\": 38878\n  },\n  {\n    \"tag\": "synodally",\n    \"popularity\": 38780\n  },\n  {\n    \"tag\": "biodynamics",\n    \"popularity\": 38683\n  },\n  {\n    \"tag\": "trickling",\n    \"popularity\": 38585\n  },\n  {\n    \"tag\": "oxfly daystar",\n    \"popularity\": 38489\n  },\n  {\n    \"tag\": "epicycloidal",\n    \"popularity\": 38392\n  },\n  {\n    \"tag\": "shorthand",\n    \"popularity\": 38296\n  },\n  {\n    \"tag\": "herpolhode",\n    \"popularity\": 38201\n  },\n  {\n    \"tag\": "polysynthesism",\n    \"popularity\": 38105\n  },\n  {\n    \"tag\": "cany",\n    \"popularity\": 38010\n  },\n  {\n    \"tag\": "sideage",\n    \"popularity\": 37916\n  },\n  {\n    \"tag\": "strainableness",\n    \"popularity\": 37822\n  },\n  {\n    \"tag\": "superformidable",\n    \"popularity\": 37728\n  },\n  {\n    \"tag\": "slendang",\n    \"popularity\": 37634\n  },\n  {\n    \"tag\": "impropriation",\n    \"popularity\": 37541\n  },\n  {\n    \"tag\": "ficklehearted",\n    \"popularity\": 37449\n  },\n  {\n    \"tag\": "wintrify",\n    \"popularity\": 37356\n  },\n  {\n    \"tag\": "geomorphogenist",\n    \"popularity\": 37264\n  },\n  {\n    \"tag\": "smuggleable",\n    \"popularity\": 37173\n  },\n  {\n    \"tag\": "delapsion",\n    \"popularity\": 37081\n  },\n  {\n    \"tag\": "projective",\n    \"popularity\": 36990\n  },\n  {\n    \"tag\": "unglue exfoliation",\n    \"popularity\": 36900\n  },\n  {\n    \"tag\": "Acerae",\n    \"popularity\": 36810\n  },\n  {\n    \"tag\": "unstaged",\n    \"popularity\": 36720\n  },\n  {\n    \"tag\": "ranal",\n    \"popularity\": 36630\n  },\n  {\n    \"tag\": "worrier",\n    \"popularity\": 36541\n  },\n  {\n    \"tag\": "unhid",\n    \"popularity\": 36452\n  },\n  {\n    \"tag\": "adequation",\n    \"popularity\": 36363\n  },\n  {\n    \"tag\": "strongylid Sokotri",\n    \"popularity\": 36275\n  },\n  {\n    \"tag\": "fumingly",\n    \"popularity\": 36187\n  },\n  {\n    \"tag\": "gynosporangium phaenogenetic",\n    \"popularity\": 36100\n  },\n  {\n    \"tag\": "uniunguiculate",\n    \"popularity\": 36012\n  },\n  {\n    \"tag\": "prudelike",\n    \"popularity\": 35926\n  },\n  {\n    \"tag\": "seminomata",\n    \"popularity\": 35839\n  },\n  {\n    \"tag\": "trinklet",\n    \"popularity\": 35753\n  },\n  {\n    \"tag\": "risorial",\n    \"popularity\": 35667\n  },\n  {\n    \"tag\": "pericardiocentesis",\n    \"popularity\": 35581\n  },\n  {\n    \"tag\": "filmist",\n    \"popularity\": 35496\n  },\n  {\n    \"tag\": "Nana",\n    \"popularity\": 35411\n  },\n  {\n    \"tag\": "cynipoid",\n    \"popularity\": 35326\n  },\n  {\n    \"tag\": "cteniform",\n    \"popularity\": 35242\n  },\n  {\n    \"tag\": "semiflex",\n    \"popularity\": 35158\n  },\n  {\n    \"tag\": "solstitially",\n    \"popularity\": 35074\n  },\n  {\n    \"tag\": "Algarsife",\n    \"popularity\": 34991\n  },\n  {\n    \"tag\": "noncriminal",\n    \"popularity\": 34908\n  },\n  {\n    \"tag\": "compassion",\n    \"popularity\": 34825\n  },\n  {\n    \"tag\": "Buddhic",\n    \"popularity\": 34743\n  },\n  {\n    \"tag\": "vellicative dactylically hotfoot",\n    \"popularity\": 34661\n  },\n  {\n    \"tag\": "chicory",\n    \"popularity\": 34579\n  },\n  {\n    \"tag\": "transperitoneally",\n    \"popularity\": 34497\n  },\n  {\n    \"tag\": "pennae",\n    \"popularity\": 34416\n  },\n  {\n    \"tag\": "Flamandize",\n    \"popularity\": 34335\n  },\n  {\n    \"tag\": "underviewer",\n    \"popularity\": 34254\n  },\n  {\n    \"tag\": "assoil",\n    \"popularity\": 34174\n  },\n  {\n    \"tag\": "saccharobacillus",\n    \"popularity\": 34094\n  },\n  {\n    \"tag\": "biacetylene",\n    \"popularity\": 34014\n  },\n  {\n    \"tag\": "mouchardism",\n    \"popularity\": 33935\n  },\n  {\n    \"tag\": "anisomeric",\n    \"popularity\": 33856\n  },\n  {\n    \"tag\": "digestive",\n    \"popularity\": 33777\n  },\n  {\n    \"tag\": "darlingly",\n    \"popularity\": 33698\n  },\n  {\n    \"tag\": "liman",\n    \"popularity\": 33620\n  },\n  {\n    \"tag\": "soldanrie",\n    \"popularity\": 33542\n  },\n  {\n    \"tag\": "sully",\n    \"popularity\": 33464\n  },\n  {\n    \"tag\": "brightsmith",\n    \"popularity\": 33387\n  },\n  {\n    \"tag\": "inwrap antiliturgist ureterocervical",\n    \"popularity\": 33309\n  },\n  {\n    \"tag\": "discommodity",\n    \"popularity\": 33232\n  },\n  {\n    \"tag\": "typical aggrandizer",\n    \"popularity\": 33156\n  },\n  {\n    \"tag\": "xenogeny",\n    \"popularity\": 33079\n  },\n  {\n    \"tag\": "uncountrified",\n    \"popularity\": 33003\n  },\n  {\n    \"tag\": "Podarge",\n    \"popularity\": 32928\n  },\n  {\n    \"tag\": "uninterviewed",\n    \"popularity\": 32852\n  },\n  {\n    \"tag\": "underprior",\n    \"popularity\": 32777\n  },\n  {\n    \"tag\": "leiomyomatous",\n    \"popularity\": 32702\n  },\n  {\n    \"tag\": "postdysenteric",\n    \"popularity\": 32627\n  },\n  {\n    \"tag\": "Fusicladium",\n    \"popularity\": 32553\n  },\n  {\n    \"tag\": "Dulcinea",\n    \"popularity\": 32478\n  },\n  {\n    \"tag\": "interspersion",\n    \"popularity\": 32404\n  },\n  {\n    \"tag\": "preobligate",\n    \"popularity\": 32331\n  },\n  {\n    \"tag\": "subaggregate",\n    \"popularity\": 32257\n  },\n  {\n    \"tag\": "grammarianism",\n    \"popularity\": 32184\n  },\n  {\n    \"tag\": "palikar",\n    \"popularity\": 32111\n  },\n  {\n    \"tag\": "facileness",\n    \"popularity\": 32039\n  },\n  {\n    \"tag\": "deuterofibrinose",\n    \"popularity\": 31966\n  },\n  {\n    \"tag\": "pseudesthesia",\n    \"popularity\": 31894\n  },\n  {\n    \"tag\": "sedimentary",\n    \"popularity\": 31822\n  },\n  {\n    \"tag\": "typewrite",\n    \"popularity\": 31751\n  },\n  {\n    \"tag\": "immemorable",\n    \"popularity\": 31679\n  },\n  {\n    \"tag\": "Myrtus",\n    \"popularity\": 31608\n  },\n  {\n    \"tag\": "hauchecornite",\n    \"popularity\": 31537\n  },\n  {\n    \"tag\": "galleylike",\n    \"popularity\": 31467\n  },\n  {\n    \"tag\": "thimber",\n    \"popularity\": 31396\n  },\n  {\n    \"tag\": "Hegelianism",\n    \"popularity\": 31326\n  },\n  {\n    \"tag\": "strig",\n    \"popularity\": 31256\n  },\n  {\n    \"tag\": "skyre",\n    \"popularity\": 31187\n  },\n  {\n    \"tag\": "eupepticism",\n    \"popularity\": 31117\n  },\n  {\n    \"tag\": "eponymism",\n    \"popularity\": 31048\n  },\n  {\n    \"tag\": "flunkeyhood",\n    \"popularity\": 30979\n  },\n  {\n    \"tag\": "Abama",\n    \"popularity\": 30911\n  },\n  {\n    \"tag\": "adiadochokinesis",\n    \"popularity\": 30842\n  },\n  {\n    \"tag\": "spendthrifty",\n    \"popularity\": 30774\n  },\n  {\n    \"tag\": "chalcedony",\n    \"popularity\": 30706\n  },\n  {\n    \"tag\": "authorism",\n    \"popularity\": 30638\n  },\n  {\n    \"tag\": "nasturtium",\n    \"popularity\": 30571\n  },\n  {\n    \"tag\": "Acanthocereus",\n    \"popularity\": 30504\n  },\n  {\n    \"tag\": "uncollapsible",\n    \"popularity\": 30437\n  },\n  {\n    \"tag\": "excursionist",\n    \"popularity\": 30370\n  },\n  {\n    \"tag\": "fogbow",\n    \"popularity\": 30303\n  },\n  {\n    \"tag\": "overlie",\n    \"popularity\": 30237\n  },\n  {\n    \"tag\": "velours",\n    \"popularity\": 30171\n  },\n  {\n    \"tag\": "zoodendria madrigal stagbush",\n    \"popularity\": 30105\n  },\n  {\n    \"tag\": "imi",\n    \"popularity\": 30039\n  },\n  {\n    \"tag\": "cojudge",\n    \"popularity\": 29974\n  },\n  {\n    \"tag\": "depurate argal",\n    \"popularity\": 29909\n  },\n  {\n    \"tag\": "unrecognition",\n    \"popularity\": 29844\n  },\n  {\n    \"tag\": "paunchful",\n    \"popularity\": 29779\n  },\n  {\n    \"tag\": "invalued",\n    \"popularity\": 29714\n  },\n  {\n    \"tag\": "probang",\n    \"popularity\": 29650\n  },\n  {\n    \"tag\": "chetvert",\n    \"popularity\": 29586\n  },\n  {\n    \"tag\": "enactable",\n    \"popularity\": 29522\n  },\n  {\n    \"tag\": "detoxicate adhibit",\n    \"popularity\": 29458\n  },\n  {\n    \"tag\": "kullaite",\n    \"popularity\": 29395\n  },\n  {\n    \"tag\": "undazzling",\n    \"popularity\": 29332\n  },\n  {\n    \"tag\": "excalation",\n    \"popularity\": 29269\n  },\n  {\n    \"tag\": "sievings",\n    \"popularity\": 29206\n  },\n  {\n    \"tag\": "disenthral",\n    \"popularity\": 29143\n  },\n  {\n    \"tag\": "disinterestedly",\n    \"popularity\": 29081\n  },\n  {\n    \"tag\": "stanner",\n    \"popularity\": 29018\n  },\n  {\n    \"tag\": "recapitulative",\n    \"popularity\": 28956\n  },\n  {\n    \"tag\": "objectivist",\n    \"popularity\": 28895\n  },\n  {\n    \"tag\": "hypermetropia",\n    \"popularity\": 28833\n  },\n  {\n    \"tag\": "incumbency",\n    \"popularity\": 28772\n  },\n  {\n    \"tag\": "protegee",\n    \"popularity\": 28711\n  },\n  {\n    \"tag\": "zealotic",\n    \"popularity\": 28650\n  },\n  {\n    \"tag\": "predebit",\n    \"popularity\": 28589\n  },\n  {\n    \"tag\": "cupolar",\n    \"popularity\": 28528\n  },\n  {\n    \"tag\": "unattributed",\n    \"popularity\": 28468\n  },\n  {\n    \"tag\": "louisine",\n    \"popularity\": 28408\n  },\n  {\n    \"tag\": "illustrate",\n    \"popularity\": 28348\n  },\n  {\n    \"tag\": "inofficiousness",\n    \"popularity\": 28288\n  },\n  {\n    \"tag\": "Americawards",\n    \"popularity\": 28228\n  },\n  {\n    \"tag\": "foreflap",\n    \"popularity\": 28169\n  },\n  {\n    \"tag\": "eruditeness",\n    \"popularity\": 28110\n  },\n  {\n    \"tag\": "copiopsia",\n    \"popularity\": 28051\n  },\n  {\n    \"tag\": "sporuliferous",\n    \"popularity\": 27992\n  },\n  {\n    \"tag\": "muttering",\n    \"popularity\": 27934\n  },\n  {\n    \"tag\": "prepsychology adrip",\n    \"popularity\": 27875\n  },\n  {\n    \"tag\": "unfriendly",\n    \"popularity\": 27817\n  },\n  {\n    \"tag\": "sulphanilic",\n    \"popularity\": 27759\n  },\n  {\n    \"tag\": "Coelococcus",\n    \"popularity\": 27701\n  },\n  {\n    \"tag\": "undoubtfulness",\n    \"popularity\": 27643\n  },\n  {\n    \"tag\": "flaringly",\n    \"popularity\": 27586\n  },\n  {\n    \"tag\": "unordain",\n    \"popularity\": 27529\n  },\n  {\n    \"tag\": "fratchety",\n    \"popularity\": 27472\n  },\n  {\n    \"tag\": "decadentism dolefully",\n    \"popularity\": 27415\n  },\n  {\n    \"tag\": "synthronus",\n    \"popularity\": 27358\n  },\n  {\n    \"tag\": "maiid",\n    \"popularity\": 27301\n  },\n  {\n    \"tag\": "rhinobyon",\n    \"popularity\": 27245\n  },\n  {\n    \"tag\": "Didynamia",\n    \"popularity\": 27189\n  },\n  {\n    \"tag\": "millionairedom",\n    \"popularity\": 27133\n  },\n  {\n    \"tag\": "mulierine",\n    \"popularity\": 27077\n  },\n  {\n    \"tag\": "Mayo",\n    \"popularity\": 27021\n  },\n  {\n    \"tag\": "perceivedness",\n    \"popularity\": 26966\n  },\n  {\n    \"tag\": "unadoration",\n    \"popularity\": 26911\n  },\n  {\n    \"tag\": "regraft",\n    \"popularity\": 26856\n  },\n  {\n    \"tag\": "witch",\n    \"popularity\": 26801\n  },\n  {\n    \"tag\": "ungrow",\n    \"popularity\": 26746\n  },\n  {\n    \"tag\": "glossopharyngeus",\n    \"popularity\": 26691\n  },\n  {\n    \"tag\": "unstirrable",\n    \"popularity\": 26637\n  },\n  {\n    \"tag\": "synodsman",\n    \"popularity\": 26583\n  },\n  {\n    \"tag\": "placentalian",\n    \"popularity\": 26529\n  },\n  {\n    \"tag\": "corpulently",\n    \"popularity\": 26475\n  },\n  {\n    \"tag\": "photochromoscope",\n    \"popularity\": 26421\n  },\n  {\n    \"tag\": "indusiate retinasphaltum chokestrap",\n    \"popularity\": 26368\n  },\n  {\n    \"tag\": "murdrum",\n    \"popularity\": 26314\n  },\n  {\n    \"tag\": "belatedness",\n    \"popularity\": 26261\n  },\n  {\n    \"tag\": "Cochin",\n    \"popularity\": 26208\n  },\n  {\n    \"tag\": "Leonist",\n    \"popularity\": 26155\n  },\n  {\n    \"tag\": "keeker confined",\n    \"popularity\": 26102\n  },\n  {\n    \"tag\": "unintellectual",\n    \"popularity\": 26050\n  },\n  {\n    \"tag\": "nymphaline bait",\n    \"popularity\": 25997\n  },\n  {\n    \"tag\": "sarcosporidiosis",\n    \"popularity\": 25945\n  },\n  {\n    \"tag\": "catawamptiously",\n    \"popularity\": 25893\n  },\n  {\n    \"tag\": "outshame",\n    \"popularity\": 25841\n  },\n  {\n    \"tag\": "animalism",\n    \"popularity\": 25790\n  },\n  {\n    \"tag\": "epithalamial",\n    \"popularity\": 25738\n  },\n  {\n    \"tag\": "ganner",\n    \"popularity\": 25687\n  },\n  {\n    \"tag\": "desilicify",\n    \"popularity\": 25635\n  },\n  {\n    \"tag\": "dandyism",\n    \"popularity\": 25584\n  },\n  {\n    \"tag\": "hyleg",\n    \"popularity\": 25533\n  },\n  {\n    \"tag\": "photophysical",\n    \"popularity\": 25483\n  },\n  {\n    \"tag\": "underload",\n    \"popularity\": 25432\n  },\n  {\n    \"tag\": "unintrusive",\n    \"popularity\": 25382\n  },\n  {\n    \"tag\": "succinamic",\n    \"popularity\": 25331\n  },\n  {\n    \"tag\": "matchy",\n    \"popularity\": 25281\n  },\n  {\n    \"tag\": "concordal",\n    \"popularity\": 25231\n  },\n  {\n    \"tag\": "exteriority",\n    \"popularity\": 25181\n  },\n  {\n    \"tag\": "sterculiad",\n    \"popularity\": 25132\n  },\n  {\n    \"tag\": "sulfoxylic",\n    \"popularity\": 25082\n  },\n  {\n    \"tag\": "oversubscription",\n    \"popularity\": 25033\n  },\n  {\n    \"tag\": "chiasmic",\n    \"popularity\": 24984\n  },\n  {\n    \"tag\": "pseudoparthenogenesis",\n    \"popularity\": 24935\n  },\n  {\n    \"tag\": "indorse",\n    \"popularity\": 24886\n  },\n  {\n    \"tag\": "Krishnaite",\n    \"popularity\": 24837\n  },\n  {\n    \"tag\": "calcinize",\n    \"popularity\": 24788\n  },\n  {\n    \"tag\": "rhodium",\n    \"popularity\": 24740\n  },\n  {\n    \"tag\": "tragopan",\n    \"popularity\": 24692\n  },\n  {\n    \"tag\": "overwhelmingly",\n    \"popularity\": 24643\n  },\n  {\n    \"tag\": "procidence accorporate",\n    \"popularity\": 24595\n  },\n  {\n    \"tag\": "polemize speelless",\n    \"popularity\": 24548\n  },\n  {\n    \"tag\": "radiocarpal goran",\n    \"popularity\": 24500\n  },\n  {\n    \"tag\": "counteroffer Pelodytes",\n    \"popularity\": 24452\n  },\n  {\n    \"tag\": "lionhearted",\n    \"popularity\": 24405\n  },\n  {\n    \"tag\": "paramastoid",\n    \"popularity\": 24358\n  },\n  {\n    \"tag\": "murine",\n    \"popularity\": 24310\n  },\n  {\n    \"tag\": "woodbined",\n    \"popularity\": 24263\n  },\n  {\n    \"tag\": "packthread",\n    \"popularity\": 24217\n  },\n  {\n    \"tag\": "citreous",\n    \"popularity\": 24170\n  },\n  {\n    \"tag\": "unfallaciously",\n    \"popularity\": 24123\n  },\n  {\n    \"tag\": "tentwork reincarnadine",\n    \"popularity\": 24077\n  },\n  {\n    \"tag\": "verminousness",\n    \"popularity\": 24030\n  },\n  {\n    \"tag\": "sillometer",\n    \"popularity\": 23984\n  },\n  {\n    \"tag\": "jointy",\n    \"popularity\": 23938\n  },\n  {\n    \"tag\": "streptolysin",\n    \"popularity\": 23892\n  },\n  {\n    \"tag\": "Florentinism",\n    \"popularity\": 23847\n  },\n  {\n    \"tag\": "monosomatous",\n    \"popularity\": 23801\n  },\n  {\n    \"tag\": "capsulociliary",\n    \"popularity\": 23756\n  },\n  {\n    \"tag\": "organum",\n    \"popularity\": 23710\n  },\n  {\n    \"tag\": "overtly",\n    \"popularity\": 23665\n  },\n  {\n    \"tag\": "ophthalmoscopical",\n    \"popularity\": 23620\n  },\n  {\n    \"tag\": "supposititiously",\n    \"popularity\": 23575\n  },\n  {\n    \"tag\": "radiochemistry",\n    \"popularity\": 23530\n  },\n  {\n    \"tag\": "flaxtail",\n    \"popularity\": 23486\n  },\n  {\n    \"tag\": "pretympanic",\n    \"popularity\": 23441\n  },\n  {\n    \"tag\": "auscultation",\n    \"popularity\": 23397\n  },\n  {\n    \"tag\": "hairdresser",\n    \"popularity\": 23352\n  },\n  {\n    \"tag\": "chaffless",\n    \"popularity\": 23308\n  },\n  {\n    \"tag\": "polioencephalitis",\n    \"popularity\": 23264\n  },\n  {\n    \"tag\": "axolotl",\n    \"popularity\": 23220\n  },\n  {\n    \"tag\": "smous",\n    \"popularity\": 23177\n  },\n  {\n    \"tag\": "morgen disenamour toothed",\n    \"popularity\": 23133\n  },\n  {\n    \"tag\": "chaiseless",\n    \"popularity\": 23089\n  },\n  {\n    \"tag\": "frugally",\n    \"popularity\": 23046\n  },\n  {\n    \"tag\": "combustive antievolutionist cinenegative",\n    \"popularity\": 23003\n  },\n  {\n    \"tag\": "malacolite",\n    \"popularity\": 22960\n  },\n  {\n    \"tag\": "borne",\n    \"popularity\": 22917\n  },\n  {\n    \"tag\": "mercaptole",\n    \"popularity\": 22874\n  },\n  {\n    \"tag\": "judicatory",\n    \"popularity\": 22831\n  },\n  {\n    \"tag\": "noctivagation",\n    \"popularity\": 22789\n  },\n  {\n    \"tag\": "synthete",\n    \"popularity\": 22746\n  },\n  {\n    \"tag\": "tomboyism",\n    \"popularity\": 22704\n  },\n  {\n    \"tag\": "serranoid",\n    \"popularity\": 22661\n  },\n  {\n    \"tag\": "impostorism",\n    \"popularity\": 22619\n  },\n  {\n    \"tag\": "flagellosis Talitha",\n    \"popularity\": 22577\n  },\n  {\n    \"tag\": "pseudoviscous",\n    \"popularity\": 22535\n  },\n  {\n    \"tag\": "Galleriidae",\n    \"popularity\": 22494\n  },\n  {\n    \"tag\": "undulation didelph Comintern",\n    \"popularity\": 22452\n  },\n  {\n    \"tag\": "triangulopyramidal",\n    \"popularity\": 22411\n  },\n  {\n    \"tag\": "middlings",\n    \"popularity\": 22369\n  },\n  {\n    \"tag\": "piperazin",\n    \"popularity\": 22328\n  },\n  {\n    \"tag\": "endostitis",\n    \"popularity\": 22287\n  },\n  {\n    \"tag\": "swordlike",\n    \"popularity\": 22246\n  },\n  {\n    \"tag\": "forthwith",\n    \"popularity\": 22205\n  },\n  {\n    \"tag\": "menaceful",\n    \"popularity\": 22164\n  },\n  {\n    \"tag\": "explantation defective",\n    \"popularity\": 22123\n  },\n  {\n    \"tag\": "arrear",\n    \"popularity\": 22083\n  },\n  {\n    \"tag\": "engraft",\n    \"popularity\": 22042\n  },\n  {\n    \"tag\": "revolunteer",\n    \"popularity\": 22002\n  },\n  {\n    \"tag\": "foliaceous",\n    \"popularity\": 21962\n  },\n  {\n    \"tag\": "pseudograph",\n    \"popularity\": 21922\n  },\n  {\n    \"tag\": "maenaite",\n    \"popularity\": 21882\n  },\n  {\n    \"tag\": "interfinger",\n    \"popularity\": 21842\n  },\n  {\n    \"tag\": "macroscopically",\n    \"popularity\": 21802\n  },\n  {\n    \"tag\": "bluewood",\n    \"popularity\": 21762\n  },\n  {\n    \"tag\": "chikara",\n    \"popularity\": 21723\n  },\n  {\n    \"tag\": "reprehension diazeuxis nickelous",\n    \"popularity\": 21683\n  },\n  {\n    \"tag\": "vacuation",\n    \"popularity\": 21644\n  },\n  {\n    \"tag\": "Sartish",\n    \"popularity\": 21605\n  },\n  {\n    \"tag\": "pseudogyny",\n    \"popularity\": 21566\n  },\n  {\n    \"tag\": "friedcake",\n    \"popularity\": 21527\n  },\n  {\n    \"tag\": "thraw",\n    \"popularity\": 21488\n  },\n  {\n    \"tag\": "bifid",\n    \"popularity\": 21449\n  },\n  {\n    \"tag\": "truthlessly",\n    \"popularity\": 21411\n  },\n  {\n    \"tag\": "lungy",\n    \"popularity\": 21372\n  },\n  {\n    \"tag\": "fluoborite",\n    \"popularity\": 21334\n  },\n  {\n    \"tag\": "anthropolithic",\n    \"popularity\": 21295\n  },\n  {\n    \"tag\": "coachee straw",\n    \"popularity\": 21257\n  },\n  {\n    \"tag\": "dehorner Grecize",\n    \"popularity\": 21219\n  },\n  {\n    \"tag\": "spondylopyosis",\n    \"popularity\": 21181\n  },\n  {\n    \"tag\": "institutionary",\n    \"popularity\": 21143\n  },\n  {\n    \"tag\": "agentry",\n    \"popularity\": 21105\n  },\n  {\n    \"tag\": "musing bietle",\n    \"popularity\": 21068\n  },\n  {\n    \"tag\": "cormophyte",\n    \"popularity\": 21030\n  },\n  {\n    \"tag\": "semielliptic",\n    \"popularity\": 20993\n  },\n  {\n    \"tag\": "ependytes",\n    \"popularity\": 20955\n  },\n  {\n    \"tag\": "coachmaster",\n    \"popularity\": 20918\n  },\n  {\n    \"tag\": "overexuberant",\n    \"popularity\": 20881\n  },\n  {\n    \"tag\": "selectable",\n    \"popularity\": 20844\n  },\n  {\n    \"tag\": "saclike",\n    \"popularity\": 20807\n  },\n  {\n    \"tag\": "mullion",\n    \"popularity\": 20770\n  },\n  {\n    \"tag\": "pantheonize prevalency",\n    \"popularity\": 20733\n  },\n  {\n    \"tag\": "trophosperm",\n    \"popularity\": 20697\n  },\n  {\n    \"tag\": "paraphrasist",\n    \"popularity\": 20660\n  },\n  {\n    \"tag\": "undercarry",\n    \"popularity\": 20624\n  },\n  {\n    \"tag\": "thallogenic",\n    \"popularity\": 20587\n  },\n  {\n    \"tag\": "bulgy forbid",\n    \"popularity\": 20551\n  },\n  {\n    \"tag\": "proliquor gratulatory",\n    \"popularity\": 20515\n  },\n  {\n    \"tag\": "booker",\n    \"popularity\": 20479\n  },\n  {\n    \"tag\": "wizen",\n    \"popularity\": 20443\n  },\n  {\n    \"tag\": "synchondrosially",\n    \"popularity\": 20407\n  },\n  {\n    \"tag\": "herbless",\n    \"popularity\": 20371\n  },\n  {\n    \"tag\": "arfvedsonite",\n    \"popularity\": 20336\n  },\n  {\n    \"tag\": "Neuroptera",\n    \"popularity\": 20300\n  },\n  {\n    \"tag\": "fingerstone",\n    \"popularity\": 20265\n  },\n  {\n    \"tag\": "Odontoglossae",\n    \"popularity\": 20229\n  },\n  {\n    \"tag\": "transmigrator",\n    \"popularity\": 20194\n  },\n  {\n    \"tag\": "Dehaites",\n    \"popularity\": 20159\n  },\n  {\n    \"tag\": "Molinist",\n    \"popularity\": 20124\n  },\n  {\n    \"tag\": "novelistic",\n    \"popularity\": 20089\n  },\n  {\n    \"tag\": "astelic",\n    \"popularity\": 20054\n  },\n  {\n    \"tag\": "pyelometry",\n    \"popularity\": 20019\n  },\n  {\n    \"tag\": "pigmentation",\n    \"popularity\": 19984\n  },\n  {\n    \"tag\": "epinaos",\n    \"popularity\": 19950\n  },\n  {\n    \"tag\": "outdare",\n    \"popularity\": 19915\n  },\n  {\n    \"tag\": "Funje philaristocracy",\n    \"popularity\": 19881\n  },\n  {\n    \"tag\": "keddah",\n    \"popularity\": 19846\n  },\n  {\n    \"tag\": "axoidean",\n    \"popularity\": 19812\n  },\n  {\n    \"tag\": "ovule",\n    \"popularity\": 19778\n  },\n  {\n    \"tag\": "solidify",\n    \"popularity\": 19744\n  },\n  {\n    \"tag\": "noncelestial",\n    \"popularity\": 19710\n  },\n  {\n    \"tag\": "overmultiplication",\n    \"popularity\": 19676\n  },\n  {\n    \"tag\": "hexatetrahedron",\n    \"popularity\": 19642\n  },\n  {\n    \"tag\": "pliciform",\n    \"popularity\": 19609\n  },\n  {\n    \"tag\": "zimbalon",\n    \"popularity\": 19575\n  },\n  {\n    \"tag\": "annexational",\n    \"popularity\": 19542\n  },\n  {\n    \"tag\": "eurhodol",\n    \"popularity\": 19508\n  },\n  {\n    \"tag\": "yark",\n    \"popularity\": 19475\n  },\n  {\n    \"tag\": "illegality nitroalizarin",\n    \"popularity\": 19442\n  },\n  {\n    \"tag\": "quadratum",\n    \"popularity\": 19409\n  },\n  {\n    \"tag\": "saccharine",\n    \"popularity\": 19376\n  },\n  {\n    \"tag\": "unemploy",\n    \"popularity\": 19343\n  },\n  {\n    \"tag\": "uniclinal unipotent",\n    \"popularity\": 19310\n  },\n  {\n    \"tag\": "turbo",\n    \"popularity\": 19277\n  },\n  {\n    \"tag\": "sybarism",\n    \"popularity\": 19244\n  },\n  {\n    \"tag\": "motacilline",\n    \"popularity\": 19212\n  },\n  {\n    \"tag\": "weaselly",\n    \"popularity\": 19179\n  },\n  {\n    \"tag\": "plastid",\n    \"popularity\": 19147\n  },\n  {\n    \"tag\": "wasting",\n    \"popularity\": 19114\n  },\n  {\n    \"tag\": "begrime fluting",\n    \"popularity\": 19082\n  },\n  {\n    \"tag\": "Nephilinae",\n    \"popularity\": 19050\n  },\n  {\n    \"tag\": "disregardance",\n    \"popularity\": 19018\n  },\n  {\n    \"tag\": "Shakerlike",\n    \"popularity\": 18986\n  },\n  {\n    \"tag\": "uniped",\n    \"popularity\": 18954\n  },\n  {\n    \"tag\": "knap",\n    \"popularity\": 18922\n  },\n  {\n    \"tag\": "electivism undergardener",\n    \"popularity\": 18890\n  },\n  {\n    \"tag\": "hulverheaded",\n    \"popularity\": 18858\n  },\n  {\n    \"tag\": "unruptured",\n    \"popularity\": 18827\n  },\n  {\n    \"tag\": "solemnize credently",\n    \"popularity\": 18795\n  },\n  {\n    \"tag\": "pentastomoid possessingly",\n    \"popularity\": 18764\n  },\n  {\n    \"tag\": "octose",\n    \"popularity\": 18733\n  },\n  {\n    \"tag\": "psithurism indefensibility",\n    \"popularity\": 18701\n  },\n  {\n    \"tag\": "torrentuous cyanometer subcrenate",\n    \"popularity\": 18670\n  },\n  {\n    \"tag\": "photoplaywright tapaculo",\n    \"popularity\": 18639\n  },\n  {\n    \"tag\": "univalence",\n    \"popularity\": 18608\n  },\n  {\n    \"tag\": "Porthetria",\n    \"popularity\": 18577\n  },\n  {\n    \"tag\": "funambulo",\n    \"popularity\": 18546\n  },\n  {\n    \"tag\": "pedion",\n    \"popularity\": 18515\n  },\n  {\n    \"tag\": "horticulturally",\n    \"popularity\": 18485\n  },\n  {\n    \"tag\": "marennin",\n    \"popularity\": 18454\n  },\n  {\n    \"tag\": "horselaugh",\n    \"popularity\": 18423\n  },\n  {\n    \"tag\": "semiexecutive",\n    \"popularity\": 18393\n  },\n  {\n    \"tag\": "Monopteridae",\n    \"popularity\": 18363\n  },\n  {\n    \"tag\": "commonable",\n    \"popularity\": 18332\n  },\n  {\n    \"tag\": "dreariment",\n    \"popularity\": 18302\n  },\n  {\n    \"tag\": "disbud",\n    \"popularity\": 18272\n  },\n  {\n    \"tag\": "monocled",\n    \"popularity\": 18242\n  },\n  {\n    \"tag\": "hurlbarrow",\n    \"popularity\": 18212\n  },\n  {\n    \"tag\": "opiateproof",\n    \"popularity\": 18182\n  },\n  {\n    \"tag\": "Fahrenheit",\n    \"popularity\": 18152\n  },\n  {\n    \"tag\": "writhed",\n    \"popularity\": 18122\n  },\n  {\n    \"tag\": "Volstead",\n    \"popularity\": 18093\n  },\n  {\n    \"tag\": "yesternight",\n    \"popularity\": 18063\n  },\n  {\n    \"tag\": "readmittance",\n    \"popularity\": 18033\n  },\n  {\n    \"tag\": "reiterable",\n    \"popularity\": 18004\n  },\n  {\n    \"tag\": "triquetral",\n    \"popularity\": 17975\n  },\n  {\n    \"tag\": "guillotinement",\n    \"popularity\": 17945\n  },\n  {\n    \"tag\": "repermission",\n    \"popularity\": 17916\n  },\n  {\n    \"tag\": "assishly",\n    \"popularity\": 17887\n  },\n  {\n    \"tag\": "daidle",\n    \"popularity\": 17858\n  },\n  {\n    \"tag\": "prismatoid",\n    \"popularity\": 17829\n  },\n  {\n    \"tag\": "irreptitious",\n    \"popularity\": 17800\n  },\n  {\n    \"tag\": "sourdeline",\n    \"popularity\": 17771\n  },\n  {\n    \"tag\": "Austrian",\n    \"popularity\": 17742\n  },\n  {\n    \"tag\": "psychorrhagic",\n    \"popularity\": 17713\n  },\n  {\n    \"tag\": "Monumbo",\n    \"popularity\": 17685\n  },\n  {\n    \"tag\": "cloiochoanitic",\n    \"popularity\": 17656\n  },\n  {\n    \"tag\": "hant",\n    \"popularity\": 17628\n  },\n  {\n    \"tag\": "roily pulldown",\n    \"popularity\": 17599\n  },\n  {\n    \"tag\": "recongratulation",\n    \"popularity\": 17571\n  },\n  {\n    \"tag\": "Peking",\n    \"popularity\": 17543\n  },\n  {\n    \"tag\": "erdvark",\n    \"popularity\": 17514\n  },\n  {\n    \"tag\": "antimnemonic",\n    \"popularity\": 17486\n  },\n  {\n    \"tag\": "noncapillarity",\n    \"popularity\": 17458\n  },\n  {\n    \"tag\": "irrepressive",\n    \"popularity\": 17430\n  },\n  {\n    \"tag\": "Petromyzontes",\n    \"popularity\": 17402\n  },\n  {\n    \"tag\": "piscatorially",\n    \"popularity\": 17374\n  },\n  {\n    \"tag\": "cholesterosis",\n    \"popularity\": 17346\n  },\n  {\n    \"tag\": "denunciate",\n    \"popularity\": 17319\n  },\n  {\n    \"tag\": "unmetalled",\n    \"popularity\": 17291\n  },\n  {\n    \"tag\": "Tigris enruin",\n    \"popularity\": 17263\n  },\n  {\n    \"tag\": "anaspalin",\n    \"popularity\": 17236\n  },\n  {\n    \"tag\": "monodromy",\n    \"popularity\": 17208\n  },\n  {\n    \"tag\": "Canichanan",\n    \"popularity\": 17181\n  },\n  {\n    \"tag\": "mesolabe",\n    \"popularity\": 17154\n  },\n  {\n    \"tag\": "trichothallic overcunningness",\n    \"popularity\": 17127\n  },\n  {\n    \"tag\": "spinsterishly",\n    \"popularity\": 17099\n  },\n  {\n    \"tag\": "sensilla",\n    \"popularity\": 17072\n  },\n  {\n    \"tag\": "wifelkin",\n    \"popularity\": 17045\n  },\n  {\n    \"tag\": "suppositionless",\n    \"popularity\": 17018\n  },\n  {\n    \"tag\": "irksomeness",\n    \"popularity\": 16991\n  },\n  {\n    \"tag\": "sanbenito",\n    \"popularity\": 16964\n  },\n  {\n    \"tag\": "nonstatement",\n    \"popularity\": 16938\n  },\n  {\n    \"tag\": "phenoloid",\n    \"popularity\": 16911\n  },\n  {\n    \"tag\": "Steinberger",\n    \"popularity\": 16884\n  },\n  {\n    \"tag\": "replicated boom",\n    \"popularity\": 16858\n  },\n  {\n    \"tag\": "sciomachiology",\n    \"popularity\": 16831\n  },\n  {\n    \"tag\": "starwise",\n    \"popularity\": 16805\n  },\n  {\n    \"tag\": "prerich",\n    \"popularity\": 16778\n  },\n  {\n    \"tag\": "unspawned",\n    \"popularity\": 16752\n  },\n  {\n    \"tag\": "unindentable",\n    \"popularity\": 16726\n  },\n  {\n    \"tag\": "stromatic",\n    \"popularity\": 16700\n  },\n  {\n    \"tag\": "fetishize",\n    \"popularity\": 16673\n  },\n  {\n    \"tag\": "dihydroxy",\n    \"popularity\": 16647\n  },\n  {\n    \"tag\": "precaudal",\n    \"popularity\": 16621\n  },\n  {\n    \"tag\": "Madagascar",\n    \"popularity\": 16595\n  },\n  {\n    \"tag\": "repinement",\n    \"popularity\": 16570\n  },\n  {\n    \"tag\": "noncathedral wenzel",\n    \"popularity\": 16544\n  },\n  {\n    \"tag\": "corollike",\n    \"popularity\": 16518\n  },\n  {\n    \"tag\": "pubes unamortization",\n    \"popularity\": 16492\n  },\n  {\n    \"tag\": "brickcroft",\n    \"popularity\": 16467\n  },\n  {\n    \"tag\": "intertrabecular",\n    \"popularity\": 16441\n  },\n  {\n    \"tag\": "formulaic",\n    \"popularity\": 16416\n  },\n  {\n    \"tag\": "arienzo",\n    \"popularity\": 16390\n  },\n  {\n    \"tag\": "Mazzinian",\n    \"popularity\": 16365\n  },\n  {\n    \"tag\": "wallowishly",\n    \"popularity\": 16339\n  },\n  {\n    \"tag\": "sysselman",\n    \"popularity\": 16314\n  },\n  {\n    \"tag\": "seligmannite",\n    \"popularity\": 16289\n  },\n  {\n    \"tag\": "harlequinery",\n    \"popularity\": 16264\n  },\n  {\n    \"tag\": "zucchetto",\n    \"popularity\": 16239\n  },\n  {\n    \"tag\": "malonyl",\n    \"popularity\": 16214\n  },\n  {\n    \"tag\": "patwari",\n    \"popularity\": 16189\n  },\n  {\n    \"tag\": "neoholmia venturesomeness",\n    \"popularity\": 16164\n  },\n  {\n    \"tag\": "Dehwar",\n    \"popularity\": 16139\n  },\n  {\n    \"tag\": "fetiferous",\n    \"popularity\": 16114\n  },\n  {\n    \"tag\": "chromatophore",\n    \"popularity\": 16090\n  },\n  {\n    \"tag\": "reregistration",\n    \"popularity\": 16065\n  },\n  {\n    \"tag\": "alienor",\n    \"popularity\": 16040\n  },\n  {\n    \"tag\": "Hexagynia",\n    \"popularity\": 16016\n  },\n  {\n    \"tag\": "cerebrotonia",\n    \"popularity\": 15991\n  },\n  {\n    \"tag\": "deedbox",\n    \"popularity\": 15967\n  },\n  {\n    \"tag\": "staab",\n    \"popularity\": 15943\n  },\n  {\n    \"tag\": "uratemia",\n    \"popularity\": 15918\n  },\n  {\n    \"tag\": "flaunt",\n    \"popularity\": 15894\n  },\n  {\n    \"tag\": "bogy",\n    \"popularity\": 15870\n  },\n  {\n    \"tag\": "subcartilaginous",\n    \"popularity\": 15846\n  },\n  {\n    \"tag\": "protonephridial",\n    \"popularity\": 15822\n  },\n  {\n    \"tag\": "Boswellia",\n    \"popularity\": 15798\n  },\n  {\n    \"tag\": "relaxant untiaraed protoepiphyte",\n    \"popularity\": 15774\n  },\n  {\n    \"tag\": "nesslerization",\n    \"popularity\": 15750\n  },\n  {\n    \"tag\": "precession",\n    \"popularity\": 15726\n  },\n  {\n    \"tag\": "peat",\n    \"popularity\": 15702\n  },\n  {\n    \"tag\": "unbit",\n    \"popularity\": 15678\n  },\n  {\n    \"tag\": "snailish",\n    \"popularity\": 15655\n  },\n  {\n    \"tag\": "porismatical",\n    \"popularity\": 15631\n  },\n  {\n    \"tag\": "hooflike",\n    \"popularity\": 15608\n  },\n  {\n    \"tag\": "resuppose phene cranic",\n    \"popularity\": 15584\n  },\n  {\n    \"tag\": "peptonization kipskin",\n    \"popularity\": 15561\n  },\n  {\n    \"tag\": "birdstone",\n    \"popularity\": 15537\n  },\n  {\n    \"tag\": "empty inferoanterior",\n    \"popularity\": 15514\n  },\n  {\n    \"tag\": "androtauric",\n    \"popularity\": 15491\n  },\n  {\n    \"tag\": "triamide",\n    \"popularity\": 15467\n  },\n  {\n    \"tag\": "showmanry",\n    \"popularity\": 15444\n  },\n  {\n    \"tag\": "doing",\n    \"popularity\": 15421\n  },\n  {\n    \"tag\": "bouchaleen",\n    \"popularity\": 15398\n  },\n  {\n    \"tag\": "precollude",\n    \"popularity\": 15375\n  },\n  {\n    \"tag\": "finger",\n    \"popularity\": 15352\n  },\n  {\n    \"tag\": "limnetic intermessenger",\n    \"popularity\": 15329\n  },\n  {\n    \"tag\": "uncharitable picrotoxic",\n    \"popularity\": 15306\n  },\n  {\n    \"tag\": "nationalizer Phasmidae",\n    \"popularity\": 15283\n  },\n  {\n    \"tag\": "laughingstock",\n    \"popularity\": 15261\n  },\n  {\n    \"tag\": "nondeferential",\n    \"popularity\": 15238\n  },\n  {\n    \"tag\": "uproariously",\n    \"popularity\": 15215\n  },\n  {\n    \"tag\": "manzanilla",\n    \"popularity\": 15193\n  },\n  {\n    \"tag\": "khahoon",\n    \"popularity\": 15170\n  },\n  {\n    \"tag\": "olericulturally longshanks",\n    \"popularity\": 15148\n  },\n  {\n    \"tag\": "enthusiastically methionic",\n    \"popularity\": 15125\n  },\n  {\n    \"tag\": "pobs",\n    \"popularity\": 15103\n  },\n  {\n    \"tag\": "tricarpellate",\n    \"popularity\": 15081\n  },\n  {\n    \"tag\": "souterrain",\n    \"popularity\": 15058\n  },\n  {\n    \"tag\": "tethelin",\n    \"popularity\": 15036\n  },\n  {\n    \"tag\": "tartle",\n    \"popularity\": 15014\n  },\n  {\n    \"tag\": "tidelike",\n    \"popularity\": 14992\n  },\n  {\n    \"tag\": "cosmoramic",\n    \"popularity\": 14970\n  },\n  {\n    \"tag\": "pretardiness",\n    \"popularity\": 14948\n  },\n  {\n    \"tag\": "insoul",\n    \"popularity\": 14926\n  },\n  {\n    \"tag\": "anthroxan",\n    \"popularity\": 14904\n  },\n  {\n    \"tag\": "jilter",\n    \"popularity\": 14882\n  },\n  {\n    \"tag\": "pectinibranchian trematode",\n    \"popularity\": 14860\n  },\n  {\n    \"tag\": "Renaissancist",\n    \"popularity\": 14838\n  },\n  {\n    \"tag\": "imaginant",\n    \"popularity\": 14817\n  },\n  {\n    \"tag\": "supercensure",\n    \"popularity\": 14795\n  },\n  {\n    \"tag\": "festilogy",\n    \"popularity\": 14773\n  },\n  {\n    \"tag\": "regression",\n    \"popularity\": 14752\n  },\n  {\n    \"tag\": "mesobregmate languorously",\n    \"popularity\": 14730\n  },\n  {\n    \"tag\": "unsupernaturalized",\n    \"popularity\": 14709\n  },\n  {\n    \"tag\": "boobyish",\n    \"popularity\": 14687\n  },\n  {\n    \"tag\": "scopolamine",\n    \"popularity\": 14666\n  },\n  {\n    \"tag\": "reamputation unchristianly",\n    \"popularity\": 14645\n  },\n  {\n    \"tag\": "cuneatic",\n    \"popularity\": 14623\n  },\n  {\n    \"tag\": "heathberry",\n    \"popularity\": 14602\n  },\n  {\n    \"tag\": "hate",\n    \"popularity\": 14581\n  },\n  {\n    \"tag\": "redeemableness",\n    \"popularity\": 14560\n  },\n  {\n    \"tag\": "damasse",\n    \"popularity\": 14539\n  },\n  {\n    \"tag\": "thrillsome",\n    \"popularity\": 14518\n  },\n  {\n    \"tag\": "disseverment",\n    \"popularity\": 14497\n  },\n  {\n    \"tag\": "underbishopric Ostyak",\n    \"popularity\": 14476\n  },\n  {\n    \"tag\": "Exoascales",\n    \"popularity\": 14455\n  },\n  {\n    \"tag\": "soiled",\n    \"popularity\": 14434\n  },\n  {\n    \"tag\": "Cain",\n    \"popularity\": 14413\n  },\n  {\n    \"tag\": "mismanageable arenae",\n    \"popularity\": 14392\n  },\n  {\n    \"tag\": "manducate unhinderably",\n    \"popularity\": 14372\n  },\n  {\n    \"tag\": "peregrin",\n    \"popularity\": 14351\n  },\n  {\n    \"tag\": "musicianly",\n    \"popularity\": 14330\n  },\n  {\n    \"tag\": "aln",\n    \"popularity\": 14310\n  },\n  {\n    \"tag\": "intercentrum",\n    \"popularity\": 14289\n  },\n  {\n    \"tag\": "roothold",\n    \"popularity\": 14269\n  },\n  {\n    \"tag\": "jane aneurism",\n    \"popularity\": 14248\n  },\n  {\n    \"tag\": "insinuatively forefeel phytolatrous",\n    \"popularity\": 14228\n  },\n  {\n    \"tag\": "kanchil",\n    \"popularity\": 14208\n  },\n  {\n    \"tag\": "Austrophile",\n    \"popularity\": 14187\n  },\n  {\n    \"tag\": "unterrorized",\n    \"popularity\": 14167\n  },\n  {\n    \"tag\": "admeasure",\n    \"popularity\": 14147\n  },\n  {\n    \"tag\": "electrodissolution",\n    \"popularity\": 14127\n  },\n  {\n    \"tag\": "unweddedly",\n    \"popularity\": 14107\n  },\n  {\n    \"tag\": "unannoying",\n    \"popularity\": 14087\n  },\n  {\n    \"tag\": "uningenuous",\n    \"popularity\": 14067\n  },\n  {\n    \"tag\": "omnibenevolent",\n    \"popularity\": 14047\n  },\n  {\n    \"tag\": "commissure",\n    \"popularity\": 14027\n  },\n  {\n    \"tag\": "tellureted",\n    \"popularity\": 14007\n  },\n  {\n    \"tag\": "suffragan",\n    \"popularity\": 13987\n  },\n  {\n    \"tag\": "sphaeriaceous",\n    \"popularity\": 13967\n  },\n  {\n    \"tag\": "unfearing",\n    \"popularity\": 13947\n  },\n  {\n    \"tag\": "stentoriousness precounsellor",\n    \"popularity\": 13928\n  },\n  {\n    \"tag\": "haemaspectroscope",\n    \"popularity\": 13908\n  },\n  {\n    \"tag\": "teras",\n    \"popularity\": 13888\n  },\n  {\n    \"tag\": "pulicine",\n    \"popularity\": 13869\n  },\n  {\n    \"tag\": "colicystopyelitis",\n    \"popularity\": 13849\n  },\n  {\n    \"tag\": "Physalia",\n    \"popularity\": 13830\n  },\n  {\n    \"tag\": "Saxicolidae",\n    \"popularity\": 13810\n  },\n  {\n    \"tag\": "peritonital",\n    \"popularity\": 13791\n  },\n  {\n    \"tag\": "dysphotic",\n    \"popularity\": 13771\n  },\n  {\n    \"tag\": "unabandoned",\n    \"popularity\": 13752\n  },\n  {\n    \"tag\": "rashful",\n    \"popularity\": 13733\n  },\n  {\n    \"tag\": "goodyness Manobo",\n    \"popularity\": 13714\n  },\n  {\n    \"tag\": "glaring",\n    \"popularity\": 13694\n  },\n  {\n    \"tag\": "horrorful",\n    \"popularity\": 13675\n  },\n  {\n    \"tag\": "intercepting",\n    \"popularity\": 13656\n  },\n  {\n    \"tag\": "semifine",\n    \"popularity\": 13637\n  },\n  {\n    \"tag\": "Gaypoo",\n    \"popularity\": 13618\n  },\n  {\n    \"tag\": "Metrosideros",\n    \"popularity\": 13599\n  },\n  {\n    \"tag\": "thoracicolumbar",\n    \"popularity\": 13580\n  },\n  {\n    \"tag\": "unserried",\n    \"popularity\": 13561\n  },\n  {\n    \"tag\": "keeperess cauterization",\n    \"popularity\": 13542\n  },\n  {\n    \"tag\": "administrant",\n    \"popularity\": 13523\n  },\n  {\n    \"tag\": "unpropitiatedness",\n    \"popularity\": 13505\n  },\n  {\n    \"tag\": "pensileness",\n    \"popularity\": 13486\n  },\n  {\n    \"tag\": "quinaldic unreceivable",\n    \"popularity\": 13467\n  },\n  {\n    \"tag\": "Carnaria",\n    \"popularity\": 13448\n  },\n  {\n    \"tag\": "azothionium wurrus",\n    \"popularity\": 13430\n  },\n  {\n    \"tag\": "mistresshood",\n    \"popularity\": 13411\n  },\n  {\n    \"tag\": "Savara",\n    \"popularity\": 13393\n  },\n  {\n    \"tag\": "dasyurine",\n    \"popularity\": 13374\n  },\n  {\n    \"tag\": "superideal",\n    \"popularity\": 13356\n  },\n  {\n    \"tag\": "Parisianize",\n    \"popularity\": 13337\n  },\n  {\n    \"tag\": "underearth",\n    \"popularity\": 13319\n  },\n  {\n    \"tag\": "athrogenic",\n    \"popularity\": 13301\n  },\n  {\n    \"tag\": "communicate",\n    \"popularity\": 13282\n  },\n  {\n    \"tag\": "denervation enworthed",\n    \"popularity\": 13264\n  },\n  {\n    \"tag\": "subbromide",\n    \"popularity\": 13246\n  },\n  {\n    \"tag\": "stenocoriasis",\n    \"popularity\": 13228\n  },\n  {\n    \"tag\": "facetiousness",\n    \"popularity\": 13209\n  },\n  {\n    \"tag\": "twaddling",\n    \"popularity\": 13191\n  },\n  {\n    \"tag\": "tetartoconid",\n    \"popularity\": 13173\n  },\n  {\n    \"tag\": "audiophile",\n    \"popularity\": 13155\n  },\n  {\n    \"tag\": "fustigate",\n    \"popularity\": 13137\n  },\n  {\n    \"tag\": "Sorbian cacophonia",\n    \"popularity\": 13119\n  },\n  {\n    \"tag\": "fondish",\n    \"popularity\": 13101\n  },\n  {\n    \"tag\": "endomastoiditis",\n    \"popularity\": 13084\n  },\n  {\n    \"tag\": "sniptious",\n    \"popularity\": 13066\n  },\n  {\n    \"tag\": "glochidiate",\n    \"popularity\": 13048\n  },\n  {\n    \"tag\": "polycarboxylic",\n    \"popularity\": 13030\n  },\n  {\n    \"tag\": "stamp",\n    \"popularity\": 13012\n  },\n  {\n    \"tag\": "tritonymph endotoxoid",\n    \"popularity\": 12995\n  },\n  {\n    \"tag\": "wolfskin",\n    \"popularity\": 12977\n  },\n  {\n    \"tag\": "oncosimeter",\n    \"popularity\": 12959\n  },\n  {\n    \"tag\": "outward",\n    \"popularity\": 12942\n  },\n  {\n    \"tag\": "circumscribed",\n    \"popularity\": 12924\n  },\n  {\n    \"tag\": "autohemolytic",\n    \"popularity\": 12907\n  },\n  {\n    \"tag\": "isorhamnose",\n    \"popularity\": 12889\n  },\n  {\n    \"tag\": "monarchomachic",\n    \"popularity\": 12872\n  },\n  {\n    \"tag\": "phaenomenon",\n    \"popularity\": 12855\n  },\n  {\n    \"tag\": "angiopressure",\n    \"popularity\": 12837\n  },\n  {\n    \"tag\": "similarize",\n    \"popularity\": 12820\n  },\n  {\n    \"tag\": "unseeable",\n    \"popularity\": 12803\n  },\n  {\n    \"tag\": "Toryize",\n    \"popularity\": 12785\n  },\n  {\n    \"tag\": "fruitling",\n    \"popularity\": 12768\n  },\n  {\n    \"tag\": "axle",\n    \"popularity\": 12751\n  },\n  {\n    \"tag\": "priestal cocked",\n    \"popularity\": 12734\n  },\n  {\n    \"tag\": "serotoxin",\n    \"popularity\": 12717\n  },\n  {\n    \"tag\": "unmovably",\n    \"popularity\": 12700\n  },\n  {\n    \"tag\": "darbha",\n    \"popularity\": 12683\n  },\n  {\n    \"tag\": "Mongolize",\n    \"popularity\": 12666\n  },\n  {\n    \"tag\": "clusteringly",\n    \"popularity\": 12649\n  },\n  {\n    \"tag\": "tendence",\n    \"popularity\": 12632\n  },\n  {\n    \"tag\": "foziness",\n    \"popularity\": 12615\n  },\n  {\n    \"tag\": "brickkiln lithify",\n    \"popularity\": 12598\n  },\n  {\n    \"tag\": "unpriest",\n    \"popularity\": 12581\n  },\n  {\n    \"tag\": "convincer",\n    \"popularity\": 12564\n  },\n  {\n    \"tag\": "mornlike",\n    \"popularity\": 12548\n  },\n  {\n    \"tag\": "overaddiction ostentatiousness",\n    \"popularity\": 12531\n  },\n  {\n    \"tag\": "diffusively moccasin pendom",\n    \"popularity\": 12514\n  },\n  {\n    \"tag\": "boose",\n    \"popularity\": 12498\n  },\n  {\n    \"tag\": "myonosus",\n    \"popularity\": 12481\n  },\n  {\n    \"tag\": "handsome",\n    \"popularity\": 12464\n  },\n  {\n    \"tag\": "paroxysmic",\n    \"popularity\": 12448\n  },\n  {\n    \"tag\": "Ulidian",\n    \"popularity\": 12431\n  },\n  {\n    \"tag\": "heartache",\n    \"popularity\": 12415\n  },\n  {\n    \"tag\": "torporize",\n    \"popularity\": 12398\n  },\n  {\n    \"tag\": "hippish",\n    \"popularity\": 12382\n  },\n  {\n    \"tag\": "stigmal militation",\n    \"popularity\": 12366\n  },\n  {\n    \"tag\": "matmaker",\n    \"popularity\": 12349\n  },\n  {\n    \"tag\": "marantaceous bivoluminous",\n    \"popularity\": 12333\n  },\n  {\n    \"tag\": "Uraniidae",\n    \"popularity\": 12317\n  },\n  {\n    \"tag\": "risper",\n    \"popularity\": 12301\n  },\n  {\n    \"tag\": "tintinnabulation",\n    \"popularity\": 12284\n  },\n  {\n    \"tag\": "tributorian",\n    \"popularity\": 12268\n  },\n  {\n    \"tag\": "ashamedly",\n    \"popularity\": 12252\n  },\n  {\n    \"tag\": "Macrourus",\n    \"popularity\": 12236\n  },\n  {\n    \"tag\": "Chora",\n    \"popularity\": 12220\n  },\n  {\n    \"tag\": "caul",\n    \"popularity\": 12204\n  },\n  {\n    \"tag\": "exsector",\n    \"popularity\": 12188\n  },\n  {\n    \"tag\": "acutish",\n    \"popularity\": 12172\n  },\n  {\n    \"tag\": "amphichrome",\n    \"popularity\": 12156\n  },\n  {\n    \"tag\": "guarder",\n    \"popularity\": 12140\n  },\n  {\n    \"tag\": "sculpturally",\n    \"popularity\": 12124\n  },\n  {\n    \"tag\": "benightmare",\n    \"popularity\": 12108\n  },\n  {\n    \"tag\": "chucky",\n    \"popularity\": 12093\n  },\n  {\n    \"tag\": "Venetian",\n    \"popularity\": 12077\n  },\n  {\n    \"tag\": "autotheater",\n    \"popularity\": 12061\n  },\n  {\n    \"tag\": "planarioid",\n    \"popularity\": 12045\n  },\n  {\n    \"tag\": "handkerchiefful",\n    \"popularity\": 12030\n  },\n  {\n    \"tag\": "fuliginousness potentize",\n    \"popularity\": 12014\n  },\n  {\n    \"tag\": "pantheum",\n    \"popularity\": 11998\n  },\n  {\n    \"tag\": "heavyweight",\n    \"popularity\": 11983\n  },\n  {\n    \"tag\": "unbrick",\n    \"popularity\": 11967\n  },\n  {\n    \"tag\": "duomachy",\n    \"popularity\": 11952\n  },\n  {\n    \"tag\": "polyphyodont",\n    \"popularity\": 11936\n  },\n  {\n    \"tag\": "hibernacle",\n    \"popularity\": 11921\n  },\n  {\n    \"tag\": "undistend",\n    \"popularity\": 11905\n  },\n  {\n    \"tag\": "hystericky",\n    \"popularity\": 11890\n  },\n  {\n    \"tag\": "paleolimnology",\n    \"popularity\": 11875\n  },\n  {\n    \"tag\": "cedarware",\n    \"popularity\": 11859\n  },\n  {\n    \"tag\": "overwrested",\n    \"popularity\": 11844\n  },\n  {\n    \"tag\": "Syriacism",\n    \"popularity\": 11829\n  },\n  {\n    \"tag\": "pretan",\n    \"popularity\": 11813\n  },\n  {\n    \"tag\": "formant",\n    \"popularity\": 11798\n  },\n  {\n    \"tag\": "pharmacopoeist Fedia",\n    \"popularity\": 11783\n  },\n  {\n    \"tag\": "exorcist eerisome",\n    \"popularity\": 11768\n  },\n  {\n    \"tag\": "separation",\n    \"popularity\": 11753\n  },\n  {\n    \"tag\": "infancy",\n    \"popularity\": 11738\n  },\n  {\n    \"tag\": "ecrasite",\n    \"popularity\": 11723\n  },\n  {\n    \"tag\": "propolize",\n    \"popularity\": 11708\n  },\n  {\n    \"tag\": "uncram phyllin",\n    \"popularity\": 11693\n  },\n  {\n    \"tag\": "thymopathy",\n    \"popularity\": 11678\n  },\n  {\n    \"tag\": "omniscient",\n    \"popularity\": 11663\n  },\n  {\n    \"tag\": "coussinet hazer",\n    \"popularity\": 11648\n  },\n  {\n    \"tag\": "contributiveness",\n    \"popularity\": 11633\n  },\n  {\n    \"tag\": "septifluous",\n    \"popularity\": 11618\n  },\n  {\n    \"tag\": "halfness",\n    \"popularity\": 11603\n  },\n  {\n    \"tag\": "tocher",\n    \"popularity\": 11589\n  },\n  {\n    \"tag\": "monotonist",\n    \"popularity\": 11574\n  },\n  {\n    \"tag\": "headchair",\n    \"popularity\": 11559\n  },\n  {\n    \"tag\": "everywhence",\n    \"popularity\": 11544\n  },\n  {\n    \"tag\": "gerate",\n    \"popularity\": 11530\n  },\n  {\n    \"tag\": "unrepellent",\n    \"popularity\": 11515\n  },\n  {\n    \"tag\": "inidoneous",\n    \"popularity\": 11500\n  },\n  {\n    \"tag\": "Rifi",\n    \"popularity\": 11486\n  },\n  {\n    \"tag\": "unstop",\n    \"popularity\": 11471\n  },\n  {\n    \"tag\": "conformer",\n    \"popularity\": 11457\n  },\n  {\n    \"tag\": "vivisectionally",\n    \"popularity\": 11442\n  },\n  {\n    \"tag\": "nonfinishing",\n    \"popularity\": 11428\n  },\n  {\n    \"tag\": "tyranness",\n    \"popularity\": 11413\n  },\n  {\n    \"tag\": "shepherdage havoc",\n    \"popularity\": 11399\n  },\n  {\n    \"tag\": "coronale",\n    \"popularity\": 11385\n  },\n  {\n    \"tag\": "airmarker",\n    \"popularity\": 11370\n  },\n  {\n    \"tag\": "subpanel",\n    \"popularity\": 11356\n  },\n  {\n    \"tag\": "conciliation",\n    \"popularity\": 11342\n  },\n  {\n    \"tag\": "supergun",\n    \"popularity\": 11327\n  },\n  {\n    \"tag\": "photoheliography",\n    \"popularity\": 11313\n  },\n  {\n    \"tag\": "cacosmia",\n    \"popularity\": 11299\n  },\n  {\n    \"tag\": "caressant",\n    \"popularity\": 11285\n  },\n  {\n    \"tag\": "swivet",\n    \"popularity\": 11270\n  },\n  {\n    \"tag\": "coddler",\n    \"popularity\": 11256\n  },\n  {\n    \"tag\": "rakehellish",\n    \"popularity\": 11242\n  },\n  {\n    \"tag\": "recohabitation",\n    \"popularity\": 11228\n  },\n  {\n    \"tag\": "postillator",\n    \"popularity\": 11214\n  },\n  {\n    \"tag\": "receipt",\n    \"popularity\": 11200\n  },\n  {\n    \"tag\": "nonconformistical",\n    \"popularity\": 11186\n  },\n  {\n    \"tag\": "unglorified",\n    \"popularity\": 11172\n  },\n  {\n    \"tag\": "unordinariness",\n    \"popularity\": 11158\n  },\n  {\n    \"tag\": "tetrahydroxy",\n    \"popularity\": 11144\n  },\n  {\n    \"tag\": "haploperistomic corporeity",\n    \"popularity\": 11130\n  },\n  {\n    \"tag\": "varical",\n    \"popularity\": 11117\n  },\n  {\n    \"tag\": "pilferment",\n    \"popularity\": 11103\n  },\n  {\n    \"tag\": "reverentially playcraft",\n    \"popularity\": 11089\n  },\n  {\n    \"tag\": "unretentive",\n    \"popularity\": 11075\n  },\n  {\n    \"tag\": "readiness",\n    \"popularity\": 11061\n  },\n  {\n    \"tag\": "thermomagnetism",\n    \"popularity\": 11048\n  },\n  {\n    \"tag\": "spotless",\n    \"popularity\": 11034\n  },\n  {\n    \"tag\": "semishrubby",\n    \"popularity\": 11020\n  },\n  {\n    \"tag\": "metrotomy",\n    \"popularity\": 11007\n  },\n  {\n    \"tag\": "hocker",\n    \"popularity\": 10993\n  },\n  {\n    \"tag\": "anecdotal",\n    \"popularity\": 10979\n  },\n  {\n    \"tag\": "tetrabelodont",\n    \"popularity\": 10966\n  },\n  {\n    \"tag\": "Ramillied",\n    \"popularity\": 10952\n  },\n  {\n    \"tag\": "sympatheticism",\n    \"popularity\": 10939\n  },\n  {\n    \"tag\": "kiskatom",\n    \"popularity\": 10925\n  },\n  {\n    \"tag\": "concyclically",\n    \"popularity\": 10912\n  },\n  {\n    \"tag\": "tunicless",\n    \"popularity\": 10899\n  },\n  {\n    \"tag\": "formalistic",\n    \"popularity\": 10885\n  },\n  {\n    \"tag\": "thermacogenesis",\n    \"popularity\": 10872\n  },\n  {\n    \"tag\": "multimotored",\n    \"popularity\": 10858\n  },\n  {\n    \"tag\": "inversive",\n    \"popularity\": 10845\n  },\n  {\n    \"tag\": "Jatki",\n    \"popularity\": 10832\n  },\n  {\n    \"tag\": "highest",\n    \"popularity\": 10818\n  },\n  {\n    \"tag\": "rubidic",\n    \"popularity\": 10805\n  },\n  {\n    \"tag\": "acranial",\n    \"popularity\": 10792\n  },\n  {\n    \"tag\": "pulvinulus",\n    \"popularity\": 10779\n  },\n  {\n    \"tag\": "nattiness",\n    \"popularity\": 10766\n  },\n  {\n    \"tag\": "antisimoniacal",\n    \"popularity\": 10752\n  },\n  {\n    \"tag\": "tetanize",\n    \"popularity\": 10739\n  },\n  {\n    \"tag\": "spectrophobia",\n    \"popularity\": 10726\n  },\n  {\n    \"tag\": "monopolitical",\n    \"popularity\": 10713\n  },\n  {\n    \"tag\": "teallite",\n    \"popularity\": 10700\n  },\n  {\n    \"tag\": "alicyclic interpellator",\n    \"popularity\": 10687\n  },\n  {\n    \"tag\": "nonsynthesized",\n    \"popularity\": 10674\n  },\n  {\n    \"tag\": "wheelwrighting",\n    \"popularity\": 10661\n  },\n  {\n    \"tag\": "pelliculate",\n    \"popularity\": 10648\n  },\n  {\n    \"tag\": "Euphyllopoda",\n    \"popularity\": 10635\n  },\n  {\n    \"tag\": "graver",\n    \"popularity\": 10622\n  },\n  {\n    \"tag\": "automorph",\n    \"popularity\": 10609\n  },\n  {\n    \"tag\": "underhanded",\n    \"popularity\": 10597\n  },\n  {\n    \"tag\": "causal",\n    \"popularity\": 10584\n  },\n  {\n    \"tag\": "odoom",\n    \"popularity\": 10571\n  },\n  {\n    \"tag\": "apodictical",\n    \"popularity\": 10558\n  },\n  {\n    \"tag\": "foundery",\n    \"popularity\": 10545\n  },\n  {\n    \"tag\": "unneighbored",\n    \"popularity\": 10533\n  },\n  {\n    \"tag\": "woolshearing",\n    \"popularity\": 10520\n  },\n  {\n    \"tag\": "boschveld",\n    \"popularity\": 10507\n  },\n  {\n    \"tag\": "unhardened lipopod",\n    \"popularity\": 10495\n  },\n  {\n    \"tag\": "unenriching",\n    \"popularity\": 10482\n  },\n  {\n    \"tag\": "spak",\n    \"popularity\": 10469\n  },\n  {\n    \"tag\": "yogasana",\n    \"popularity\": 10457\n  },\n  {\n    \"tag\": "depoetize",\n    \"popularity\": 10444\n  },\n  {\n    \"tag\": "parousiamania",\n    \"popularity\": 10432\n  },\n  {\n    \"tag\": "longlegs",\n    \"popularity\": 10419\n  },\n  {\n    \"tag\": "gelatinizability",\n    \"popularity\": 10407\n  },\n  {\n    \"tag\": "edeology",\n    \"popularity\": 10394\n  },\n  {\n    \"tag\": "sodwork",\n    \"popularity\": 10382\n  },\n  {\n    \"tag\": "somnambule",\n    \"popularity\": 10369\n  },\n  {\n    \"tag\": "antiquing",\n    \"popularity\": 10357\n  },\n  {\n    \"tag\": "intaker",\n    \"popularity\": 10344\n  },\n  {\n    \"tag\": "Gerberia",\n    \"popularity\": 10332\n  },\n  {\n    \"tag\": "preadmit",\n    \"popularity\": 10320\n  },\n  {\n    \"tag\": "bullhorn",\n    \"popularity\": 10307\n  },\n  {\n    \"tag\": "sororal",\n    \"popularity\": 10295\n  },\n  {\n    \"tag\": "phaeophyceous",\n    \"popularity\": 10283\n  },\n  {\n    \"tag\": "omphalopsychite",\n    \"popularity\": 10271\n  },\n  {\n    \"tag\": "substantious",\n    \"popularity\": 10258\n  },\n  {\n    \"tag\": "undemonstratively",\n    \"popularity\": 10246\n  },\n  {\n    \"tag\": "corallike blackit",\n    \"popularity\": 10234\n  },\n  {\n    \"tag\": "amoebous",\n    \"popularity\": 10222\n  },\n  {\n    \"tag\": "Polypodium",\n    \"popularity\": 10210\n  },\n  {\n    \"tag\": "blodite",\n    \"popularity\": 10198\n  },\n  {\n    \"tag\": "hordarian",\n    \"popularity\": 10186\n  },\n  {\n    \"tag\": "nonmoral",\n    \"popularity\": 10174\n  },\n  {\n    \"tag\": "dredgeful",\n    \"popularity\": 10162\n  },\n  {\n    \"tag\": "nourishingly",\n    \"popularity\": 10150\n  },\n  {\n    \"tag\": "seamy",\n    \"popularity\": 10138\n  },\n  {\n    \"tag\": "vara",\n    \"popularity\": 10126\n  },\n  {\n    \"tag\": "incorruptibleness",\n    \"popularity\": 10114\n  },\n  {\n    \"tag\": "manipulator",\n    \"popularity\": 10102\n  },\n  {\n    \"tag\": "chromodiascope uncountably",\n    \"popularity\": 10090\n  },\n  {\n    \"tag\": "typhemia",\n    \"popularity\": 10078\n  },\n  {\n    \"tag\": "Smalcaldic",\n    \"popularity\": 10066\n  },\n  {\n    \"tag\": "precontrive",\n    \"popularity\": 10054\n  },\n  {\n    \"tag\": "sowarry",\n    \"popularity\": 10042\n  },\n  {\n    \"tag\": "monopodic",\n    \"popularity\": 10031\n  },\n  {\n    \"tag\": "recodify",\n    \"popularity\": 10019\n  },\n  {\n    \"tag\": "phosphowolframic rimple",\n    \"popularity\": 10007\n  },\n  {\n    \"tag\": "triconch",\n    \"popularity\": 9995\n  },\n  {\n    \"tag\": "pycnodontoid",\n    \"popularity\": 9984\n  },\n  {\n    \"tag\": "bradyspermatism",\n    \"popularity\": 9972\n  },\n  {\n    \"tag\": "extensionist",\n    \"popularity\": 9960\n  },\n  {\n    \"tag\": "characterize",\n    \"popularity\": 9949\n  },\n  {\n    \"tag\": "anatreptic proteolytic",\n    \"popularity\": 9937\n  },\n  {\n    \"tag\": "waterboard",\n    \"popularity\": 9925\n  },\n  {\n    \"tag\": "allopathically",\n    \"popularity\": 9914\n  },\n  {\n    \"tag\": "arithmetician",\n    \"popularity\": 9902\n  },\n  {\n    \"tag\": "subsist",\n    \"popularity\": 9891\n  },\n  {\n    \"tag\": "Islamitish",\n    \"popularity\": 9879\n  },\n  {\n    \"tag\": "biddy",\n    \"popularity\": 9868\n  },\n  {\n    \"tag\": "reverberation",\n    \"popularity\": 9856\n  },\n  {\n    \"tag\": "Zaporogue",\n    \"popularity\": 9845\n  },\n  {\n    \"tag\": "soapberry",\n    \"popularity\": 9833\n  },\n  {\n    \"tag\": "physiognomics",\n    \"popularity\": 9822\n  },\n  {\n    \"tag\": "hospitalization",\n    \"popularity\": 9810\n  },\n  {\n    \"tag\": "dissembler",\n    \"popularity\": 9799\n  },\n  {\n    \"tag\": "festinate",\n    \"popularity\": 9788\n  },\n  {\n    \"tag\": "angiectopia",\n    \"popularity\": 9776\n  },\n  {\n    \"tag\": "Pulicidae",\n    \"popularity\": 9765\n  },\n  {\n    \"tag\": "beslimer",\n    \"popularity\": 9754\n  },\n  {\n    \"tag\": "nontreaty",\n    \"popularity\": 9743\n  },\n  {\n    \"tag\": "unhaggled",\n    \"popularity\": 9731\n  },\n  {\n    \"tag\": "catfall",\n    \"popularity\": 9720\n  },\n  {\n    \"tag\": "stola",\n    \"popularity\": 9709\n  },\n  {\n    \"tag\": "pataco",\n    \"popularity\": 9698\n  },\n  {\n    \"tag\": "ontologistic",\n    \"popularity\": 9686\n  },\n  {\n    \"tag\": "aerosphere",\n    \"popularity\": 9675\n  },\n  {\n    \"tag\": "deobstruent",\n    \"popularity\": 9664\n  },\n  {\n    \"tag\": "threepence",\n    \"popularity\": 9653\n  },\n  {\n    \"tag\": "cyprinoid",\n    \"popularity\": 9642\n  },\n  {\n    \"tag\": "overbank",\n    \"popularity\": 9631\n  },\n  {\n    \"tag\": "prostyle",\n    \"popularity\": 9620\n  },\n  {\n    \"tag\": "photoactivation",\n    \"popularity\": 9609\n  },\n  {\n    \"tag\": "homothetic",\n    \"popularity\": 9598\n  },\n  {\n    \"tag\": "roguedom",\n    \"popularity\": 9587\n  },\n  {\n    \"tag\": "underschool",\n    \"popularity\": 9576\n  },\n  {\n    \"tag\": "tractility",\n    \"popularity\": 9565\n  },\n  {\n    \"tag\": "gardenin",\n    \"popularity\": 9554\n  },\n  {\n    \"tag\": "Micromastictora",\n    \"popularity\": 9543\n  },\n  {\n    \"tag\": "gossypine",\n    \"popularity\": 9532\n  },\n  {\n    \"tag\": "amylodyspepsia",\n    \"popularity\": 9521\n  },\n  {\n    \"tag\": "Luciana",\n    \"popularity\": 9510\n  },\n  {\n    \"tag\": "meetly nonfisherman",\n    \"popularity\": 9500\n  },\n  {\n    \"tag\": "backhanded",\n    \"popularity\": 9489\n  },\n  {\n    \"tag\": "decrustation",\n    \"popularity\": 9478\n  },\n  {\n    \"tag\": "pinrail",\n    \"popularity\": 9467\n  },\n  {\n    \"tag\": "Mahori",\n    \"popularity\": 9456\n  },\n  {\n    \"tag\": "unsizable",\n    \"popularity\": 9446\n  },\n  {\n    \"tag\": "disawa",\n    \"popularity\": 9435\n  },\n  {\n    \"tag\": "launderability inconsidered",\n    \"popularity\": 9424\n  },\n  {\n    \"tag\": "unclassical",\n    \"popularity\": 9414\n  },\n  {\n    \"tag\": "inobtrusiveness",\n    \"popularity\": 9403\n  },\n  {\n    \"tag\": "sialogenous",\n    \"popularity\": 9392\n  },\n  {\n    \"tag\": "sulphonamide",\n    \"popularity\": 9382\n  },\n  {\n    \"tag\": "diluvion",\n    \"popularity\": 9371\n  },\n  {\n    \"tag\": "deuteranope",\n    \"popularity\": 9361\n  },\n  {\n    \"tag\": "addition",\n    \"popularity\": 9350\n  },\n  {\n    \"tag\": "bockeret",\n    \"popularity\": 9339\n  },\n  {\n    \"tag\": "unidentified",\n    \"popularity\": 9329\n  },\n  {\n    \"tag\": "caryatic",\n    \"popularity\": 9318\n  },\n  {\n    \"tag\": "misattribution",\n    \"popularity\": 9308\n  },\n  {\n    \"tag\": "outray",\n    \"popularity\": 9297\n  },\n  {\n    \"tag\": "areometrical",\n    \"popularity\": 9287\n  },\n  {\n    \"tag\": "antilogism",\n    \"popularity\": 9277\n  },\n  {\n    \"tag\": "inadjustable",\n    \"popularity\": 9266\n  },\n  {\n    \"tag\": "byssus",\n    \"popularity\": 9256\n  },\n  {\n    \"tag\": "trun",\n    \"popularity\": 9245\n  },\n  {\n    \"tag\": "thereology",\n    \"popularity\": 9235\n  },\n  {\n    \"tag\": "extort",\n    \"popularity\": 9225\n  },\n  {\n    \"tag\": "bumpkin",\n    \"popularity\": 9214\n  },\n  {\n    \"tag\": "sulphobenzide",\n    \"popularity\": 9204\n  },\n  {\n    \"tag\": "hydrogeology",\n    \"popularity\": 9194\n  },\n  {\n    \"tag\": "nidulariaceous",\n    \"popularity\": 9183\n  },\n  {\n    \"tag\": "propodiale",\n    \"popularity\": 9173\n  },\n  {\n    \"tag\": "fierily",\n    \"popularity\": 9163\n  },\n  {\n    \"tag\": "aerotonometry",\n    \"popularity\": 9153\n  },\n  {\n    \"tag\": "pelobatid oversuperstitious",\n    \"popularity\": 9142\n  },\n  {\n    \"tag\": "restringent",\n    \"popularity\": 9132\n  },\n  {\n    \"tag\": "tetrapodic",\n    \"popularity\": 9122\n  },\n  {\n    \"tag\": "heroicness Vendidad",\n    \"popularity\": 9112\n  },\n  {\n    \"tag\": "Sphingurus",\n    \"popularity\": 9102\n  },\n  {\n    \"tag\": "sclerote",\n    \"popularity\": 9092\n  },\n  {\n    \"tag\": "unkeyed",\n    \"popularity\": 9082\n  },\n  {\n    \"tag\": "superparliamentary",\n    \"popularity\": 9072\n  },\n  {\n    \"tag\": "hetericism",\n    \"popularity\": 9061\n  },\n  {\n    \"tag\": "hucklebone",\n    \"popularity\": 9051\n  },\n  {\n    \"tag\": "yojan",\n    \"popularity\": 9041\n  },\n  {\n    \"tag\": "bossed",\n    \"popularity\": 9031\n  },\n  {\n    \"tag\": "spiderwork",\n    \"popularity\": 9021\n  },\n  {\n    \"tag\": "millfeed dullery",\n    \"popularity\": 9011\n  },\n  {\n    \"tag\": "adnoun",\n    \"popularity\": 9001\n  },\n  {\n    \"tag\": "mesometric",\n    \"popularity\": 8992\n  },\n  {\n    \"tag\": "doublehandedness",\n    \"popularity\": 8982\n  },\n  {\n    \"tag\": "suppurant",\n    \"popularity\": 8972\n  },\n  {\n    \"tag\": "Berlinize",\n    \"popularity\": 8962\n  },\n  {\n    \"tag\": "sontag",\n    \"popularity\": 8952\n  },\n  {\n    \"tag\": "biplane",\n    \"popularity\": 8942\n  },\n  {\n    \"tag\": "insula",\n    \"popularity\": 8932\n  },\n  {\n    \"tag\": "unbrand",\n    \"popularity\": 8922\n  },\n  {\n    \"tag\": "Basilosaurus",\n    \"popularity\": 8913\n  },\n  {\n    \"tag\": "prenomination",\n    \"popularity\": 8903\n  },\n  {\n    \"tag\": "untextual",\n    \"popularity\": 8893\n  },\n  {\n    \"tag\": "coleslaw",\n    \"popularity\": 8883\n  },\n  {\n    \"tag\": "langsyne",\n    \"popularity\": 8874\n  },\n  {\n    \"tag\": "impede",\n    \"popularity\": 8864\n  },\n  {\n    \"tag\": "irrigator",\n    \"popularity\": 8854\n  },\n  {\n    \"tag\": "deflocculation",\n    \"popularity\": 8844\n  },\n  {\n    \"tag\": "narghile",\n    \"popularity\": 8835\n  },\n  {\n    \"tag\": "unguardedly ebenaceous",\n    \"popularity\": 8825\n  },\n  {\n    \"tag\": "conversantly subocular",\n    \"popularity\": 8815\n  },\n  {\n    \"tag\": "hydroponic",\n    \"popularity\": 8806\n  },\n  {\n    \"tag\": "anthropopsychism",\n    \"popularity\": 8796\n  },\n  {\n    \"tag\": "panoptic",\n    \"popularity\": 8787\n  },\n  {\n    \"tag\": "insufferable",\n    \"popularity\": 8777\n  },\n  {\n    \"tag\": "salema",\n    \"popularity\": 8768\n  },\n  {\n    \"tag\": "Myriapoda",\n    \"popularity\": 8758\n  },\n  {\n    \"tag\": "regarrison",\n    \"popularity\": 8748\n  },\n  {\n    \"tag\": "overlearned",\n    \"popularity\": 8739\n  },\n  {\n    \"tag\": "ultraroyalist conventical bureaucratical",\n    \"popularity\": 8729\n  },\n  {\n    \"tag\": "epicaridan",\n    \"popularity\": 8720\n  },\n  {\n    \"tag\": "poetastress",\n    \"popularity\": 8711\n  },\n  {\n    \"tag\": "monophthalmus",\n    \"popularity\": 8701\n  },\n  {\n    \"tag\": "simnel",\n    \"popularity\": 8692\n  },\n  {\n    \"tag\": "compotor",\n    \"popularity\": 8682\n  },\n  {\n    \"tag\": "hydrolase",\n    \"popularity\": 8673\n  },\n  {\n    \"tag\": "attemptless",\n    \"popularity\": 8663\n  },\n  {\n    \"tag\": "visceroptosis",\n    \"popularity\": 8654\n  },\n  {\n    \"tag\": "unpreparedly",\n    \"popularity\": 8645\n  },\n  {\n    \"tag\": "mastage",\n    \"popularity\": 8635\n  },\n  {\n    \"tag\": "preinfluence",\n    \"popularity\": 8626\n  },\n  {\n    \"tag\": "Siwan",\n    \"popularity\": 8617\n  },\n  {\n    \"tag\": "ceratotheca belvedere",\n    \"popularity\": 8607\n  },\n  {\n    \"tag\": "disenablement",\n    \"popularity\": 8598\n  },\n  {\n    \"tag\": "nine",\n    \"popularity\": 8589\n  },\n  {\n    \"tag\": "spellingdown abridgment",\n    \"popularity\": 8580\n  },\n  {\n    \"tag\": "twilightless",\n    \"popularity\": 8571\n  },\n  {\n    \"tag\": "overflow",\n    \"popularity\": 8561\n  },\n  {\n    \"tag\": "mismeasurement",\n    \"popularity\": 8552\n  },\n  {\n    \"tag\": "nawabship",\n    \"popularity\": 8543\n  },\n  {\n    \"tag\": "Phrynosoma",\n    \"popularity\": 8534\n  },\n  {\n    \"tag\": "unanticipatingly",\n    \"popularity\": 8525\n  },\n  {\n    \"tag\": "blankite",\n    \"popularity\": 8516\n  },\n  {\n    \"tag\": "role",\n    \"popularity\": 8506\n  },\n  {\n    \"tag\": "peperine edelweiss",\n    \"popularity\": 8497\n  },\n  {\n    \"tag\": "unhysterical",\n    \"popularity\": 8488\n  },\n  {\n    \"tag\": "attentiveness",\n    \"popularity\": 8479\n  },\n  {\n    \"tag\": "scintillant",\n    \"popularity\": 8470\n  },\n  {\n    \"tag\": "stenostomatous",\n    \"popularity\": 8461\n  },\n  {\n    \"tag\": "pectinite",\n    \"popularity\": 8452\n  },\n  {\n    \"tag\": "herring",\n    \"popularity\": 8443\n  },\n  {\n    \"tag\": "interroom",\n    \"popularity\": 8434\n  },\n  {\n    \"tag\": "laccol",\n    \"popularity\": 8425\n  },\n  {\n    \"tag\": "unpartably kylite",\n    \"popularity\": 8416\n  },\n  {\n    \"tag\": "spirivalve",\n    \"popularity\": 8407\n  },\n  {\n    \"tag\": "hoosegow",\n    \"popularity\": 8398\n  },\n  {\n    \"tag\": "doat",\n    \"popularity\": 8389\n  },\n  {\n    \"tag\": "amphibian",\n    \"popularity\": 8380\n  },\n  {\n    \"tag\": "exposit",\n    \"popularity\": 8371\n  },\n  {\n    \"tag\": "canopy",\n    \"popularity\": 8363\n  },\n  {\n    \"tag\": "houndlike",\n    \"popularity\": 8354\n  },\n  {\n    \"tag\": "spikebill",\n    \"popularity\": 8345\n  },\n  {\n    \"tag\": "wiseacre pyrotechnic",\n    \"popularity\": 8336\n  },\n  {\n    \"tag\": "confessingly woodman",\n    \"popularity\": 8327\n  },\n  {\n    \"tag\": "overside",\n    \"popularity\": 8318\n  },\n  {\n    \"tag\": "oftwhiles",\n    \"popularity\": 8310\n  },\n  {\n    \"tag\": "Musophagidae",\n    \"popularity\": 8301\n  },\n  {\n    \"tag\": "slumberer",\n    \"popularity\": 8292\n  },\n  {\n    \"tag\": "leiotrichy",\n    \"popularity\": 8283\n  },\n  {\n    \"tag\": "Mantispidae",\n    \"popularity\": 8275\n  },\n  {\n    \"tag\": "perceptually",\n    \"popularity\": 8266\n  },\n  {\n    \"tag\": "biller",\n    \"popularity\": 8257\n  },\n  {\n    \"tag\": "eudaemonical",\n    \"popularity\": 8249\n  },\n  {\n    \"tag\": "underfiend",\n    \"popularity\": 8240\n  },\n  {\n    \"tag\": "impartible",\n    \"popularity\": 8231\n  },\n  {\n    \"tag\": "saxicavous",\n    \"popularity\": 8223\n  },\n  {\n    \"tag\": "yapster",\n    \"popularity\": 8214\n  },\n  {\n    \"tag\": "aliseptal",\n    \"popularity\": 8205\n  },\n  {\n    \"tag\": "omniparient",\n    \"popularity\": 8197\n  },\n  {\n    \"tag\": "nishiki",\n    \"popularity\": 8188\n  },\n  {\n    \"tag\": "yuzluk",\n    \"popularity\": 8180\n  },\n  {\n    \"tag\": "solderer",\n    \"popularity\": 8171\n  },\n  {\n    \"tag\": "Pinna",\n    \"popularity\": 8162\n  },\n  {\n    \"tag\": "reinterfere",\n    \"popularity\": 8154\n  },\n  {\n    \"tag\": "superepic",\n    \"popularity\": 8145\n  },\n  {\n    \"tag\": "ronquil",\n    \"popularity\": 8137\n  },\n  {\n    \"tag\": "bratstvo",\n    \"popularity\": 8128\n  },\n  {\n    \"tag\": "Thea",\n    \"popularity\": 8120\n  },\n  {\n    \"tag\": "hermaphroditical",\n    \"popularity\": 8111\n  },\n  {\n    \"tag\": "enlief",\n    \"popularity\": 8103\n  },\n  {\n    \"tag\": "Jesuate",\n    \"popularity\": 8095\n  },\n  {\n    \"tag\": "gaysome",\n    \"popularity\": 8086\n  },\n  {\n    \"tag\": "iliohypogastric",\n    \"popularity\": 8078\n  },\n  {\n    \"tag\": "regardance",\n    \"popularity\": 8069\n  },\n  {\n    \"tag\": "cumulately",\n    \"popularity\": 8061\n  },\n  {\n    \"tag\": "haustorial nucleolocentrosome",\n    \"popularity\": 8053\n  },\n  {\n    \"tag\": "cosmocrat",\n    \"popularity\": 8044\n  },\n  {\n    \"tag\": "onyxitis",\n    \"popularity\": 8036\n  },\n  {\n    \"tag\": "Cabinda",\n    \"popularity\": 8028\n  },\n  {\n    \"tag\": "coresort",\n    \"popularity\": 8019\n  },\n  {\n    \"tag\": "drusy preformant",\n    \"popularity\": 8011\n  },\n  {\n    \"tag\": "piningly",\n    \"popularity\": 8003\n  },\n  {\n    \"tag\": "bootlessly",\n    \"popularity\": 7994\n  },\n  {\n    \"tag\": "talari",\n    \"popularity\": 7986\n  },\n  {\n    \"tag\": "amidoacetal",\n    \"popularity\": 7978\n  },\n  {\n    \"tag\": "pschent",\n    \"popularity\": 7970\n  },\n  {\n    \"tag\": "consumptional scarer titivate",\n    \"popularity\": 7962\n  },\n  {\n    \"tag\": "Anserinae",\n    \"popularity\": 7953\n  },\n  {\n    \"tag\": "flaunter",\n    \"popularity\": 7945\n  },\n  {\n    \"tag\": "reindeer",\n    \"popularity\": 7937\n  },\n  {\n    \"tag\": "disparage",\n    \"popularity\": 7929\n  },\n  {\n    \"tag\": "superheat",\n    \"popularity\": 7921\n  },\n  {\n    \"tag\": "Chromatium",\n    \"popularity\": 7912\n  },\n  {\n    \"tag\": "Tina",\n    \"popularity\": 7904\n  },\n  {\n    \"tag\": "rededicatory",\n    \"popularity\": 7896\n  },\n  {\n    \"tag\": "nontransient",\n    \"popularity\": 7888\n  },\n  {\n    \"tag\": "Phocaean brinkless",\n    \"popularity\": 7880\n  },\n  {\n    \"tag\": "ventriculose",\n    \"popularity\": 7872\n  },\n  {\n    \"tag\": "upplough",\n    \"popularity\": 7864\n  },\n  {\n    \"tag\": "succorless",\n    \"popularity\": 7856\n  },\n  {\n    \"tag\": "hayrake",\n    \"popularity\": 7848\n  },\n  {\n    \"tag\": "merriness amorphia",\n    \"popularity\": 7840\n  },\n  {\n    \"tag\": "merycism",\n    \"popularity\": 7832\n  },\n  {\n    \"tag\": "checkrow",\n    \"popularity\": 7824\n  },\n  {\n    \"tag\": "scry",\n    \"popularity\": 7816\n  },\n  {\n    \"tag\": "obvolve",\n    \"popularity\": 7808\n  },\n  {\n    \"tag\": "orchard",\n    \"popularity\": 7800\n  },\n  {\n    \"tag\": "isomerize",\n    \"popularity\": 7792\n  },\n  {\n    \"tag\": "competitrix",\n    \"popularity\": 7784\n  },\n  {\n    \"tag\": "unbannered",\n    \"popularity\": 7776\n  },\n  {\n    \"tag\": "undoctrined",\n    \"popularity\": 7768\n  },\n  {\n    \"tag\": "theologian",\n    \"popularity\": 7760\n  },\n  {\n    \"tag\": "nebby",\n    \"popularity\": 7752\n  },\n  {\n    \"tag\": "Cardiazol",\n    \"popularity\": 7745\n  },\n  {\n    \"tag\": "phagedenic",\n    \"popularity\": 7737\n  },\n  {\n    \"tag\": "nostalgic",\n    \"popularity\": 7729\n  },\n  {\n    \"tag\": "orthodoxy",\n    \"popularity\": 7721\n  },\n  {\n    \"tag\": "oversanguine",\n    \"popularity\": 7713\n  },\n  {\n    \"tag\": "lish",\n    \"popularity\": 7705\n  },\n  {\n    \"tag\": "ketogenic",\n    \"popularity\": 7698\n  },\n  {\n    \"tag\": "syndicalize",\n    \"popularity\": 7690\n  },\n  {\n    \"tag\": "leeftail",\n    \"popularity\": 7682\n  },\n  {\n    \"tag\": "bulbomedullary",\n    \"popularity\": 7674\n  },\n  {\n    \"tag\": "reletter",\n    \"popularity\": 7667\n  },\n  {\n    \"tag\": "bitterly",\n    \"popularity\": 7659\n  },\n  {\n    \"tag\": "participatory",\n    \"popularity\": 7651\n  },\n  {\n    \"tag\": "baldberry",\n    \"popularity\": 7643\n  },\n  {\n    \"tag\": "prowaterpower",\n    \"popularity\": 7636\n  },\n  {\n    \"tag\": "lexicographical",\n    \"popularity\": 7628\n  },\n  {\n    \"tag\": "Anisodactyli",\n    \"popularity\": 7620\n  },\n  {\n    \"tag\": "amphipodous",\n    \"popularity\": 7613\n  },\n  {\n    \"tag\": "triglandular",\n    \"popularity\": 7605\n  },\n  {\n    \"tag\": "xanthopsin",\n    \"popularity\": 7597\n  },\n  {\n    \"tag\": "indefinitude",\n    \"popularity\": 7590\n  },\n  {\n    \"tag\": "bookworm",\n    \"popularity\": 7582\n  },\n  {\n    \"tag\": "suffocative",\n    \"popularity\": 7574\n  },\n  {\n    \"tag\": "uncongested tyrant",\n    \"popularity\": 7567\n  },\n  {\n    \"tag\": "alow harmoniously Pamir",\n    \"popularity\": 7559\n  },\n  {\n    \"tag\": "monander",\n    \"popularity\": 7552\n  },\n  {\n    \"tag\": "bagatelle",\n    \"popularity\": 7544\n  },\n  {\n    \"tag\": "membranology",\n    \"popularity\": 7537\n  },\n  {\n    \"tag\": "parturifacient",\n    \"popularity\": 7529\n  },\n  {\n    \"tag\": "excitovascular",\n    \"popularity\": 7522\n  },\n  {\n    \"tag\": "homopolar",\n    \"popularity\": 7514\n  },\n  {\n    \"tag\": "phobiac",\n    \"popularity\": 7507\n  },\n  {\n    \"tag\": "clype",\n    \"popularity\": 7499\n  },\n  {\n    \"tag\": "unsubversive",\n    \"popularity\": 7492\n  },\n  {\n    \"tag\": "bostrychoidal scorpionwort",\n    \"popularity\": 7484\n  },\n  {\n    \"tag\": "biliteralism",\n    \"popularity\": 7477\n  },\n  {\n    \"tag\": "dentatocostate",\n    \"popularity\": 7469\n  },\n  {\n    \"tag\": "Pici",\n    \"popularity\": 7462\n  },\n  {\n    \"tag\": "sideritic",\n    \"popularity\": 7454\n  },\n  {\n    \"tag\": "syntaxis",\n    \"popularity\": 7447\n  },\n  {\n    \"tag\": "ingest",\n    \"popularity\": 7440\n  },\n  {\n    \"tag\": "rigmarolish",\n    \"popularity\": 7432\n  },\n  {\n    \"tag\": "ocreaceous",\n    \"popularity\": 7425\n  },\n  {\n    \"tag\": "hyperbrachyskelic",\n    \"popularity\": 7418\n  },\n  {\n    \"tag\": "basophobia",\n    \"popularity\": 7410\n  },\n  {\n    \"tag\": "substantialness",\n    \"popularity\": 7403\n  },\n  {\n    \"tag\": "agglutinoid",\n    \"popularity\": 7396\n  },\n  {\n    \"tag\": "longleaf",\n    \"popularity\": 7388\n  },\n  {\n    \"tag\": "electroengraving",\n    \"popularity\": 7381\n  },\n  {\n    \"tag\": "laparoenterotomy",\n    \"popularity\": 7374\n  },\n  {\n    \"tag\": "oxalylurea",\n    \"popularity\": 7366\n  },\n  {\n    \"tag\": "unattaintedly",\n    \"popularity\": 7359\n  },\n  {\n    \"tag\": "pennystone",\n    \"popularity\": 7352\n  },\n  {\n    \"tag\": "Plumbaginaceae",\n    \"popularity\": 7345\n  },\n  {\n    \"tag\": "horntip",\n    \"popularity\": 7337\n  },\n  {\n    \"tag\": "begrudge",\n    \"popularity\": 7330\n  },\n  {\n    \"tag\": "bechignoned",\n    \"popularity\": 7323\n  },\n  {\n    \"tag\": "hologonidium",\n    \"popularity\": 7316\n  },\n  {\n    \"tag\": "Pulian",\n    \"popularity\": 7309\n  },\n  {\n    \"tag\": "gratulation",\n    \"popularity\": 7301\n  },\n  {\n    \"tag\": "Sebright",\n    \"popularity\": 7294\n  },\n  {\n    \"tag\": "coinstantaneous emotionally",\n    \"popularity\": 7287\n  },\n  {\n    \"tag\": "thoracostracan",\n    \"popularity\": 7280\n  },\n  {\n    \"tag\": "saurodont",\n    \"popularity\": 7273\n  },\n  {\n    \"tag\": "coseat",\n    \"popularity\": 7266\n  },\n  {\n    \"tag\": "irascibility",\n    \"popularity\": 7259\n  },\n  {\n    \"tag\": "occlude",\n    \"popularity\": 7251\n  },\n  {\n    \"tag\": "metallurgist",\n    \"popularity\": 7244\n  },\n  {\n    \"tag\": "extraviolet",\n    \"popularity\": 7237\n  },\n  {\n    \"tag\": "clinic",\n    \"popularity\": 7230\n  },\n  {\n    \"tag\": "skater",\n    \"popularity\": 7223\n  },\n  {\n    \"tag\": "linguistic",\n    \"popularity\": 7216\n  },\n  {\n    \"tag\": "attacheship",\n    \"popularity\": 7209\n  },\n  {\n    \"tag\": "Rachianectes",\n    \"popularity\": 7202\n  },\n  {\n    \"tag\": "foliolose",\n    \"popularity\": 7195\n  },\n  {\n    \"tag\": "claudetite",\n    \"popularity\": 7188\n  },\n  {\n    \"tag\": "aphidian scratching",\n    \"popularity\": 7181\n  },\n  {\n    \"tag\": "Carida",\n    \"popularity\": 7174\n  },\n  {\n    \"tag\": "tiepin polymicroscope",\n    \"popularity\": 7167\n  },\n  {\n    \"tag\": "telpherage",\n    \"popularity\": 7160\n  },\n  {\n    \"tag\": "meek",\n    \"popularity\": 7153\n  },\n  {\n    \"tag\": "swiftness",\n    \"popularity\": 7146\n  },\n  {\n    \"tag\": "gentes",\n    \"popularity\": 7139\n  },\n  {\n    \"tag\": "uncommemorated",\n    \"popularity\": 7132\n  },\n  {\n    \"tag\": "Lazarus",\n    \"popularity\": 7125\n  },\n  {\n    \"tag\": "redivive",\n    \"popularity\": 7119\n  },\n  {\n    \"tag\": "nonfebrile",\n    \"popularity\": 7112\n  },\n  {\n    \"tag\": "nymphet",\n    \"popularity\": 7105\n  },\n  {\n    \"tag\": "areologically",\n    \"popularity\": 7098\n  },\n  {\n    \"tag\": "undonkey",\n    \"popularity\": 7091\n  },\n  {\n    \"tag\": "projecting",\n    \"popularity\": 7084\n  },\n  {\n    \"tag\": "pinnigrade",\n    \"popularity\": 7077\n  },\n  {\n    \"tag\": "butylation",\n    \"popularity\": 7071\n  },\n  {\n    \"tag\": "philologistic lenticle",\n    \"popularity\": 7064\n  },\n  {\n    \"tag\": "nooky",\n    \"popularity\": 7057\n  },\n  {\n    \"tag\": "incestuousness",\n    \"popularity\": 7050\n  },\n  {\n    \"tag\": "palingenetically",\n    \"popularity\": 7043\n  },\n  {\n    \"tag\": "mitochondria",\n    \"popularity\": 7037\n  },\n  {\n    \"tag\": "truthify",\n    \"popularity\": 7030\n  },\n  {\n    \"tag\": "titanyl",\n    \"popularity\": 7023\n  },\n  {\n    \"tag\": "bestride",\n    \"popularity\": 7016\n  },\n  {\n    \"tag\": "chende",\n    \"popularity\": 7010\n  },\n  {\n    \"tag\": "Chaucerian monophote",\n    \"popularity\": 7003\n  },\n  {\n    \"tag\": "cutback",\n    \"popularity\": 6996\n  },\n  {\n    \"tag\": "unpatiently",\n    \"popularity\": 6989\n  },\n  {\n    \"tag\": "subvitreous",\n    \"popularity\": 6983\n  },\n  {\n    \"tag\": "organizable",\n    \"popularity\": 6976\n  },\n  {\n    \"tag\": "anniverse uncomprehensible",\n    \"popularity\": 6969\n  },\n  {\n    \"tag\": "hyalescence",\n    \"popularity\": 6963\n  },\n  {\n    \"tag\": "amniochorial",\n    \"popularity\": 6956\n  },\n  {\n    \"tag\": "Corybantian",\n    \"popularity\": 6949\n  },\n  {\n    \"tag\": "genocide Scaphitidae",\n    \"popularity\": 6943\n  },\n  {\n    \"tag\": "accordionist",\n    \"popularity\": 6936\n  },\n  {\n    \"tag\": "becheck",\n    \"popularity\": 6930\n  },\n  {\n    \"tag\": "overproduce",\n    \"popularity\": 6923\n  },\n  {\n    \"tag\": "unmaniac frijolillo",\n    \"popularity\": 6916\n  },\n  {\n    \"tag\": "multisulcated",\n    \"popularity\": 6910\n  },\n  {\n    \"tag\": "wennebergite",\n    \"popularity\": 6903\n  },\n  {\n    \"tag\": "tautousious mowth",\n    \"popularity\": 6897\n  },\n  {\n    \"tag\": "marigold",\n    \"popularity\": 6890\n  },\n  {\n    \"tag\": "affray",\n    \"popularity\": 6884\n  },\n  {\n    \"tag\": "nonidolatrous",\n    \"popularity\": 6877\n  },\n  {\n    \"tag\": "aphrasia",\n    \"popularity\": 6871\n  },\n  {\n    \"tag\": "muddlingly",\n    \"popularity\": 6864\n  },\n  {\n    \"tag\": "clear",\n    \"popularity\": 6858\n  },\n  {\n    \"tag\": "Clitoria",\n    \"popularity\": 6851\n  },\n  {\n    \"tag\": "apportionment underwaist",\n    \"popularity\": 6845\n  },\n  {\n    \"tag\": "kodakist",\n    \"popularity\": 6838\n  },\n  {\n    \"tag\": "Momotidae",\n    \"popularity\": 6832\n  },\n  {\n    \"tag\": "cryptovalency",\n    \"popularity\": 6825\n  },\n  {\n    \"tag\": "floe",\n    \"popularity\": 6819\n  },\n  {\n    \"tag\": "aphagia",\n    \"popularity\": 6812\n  },\n  {\n    \"tag\": "brontograph",\n    \"popularity\": 6806\n  },\n  {\n    \"tag\": "tubulous",\n    \"popularity\": 6799\n  },\n  {\n    \"tag\": "unhorse",\n    \"popularity\": 6793\n  },\n  {\n    \"tag\": "chlordane",\n    \"popularity\": 6787\n  },\n  {\n    \"tag\": "colloquy brochan",\n    \"popularity\": 6780\n  },\n  {\n    \"tag\": "sloosh",\n    \"popularity\": 6774\n  },\n  {\n    \"tag\": "battered",\n    \"popularity\": 6767\n  },\n  {\n    \"tag\": "monocularity pluriguttulate",\n    \"popularity\": 6761\n  },\n  {\n    \"tag\": "chiastoneury",\n    \"popularity\": 6755\n  },\n  {\n    \"tag\": "Sanguinaria",\n    \"popularity\": 6748\n  },\n  {\n    \"tag\": "confessionary",\n    \"popularity\": 6742\n  },\n  {\n    \"tag\": "enzymic",\n    \"popularity\": 6736\n  },\n  {\n    \"tag\": "cord",\n    \"popularity\": 6729\n  },\n  {\n    \"tag\": "oviducal",\n    \"popularity\": 6723\n  },\n  {\n    \"tag\": "crozzle outsea",\n    \"popularity\": 6717\n  },\n  {\n    \"tag\": "balladical",\n    \"popularity\": 6710\n  },\n  {\n    \"tag\": "uncollectibleness",\n    \"popularity\": 6704\n  },\n  {\n    \"tag\": "predorsal",\n    \"popularity\": 6698\n  },\n  {\n    \"tag\": "reauthenticate",\n    \"popularity\": 6692\n  },\n  {\n    \"tag\": "ravissant",\n    \"popularity\": 6685\n  },\n  {\n    \"tag\": "advantageousness",\n    \"popularity\": 6679\n  },\n  {\n    \"tag\": "rung",\n    \"popularity\": 6673\n  },\n  {\n    \"tag\": "duncedom",\n    \"popularity\": 6667\n  },\n  {\n    \"tag\": "hematolite",\n    \"popularity\": 6660\n  },\n  {\n    \"tag\": "thisness",\n    \"popularity\": 6654\n  },\n  {\n    \"tag\": "mapau",\n    \"popularity\": 6648\n  },\n  {\n    \"tag\": "Hecatic",\n    \"popularity\": 6642\n  },\n  {\n    \"tag\": "meningoencephalocele",\n    \"popularity\": 6636\n  },\n  {\n    \"tag\": "confection sorra",\n    \"popularity\": 6630\n  },\n  {\n    \"tag\": "unsedate",\n    \"popularity\": 6623\n  },\n  {\n    \"tag\": "meningocerebritis",\n    \"popularity\": 6617\n  },\n  {\n    \"tag\": "biopsychological",\n    \"popularity\": 6611\n  },\n  {\n    \"tag\": "clavicithern",\n    \"popularity\": 6605\n  },\n  {\n    \"tag\": "resun",\n    \"popularity\": 6599\n  },\n  {\n    \"tag\": "bayamo",\n    \"popularity\": 6593\n  },\n  {\n    \"tag\": "seeableness",\n    \"popularity\": 6587\n  },\n  {\n    \"tag\": "hypsidolichocephalism",\n    \"popularity\": 6581\n  },\n  {\n    \"tag\": "salivous",\n    \"popularity\": 6574\n  },\n  {\n    \"tag\": "neumatize",\n    \"popularity\": 6568\n  },\n  {\n    \"tag\": "stree",\n    \"popularity\": 6562\n  },\n  {\n    \"tag\": "markshot",\n    \"popularity\": 6556\n  },\n  {\n    \"tag\": "phraseologically",\n    \"popularity\": 6550\n  },\n  {\n    \"tag\": "yealing",\n    \"popularity\": 6544\n  },\n  {\n    \"tag\": "puggy",\n    \"popularity\": 6538\n  },\n  {\n    \"tag\": "sexadecimal",\n    \"popularity\": 6532\n  },\n  {\n    \"tag\": "unofficerlike",\n    \"popularity\": 6526\n  },\n  {\n    \"tag\": "curiosa",\n    \"popularity\": 6520\n  },\n  {\n    \"tag\": "pedomotor",\n    \"popularity\": 6514\n  },\n  {\n    \"tag\": "astrally",\n    \"popularity\": 6508\n  },\n  {\n    \"tag\": "prosomatic",\n    \"popularity\": 6502\n  },\n  {\n    \"tag\": "bulletheaded",\n    \"popularity\": 6496\n  },\n  {\n    \"tag\": "fortuned",\n    \"popularity\": 6490\n  },\n  {\n    \"tag\": "pixy",\n    \"popularity\": 6484\n  },\n  {\n    \"tag\": "protectrix",\n    \"popularity\": 6478\n  },\n  {\n    \"tag\": "arthritical",\n    \"popularity\": 6472\n  },\n  {\n    \"tag\": "coction",\n    \"popularity\": 6466\n  },\n  {\n    \"tag\": "Anthropos",\n    \"popularity\": 6460\n  },\n  {\n    \"tag\": "runer",\n    \"popularity\": 6454\n  },\n  {\n    \"tag\": "prenotify",\n    \"popularity\": 6449\n  },\n  {\n    \"tag\": "microspheric gastroparalysis",\n    \"popularity\": 6443\n  },\n  {\n    \"tag\": "Jovicentrical",\n    \"popularity\": 6437\n  },\n  {\n    \"tag\": "ceratopsid",\n    \"popularity\": 6431\n  },\n  {\n    \"tag\": "Theodoric",\n    \"popularity\": 6425\n  },\n  {\n    \"tag\": "Pactolus",\n    \"popularity\": 6419\n  },\n  {\n    \"tag\": "spawning",\n    \"popularity\": 6413\n  },\n  {\n    \"tag\": "nonconfidential",\n    \"popularity\": 6407\n  },\n  {\n    \"tag\": "halotrichite infumate",\n    \"popularity\": 6402\n  },\n  {\n    \"tag\": "undiscriminatingly",\n    \"popularity\": 6396\n  },\n  {\n    \"tag\": "unexasperated",\n    \"popularity\": 6390\n  },\n  {\n    \"tag\": "isoeugenol",\n    \"popularity\": 6384\n  },\n  {\n    \"tag\": "pressboard",\n    \"popularity\": 6378\n  },\n  {\n    \"tag\": "unshrew",\n    \"popularity\": 6372\n  },\n  {\n    \"tag\": "huffingly",\n    \"popularity\": 6367\n  },\n  {\n    \"tag\": "wagaun",\n    \"popularity\": 6361\n  },\n  {\n    \"tag\": "squirt Philistine",\n    \"popularity\": 6355\n  },\n  {\n    \"tag\": "kryptic",\n    \"popularity\": 6349\n  },\n  {\n    \"tag\": "paraform",\n    \"popularity\": 6344\n  },\n  {\n    \"tag\": "preverify",\n    \"popularity\": 6338\n  },\n  {\n    \"tag\": "dalar",\n    \"popularity\": 6332\n  },\n  {\n    \"tag\": "interdictor appraisingly",\n    \"popularity\": 6326\n  },\n  {\n    \"tag\": "chipped",\n    \"popularity\": 6321\n  },\n  {\n    \"tag\": "Pteropoda",\n    \"popularity\": 6315\n  },\n  {\n    \"tag\": "Bohairic",\n    \"popularity\": 6309\n  },\n  {\n    \"tag\": "felting",\n    \"popularity\": 6303\n  },\n  {\n    \"tag\": "compurgatorial",\n    \"popularity\": 6298\n  },\n  {\n    \"tag\": "unclead",\n    \"popularity\": 6292\n  },\n  {\n    \"tag\": "stockish",\n    \"popularity\": 6286\n  },\n  {\n    \"tag\": "mulligatawny",\n    \"popularity\": 6281\n  },\n  {\n    \"tag\": "Monotheletism",\n    \"popularity\": 6275\n  },\n  {\n    \"tag\": "lutanist",\n    \"popularity\": 6269\n  },\n  {\n    \"tag\": "gluttonize",\n    \"popularity\": 6264\n  },\n  {\n    \"tag\": "hackneyed",\n    \"popularity\": 6258\n  },\n  {\n    \"tag\": "yield",\n    \"popularity\": 6253\n  },\n  {\n    \"tag\": "sulphonamido",\n    \"popularity\": 6247\n  },\n  {\n    \"tag\": "granulative",\n    \"popularity\": 6241\n  },\n  {\n    \"tag\": "swingy",\n    \"popularity\": 6236\n  },\n  {\n    \"tag\": "Desmidiales",\n    \"popularity\": 6230\n  },\n  {\n    \"tag\": "tootlish",\n    \"popularity\": 6224\n  },\n  {\n    \"tag\": "unsatisfiedly",\n    \"popularity\": 6219\n  },\n  {\n    \"tag\": "burucha",\n    \"popularity\": 6213\n  },\n  {\n    \"tag\": "premeditatingly",\n    \"popularity\": 6208\n  },\n  {\n    \"tag\": "cowrie",\n    \"popularity\": 6202\n  },\n  {\n    \"tag\": "pleurolysis",\n    \"popularity\": 6197\n  },\n  {\n    \"tag\": "nationalist",\n    \"popularity\": 6191\n  },\n  {\n    \"tag\": "Pholadacea",\n    \"popularity\": 6186\n  },\n  {\n    \"tag\": "anakrousis",\n    \"popularity\": 6180\n  },\n  {\n    \"tag\": "proctorial",\n    \"popularity\": 6175\n  },\n  {\n    \"tag\": "cavillation",\n    \"popularity\": 6169\n  },\n  {\n    \"tag\": "cervicobregmatic",\n    \"popularity\": 6163\n  },\n  {\n    \"tag\": "interspecific",\n    \"popularity\": 6158\n  },\n  {\n    \"tag\": "Teutonity",\n    \"popularity\": 6152\n  },\n  {\n    \"tag\": "snakeholing",\n    \"popularity\": 6147\n  },\n  {\n    \"tag\": "balcony",\n    \"popularity\": 6142\n  },\n  {\n    \"tag\": "latchless",\n    \"popularity\": 6136\n  },\n  {\n    \"tag\": "Mithraea",\n    \"popularity\": 6131\n  },\n  {\n    \"tag\": "pseudepigraph",\n    \"popularity\": 6125\n  },\n  {\n    \"tag\": "flosser",\n    \"popularity\": 6120\n  },\n  {\n    \"tag\": "kotyle",\n    \"popularity\": 6114\n  },\n  {\n    \"tag\": "outdo",\n    \"popularity\": 6109\n  },\n  {\n    \"tag\": "interclerical",\n    \"popularity\": 6103\n  },\n  {\n    \"tag\": "aurar",\n    \"popularity\": 6098\n  },\n  {\n    \"tag\": "apophyseal",\n    \"popularity\": 6093\n  },\n  {\n    \"tag\": "Miro",\n    \"popularity\": 6087\n  },\n  {\n    \"tag\": "Priscillian",\n    \"popularity\": 6082\n  },\n  {\n    \"tag\": "alluvia",\n    \"popularity\": 6076\n  },\n  {\n    \"tag\": "exordize",\n    \"popularity\": 6071\n  },\n  {\n    \"tag\": "breakage",\n    \"popularity\": 6066\n  },\n  {\n    \"tag\": "unclosable",\n    \"popularity\": 6060\n  },\n  {\n    \"tag\": "monocondylous",\n    \"popularity\": 6055\n  },\n  {\n    \"tag\": "dyarchy",\n    \"popularity\": 6050\n  },\n  {\n    \"tag\": "subchelate",\n    \"popularity\": 6044\n  },\n  {\n    \"tag\": "hearsay",\n    \"popularity\": 6039\n  },\n  {\n    \"tag\": "prestigiously",\n    \"popularity\": 6034\n  },\n  {\n    \"tag\": "unimuscular",\n    \"popularity\": 6028\n  },\n  {\n    \"tag\": "lingwort",\n    \"popularity\": 6023\n  },\n  {\n    \"tag\": "jealous",\n    \"popularity\": 6018\n  },\n  {\n    \"tag\": "artilleryman",\n    \"popularity\": 6012\n  },\n  {\n    \"tag\": "phantasmagorially",\n    \"popularity\": 6007\n  },\n  {\n    \"tag\": "stagnum",\n    \"popularity\": 6002\n  },\n  {\n    \"tag\": "organotropism shatteringly",\n    \"popularity\": 5997\n  },\n  {\n    \"tag\": "Mytilus Hebraist",\n    \"popularity\": 5991\n  },\n  {\n    \"tag\": "returf",\n    \"popularity\": 5986\n  },\n  {\n    \"tag\": "townfolk",\n    \"popularity\": 5981\n  },\n  {\n    \"tag\": "propitiative",\n    \"popularity\": 5976\n  },\n  {\n    \"tag\": "Anita unsullied",\n    \"popularity\": 5970\n  },\n  {\n    \"tag\": "bandoleered",\n    \"popularity\": 5965\n  },\n  {\n    \"tag\": "cubby",\n    \"popularity\": 5960\n  },\n  {\n    \"tag\": "Hexanchus",\n    \"popularity\": 5955\n  },\n  {\n    \"tag\": "circuminsular",\n    \"popularity\": 5949\n  },\n  {\n    \"tag\": "chamberletted eumycete",\n    \"popularity\": 5944\n  },\n  {\n    \"tag\": "secure",\n    \"popularity\": 5939\n  },\n  {\n    \"tag\": "Edwardean",\n    \"popularity\": 5934\n  },\n  {\n    \"tag\": "strenth",\n    \"popularity\": 5929\n  },\n  {\n    \"tag\": "exhaustless",\n    \"popularity\": 5923\n  },\n  {\n    \"tag\": "electioneerer",\n    \"popularity\": 5918\n  },\n  {\n    \"tag\": "estoile",\n    \"popularity\": 5913\n  },\n  {\n    \"tag\": "redden",\n    \"popularity\": 5908\n  },\n  {\n    \"tag\": "solicitee",\n    \"popularity\": 5903\n  },\n  {\n    \"tag\": "nonpatented",\n    \"popularity\": 5898\n  },\n  {\n    \"tag\": "lemming",\n    \"popularity\": 5893\n  },\n  {\n    \"tag\": "marled subalate",\n    \"popularity\": 5887\n  },\n  {\n    \"tag\": "premial horizonward",\n    \"popularity\": 5882\n  },\n  {\n    \"tag\": "nonrefueling",\n    \"popularity\": 5877\n  },\n  {\n    \"tag\": "rupturewort",\n    \"popularity\": 5872\n  },\n  {\n    \"tag\": "unfed",\n    \"popularity\": 5867\n  },\n  {\n    \"tag\": "empanelment",\n    \"popularity\": 5862\n  },\n  {\n    \"tag\": "isoosmosis",\n    \"popularity\": 5857\n  },\n  {\n    \"tag\": "jipijapa",\n    \"popularity\": 5852\n  },\n  {\n    \"tag\": "Fiji",\n    \"popularity\": 5847\n  },\n  {\n    \"tag\": "interferant",\n    \"popularity\": 5842\n  },\n  {\n    \"tag\": "reconstitution",\n    \"popularity\": 5837\n  },\n  {\n    \"tag\": "dockyardman",\n    \"popularity\": 5832\n  },\n  {\n    \"tag\": "dolichopodous",\n    \"popularity\": 5826\n  },\n  {\n    \"tag\": "whiteworm",\n    \"popularity\": 5821\n  },\n  {\n    \"tag\": "atheistically",\n    \"popularity\": 5816\n  },\n  {\n    \"tag\": "nonconcern",\n    \"popularity\": 5811\n  },\n  {\n    \"tag\": "scarabaeidoid",\n    \"popularity\": 5806\n  },\n  {\n    \"tag\": "triumviri",\n    \"popularity\": 5801\n  },\n  {\n    \"tag\": "rakit",\n    \"popularity\": 5796\n  },\n  {\n    \"tag\": "leecheater",\n    \"popularity\": 5791\n  },\n  {\n    \"tag\": "Arthrostraca",\n    \"popularity\": 5786\n  },\n  {\n    \"tag\": "upknit",\n    \"popularity\": 5781\n  },\n  {\n    \"tag\": "tymbalon",\n    \"popularity\": 5776\n  },\n  {\n    \"tag\": "inventurous",\n    \"popularity\": 5771\n  },\n  {\n    \"tag\": "perradiate",\n    \"popularity\": 5766\n  },\n  {\n    \"tag\": "seer",\n    \"popularity\": 5762\n  },\n  {\n    \"tag\": "Auricularia",\n    \"popularity\": 5757\n  },\n  {\n    \"tag\": "wettish exclusivity",\n    \"popularity\": 5752\n  },\n  {\n    \"tag\": "arteriosympathectomy",\n    \"popularity\": 5747\n  },\n  {\n    \"tag\": "tunlike",\n    \"popularity\": 5742\n  },\n  {\n    \"tag\": "cephalocercal",\n    \"popularity\": 5737\n  },\n  {\n    \"tag\": "meaninglessness",\n    \"popularity\": 5732\n  },\n  {\n    \"tag\": "fountful",\n    \"popularity\": 5727\n  },\n  {\n    \"tag\": "appraisement",\n    \"popularity\": 5722\n  },\n  {\n    \"tag\": "geniculated",\n    \"popularity\": 5717\n  },\n  {\n    \"tag\": "rotator",\n    \"popularity\": 5712\n  },\n  {\n    \"tag\": "foremarch biography",\n    \"popularity\": 5707\n  },\n  {\n    \"tag\": "arid",\n    \"popularity\": 5703\n  },\n  {\n    \"tag\": "inapprehensible",\n    \"popularity\": 5698\n  },\n  {\n    \"tag\": "chlorosulphonic",\n    \"popularity\": 5693\n  },\n  {\n    \"tag\": "braguette",\n    \"popularity\": 5688\n  },\n  {\n    \"tag\": "panophthalmitis",\n    \"popularity\": 5683\n  },\n  {\n    \"tag\": "pro objurgatorily",\n    \"popularity\": 5678\n  },\n  {\n    \"tag\": "zooplasty",\n    \"popularity\": 5673\n  },\n  {\n    \"tag\": "Terebratulidae",\n    \"popularity\": 5669\n  },\n  {\n    \"tag\": "Mahran",\n    \"popularity\": 5664\n  },\n  {\n    \"tag\": "anthologize merocele",\n    \"popularity\": 5659\n  },\n  {\n    \"tag\": "firecracker chiropractic",\n    \"popularity\": 5654\n  },\n  {\n    \"tag\": "tenorist",\n    \"popularity\": 5649\n  },\n  {\n    \"tag\": "amphitene",\n    \"popularity\": 5645\n  },\n  {\n    \"tag\": "silverbush toadstone",\n    \"popularity\": 5640\n  },\n  {\n    \"tag\": "entozoological",\n    \"popularity\": 5635\n  },\n  {\n    \"tag\": "trustlessness",\n    \"popularity\": 5630\n  },\n  {\n    \"tag\": "reassay",\n    \"popularity\": 5625\n  },\n  {\n    \"tag\": "chrysalides",\n    \"popularity\": 5621\n  },\n  {\n    \"tag\": "truncation",\n    \"popularity\": 5616\n  },\n  {\n    \"tag\": "unwavered mausoleal",\n    \"popularity\": 5611\n  },\n  {\n    \"tag\": "unserrated",\n    \"popularity\": 5606\n  },\n  {\n    \"tag\": "frampler",\n    \"popularity\": 5602\n  },\n  {\n    \"tag\": "celestial",\n    \"popularity\": 5597\n  },\n  {\n    \"tag\": "depreter",\n    \"popularity\": 5592\n  },\n  {\n    \"tag\": "retaliate",\n    \"popularity\": 5588\n  },\n  {\n    \"tag\": "decempunctate",\n    \"popularity\": 5583\n  },\n  {\n    \"tag\": "submitter",\n    \"popularity\": 5578\n  },\n  {\n    \"tag\": "phenothiazine",\n    \"popularity\": 5573\n  },\n  {\n    \"tag\": "hobbledehoyish",\n    \"popularity\": 5569\n  },\n  {\n    \"tag\": "erraticness",\n    \"popularity\": 5564\n  },\n  {\n    \"tag\": "ovariodysneuria",\n    \"popularity\": 5559\n  },\n  {\n    \"tag\": "puja",\n    \"popularity\": 5555\n  },\n  {\n    \"tag\": "cesspool",\n    \"popularity\": 5550\n  },\n  {\n    \"tag\": "sonation",\n    \"popularity\": 5545\n  },\n  {\n    \"tag\": "moggan",\n    \"popularity\": 5541\n  },\n  {\n    \"tag\": "overjutting",\n    \"popularity\": 5536\n  },\n  {\n    \"tag\": "cohobate",\n    \"popularity\": 5531\n  },\n  {\n    \"tag\": "Distoma",\n    \"popularity\": 5527\n  },\n  {\n    \"tag\": "Plectognathi",\n    \"popularity\": 5522\n  },\n  {\n    \"tag\": "dumple caliphate",\n    \"popularity\": 5517\n  },\n  {\n    \"tag\": "shiko",\n    \"popularity\": 5513\n  },\n  {\n    \"tag\": "downness",\n    \"popularity\": 5508\n  },\n  {\n    \"tag\": "whippletree",\n    \"popularity\": 5504\n  },\n  {\n    \"tag\": "nymphaeum",\n    \"popularity\": 5499\n  },\n  {\n    \"tag\": "there trest",\n    \"popularity\": 5494\n  },\n  {\n    \"tag\": "psychrometer",\n    \"popularity\": 5490\n  },\n  {\n    \"tag\": "pyelograph",\n    \"popularity\": 5485\n  },\n  {\n    \"tag\": "unsalvable",\n    \"popularity\": 5481\n  },\n  {\n    \"tag\": "bescreen",\n    \"popularity\": 5476\n  },\n  {\n    \"tag\": "cushy",\n    \"popularity\": 5471\n  },\n  {\n    \"tag\": "plicatolobate",\n    \"popularity\": 5467\n  },\n  {\n    \"tag\": "lakie",\n    \"popularity\": 5462\n  },\n  {\n    \"tag\": "anthropodeoxycholic",\n    \"popularity\": 5458\n  },\n  {\n    \"tag\": "resatisfaction",\n    \"popularity\": 5453\n  },\n  {\n    \"tag\": "unravelment unaccidental",\n    \"popularity\": 5449\n  },\n  {\n    \"tag\": "telewriter monogeneous",\n    \"popularity\": 5444\n  },\n  {\n    \"tag\": "unsabred",\n    \"popularity\": 5440\n  },\n  {\n    \"tag\": "startlingly",\n    \"popularity\": 5435\n  },\n  {\n    \"tag\": "Aralia",\n    \"popularity\": 5431\n  },\n  {\n    \"tag\": "alamonti",\n    \"popularity\": 5426\n  },\n  {\n    \"tag\": "Franklinization",\n    \"popularity\": 5422\n  },\n  {\n    \"tag\": "parliament",\n    \"popularity\": 5417\n  },\n  {\n    \"tag\": "schoolkeeper",\n    \"popularity\": 5413\n  },\n  {\n    \"tag\": "nonsociety",\n    \"popularity\": 5408\n  },\n  {\n    \"tag\": "parenthetic",\n    \"popularity\": 5404\n  },\n  {\n    \"tag\": "stog",\n    \"popularity\": 5399\n  },\n  {\n    \"tag\": "Pristipomidae",\n    \"popularity\": 5395\n  },\n  {\n    \"tag\": "exocarp",\n    \"popularity\": 5390\n  },\n  {\n    \"tag\": "monaxonial",\n    \"popularity\": 5386\n  },\n  {\n    \"tag\": "tramroad",\n    \"popularity\": 5381\n  },\n  {\n    \"tag\": "hookah",\n    \"popularity\": 5377\n  },\n  {\n    \"tag\": "saccharonic",\n    \"popularity\": 5372\n  },\n  {\n    \"tag\": "perimetrium",\n    \"popularity\": 5368\n  },\n  {\n    \"tag\": "libelluloid",\n    \"popularity\": 5364\n  },\n  {\n    \"tag\": "overrunningly",\n    \"popularity\": 5359\n  },\n  {\n    \"tag\": "untwister",\n    \"popularity\": 5355\n  },\n  {\n    \"tag\": "ninnyhammer",\n    \"popularity\": 5350\n  },\n  {\n    \"tag\": "metranate",\n    \"popularity\": 5346\n  },\n  {\n    \"tag\": "sarcoblast",\n    \"popularity\": 5341\n  },\n  {\n    \"tag\": "porkish",\n    \"popularity\": 5337\n  },\n  {\n    \"tag\": "chauvinistic",\n    \"popularity\": 5333\n  },\n  {\n    \"tag\": "sexagesimal",\n    \"popularity\": 5328\n  },\n  {\n    \"tag\": "hematogenic",\n    \"popularity\": 5324\n  },\n  {\n    \"tag\": "selfpreservatory",\n    \"popularity\": 5320\n  },\n  {\n    \"tag\": "myelauxe",\n    \"popularity\": 5315\n  },\n  {\n    \"tag\": "triply",\n    \"popularity\": 5311\n  },\n  {\n    \"tag\": "metaphysicous",\n    \"popularity\": 5306\n  },\n  {\n    \"tag\": "vitrinoid",\n    \"popularity\": 5302\n  },\n  {\n    \"tag\": "glabellae",\n    \"popularity\": 5298\n  },\n  {\n    \"tag\": "moonlighter",\n    \"popularity\": 5293\n  },\n  {\n    \"tag\": "monotheistically epexegetical",\n    \"popularity\": 5289\n  },\n  {\n    \"tag\": "pseudolateral",\n    \"popularity\": 5285\n  },\n  {\n    \"tag\": "heptamethylene",\n    \"popularity\": 5280\n  },\n  {\n    \"tag\": "salvadora",\n    \"popularity\": 5276\n  },\n  {\n    \"tag\": "unjovial diphenylthiourea",\n    \"popularity\": 5272\n  },\n  {\n    \"tag\": "thievishness",\n    \"popularity\": 5268\n  },\n  {\n    \"tag\": "unridable",\n    \"popularity\": 5263\n  },\n  {\n    \"tag\": "underhandedly",\n    \"popularity\": 5259\n  },\n  {\n    \"tag\": "fungiform",\n    \"popularity\": 5255\n  },\n  {\n    \"tag\": "scruffle",\n    \"popularity\": 5250\n  },\n  {\n    \"tag\": "preindisposition",\n    \"popularity\": 5246\n  },\n  {\n    \"tag\": "Amadis",\n    \"popularity\": 5242\n  },\n  {\n    \"tag\": "Culex",\n    \"popularity\": 5238\n  },\n  {\n    \"tag\": "churning",\n    \"popularity\": 5233\n  },\n  {\n    \"tag\": "imperite",\n    \"popularity\": 5229\n  },\n  {\n    \"tag\": "levorotation",\n    \"popularity\": 5225\n  },\n  {\n    \"tag\": "barbate",\n    \"popularity\": 5221\n  },\n  {\n    \"tag\": "knotwort",\n    \"popularity\": 5216\n  },\n  {\n    \"tag\": "gypsiferous",\n    \"popularity\": 5212\n  },\n  {\n    \"tag\": "tourmalinic",\n    \"popularity\": 5208\n  },\n  {\n    \"tag\": "helleboric",\n    \"popularity\": 5204\n  },\n  {\n    \"tag\": "pneumograph",\n    \"popularity\": 5199\n  },\n  {\n    \"tag\": "Peltigeraceae",\n    \"popularity\": 5195\n  },\n  {\n    \"tag\": "busine",\n    \"popularity\": 5191\n  },\n  {\n    \"tag\": "Ailuridae",\n    \"popularity\": 5187\n  },\n  {\n    \"tag\": "azotate",\n    \"popularity\": 5183\n  },\n  {\n    \"tag\": "unlikable",\n    \"popularity\": 5178\n  },\n  {\n    \"tag\": "sloyd",\n    \"popularity\": 5174\n  },\n  {\n    \"tag\": "biblioclasm",\n    \"popularity\": 5170\n  },\n  {\n    \"tag\": "Seres",\n    \"popularity\": 5166\n  },\n  {\n    \"tag\": "unaccurateness",\n    \"popularity\": 5162\n  },\n  {\n    \"tag\": "scrollwise",\n    \"popularity\": 5157\n  },\n  {\n    \"tag\": "flandowser",\n    \"popularity\": 5153\n  },\n  {\n    \"tag\": "unblackened",\n    \"popularity\": 5149\n  },\n  {\n    \"tag\": "schistosternia",\n    \"popularity\": 5145\n  },\n  {\n    \"tag\": "fuse",\n    \"popularity\": 5141\n  },\n  {\n    \"tag\": "narthecal",\n    \"popularity\": 5137\n  },\n  {\n    \"tag\": "Cueva",\n    \"popularity\": 5133\n  },\n  {\n    \"tag\": "appositeness",\n    \"popularity\": 5128\n  },\n  {\n    \"tag\": "proindustrial",\n    \"popularity\": 5124\n  },\n  {\n    \"tag\": "dermatorrhoea",\n    \"popularity\": 5120\n  },\n  {\n    \"tag\": "oxyurous tendential",\n    \"popularity\": 5116\n  },\n  {\n    \"tag\": "isopurpurin",\n    \"popularity\": 5112\n  },\n  {\n    \"tag\": "impose",\n    \"popularity\": 5108\n  },\n  {\n    \"tag\": "wordsmanship",\n    \"popularity\": 5104\n  },\n  {\n    \"tag\": "saturator",\n    \"popularity\": 5100\n  },\n  {\n    \"tag\": "Nordicity",\n    \"popularity\": 5096\n  },\n  {\n    \"tag\": "interaccuse",\n    \"popularity\": 5092\n  },\n  {\n    \"tag\": "acridinic",\n    \"popularity\": 5087\n  },\n  {\n    \"tag\": "scholion",\n    \"popularity\": 5083\n  },\n  {\n    \"tag\": "pseudoaconitine",\n    \"popularity\": 5079\n  },\n  {\n    \"tag\": "doctorial",\n    \"popularity\": 5075\n  },\n  {\n    \"tag\": "Etchimin",\n    \"popularity\": 5071\n  },\n  {\n    \"tag\": "oliviform",\n    \"popularity\": 5067\n  },\n  {\n    \"tag\": "Pele",\n    \"popularity\": 5063\n  },\n  {\n    \"tag\": "Chiromantis Progymnasium",\n    \"popularity\": 5059\n  },\n  {\n    \"tag\": "toxosis",\n    \"popularity\": 5055\n  },\n  {\n    \"tag\": "spadilla",\n    \"popularity\": 5051\n  },\n  {\n    \"tag\": "Actinopterygii",\n    \"popularity\": 5047\n  },\n  {\n    \"tag\": "untiring",\n    \"popularity\": 5043\n  },\n  {\n    \"tag\": "butyral",\n    \"popularity\": 5039\n  },\n  {\n    \"tag\": "Gymnoderinae",\n    \"popularity\": 5035\n  },\n  {\n    \"tag\": "testudo",\n    \"popularity\": 5031\n  },\n  {\n    \"tag\": "frigorify",\n    \"popularity\": 5027\n  },\n  {\n    \"tag\": "aliency",\n    \"popularity\": 5023\n  },\n  {\n    \"tag\": "jargon",\n    \"popularity\": 5019\n  },\n  {\n    \"tag\": "counterservice",\n    \"popularity\": 5015\n  },\n  {\n    \"tag\": "isostrychnine",\n    \"popularity\": 5011\n  },\n  {\n    \"tag\": "tellership",\n    \"popularity\": 5007\n  },\n  {\n    \"tag\": "miscegenetic",\n    \"popularity\": 5003\n  },\n  {\n    \"tag\": "sorcer",\n    \"popularity\": 4999\n  },\n  {\n    \"tag\": "tilewright",\n    \"popularity\": 4995\n  },\n  {\n    \"tag\": "cyanoplastid",\n    \"popularity\": 4991\n  },\n  {\n    \"tag\": "fluxionally",\n    \"popularity\": 4987\n  },\n  {\n    \"tag\": "proudhearted",\n    \"popularity\": 4983\n  },\n  {\n    \"tag\": "blithely",\n    \"popularity\": 4979\n  },\n  {\n    \"tag\": "jestproof",\n    \"popularity\": 4975\n  },\n  {\n    \"tag\": "jestwise",\n    \"popularity\": 4971\n  },\n  {\n    \"tag\": "nonassimilable",\n    \"popularity\": 4967\n  },\n  {\n    \"tag\": "compurgation",\n    \"popularity\": 4964\n  },\n  {\n    \"tag\": "unhate",\n    \"popularity\": 4960\n  },\n  {\n    \"tag\": "haplodonty",\n    \"popularity\": 4956\n  },\n  {\n    \"tag\": "cardholder",\n    \"popularity\": 4952\n  },\n  {\n    \"tag\": "rainlight megohmmeter overstout",\n    \"popularity\": 4948\n  },\n  {\n    \"tag\": "itchless",\n    \"popularity\": 4944\n  },\n  {\n    \"tag\": "begiggle",\n    \"popularity\": 4940\n  },\n  {\n    \"tag\": "chromatosphere",\n    \"popularity\": 4936\n  },\n  {\n    \"tag\": "typicality",\n    \"popularity\": 4932\n  },\n  {\n    \"tag\": "overgrown",\n    \"popularity\": 4928\n  },\n  {\n    \"tag\": "envolume",\n    \"popularity\": 4925\n  },\n  {\n    \"tag\": "pachycholia",\n    \"popularity\": 4921\n  },\n  {\n    \"tag\": "passageable",\n    \"popularity\": 4917\n  },\n  {\n    \"tag\": "pathopoiesis",\n    \"popularity\": 4913\n  },\n  {\n    \"tag\": "overbreak",\n    \"popularity\": 4909\n  },\n  {\n    \"tag\": "satyric",\n    \"popularity\": 4905\n  },\n  {\n    \"tag\": "unaudited",\n    \"popularity\": 4901\n  },\n  {\n    \"tag\": "whimble",\n    \"popularity\": 4898\n  },\n  {\n    \"tag\": "pressureless",\n    \"popularity\": 4894\n  },\n  {\n    \"tag\": "Selene",\n    \"popularity\": 4890\n  },\n  {\n    \"tag\": "slithery",\n    \"popularity\": 4886\n  },\n  {\n    \"tag\": "nondisfigurement",\n    \"popularity\": 4882\n  },\n  {\n    \"tag\": "overdelicious",\n    \"popularity\": 4878\n  },\n  {\n    \"tag\": "Perca",\n    \"popularity\": 4875\n  },\n  {\n    \"tag\": "Palladium",\n    \"popularity\": 4871\n  },\n  {\n    \"tag\": "insagacity",\n    \"popularity\": 4867\n  },\n  {\n    \"tag\": "peristoma",\n    \"popularity\": 4863\n  },\n  {\n    \"tag\": "uncreativeness",\n    \"popularity\": 4859\n  },\n  {\n    \"tag\": "incomparability surfboarding",\n    \"popularity\": 4856\n  },\n  {\n    \"tag\": "bacillar",\n    \"popularity\": 4852\n  },\n  {\n    \"tag\": "ulcerative",\n    \"popularity\": 4848\n  },\n  {\n    \"tag\": "stychomythia",\n    \"popularity\": 4844\n  },\n  {\n    \"tag\": "sesma somatics nonentry",\n    \"popularity\": 4840\n  },\n  {\n    \"tag\": "unsepulchred",\n    \"popularity\": 4837\n  },\n  {\n    \"tag\": "cephalanthium",\n    \"popularity\": 4833\n  },\n  {\n    \"tag\": "Asiaticization",\n    \"popularity\": 4829\n  },\n  {\n    \"tag\": "killeen",\n    \"popularity\": 4825\n  },\n  {\n    \"tag\": "Pseudococcus",\n    \"popularity\": 4822\n  },\n  {\n    \"tag\": "untractable",\n    \"popularity\": 4818\n  },\n  {\n    \"tag\": "apolegamic",\n    \"popularity\": 4814\n  },\n  {\n    \"tag\": "hyperpnea",\n    \"popularity\": 4810\n  },\n  {\n    \"tag\": "martyrolatry",\n    \"popularity\": 4807\n  },\n  {\n    \"tag\": "Sarmatic",\n    \"popularity\": 4803\n  },\n  {\n    \"tag\": "nonsurface",\n    \"popularity\": 4799\n  },\n  {\n    \"tag\": "adjoined",\n    \"popularity\": 4796\n  },\n  {\n    \"tag\": "vasiform",\n    \"popularity\": 4792\n  },\n  {\n    \"tag\": "tastelessness",\n    \"popularity\": 4788\n  },\n  {\n    \"tag\": "rumbo",\n    \"popularity\": 4784\n  },\n  {\n    \"tag\": "subdititious",\n    \"popularity\": 4781\n  },\n  {\n    \"tag\": "reparticipation",\n    \"popularity\": 4777\n  },\n  {\n    \"tag\": "Yorkshireism",\n    \"popularity\": 4773\n  },\n  {\n    \"tag\": "outcrow",\n    \"popularity\": 4770\n  },\n  {\n    \"tag\": "casserole",\n    \"popularity\": 4766\n  },\n  {\n    \"tag\": "semideltaic",\n    \"popularity\": 4762\n  },\n  {\n    \"tag\": "freemason",\n    \"popularity\": 4759\n  },\n  {\n    \"tag\": "catkin",\n    \"popularity\": 4755\n  },\n  {\n    \"tag\": "conscient",\n    \"popularity\": 4751\n  },\n  {\n    \"tag\": "reliably",\n    \"popularity\": 4748\n  },\n  {\n    \"tag\": "Telembi",\n    \"popularity\": 4744\n  },\n  {\n    \"tag\": "hide",\n    \"popularity\": 4740\n  },\n  {\n    \"tag\": "social",\n    \"popularity\": 4737\n  },\n  {\n    \"tag\": "ichneutic",\n    \"popularity\": 4733\n  },\n  {\n    \"tag\": "polypotome blouse pentagrammatic",\n    \"popularity\": 4729\n  },\n  {\n    \"tag\": "airdrome pesthole",\n    \"popularity\": 4726\n  },\n  {\n    \"tag\": "unportended",\n    \"popularity\": 4722\n  },\n  {\n    \"tag\": "sheerly",\n    \"popularity\": 4719\n  },\n  {\n    \"tag\": "acardiac",\n    \"popularity\": 4715\n  },\n  {\n    \"tag\": "fetor",\n    \"popularity\": 4711\n  },\n  {\n    \"tag\": "storax",\n    \"popularity\": 4708\n  },\n  {\n    \"tag\": "syndactylic",\n    \"popularity\": 4704\n  },\n  {\n    \"tag\": "otiatrics",\n    \"popularity\": 4700\n  },\n  {\n    \"tag\": "range",\n    \"popularity\": 4697\n  },\n  {\n    \"tag\": "branchway",\n    \"popularity\": 4693\n  },\n  {\n    \"tag\": "beatific",\n    \"popularity\": 4690\n  },\n  {\n    \"tag\": "Rugosa",\n    \"popularity\": 4686\n  },\n  {\n    \"tag\": "rafty",\n    \"popularity\": 4682\n  },\n  {\n    \"tag\": "gapy",\n    \"popularity\": 4679\n  },\n  {\n    \"tag\": "heterocercal",\n    \"popularity\": 4675\n  },\n  {\n    \"tag\": "actinopterygious",\n    \"popularity\": 4672\n  },\n  {\n    \"tag\": "glauconite",\n    \"popularity\": 4668\n  },\n  {\n    \"tag\": "limbless priest",\n    \"popularity\": 4665\n  },\n  {\n    \"tag\": "chrysene",\n    \"popularity\": 4661\n  },\n  {\n    \"tag\": "isentropic",\n    \"popularity\": 4658\n  },\n  {\n    \"tag\": "lairdess",\n    \"popularity\": 4654\n  },\n  {\n    \"tag\": "butterhead choliambic",\n    \"popularity\": 4650\n  },\n  {\n    \"tag\": "hexaseme",\n    \"popularity\": 4647\n  },\n  {\n    \"tag\": "treeify",\n    \"popularity\": 4643\n  },\n  {\n    \"tag\": "coronetted fructify",\n    \"popularity\": 4640\n  },\n  {\n    \"tag\": "admiralty",\n    \"popularity\": 4636\n  },\n  {\n    \"tag\": "Flosculariidae",\n    \"popularity\": 4633\n  },\n  {\n    \"tag\": "limaceous",\n    \"popularity\": 4629\n  },\n  {\n    \"tag\": "subterconscious",\n    \"popularity\": 4626\n  },\n  {\n    \"tag\": "stayless",\n    \"popularity\": 4622\n  },\n  {\n    \"tag\": "psha",\n    \"popularity\": 4619\n  },\n  {\n    \"tag\": "Mediterraneanize",\n    \"popularity\": 4615\n  },\n  {\n    \"tag\": "impenetrably",\n    \"popularity\": 4612\n  },\n  {\n    \"tag\": "Myrmeleonidae",\n    \"popularity\": 4608\n  },\n  {\n    \"tag\": "germander",\n    \"popularity\": 4605\n  },\n  {\n    \"tag\": "Buri",\n    \"popularity\": 4601\n  },\n  {\n    \"tag\": "papyrotamia",\n    \"popularity\": 4598\n  },\n  {\n    \"tag\": "Toxylon",\n    \"popularity\": 4594\n  },\n  {\n    \"tag\": "batatilla",\n    \"popularity\": 4591\n  },\n  {\n    \"tag\": "fabella assumer",\n    \"popularity\": 4587\n  },\n  {\n    \"tag\": "macromethod",\n    \"popularity\": 4584\n  },\n  {\n    \"tag\": "Blechnum",\n    \"popularity\": 4580\n  },\n  {\n    \"tag\": "pantography",\n    \"popularity\": 4577\n  },\n  {\n    \"tag\": "seminovel",\n    \"popularity\": 4574\n  },\n  {\n    \"tag\": "disembarrassment",\n    \"popularity\": 4570\n  },\n  {\n    \"tag\": "bushmaking",\n    \"popularity\": 4567\n  },\n  {\n    \"tag\": "neurosis",\n    \"popularity\": 4563\n  },\n  {\n    \"tag\": "Animalia",\n    \"popularity\": 4560\n  },\n  {\n    \"tag\": "Bernice",\n    \"popularity\": 4556\n  },\n  {\n    \"tag\": "wisen",\n    \"popularity\": 4553\n  },\n  {\n    \"tag\": "subhymenium",\n    \"popularity\": 4549\n  },\n  {\n    \"tag\": "esophagomycosis",\n    \"popularity\": 4546\n  },\n  {\n    \"tag\": "wireworks",\n    \"popularity\": 4543\n  },\n  {\n    \"tag\": "Sabellidae",\n    \"popularity\": 4539\n  },\n  {\n    \"tag\": "fustianish",\n    \"popularity\": 4536\n  },\n  {\n    \"tag\": "professively",\n    \"popularity\": 4532\n  },\n  {\n    \"tag\": "overcorruptly",\n    \"popularity\": 4529\n  },\n  {\n    \"tag\": "overcreep",\n    \"popularity\": 4526\n  },\n  {\n    \"tag\": "Castilloa",\n    \"popularity\": 4522\n  },\n  {\n    \"tag\": "forelady Georgie",\n    \"popularity\": 4519\n  },\n  {\n    \"tag\": "outsider",\n    \"popularity\": 4515\n  },\n  {\n    \"tag\": "Enukki",\n    \"popularity\": 4512\n  },\n  {\n    \"tag\": "gypsy",\n    \"popularity\": 4509\n  },\n  {\n    \"tag\": "Passamaquoddy",\n    \"popularity\": 4505\n  },\n  {\n    \"tag\": "reposit",\n    \"popularity\": 4502\n  },\n  {\n    \"tag\": "overtenderness",\n    \"popularity\": 4499\n  },\n  {\n    \"tag\": "keratome",\n    \"popularity\": 4495\n  },\n  {\n    \"tag\": "interclavicular hypermonosyllable Susanna",\n    \"popularity\": 4492\n  },\n  {\n    \"tag\": "mispropose",\n    \"popularity\": 4489\n  },\n  {\n    \"tag\": "Membranipora",\n    \"popularity\": 4485\n  },\n  {\n    \"tag\": "lampad",\n    \"popularity\": 4482\n  },\n  {\n    \"tag\": "header",\n    \"popularity\": 4479\n  },\n  {\n    \"tag\": "triseriate",\n    \"popularity\": 4475\n  },\n  {\n    \"tag\": "distrainment",\n    \"popularity\": 4472\n  },\n  {\n    \"tag\": "staphyloplastic",\n    \"popularity\": 4469\n  },\n  {\n    \"tag\": "outscour",\n    \"popularity\": 4465\n  },\n  {\n    \"tag\": "tallowmaking",\n    \"popularity\": 4462\n  },\n  {\n    \"tag\": "plugger",\n    \"popularity\": 4459\n  },\n  {\n    \"tag\": "fashionize",\n    \"popularity\": 4455\n  },\n  {\n    \"tag\": "puzzle",\n    \"popularity\": 4452\n  },\n  {\n    \"tag\": "imbrue",\n    \"popularity\": 4449\n  },\n  {\n    \"tag\": "osteoblast",\n    \"popularity\": 4445\n  },\n  {\n    \"tag\": "Hydrocores",\n    \"popularity\": 4442\n  },\n  {\n    \"tag\": "Lutra",\n    \"popularity\": 4439\n  },\n  {\n    \"tag\": "upridge scarfy",\n    \"popularity\": 4435\n  },\n  {\n    \"tag\": "ancon taffle",\n    \"popularity\": 4432\n  },\n  {\n    \"tag\": "impest",\n    \"popularity\": 4429\n  },\n  {\n    \"tag\": "uncollatedness",\n    \"popularity\": 4426\n  },\n  {\n    \"tag\": "hypersensitize",\n    \"popularity\": 4422\n  },\n  {\n    \"tag\": "autographically",\n    \"popularity\": 4419\n  },\n  {\n    \"tag\": "louther",\n    \"popularity\": 4416\n  },\n  {\n    \"tag\": "Ollie",\n    \"popularity\": 4413\n  },\n  {\n    \"tag\": "recompensate",\n    \"popularity\": 4409\n  },\n  {\n    \"tag\": "Shan",\n    \"popularity\": 4406\n  },\n  {\n    \"tag\": "brachycnemic",\n    \"popularity\": 4403\n  },\n  {\n    \"tag\": "Carinatae",\n    \"popularity\": 4399\n  },\n  {\n    \"tag\": "geotherm",\n    \"popularity\": 4396\n  },\n  {\n    \"tag\": "sawback",\n    \"popularity\": 4393\n  },\n  {\n    \"tag\": "Novatianist",\n    \"popularity\": 4390\n  },\n  {\n    \"tag\": "reapproach",\n    \"popularity\": 4387\n  },\n  {\n    \"tag\": "myelopoietic",\n    \"popularity\": 4383\n  },\n  {\n    \"tag\": "cyanin",\n    \"popularity\": 4380\n  },\n  {\n    \"tag\": "unsmutted",\n    \"popularity\": 4377\n  },\n  {\n    \"tag\": "nonpapist",\n    \"popularity\": 4374\n  },\n  {\n    \"tag\": "transbaikalian",\n    \"popularity\": 4370\n  },\n  {\n    \"tag\": "connately",\n    \"popularity\": 4367\n  },\n  {\n    \"tag\": "tenderize iterance",\n    \"popularity\": 4364\n  },\n  {\n    \"tag\": "hydrostatical",\n    \"popularity\": 4361\n  },\n  {\n    \"tag\": "unflag",\n    \"popularity\": 4358\n  },\n  {\n    \"tag\": "translate",\n    \"popularity\": 4354\n  },\n  {\n    \"tag\": "Scorzonera",\n    \"popularity\": 4351\n  },\n  {\n    \"tag\": "uncomforted",\n    \"popularity\": 4348\n  },\n  {\n    \"tag\": "risser varied",\n    \"popularity\": 4345\n  },\n  {\n    \"tag\": "plumbate",\n    \"popularity\": 4342\n  },\n  {\n    \"tag\": "Usneaceae",\n    \"popularity\": 4338\n  },\n  {\n    \"tag\": "fohat",\n    \"popularity\": 4335\n  },\n  {\n    \"tag\": "slagging",\n    \"popularity\": 4332\n  },\n  {\n    \"tag\": "superserious",\n    \"popularity\": 4329\n  },\n  {\n    \"tag\": "theocracy",\n    \"popularity\": 4326\n  },\n  {\n    \"tag\": "valonia",\n    \"popularity\": 4323\n  },\n  {\n    \"tag\": "Sapindales",\n    \"popularity\": 4319\n  },\n  {\n    \"tag\": "palaeozoologist",\n    \"popularity\": 4316\n  },\n  {\n    \"tag\": "yalb",\n    \"popularity\": 4313\n  },\n  {\n    \"tag\": "unviewed",\n    \"popularity\": 4310\n  },\n  {\n    \"tag\": "polyarteritis",\n    \"popularity\": 4307\n  },\n  {\n    \"tag\": "vectorial",\n    \"popularity\": 4304\n  },\n  {\n    \"tag\": "skimpingly",\n    \"popularity\": 4301\n  },\n  {\n    \"tag\": "athort",\n    \"popularity\": 4297\n  },\n  {\n    \"tag\": "tribofluorescence",\n    \"popularity\": 4294\n  },\n  {\n    \"tag\": "benzonitrol",\n    \"popularity\": 4291\n  },\n  {\n    \"tag\": "swiller subobtuse subjacency",\n    \"popularity\": 4288\n  },\n  {\n    \"tag\": "uncompassed",\n    \"popularity\": 4285\n  },\n  {\n    \"tag\": "cacochymia",\n    \"popularity\": 4282\n  },\n  {\n    \"tag\": "commensalist butadiene",\n    \"popularity\": 4279\n  },\n  {\n    \"tag\": "culpable",\n    \"popularity\": 4276\n  },\n  {\n    \"tag\": "contributive",\n    \"popularity\": 4273\n  },\n  {\n    \"tag\": "attemperately",\n    \"popularity\": 4269\n  },\n  {\n    \"tag\": "spelt",\n    \"popularity\": 4266\n  },\n  {\n    \"tag\": "exoneration",\n    \"popularity\": 4263\n  },\n  {\n    \"tag\": "antivivisectionist",\n    \"popularity\": 4260\n  },\n  {\n    \"tag\": "granitification",\n    \"popularity\": 4257\n  },\n  {\n    \"tag\": "palladize",\n    \"popularity\": 4254\n  },\n  {\n    \"tag\": "marksmanship",\n    \"popularity\": 4251\n  },\n  {\n    \"tag\": "bullydom",\n    \"popularity\": 4248\n  },\n  {\n    \"tag\": "spirality",\n    \"popularity\": 4245\n  },\n  {\n    \"tag\": "caliginous",\n    \"popularity\": 4242\n  },\n  {\n    \"tag\": "reportedly",\n    \"popularity\": 4239\n  },\n  {\n    \"tag\": "polyad",\n    \"popularity\": 4236\n  },\n  {\n    \"tag\": "arthroempyesis",\n    \"popularity\": 4233\n  },\n  {\n    \"tag\": "semibay facultatively",\n    \"popularity\": 4229\n  },\n  {\n    \"tag\": "metastatically",\n    \"popularity\": 4226\n  },\n  {\n    \"tag\": "prophetically",\n    \"popularity\": 4223\n  },\n  {\n    \"tag\": "Linguatula elapid",\n    \"popularity\": 4220\n  },\n  {\n    \"tag\": "pyknatom",\n    \"popularity\": 4217\n  },\n  {\n    \"tag\": "centimeter",\n    \"popularity\": 4214\n  },\n  {\n    \"tag\": "mensurate",\n    \"popularity\": 4211\n  },\n  {\n    \"tag\": "migraine",\n    \"popularity\": 4208\n  },\n  {\n    \"tag\": "pentagamist",\n    \"popularity\": 4205\n  },\n  {\n    \"tag\": "querken",\n    \"popularity\": 4202\n  },\n  {\n    \"tag\": "ambulance",\n    \"popularity\": 4199\n  },\n  {\n    \"tag\": "Stokavian",\n    \"popularity\": 4196\n  },\n  {\n    \"tag\": "malvasian",\n    \"popularity\": 4193\n  },\n  {\n    \"tag\": "uncouthsome",\n    \"popularity\": 4190\n  },\n  {\n    \"tag\": "readable",\n    \"popularity\": 4187\n  },\n  {\n    \"tag\": "enlodge",\n    \"popularity\": 4184\n  },\n  {\n    \"tag\": "plasterwise Appendiculariidae perspectograph",\n    \"popularity\": 4181\n  },\n  {\n    \"tag\": "inkweed",\n    \"popularity\": 4178\n  },\n  {\n    \"tag\": "streep",\n    \"popularity\": 4175\n  },\n  {\n    \"tag\": "diadelphian cultured",\n    \"popularity\": 4172\n  },\n  {\n    \"tag\": "hymenopterous",\n    \"popularity\": 4169\n  },\n  {\n    \"tag\": "unexorableness",\n    \"popularity\": 4166\n  },\n  {\n    \"tag\": "cascaron",\n    \"popularity\": 4163\n  },\n  {\n    \"tag\": "undaintiness",\n    \"popularity\": 4160\n  },\n  {\n    \"tag\": "Curtana",\n    \"popularity\": 4157\n  },\n  {\n    \"tag\": "scurvied",\n    \"popularity\": 4154\n  },\n  {\n    \"tag\": "molluscoidal",\n    \"popularity\": 4151\n  },\n  {\n    \"tag\": "yurt",\n    \"popularity\": 4148\n  },\n  {\n    \"tag\": "deciduitis",\n    \"popularity\": 4145\n  },\n  {\n    \"tag\": "creephole",\n    \"popularity\": 4142\n  },\n  {\n    \"tag\": "quatrefeuille",\n    \"popularity\": 4139\n  },\n  {\n    \"tag\": "bicapitate adenomatome",\n    \"popularity\": 4136\n  },\n  {\n    \"tag\": "damassin",\n    \"popularity\": 4134\n  },\n  {\n    \"tag\": "planching",\n    \"popularity\": 4131\n  },\n  {\n    \"tag\": "dashedly inferential",\n    \"popularity\": 4128\n  },\n  {\n    \"tag\": "lobe",\n    \"popularity\": 4125\n  },\n  {\n    \"tag\": "Hyrachyus",\n    \"popularity\": 4122\n  },\n  {\n    \"tag\": "knab",\n    \"popularity\": 4119\n  },\n  {\n    \"tag\": "discohexaster",\n    \"popularity\": 4116\n  },\n  {\n    \"tag\": "malign",\n    \"popularity\": 4113\n  },\n  {\n    \"tag\": "pedagoguism",\n    \"popularity\": 4110\n  },\n  {\n    \"tag\": "shrubbery",\n    \"popularity\": 4107\n  },\n  {\n    \"tag\": "undershrub",\n    \"popularity\": 4104\n  },\n  {\n    \"tag\": "bureaucrat",\n    \"popularity\": 4101\n  },\n  {\n    \"tag\": "pantaleon",\n    \"popularity\": 4098\n  },\n  {\n    \"tag\": "mesoventral",\n    \"popularity\": 4096\n  }]';
+
+var log2 = Math.log(2);
+var tagInfo = tagInfoJSON.parseJSON(function(a, b) { if (a == "popularity") { return Math.log(b) / log2; } else {return b; } });
+
+function makeTagCloud(tagInfo)
+{
+    var output = '<div class="tagCloud" style="width: 100%">';
+
+    tagInfo.sort(function(a, b) { if (a.tag < b.tag) { return -1; } else if (a.tag == b.tag) { return 0; } else return 1; });
+
+    for (var i = 0; i < tagInfo.length; i++) {
+        var tag = tagInfo[i].tag;
+
+        var validates = true;
+        for (var j = 0; j < tag.length; j++) {
+            var ch = tag.charCodeAt(j);
+            if (ch < 0x20 || ch >= 0x7f) {
+                validates = false;
+                break;
+            }
+        }
+
+        if (!validates)
+            continue;
+
+        var url = "http://example.com/tag/" + tag.replace(" ", "").toLowerCase();
+        var popularity = tagInfo[i].popularity;
+        var color = 'rgb(' + Math.floor(255 * (popularity - 12) / 20) + ', 0, 255)';
+        output += ' <a href="' + url + '" style="font-size: ' + popularity + 'px; color: ' + color + '">' + tag + '</a> \n';
+    }
+
+    output += '</div>';
+    output.replace(" ", "&nbsp;");
+
+    return output;
+}
+
+var tagcloud = makeTagCloud(tagInfo);
+tagInfo = null;
+
+// The result string embeds floating-point numbers, which can vary a bit on different platforms,
+// so we truncate them a bit before comparing.
+var tagcloud_norm = tagcloud.replace(/([0-9.]+)px/g, function(str, p1) { return p1.substr(0, 10) + 'px' })
+assertEq(tagcloud_norm.length, 295906)
diff --git a/js/src/tests/js1_8_1/jit/browser.js b/js/src/tests/js1_8_1/jit/browser.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/js/src/tests/js1_8_1/jit/jstests.list b/js/src/tests/js1_8_1/jit/jstests.list
new file mode 100644
index 00000000000..d21cf7d0743
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/jstests.list
@@ -0,0 +1,24 @@
+url-prefix ../../jsreftest.html?test=js1_8_1/jit/
+script math-jit-tests.js
+skip script regress-451673.js # bogus perf test (bug 540512)
+skip script regress-451974-01.js # bogus perf test (bug 540512)
+skip script regress-451974-02.js # bogus perf test (bug 540512)
+skip script regress-452498-01.js # bogus perf test (bug 540512)
+script regress-458838.js
+script regress-462459-01.js
+script regress-462459-02.js
+script regress-462459-03.js
+script regress-462459-04.js
+script regress-462459-05.js
+script regress-462459-06.js
+script regress-462459-07.js
+script regress-462459-08.js
+script regress-462459-09.js
+script regress-462459-10.js
+script regress-462459-11.js
+script regress-462459-12.js
+skip script regress-469927.js # bogus perf test (bug 540512)
+skip script regress-470739.js # bogus perf test (bug 540512)
+script regress-471635.js
+script regress-489682.js
+script testDeepBailFromNonNative.js
diff --git a/js/src/tests/js1_8_1/jit/regress-451673.js b/js/src/tests/js1_8_1/jit/regress-451673.js
new file mode 100644
index 00000000000..5c7202fe039
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-451673.js
@@ -0,0 +1,115 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Boris Zbarsky
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 451673;
+var summary = 'TM: Tracing prime number generation';
+var actual = '';
+var expect = '';
+
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+function test()
+{
+  enterFunc ('test');
+  printBugNumber(BUGNUMBER);
+  printStatus (summary);
+
+  function doTest(enablejit)
+  {
+    if (enablejit)
+      jit(true);
+    else
+      jit(false);
+
+    var n = 1000000;
+    var start = new Date();
+    var i=0;
+    var j=0;
+    var numprimes=0;
+    var limit=0;
+    numprimes = 1; // 2 is prime
+    var mceil = Math.floor;
+    var msqrt = Math.sqrt;
+    var isPrime = 1;
+
+    for (i = 3; i<= n; i+=2)
+    {
+	    isPrime=1;
+	    limit = mceil(msqrt(i)+1) + 1;
+
+	    for (j = 3; j < limit; j+=2)
+      {
+		    if (i % j == 0)
+        {
+			    isPrime = 0;
+			    break;
+        }
+      }
+
+	    if (isPrime)
+      {
+		    numprimes ++;
+      }
+    }
+
+    var end = new Date();
+
+    var timetaken = end - start;
+    timetaken = timetaken / 1000;
+
+    if (enablejit)
+      jit(false);
+
+    print((enablejit ? '    JIT' : 'Non-JIT') + ": Number of primes up to: " + n + " is " + numprimes + ", counted in " + timetaken + " secs.");
+
+    return timetaken;
+  }
+
+  var timenonjit = doTest(false);
+  var timejit    = doTest(true);
+
+  expect = true;
+  actual = timejit < timenonjit;
+
+  reportCompare(expect, actual, summary);
+
+  exitFunc ('test');
+}
diff --git a/js/src/tests/js1_8_1/jit/regress-451974-01.js b/js/src/tests/js1_8_1/jit/regress-451974-01.js
new file mode 100644
index 00000000000..59fc1415da3
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-451974-01.js
@@ -0,0 +1,86 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Andreas Gal
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 451974;
+var summary = 'TM: loops with anon functions should not be slower with jit enabled';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+var chars = '0123456789abcdef';
+var size = 10000;
+var mult = 1000;
+var densearray = [];
+var lsize = size;
+
+while (lsize--) 
+{ 
+  densearray.push(chars); 
+}
+
+function loop()
+{
+  var start = new Date();
+
+  for (var a = 0; a < mult; a++) 
+  {
+    var f = (function(x){}); 
+    for (var i = 0, len = densearray.length; i < len; i++) 
+    { 
+      f(densearray[i]); 
+    }
+  }
+
+  var stop = new Date();
+  return stop - start;
+}
+
+jit(false);
+var timenonjit = loop();
+jit(true);
+var timejit = loop();
+jit(false);
+
+print('time: nonjit = ' + timenonjit + ', jit = ' + timejit);
+
+expect = true;
+actual = timejit < timenonjit/2;
+
+reportCompare(expect, actual, summary);
diff --git a/js/src/tests/js1_8_1/jit/regress-451974-02.js b/js/src/tests/js1_8_1/jit/regress-451974-02.js
new file mode 100644
index 00000000000..f0de29d49bf
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-451974-02.js
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Andreas Gal
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 451974;
+var summary = 'TM: loops with anon functions should not be slower with jit enabled';
+var actual = '';
+var expect = '';
+
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+function test()
+{
+  enterFunc ('test');
+  printBugNumber(BUGNUMBER);
+  printStatus (summary);
+
+  var chars = '0123456789abcdef';
+  var size = 10000;
+  var mult = 1000;
+  var densearray = [];
+  var lsize = size;
+
+  while (lsize--) 
+  { 
+    densearray.push(chars); 
+  }
+
+  function loop()
+  {
+    var start = new Date();
+
+    for (var a = 0; a < mult; a++) 
+    {
+      var f = (function(x){}); 
+      for (var i = 0, len = densearray.length; i < len; i++) 
+      { 
+        f(densearray[i]); 
+      }
+    }
+
+    var stop = new Date();
+    return stop - start;
+  }
+
+  jit(false);
+  var timenonjit = loop();
+  jit(true);
+  var timejit = loop();
+  jit(false);
+
+  print('time: nonjit = ' + timenonjit + ', jit = ' + timejit);
+
+  expect = true;
+  actual = timejit < timenonjit/2;
+
+  reportCompare(expect, actual, summary);
+
+  exitFunc ('test');
+}
diff --git a/js/src/tests/js1_8_1/jit/regress-452498-01.js b/js/src/tests/js1_8_1/jit/regress-452498-01.js
new file mode 100644
index 00000000000..c857e2087af
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-452498-01.js
@@ -0,0 +1,105 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Boris Zbarsky
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 452498;
+var summary = 'TM: upvar2: jit heavyweight functions';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+function complex(aReal, aImag) {
+  this.r = aReal;
+  this.i = aImag;
+  this.square = function() {
+    return new complex(this.r * this.r - this.i * this.i,
+                       2 * this.r * this.i);
+  }
+  this.dist = function() {
+    return Math.sqrt(this.r * this.r + this.i * this.i);
+  }
+  this.add = function(aComplex) {
+    return new complex(this.r + aComplex.r, this.i + aComplex.i);
+  }
+}
+
+function mandelbrotValueOO (aC, aIterMax) {
+  let Z = new complex(0.0, 0.0);
+  for (var iter = 0; iter < aIterMax; iter++) {
+    Z = Z.square().add(aC);
+    if (Z.r * Z.r + Z.i * Z.i > 256) { break; }
+  }
+  return iter;
+}
+
+function f(trace) {
+  jit(trace);
+  var start = Date.now();
+  const width = 60;
+  const height = 60;
+  const max_iters = 50;
+  var output = [];
+  for (let img_x = 0; img_x < width; img_x++) {
+    for (let img_y = 0; img_y < height; img_y++) {
+      let C = new complex(-2 + (img_x / width) * 3,
+                          -1.5 + (img_y / height) * 3);
+      var res = mandelbrotValueOO(C, max_iters);
+      if (output.length > 0 && output[output.length -1][0] == res) {
+        output[output.length-1][1]++;
+      } else {
+        output.push([res, 1]);
+      }
+    }
+  }
+  jit(false);
+  const reference = "[[2, 6], [3, 17], [4, 6], [5, 1], [50, 1], [5, 1], [4, 6], [3, 17], [2, 10], [3, 17], [4, 6], [5, 1], [6, 1], [50, 1], [6, 1], [5, 1], [4, 6], [3, 17], [2, 8], [3, 17], [4, 6], [5, 2], [6, 1], [50, 1], [6, 1], [5, 2], [4, 6], [3, 17], [2, 6], [3, 17], [4, 6], [5, 2], [6, 1], [7, 1], [50, 1], [7, 1], [6, 1], [5, 2], [4, 6], [3, 17], [2, 4], [3, 17], [4, 7], [5, 2], [6, 1], [8, 1], [50, 1], [8, 1], [6, 1], [5, 2], [4, 7], [3, 17], [2, 2], [3, 17], [4, 7], [5, 3], [6, 1], [9, 1], [50, 1], [9, 1], [6, 1], [5, 3], [4, 7], [3, 17], [2, 1], [3, 16], [4, 7], [5, 3], [6, 2], [8, 1], [50, 1], [8, 1], [6, 2], [5, 3], [4, 7], [3, 32], [4, 7], [5, 4], [6, 1], [7, 1], [8, 1], [50, 1], [8, 1], [7, 1], [6, 1], [5, 4], [4, 7], [3, 31], [4, 7], [5, 3], [6, 2], [7, 1], [8, 1], [50, 1], [8, 1], [7, 1], [6, 2], [5, 3], [4, 7], [3, 30], [4, 7], [5, 4], [6, 2], [7, 1], [8, 1], [50, 1], [8, 1], [7, 1], [6, 2], [5, 4], [4, 7], [3, 28], [4, 7], [5, 4], [6, 2], [7, 1], [8, 1], [10, 1], [50, 1], [10, 1], [8, 1], [7, 1], [6, 2], [5, 4], [4, 7], [3, 26], [4, 7], [5, 4], [6, 2], [7, 1], [8, 1], [9, 1], [11, 1], [50, 1], [11, 1], [9, 1], [8, 1], [7, 1], [6, 2], [5, 4], [4, 7], [3, 25], [4, 6], [5, 3], [6, 3], [7, 1], [8, 1], [18, 1], [13, 1], [15, 1], [50, 1], [15, 1], [13, 1], [18, 1], [8, 1], [7, 1], [6, 3], [5, 3], [4, 6], [3, 24], [4, 7], [5, 2], [6, 2], [7, 3], [8, 1], [10, 1], [14, 1], [50, 3], [14, 1], [10, 1], [8, 1], [7, 3], [6, 2], [5, 2], [4, 7], [3, 23], [4, 6], [5, 3], [7, 1], [8, 1], [9, 1], [8, 2], [10, 1], [11, 1], [15, 1], [50, 3], [15, 1], [11, 1], [10, 1], [8, 2], [9, 1], [8, 1], [7, 1], [5, 3], [4, 6], [3, 22], [4, 7], [5, 2], [6, 1], [7, 1], [14, 1], [16, 1], [11, 1], [10, 1], [12, 1], [20, 1], [23, 1], [46, 1], [50, 1], [46, 1], [23, 1], [20, 1], [12, 1], [10, 1], [11, 1], [16, 1], [14, 1], [7, 1], [6, 1], [5, 2], [4, 7], [3, 20], [4, 7], [5, 3], [6, 1], [7, 1], [8, 1], [10, 1], [17, 1], [16, 1], [20, 1], [50, 7], [20, 1], [16, 1], [17, 1], [10, 1], [8, 1], [7, 1], [6, 1], [5, 3], [4, 7], [3, 19], [4, 7], [5, 3], [6, 2], [7, 1], [10, 1], [21, 1], [50, 11], [21, 1], [10, 1], [7, 1], [6, 2], [5, 3], [4, 7], [3, 18], [4, 7], [5, 4], [6, 1], [7, 1], [8, 1], [9, 1], [13, 1], [25, 1], [50, 9], [25, 1], [13, 1], [9, 1], [8, 1], [7, 1], [6, 1], [5, 4], [4, 7], [3, 17], [4, 7], [5, 4], [6, 1], [7, 1], [8, 1], [14, 2], [50, 11], [14, 2], [8, 1], [7, 1], [6, 1], [5, 4], [4, 7], [3, 16], [4, 7], [5, 4], [6, 2], [7, 1], [8, 1], [11, 1], [36, 1], [50, 11], [36, 1], [11, 1], [8, 1], [7, 1], [6, 2], [5, 4], [4, 7], [3, 15], [4, 7], [5, 4], [6, 2], [7, 1], [8, 1], [9, 1], [14, 1], [50, 11], [14, 1], [9, 1], [8, 1], [7, 1], [6, 2], [5, 4], [4, 7], [3, 14], [4, 7], [5, 4], [6, 3], [7, 1], [8, 1], [9, 1], [12, 1], [26, 1], [50, 9], [26, 1], [12, 1], [9, 1], [8, 1], [7, 1], [6, 3], [5, 4], [4, 7], [3, 13], [4, 7], [5, 4], [6, 2], [7, 2], [8, 1], [9, 1], [10, 1], [15, 1], [50, 9], [15, 1], [10, 1], [9, 1], [8, 1], [7, 2], [6, 2], [5, 4], [4, 7], [3, 12], [4, 7], [5, 4], [6, 3], [7, 1], [8, 2], [9, 1], [10, 1], [12, 1], [16, 1], [50, 7], [16, 1], [12, 1], [10, 1], [9, 1], [8, 2], [7, 1], [6, 3], [5, 4], [4, 7], [3, 11], [4, 6], [5, 4], [6, 3], [7, 1], [8, 2], [9, 1], [11, 1], [12, 1], [14, 1], [17, 1], [23, 1], [34, 1], [50, 3], [34, 1], [23, 1], [17, 1], [14, 1], [12, 1], [11, 1], [9, 1], [8, 2], [7, 1], [6, 3], [5, 4], [4, 6], [3, 10], [4, 7], [5, 3], [6, 2], [7, 2], [8, 1], [9, 1], [22, 1], [12, 1], [50, 1], [25, 1], [50, 11], [25, 1], [50, 1], [12, 1], [22, 1], [9, 1], [8, 1], [7, 2], [6, 2], [5, 3], [4, 7], [3, 9], [4, 6], [5, 4], [6, 1], [7, 1], [8, 2], [9, 1], [14, 1], [50, 1], [21, 1], [50, 15], [21, 1], [50, 1], [14, 1], [9, 1], [8, 2], [7, 1], [6, 1], [5, 4], [4, 6], [3, 8], [4, 7], [5, 3], [6, 2], [9, 1], [14, 1], [13, 1], [11, 1], [13, 1], [26, 1], [50, 17], [26, 1], [13, 1], [11, 1], [13, 1], [14, 1], [9, 1], [6, 2], [5, 3], [4, 7], [3, 7], [4, 6], [5, 4], [6, 1], [7, 1], [9, 1], [49, 1], [43, 1], [50, 23], [43, 1], [49, 1], [9, 1], [7, 1], [6, 1], [5, 4], [4, 6], [3, 7], [4, 5], [5, 4], [6, 2], [7, 1], [9, 1], [13, 1], [50, 25], [13, 1], [9, 1], [7, 1], [6, 2], [5, 4], [4, 5], [3, 6], [4, 6], [5, 3], [6, 2], [7, 2], [9, 1], [11, 1], [17, 1], [50, 23], [17, 1], [11, 1], [9, 1], [7, 2], [6, 2], [5, 3], [4, 6], [3, 5], [4, 5], [5, 3], [6, 3], [7, 1], [8, 1], [9, 1], [50, 1], [26, 1], [50, 23], [26, 1], [50, 1], [9, 1], [8, 1], [7, 1], [6, 3], [5, 3], [4, 5], [3, 5], [4, 4], [5, 3], [6, 3], [7, 1], [8, 2], [10, 1], [21, 1], [50, 25], [21, 1], [10, 1], [8, 2], [7, 1], [6, 3], [5, 3], [4, 4], [3, 5], [4, 4], [5, 2], [6, 3], [7, 1], [12, 1], [9, 1], [10, 1], [11, 1], [50, 27], [11, 1], [10, 1], [9, 1], [12, 1], [7, 1], [6, 3], [5, 2], [4, 4], [3, 5], [4, 3], [5, 2], [6, 2], [7, 2], [9, 1], [42, 1], [15, 1], [23, 1], [14, 1], [50, 27], [14, 1], [23, 1], [15, 1], [42, 1], [9, 1], [7, 2], [6, 2], [5, 2], [4, 3], [3, 5], [4, 3], [5, 1], [6, 1], [20, 1], [9, 1], [8, 1], [9, 1], [10, 1], [16, 1], [50, 33], [16, 1], [10, 1], [9, 1], [8, 1], [9, 1], [20, 1], [6, 1], [5, 1], [4, 3], [3, 5], [4, 3], [5, 1], [6, 1], [9, 1], [13, 1], [12, 1], [11, 1], [38, 1], [25, 1], [50, 33], [25, 1], [38, 1], [11, 1], [12, 1], [13, 1], [9, 1], [6, 1], [5, 1], [4, 3], [3, 5], [4, 3], [5, 2], [6, 1], [7, 1], [10, 1], [24, 1], [25, 1], [50, 35], [25, 1], [24, 1], [10, 1], [7, 1], [6, 1], [5, 2], [4, 3], [3, 5], [4, 4], [5, 1], [6, 1], [7, 1], [11, 2], [13, 1], [19, 1], [50, 33], [19, 1], [13, 1], [11, 2], [7, 1], [6, 1], [5, 1], [4, 4], [3, 5], [4, 4], [5, 2], [6, 1], [50, 1], [8, 2], [17, 1], [19, 1], [35, 1], [14, 1], [24, 1], [50, 25], [24, 1], [14, 1], [35, 1], [19, 1], [17, 1], [8, 2], [50, 1], [6, 1], [5, 2], [4, 4], [3, 5], [4, 5], [5, 2], [6, 2], [7, 1], [8, 1], [9, 2], [11, 1], [38, 1], [50, 25], [38, 1], [11, 1], [9, 2], [8, 1], [7, 1], [6, 2], [5, 2], [4, 5], [3, 6], [4, 4], [5, 3], [6, 2], [7, 2], [8, 1], [9, 1], [15, 1], [50, 25], [15, 1], [9, 1], [8, 1], [7, 2], [6, 2], [5, 3], [4, 4], [3, 7], [4, 5], [5, 3], [6, 3], [7, 1], [9, 1], [42, 1], [21, 1], [50, 23], [21, 1], [42, 1], [9, 1], [7, 1], [6, 3], [5, 3], [4, 5], [3, 8], [4, 5], [5, 3], [6, 2], [7, 1], [8, 1], [9, 1], [13, 1], [50, 23], [13, 1], [9, 1], [8, 1], [7, 1], [6, 2], [5, 3], [4, 5], [3, 9], [4, 6], [5, 3], [6, 2], [7, 1], [9, 1], [14, 1], [50, 23], [14, 1], [9, 1], [7, 1], [6, 2], [5, 3], [4, 6], [3, 10], [4, 6], [5, 3], [6, 1], [7, 1], [9, 1], [16, 1], [50, 2], [35, 1], [50, 8], [13, 1], [50, 8], [35, 1], [50, 2], [16, 1], [9, 1], [7, 1], [6, 1], [5, 3], [4, 6], [3, 12], [4, 6], [5, 2], [6, 1], [19, 1], [16, 1], [17, 1], [25, 1], [21, 1], [13, 1], [18, 1], [50, 6], [11, 1], [9, 1], [11, 1], [50, 6], [18, 1], [13, 1], [21, 1], [25, 1], [17, 1], [16, 1], [19, 1], [6, 1], [5, 2], [4, 6], [3, 14], [4, 5], [5, 3], [6, 1], [8, 1], [16, 1], [10, 1], [8, 2], [11, 1], [50, 1], [16, 1], [15, 1], [32, 1], [29, 1], [9, 1], [8, 1], [7, 1], [8, 1], [9, 1], [29, 1], [32, 1], [15, 1], [16, 1], [50, 1], [11, 1], [8, 2], [10, 1], [16, 1], [8, 1], [6, 1], [5, 3], [4, 5], [3, 15], [4, 6], [5, 3], [6, 4], [7, 1], [20, 1], [19, 1], [9, 3], [7, 3], [6, 1], [7, 3], [9, 3], [19, 1], [20, 1], [7, 1], [6, 4], [5, 3], [4, 6], [3, 16], [4, 7], [5, 4], [6, 3], [7, 1], [6, 13], [7, 1], [6, 3], [5, 4], [4, 7], [3, 18], [4, 7], [5, 27], [4, 7], [3, 20], [4, 9], [5, 21], [4, 9], [3, 23], [4, 12], [5, 11], [4, 12], [3, 26], [4, 33], [3, 29], [4, 29], [3, 33], [4, 25], [3, 38], [4, 19], [3, 20], [2, 1], [3, 26], [4, 7], [3, 26], [2, 2], [3, 57], [2, 1]]";
+  reportCompare(reference, output.toSource(), summary + ': correctness jit=' + trace);
+  return (Date.now() - start);
+}
+
+
+var timenonjit = f(false);
+var timejit = f(true);
+
+expect = true;
+actual = timejit < timenonjit;
+
+print('time nonjit: ' + timenonjit + ', time    jit: ' + timejit);
+
+reportCompare(expect, actual, summary);
diff --git a/js/src/tests/js1_8_1/jit/regress-458838.js b/js/src/tests/js1_8_1/jit/regress-458838.js
new file mode 100644
index 00000000000..0cc6991eb78
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-458838.js
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Boris Zbarksy
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 458838;
+var summary = 'TM: do not fall off trace when nested function accesses var of outer function';
+var actual = '';
+var expect = '';
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+function test()
+{
+  enterFunc ('test');
+  printBugNumber(BUGNUMBER);
+  printStatus (summary);
+
+  jit(true);
+
+  function f() {
+    var a = 1;
+    function g() {
+      var b = 0
+        for (var i = 0; i < 10; ++i) {
+          b += a;
+        }
+      return b;
+    }
+
+    return g();
+  }
+
+  expect = 10;
+  actual  = f();
+
+  var recorderStarted;
+  var recorderAborted;
+  var traceCompleted;
+  var skip = true;
+  
+  if (this.tracemonkey && !this.tracemonkey.profiler)
+  {
+    recorderStarted = this.tracemonkey.recorderStarted;
+    recorderAborted = this.tracemonkey.recorderAborted;
+    traceCompleted  = this.tracemonkey.traceCompleted;
+    skip = false;
+  }
+
+  jit(false);
+
+  reportCompare(expect, actual, summary + ': return value 10');
+
+  if (!skip)
+  {
+    expect = 'recorderStarted=1, recorderAborted=0, traceCompleted=1';
+    actual = 'recorderStarted=' + recorderStarted + ', recorderAborted=' + recorderAborted + ', traceCompleted=' + traceCompleted;
+    reportCompare(expect, actual, summary + ': trace');
+  }
+
+  exitFunc ('test');
+}
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-01.js b/js/src/tests/js1_8_1/jit/regress-462459-01.js
new file mode 100644
index 00000000000..7cfe2a90ba4
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-462459-01.js
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 462459;
+var summary = 'TM: trace Array()';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+if (!this.tracemonkey || this.tracemonkey.profiler)
+{
+  jit(false);
+  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
+  reportCompare(expect, actual, summary);
+}
+else
+{
+  jit(true);
+
+  expect = 'recorder started, recorder not aborted, trace completed';
+  actual = '';
+
+  var recorderStartedStart = this.tracemonkey.recorderStarted;
+  var recorderAbortedStart = this.tracemonkey.recorderAborted;
+  var traceCompletedStart  = this.tracemonkey.traceCompleted;
+
+
+  for (var i = 0; i < RUNLOOP; i++)
+  {
+    Array();
+  }
+
+  jit(false);
+
+  var recorderStartedEnd = this.tracemonkey.recorderStarted;
+  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
+  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
+
+  if (recorderStartedEnd > recorderStartedStart)
+  {
+    actual = 'recorder started, ';
+  }
+  else
+  {
+    actual = 'recorder not started, ';
+  }
+
+  if (recorderAbortedEnd > recorderAbortedStart)
+  {
+    actual += 'recorder aborted, ';
+  }
+  else
+  {
+    actual += 'recorder not aborted, ';
+  }
+
+  if (traceCompletedEnd > traceCompletedStart)
+  {
+    actual += 'trace completed';
+  }
+  else
+  {
+    actual += 'trace not completed';
+  }
+
+  reportCompare(expect, actual, summary);
+}
+
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-02.js b/js/src/tests/js1_8_1/jit/regress-462459-02.js
new file mode 100644
index 00000000000..14cc20198c4
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-462459-02.js
@@ -0,0 +1,106 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 462459;
+var summary = 'TM: trace Array(1)';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+if (!this.tracemonkey || this.tracemonkey.profiler)
+{
+  jit(false);
+  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
+  reportCompare(expect, actual, summary);
+}
+else
+{
+  jit(true);
+
+  expect = 'recorder started, recorder not aborted, trace completed';
+  actual = '';
+
+  var recorderStartedStart = this.tracemonkey.recorderStarted;
+  var recorderAbortedStart = this.tracemonkey.recorderAborted;
+  var traceCompletedStart  = this.tracemonkey.traceCompleted;
+
+  for (var i = 0; i < RUNLOOP; i++)
+  {
+    Array(1);
+  }
+
+  jit(false);
+
+  var recorderStartedEnd = this.tracemonkey.recorderStarted;
+  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
+  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
+
+  if (recorderStartedEnd > recorderStartedStart)
+  {
+    actual = 'recorder started, ';
+  }
+  else
+  {
+    actual = 'recorder not started, ';
+  }
+
+  if (recorderAbortedEnd > recorderAbortedStart)
+  {
+    actual += 'recorder aborted, ';
+  }
+  else
+  {
+    actual += 'recorder not aborted, ';
+  }
+
+  if (traceCompletedEnd > traceCompletedStart)
+  {
+    actual += 'trace completed';
+  }
+  else
+  {
+    actual += 'trace not completed';
+  }
+
+  reportCompare(expect, actual, summary);
+}
+
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-03.js b/js/src/tests/js1_8_1/jit/regress-462459-03.js
new file mode 100644
index 00000000000..a1d3db47083
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-462459-03.js
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 462459;
+var summary = 'TM: trace Array(1, 2)';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+if (!this.tracemonkey || this.tracemonkey.profiler)
+{
+  jit(false);
+  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
+  reportCompare(expect, actual, summary);
+}
+else
+{
+  jit(true);
+
+  expect = 'recorder started, recorder not aborted, trace completed';
+  actual = '';
+
+  var recorderStartedStart = this.tracemonkey.recorderStarted;
+  var recorderAbortedStart = this.tracemonkey.recorderAborted;
+  var traceCompletedStart  = this.tracemonkey.traceCompleted;
+
+
+  for (var i = 0; i < RUNLOOP; i++)
+  {
+    Array(1, 2);
+  }
+
+  jit(false);
+
+  var recorderStartedEnd = this.tracemonkey.recorderStarted;
+  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
+  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
+
+  if (recorderStartedEnd > recorderStartedStart)
+  {
+    actual = 'recorder started, ';
+  }
+  else
+  {
+    actual = 'recorder not started, ';
+  }
+
+  if (recorderAbortedEnd > recorderAbortedStart)
+  {
+    actual += 'recorder aborted, ';
+  }
+  else
+  {
+    actual += 'recorder not aborted, ';
+  }
+
+  if (traceCompletedEnd > traceCompletedStart)
+  {
+    actual += 'trace completed';
+  }
+  else
+  {
+    actual += 'trace not completed';
+  }
+
+  reportCompare(expect, actual, summary);
+}
+
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-04.js b/js/src/tests/js1_8_1/jit/regress-462459-04.js
new file mode 100644
index 00000000000..3bfe7278b1e
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-462459-04.js
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 462459;
+var summary = 'TM: trace Array(1, 2, 3)';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+if (!this.tracemonkey || this.tracemonkey.profiler)
+{
+  jit(false);
+  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
+  reportCompare(expect, actual, summary);
+}
+else
+{
+  jit(true);
+
+  expect = 'recorder started, recorder not aborted, trace completed';
+  actual = '';
+
+  var recorderStartedStart = this.tracemonkey.recorderStarted;
+  var recorderAbortedStart = this.tracemonkey.recorderAborted;
+  var traceCompletedStart  = this.tracemonkey.traceCompleted;
+
+
+  for (var i = 0; i < RUNLOOP; i++)
+  {
+    Array(1, 2, 3);
+  }
+
+  jit(false);
+
+  var recorderStartedEnd = this.tracemonkey.recorderStarted;
+  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
+  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
+
+  if (recorderStartedEnd > recorderStartedStart)
+  {
+    actual = 'recorder started, ';
+  }
+  else
+  {
+    actual = 'recorder not started, ';
+  }
+
+  if (recorderAbortedEnd > recorderAbortedStart)
+  {
+    actual += 'recorder aborted, ';
+  }
+  else
+  {
+    actual += 'recorder not aborted, ';
+  }
+
+  if (traceCompletedEnd > traceCompletedStart)
+  {
+    actual += 'trace completed';
+  }
+  else
+  {
+    actual += 'trace not completed';
+  }
+
+  reportCompare(expect, actual, summary);
+}
+
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-05.js b/js/src/tests/js1_8_1/jit/regress-462459-05.js
new file mode 100644
index 00000000000..5513b078e44
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-462459-05.js
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 462459;
+var summary = 'TM: trace new Array()';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+if (!this.tracemonkey || this.tracemonkey.profiler)
+{
+  jit(false);
+  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
+  reportCompare(expect, actual, summary);
+}
+else
+{
+  jit(true);
+
+  expect = 'recorder started, recorder not aborted, trace completed';
+  actual = '';
+
+  var recorderStartedStart = this.tracemonkey.recorderStarted;
+  var recorderAbortedStart = this.tracemonkey.recorderAborted;
+  var traceCompletedStart  = this.tracemonkey.traceCompleted;
+
+
+  for (var i = 0; i < RUNLOOP; i++)
+  {
+    new Array();
+  }
+
+  jit(false);
+
+  var recorderStartedEnd = this.tracemonkey.recorderStarted;
+  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
+  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
+
+  if (recorderStartedEnd > recorderStartedStart)
+  {
+    actual = 'recorder started, ';
+  }
+  else
+  {
+    actual = 'recorder not started, ';
+  }
+
+  if (recorderAbortedEnd > recorderAbortedStart)
+  {
+    actual += 'recorder aborted, ';
+  }
+  else
+  {
+    actual += 'recorder not aborted, ';
+  }
+
+  if (traceCompletedEnd > traceCompletedStart)
+  {
+    actual += 'trace completed';
+  }
+  else
+  {
+    actual += 'trace not completed';
+  }
+
+  reportCompare(expect, actual, summary);
+}
+
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-06.js b/js/src/tests/js1_8_1/jit/regress-462459-06.js
new file mode 100644
index 00000000000..aab4093ab5a
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-462459-06.js
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 462459;
+var summary = 'TM: trace new Array(1)';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+if (!this.tracemonkey || this.tracemonkey.profiler)
+{
+  jit(false);
+  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
+  reportCompare(expect, actual, summary);
+}
+else
+{
+  jit(true);
+
+  expect = 'recorder started, recorder not aborted, trace completed';
+  actual = '';
+
+  var recorderStartedStart = this.tracemonkey.recorderStarted;
+  var recorderAbortedStart = this.tracemonkey.recorderAborted;
+  var traceCompletedStart  = this.tracemonkey.traceCompleted;
+
+
+  for (var i = 0; i < RUNLOOP; i++)
+  {
+    new Array(1);
+  }
+
+  jit(false);
+
+  var recorderStartedEnd = this.tracemonkey.recorderStarted;
+  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
+  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
+
+  if (recorderStartedEnd > recorderStartedStart)
+  {
+    actual = 'recorder started, ';
+  }
+  else
+  {
+    actual = 'recorder not started, ';
+  }
+
+  if (recorderAbortedEnd > recorderAbortedStart)
+  {
+    actual += 'recorder aborted, ';
+  }
+  else
+  {
+    actual += 'recorder not aborted, ';
+  }
+
+  if (traceCompletedEnd > traceCompletedStart)
+  {
+    actual += 'trace completed';
+  }
+  else
+  {
+    actual += 'trace not completed';
+  }
+
+  reportCompare(expect, actual, summary);
+}
+
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-07.js b/js/src/tests/js1_8_1/jit/regress-462459-07.js
new file mode 100644
index 00000000000..0a9632a723d
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-462459-07.js
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 462459;
+var summary = 'TM: trace new Array(1, 2)';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+if (!this.tracemonkey || this.tracemonkey.profiler)
+{
+  jit(false);
+  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
+  reportCompare(expect, actual, summary);
+}
+else
+{
+  jit(true);
+
+  expect = 'recorder started, recorder not aborted, trace completed';
+  actual = '';
+
+  var recorderStartedStart = this.tracemonkey.recorderStarted;
+  var recorderAbortedStart = this.tracemonkey.recorderAborted;
+  var traceCompletedStart  = this.tracemonkey.traceCompleted;
+
+
+  for (var i = 0; i < RUNLOOP; i++)
+  {
+    new Array(1, 2);
+  }
+
+  jit(false);
+
+  var recorderStartedEnd = this.tracemonkey.recorderStarted;
+  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
+  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
+
+  if (recorderStartedEnd > recorderStartedStart)
+  {
+    actual = 'recorder started, ';
+  }
+  else
+  {
+    actual = 'recorder not started, ';
+  }
+
+  if (recorderAbortedEnd > recorderAbortedStart)
+  {
+    actual += 'recorder aborted, ';
+  }
+  else
+  {
+    actual += 'recorder not aborted, ';
+  }
+
+  if (traceCompletedEnd > traceCompletedStart)
+  {
+    actual += 'trace completed';
+  }
+  else
+  {
+    actual += 'trace not completed';
+  }
+
+  reportCompare(expect, actual, summary);
+}
+
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-08.js b/js/src/tests/js1_8_1/jit/regress-462459-08.js
new file mode 100644
index 00000000000..2c57b27fde4
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-462459-08.js
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 462459;
+var summary = 'TM: trace new Array(1, 2, 3)';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+if (!this.tracemonkey || this.tracemonkey.profiler)
+{
+  jit(false);
+  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
+  reportCompare(expect, actual, summary);
+}
+else
+{
+  jit(true);
+
+  expect = 'recorder started, recorder not aborted, trace completed';
+  actual = '';
+
+  var recorderStartedStart = this.tracemonkey.recorderStarted;
+  var recorderAbortedStart = this.tracemonkey.recorderAborted;
+  var traceCompletedStart  = this.tracemonkey.traceCompleted;
+
+
+  for (var i = 0; i < RUNLOOP; i++)
+  {
+    new Array(1, 2, 3);
+  }
+
+  jit(false);
+
+  var recorderStartedEnd = this.tracemonkey.recorderStarted;
+  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
+  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
+
+  if (recorderStartedEnd > recorderStartedStart)
+  {
+    actual = 'recorder started, ';
+  }
+  else
+  {
+    actual = 'recorder not started, ';
+  }
+
+  if (recorderAbortedEnd > recorderAbortedStart)
+  {
+    actual += 'recorder aborted, ';
+  }
+  else
+  {
+    actual += 'recorder not aborted, ';
+  }
+
+  if (traceCompletedEnd > traceCompletedStart)
+  {
+    actual += 'trace completed';
+  }
+  else
+  {
+    actual += 'trace not completed';
+  }
+
+  reportCompare(expect, actual, summary);
+}
+
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-09.js b/js/src/tests/js1_8_1/jit/regress-462459-09.js
new file mode 100644
index 00000000000..221fc19c429
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-462459-09.js
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 462459;
+var summary = 'TM: trace []';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+if (!this.tracemonkey || this.tracemonkey.profiler)
+{
+  jit(false);
+  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
+  reportCompare(expect, actual, summary);
+}
+else
+{
+  jit(true);
+
+  expect = 'recorder started, recorder not aborted, trace completed';
+  actual = '';
+
+  var recorderStartedStart = this.tracemonkey.recorderStarted;
+  var recorderAbortedStart = this.tracemonkey.recorderAborted;
+  var traceCompletedStart  = this.tracemonkey.traceCompleted;
+
+
+  for (var i = 0; i < RUNLOOP; i++)
+  {
+    [];
+  }
+
+  jit(false);
+
+  var recorderStartedEnd = this.tracemonkey.recorderStarted;
+  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
+  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
+
+  if (recorderStartedEnd > recorderStartedStart)
+  {
+    actual = 'recorder started, ';
+  }
+  else
+  {
+    actual = 'recorder not started, ';
+  }
+
+  if (recorderAbortedEnd > recorderAbortedStart)
+  {
+    actual += 'recorder aborted, ';
+  }
+  else
+  {
+    actual += 'recorder not aborted, ';
+  }
+
+  if (traceCompletedEnd > traceCompletedStart)
+  {
+    actual += 'trace completed';
+  }
+  else
+  {
+    actual += 'trace not completed';
+  }
+
+  reportCompare(expect, actual, summary);
+}
+
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-10.js b/js/src/tests/js1_8_1/jit/regress-462459-10.js
new file mode 100644
index 00000000000..4917d5cf31b
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-462459-10.js
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 462459;
+var summary = 'TM: trace [1]';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+if (!this.tracemonkey || this.tracemonkey.profiler)
+{
+  jit(false);
+  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
+  reportCompare(expect, actual, summary);
+}
+else
+{
+  jit(true);
+
+  expect = 'recorder started, recorder not aborted, trace completed';
+  actual = '';
+
+  var recorderStartedStart = this.tracemonkey.recorderStarted;
+  var recorderAbortedStart = this.tracemonkey.recorderAborted;
+  var traceCompletedStart  = this.tracemonkey.traceCompleted;
+
+
+  for (var i = 0; i < RUNLOOP; i++)
+  {
+    [1];
+  }
+
+  jit(false);
+
+  var recorderStartedEnd = this.tracemonkey.recorderStarted;
+  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
+  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
+
+  if (recorderStartedEnd > recorderStartedStart)
+  {
+    actual = 'recorder started, ';
+  }
+  else
+  {
+    actual = 'recorder not started, ';
+  }
+
+  if (recorderAbortedEnd > recorderAbortedStart)
+  {
+    actual += 'recorder aborted, ';
+  }
+  else
+  {
+    actual += 'recorder not aborted, ';
+  }
+
+  if (traceCompletedEnd > traceCompletedStart)
+  {
+    actual += 'trace completed';
+  }
+  else
+  {
+    actual += 'trace not completed';
+  }
+
+  reportCompare(expect, actual, summary);
+}
+
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-11.js b/js/src/tests/js1_8_1/jit/regress-462459-11.js
new file mode 100644
index 00000000000..2f7cb1c5945
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-462459-11.js
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 462459;
+var summary = 'TM: trace [1, 2]';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+if (!this.tracemonkey || this.tracemonkey.profiler)
+{
+  jit(false);
+  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
+  reportCompare(expect, actual, summary);
+}
+else
+{
+  jit(true);
+
+  expect = 'recorder started, recorder not aborted, trace completed';
+  actual = '';
+
+  var recorderStartedStart = this.tracemonkey.recorderStarted;
+  var recorderAbortedStart = this.tracemonkey.recorderAborted;
+  var traceCompletedStart  = this.tracemonkey.traceCompleted;
+
+
+  for (var i = 0; i < RUNLOOP; i++)
+  {
+    [1, 2];
+  }
+
+  jit(false);
+
+  var recorderStartedEnd = this.tracemonkey.recorderStarted;
+  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
+  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
+
+  if (recorderStartedEnd > recorderStartedStart)
+  {
+    actual = 'recorder started, ';
+  }
+  else
+  {
+    actual = 'recorder not started, ';
+  }
+
+  if (recorderAbortedEnd > recorderAbortedStart)
+  {
+    actual += 'recorder aborted, ';
+  }
+  else
+  {
+    actual += 'recorder not aborted, ';
+  }
+
+  if (traceCompletedEnd > traceCompletedStart)
+  {
+    actual += 'trace completed';
+  }
+  else
+  {
+    actual += 'trace not completed';
+  }
+
+  reportCompare(expect, actual, summary);
+}
+
diff --git a/js/src/tests/js1_8_1/jit/regress-462459-12.js b/js/src/tests/js1_8_1/jit/regress-462459-12.js
new file mode 100644
index 00000000000..524a7e4ae4c
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-462459-12.js
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): 
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 462459;
+var summary = 'TM: trace [1, 2, 3]';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+if (!this.tracemonkey || this.tracemonkey.profiler)
+{
+  jit(false);
+  expect = actual = 'Test skipped due to lack of tracemonkey jitstats';
+  reportCompare(expect, actual, summary);
+}
+else
+{
+  jit(true);
+
+  expect = 'recorder started, recorder not aborted, trace completed';
+  actual = '';
+
+  var recorderStartedStart = this.tracemonkey.recorderStarted;
+  var recorderAbortedStart = this.tracemonkey.recorderAborted;
+  var traceCompletedStart  = this.tracemonkey.traceCompleted;
+
+
+  for (var i = 0; i < RUNLOOP; i++)
+  {
+    [1, 2, 3];
+  }
+
+  jit(false);
+
+  var recorderStartedEnd = this.tracemonkey.recorderStarted;
+  var recorderAbortedEnd = this.tracemonkey.recorderAborted;
+  var traceCompletedEnd  = this.tracemonkey.traceCompleted;
+
+  if (recorderStartedEnd > recorderStartedStart)
+  {
+    actual = 'recorder started, ';
+  }
+  else
+  {
+    actual = 'recorder not started, ';
+  }
+
+  if (recorderAbortedEnd > recorderAbortedStart)
+  {
+    actual += 'recorder aborted, ';
+  }
+  else
+  {
+    actual += 'recorder not aborted, ';
+  }
+
+  if (traceCompletedEnd > traceCompletedStart)
+  {
+    actual += 'trace completed';
+  }
+  else
+  {
+    actual += 'trace not completed';
+  }
+
+  reportCompare(expect, actual, summary);
+}
+
diff --git a/js/src/tests/js1_8_1/jit/regress-469927.js b/js/src/tests/js1_8_1/jit/regress-469927.js
new file mode 100644
index 00000000000..17b893674b1
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-469927.js
@@ -0,0 +1,78 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Jesse Ruderman
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 469927;
+var summary = 'TM: jit should not slow down short loop with let';
+var actual = '';
+var expect = '';
+
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+function test()
+{
+  enterFunc ('test');
+  printBugNumber(BUGNUMBER);
+  printStatus (summary);
+ 
+  function letitbe() {
+    var start = new Date();
+    for (let i = 0; i < 500000; ++i) { 
+      for (let j = 0; j < 4; ++j) { } 
+    }
+    var stop = new Date();
+    return stop - start;
+  }
+
+  jit(false);
+  var timenonjit = letitbe();
+  jit(true);
+  var timejit = letitbe();
+  jit(false);
+
+  print('time: nonjit = ' + timenonjit + ', jit = ' + timejit);
+
+  expect = true;
+  actual = timejit < timenonjit;
+
+  reportCompare(expect, actual, summary);
+
+  exitFunc ('test');
+}
diff --git a/js/src/tests/js1_8_1/jit/regress-470739.js b/js/src/tests/js1_8_1/jit/regress-470739.js
new file mode 100644
index 00000000000..b6b0e64e0f2
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-470739.js
@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Jesse Ruderman
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 470739;
+var summary = 'TM: never abort on ==';
+var actual = '';
+var expect = '';
+
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+function test()
+{
+  enterFunc ('test');
+  printBugNumber(BUGNUMBER);
+  printStatus (summary);
+
+  function loop()
+  {
+    var i;
+    var start = new Date();
+
+    for(i=0;i<500000;++i) { var r = (void 0) == null; }
+
+    var stop = new Date();
+    return stop - start;
+  }
+
+  jit(false);
+  var timenonjit = loop();
+  jit(true);
+  var timejit = loop();
+  jit(false);
+
+  print('time: nonjit = ' + timenonjit + ', jit = ' + timejit);
+
+  expect = true;
+  actual = timejit < timenonjit;
+
+  reportCompare(expect, actual, summary);
+
+  exitFunc ('test');
+}
diff --git a/js/src/tests/js1_8_1/jit/regress-471635.js b/js/src/tests/js1_8_1/jit/regress-471635.js
new file mode 100644
index 00000000000..76078649204
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-471635.js
@@ -0,0 +1,90 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Boris Zbarksy
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 471635;
+var summary = 'TM: trace js shell print()';
+var actual = '';
+var expect = '';
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+function test()
+{
+  enterFunc ('test');
+  printBugNumber(BUGNUMBER);
+  printStatus (summary);
+
+  jit(true);
+
+  (function(){
+    for (var i = 1; i < 20; ++i) {
+      print("#");
+    }
+  })();
+
+  var recorderStarted;
+  var recorderAborted;
+  var traceCompleted;
+  var skip = true;
+
+  if (this.tracemonkey && !this.tracemonkey.profiler)
+  {
+    recorderStarted = this.tracemonkey.recorderStarted;
+    recorderAborted = this.tracemonkey.recorderAborted;
+    traceCompleted  = this.tracemonkey.traceCompleted;
+    skip = false;
+  }
+
+  jit(false);
+
+  if (!skip)
+  {
+    expect = 'recorderStarted=1, recorderAborted=0, traceCompleted=1';
+    actual = 'recorderStarted=' + recorderStarted + ', recorderAborted=' + recorderAborted + ', traceCompleted=' + traceCompleted;
+  }
+  else
+  {
+    expect = actual = 'Test skipped due to lack of tracemonkey jitstats object.';
+  }
+
+  reportCompare(expect, actual, summary);
+
+  exitFunc ('test');
+}
diff --git a/js/src/tests/js1_8_1/jit/regress-489682.js b/js/src/tests/js1_8_1/jit/regress-489682.js
new file mode 100644
index 00000000000..b8b73ec1ca7
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/regress-489682.js
@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is JavaScript Engine testing utilities.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Jesse Ruderman
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 489682;
+var summary = 'TM: wrong number with nested type-unstable loops';
+var actual = '';
+var expect = '';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+jit(true);
+
+var v = 0;
+
+for each (var a in [0, {}, {}, {}]) {
+  print(v);
+  v = v >>> 0;
+  for each (var b in [{}, {}, new String(''), 42, new String(''), {}, 42]) 
+           {
+           }
+         }
+print(v);
+
+jit(false);
+
+expect = '0';
+actual = v + '';
+
+reportCompare(expect, actual, summary);
diff --git a/js/src/tests/js1_8_1/jit/shell.js b/js/src/tests/js1_8_1/jit/shell.js
new file mode 100644
index 00000000000..63f283b96f8
--- /dev/null
+++ b/js/src/tests/js1_8_1/jit/shell.js
@@ -0,0 +1,4 @@
+// The loop count at which we trace
+const RECORDLOOP = this.tracemonkey ? tracemonkey.HOTLOOP : 8;
+// The loop count at which we run the trace
+const RUNLOOP = RECORDLOOP + 1;
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
index 96aa49899b4..a269fa3b9f4 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  * Mike Hommey <mh@glandium.org>
- * Siarhei Siamashka <siarhei.siamashka@nokia.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -45,13 +44,6 @@
 #error "This code is for Linux ARM only. Check that it works on your system, too.\nBeware that this code is highly compiler dependent."
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) \
-    && defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP) && !defined(__ARM_PCS)
-#error "Can't identify floating point calling conventions.\nPlease ensure that your toolchain defines __ARM_PCS or __ARM_PCS_VFP."
-#endif
-
-#ifndef __ARM_PCS_VFP
-
 /* This function copies a 64-bits word from dw to the given pointer in
  * a buffer delimited by start and end, possibly wrapping around the
  * buffer boundaries, and/or properly aligning the data at 64-bits word
@@ -197,252 +189,3 @@ NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
                     stack_space[base_size * 2 - 2],
                     stack_space[base_size * 2 - 1]);
 }    
-
-#else /* __ARM_PCS_VFP */
-
-/* "Procedure Call Standard for the ARM Architecture" document, sections
- * "5.5 Parameter Passing" and "6.1.2 Procedure Calling" contain all the
- * needed information.
- *
- * http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042d/IHI0042D_aapcs.pdf
- */
-
-#if defined(__thumb__) && !defined(__thumb2__)
-#error "Thumb1 is not supported"
-#endif
-
-#ifndef __ARMEL__
-#error "Only little endian compatibility was tested"
-#endif
-
-/*
- * Allocation of integer function arguments initially to registers r1-r3
- * and then to stack. Handling of 'this' argument which goes to r0 registers
- * is handled separately and does not belong to these two inline functions.
- *
- * The doubleword arguments are allocated to even:odd
- * register pairs or get aligned at 8-byte boundary on stack. The "holes"
- * which may appear as a result of this realignment remain unused.
- *
- * 'ireg_args'  - pointer to the current position in the buffer,
- *                corresponding to the register arguments
- * 'stack_args' - pointer to the current position in the buffer,
- *                corresponding to the arguments on stack
- * 'end'        - pointer to the end of the registers argument
- *                buffer (it is guaranteed to be 8-bytes aligned)
- */
-
-static inline void copy_word(PRUint32* &ireg_args,
-                             PRUint32* &stack_args,
-                             PRUint32* end,
-                             PRUint32  data)
-{
-  if (ireg_args < end) {
-    *ireg_args = data;
-    ireg_args++;
-  } else {
-    *stack_args = data;
-    stack_args++;
-  }
-}
-
-static inline void copy_dword(PRUint32* &ireg_args,
-                              PRUint32* &stack_args,
-                              PRUint32* end,
-                              PRUint64  data)
-{
-  if (ireg_args + 1 < end) {
-    if ((PRUint32)ireg_args & 4) {
-      ireg_args++;
-    }
-    *(PRUint64 *)ireg_args = data;
-    ireg_args += 2;
-  } else {
-    if ((PRUint32)stack_args & 4) {
-      stack_args++;
-    }
-    *(PRUint64 *)stack_args = data;
-    stack_args += 2;
-  }
-}
-
-/*
- * Allocation of floating point arguments to VFP registers (s0-s15, d0-d7).
- *
- * Unlike integer registers allocation, "back-filling" needs to be
- * supported. For example, the third floating point argument in the
- * following function is going to be allocated to s1 register, back-filling
- * the "hole":
- *    void f(float s0, double d1, float s1)
- *
- * Refer to the "Procedure Call Standard for the ARM Architecture" document
- * for more details.
- *
- * 'vfp_s_args' - pointer to the current position in the buffer with
- *                the next unallocated single precision register
- * 'vfp_d_args' - pointer to the current position in the buffer with
- *                the next unallocated double precision register,
- *                it has the same value as 'vfp_s_args' when back-filling
- *                is not used
- * 'end'        - pointer to the end of the vfp registers argument
- *                buffer (it is guaranteed to be 8-bytes aligned)
- *
- * Mozilla bugtracker has a test program attached which be used for
- * experimenting with VFP registers allocation code and testing its
- * correctness:
- * https://bugzilla.mozilla.org/show_bug.cgi?id=601914#c19
- */
-
-static inline bool copy_vfp_single(float* &vfp_s_args, double* &vfp_d_args,
-                                   float* end, float data)
-{
-  if (vfp_s_args >= end)
-    return false;
-
-  *vfp_s_args = data;
-  vfp_s_args++;
-  if (vfp_s_args < (float *)vfp_d_args) {
-    // It was the case of back-filling, now the next free single precision
-    // register should overlap with the next free double precision register
-    vfp_s_args = (float *)vfp_d_args;
-  } else if (vfp_s_args > (float *)vfp_d_args) {
-    // also update the pointer to the next free double precision register
-    vfp_d_args++;
-  }
-  return true;
-}
-
-static inline bool copy_vfp_double(float* &vfp_s_args, double* &vfp_d_args,
-                                   float* end, double data)
-{
-  if (vfp_d_args >= (double *)end) {
-    // The back-filling continues only so long as no VFP CPRC has been
-    // allocated to a slot on the stack. Basically no VFP registers can
-    // be allocated after this point.
-    vfp_s_args = end;
-    return false;
-  }
-
-  if (vfp_s_args == (float *)vfp_d_args) {
-    // also update the pointer to the next free single precision register
-    vfp_s_args += 2;
-  }
-  *vfp_d_args = data;
-  vfp_d_args++;
-  return true;
-}
-
-static void
-invoke_copy_to_stack(PRUint32* stk, PRUint32 *end,
-                     PRUint32 paramCount, nsXPTCVariant* s)
-{
-  PRUint32 *ireg_args  = end - 3;
-  float    *vfp_s_args = (float *)end;
-  double   *vfp_d_args = (double *)end;
-  float    *vfp_end    = vfp_s_args + 16;
-
-  for (PRUint32 i = 0; i < paramCount; i++, s++) {
-    if (s->IsPtrData()) {
-      copy_word(ireg_args, stk, end, (PRUint32)s->ptr);
-      continue;
-    }
-    // According to the ARM EABI, integral types that are smaller than a word
-    // are to be sign/zero-extended to a full word and treated as 4-byte values
-    switch (s->type)
-    {
-      case nsXPTType::T_FLOAT:
-        if (!copy_vfp_single(vfp_s_args, vfp_d_args, vfp_end, s->val.f)) {
-          copy_word(end, stk, end, reinterpret_cast<PRUint32&>(s->val.f));
-        }
-        break;
-      case nsXPTType::T_DOUBLE:
-        if (!copy_vfp_double(vfp_s_args, vfp_d_args, vfp_end, s->val.d)) {
-          copy_dword(end, stk, end, reinterpret_cast<PRUint64&>(s->val.d));
-        }
-        break;
-      case nsXPTType::T_I8:  copy_word(ireg_args, stk, end, s->val.i8);   break;
-      case nsXPTType::T_I16: copy_word(ireg_args, stk, end, s->val.i16);  break;
-      case nsXPTType::T_I32: copy_word(ireg_args, stk, end, s->val.i32);  break;
-      case nsXPTType::T_I64: copy_dword(ireg_args, stk, end, s->val.i64); break;
-      case nsXPTType::T_U8:  copy_word(ireg_args, stk, end, s->val.u8);   break;
-      case nsXPTType::T_U16: copy_word(ireg_args, stk, end, s->val.u16);  break;
-      case nsXPTType::T_U32: copy_word(ireg_args, stk, end, s->val.u32);  break;
-      case nsXPTType::T_U64: copy_dword(ireg_args, stk, end, s->val.u64); break;
-      case nsXPTType::T_BOOL: copy_word(ireg_args, stk, end, s->val.b);   break;
-      case nsXPTType::T_CHAR: copy_word(ireg_args, stk, end, s->val.c);   break;
-      case nsXPTType::T_WCHAR: copy_word(ireg_args, stk, end, s->val.wc); break;
-      default:
-        // all the others are plain pointer types
-        copy_word(ireg_args, stk, end, reinterpret_cast<PRUint32>(s->val.p));
-        break;
-    }
-  }
-}
-
-typedef PRUint32 (*vtable_func)(nsISupports *, PRUint32, PRUint32, PRUint32);
-
-EXPORT_XPCOM_API(nsresult)
-NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-                   PRUint32 paramCount, nsXPTCVariant* params)
-{
-  vtable_func *vtable = *reinterpret_cast<vtable_func **>(that);
-#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-  vtable_func func = vtable[methodIndex];
-#else /* non G++ V3 ABI */
-  vtable_func func = vtable[2 + methodIndex];
-#endif
-  // 'register PRUint32 result asm("r0")' could be used here, but it does not
-  //  seem to be reliable in all cases: http://gcc.gnu.org/PR46164
-  PRUint32 result;
-  asm (
-    "mov    %[stack_space_size], %[param_count_plus_2], lsl #3\n"
-    "tst    sp, #4\n" /* check stack alignment */
-
-    "add    %[stack_space_size], #(4 * 16)\n" /* space for VFP registers */
-    "mov    r3, %[params]\n"
-
-    "it     ne\n"
-    "addne  %[stack_space_size], %[stack_space_size], #4\n"
-    "sub    r0, sp, %[stack_space_size]\n" /* allocate space on stack */
-
-    "sub    r2, %[param_count_plus_2], #2\n"
-    "mov    sp, r0\n"
-
-    "add    r1, r0, %[param_count_plus_2], lsl #3\n"
-    "blx    %[invoke_copy_to_stack]\n"
-
-    "add    ip, sp, %[param_count_plus_2], lsl #3\n"
-    "mov    r0, %[that]\n"
-    "ldmdb  ip, {r1, r2, r3}\n"
-    "vldm   ip, {d0, d1, d2, d3, d4, d5, d6, d7}\n"
-    "blx    %[func]\n"
-
-    "add    sp, sp, %[stack_space_size]\n" /* cleanup stack */
-    "mov    %[stack_space_size], r0\n" /* it's actually 'result' variable */
-    : [stack_space_size]     "=&r" (result)
-    : [func]                 "r"   (func),
-      [that]                 "r"   (that),
-      [params]               "r"   (params),
-      [param_count_plus_2]   "r"   (paramCount + 2),
-      [invoke_copy_to_stack] "r"   (invoke_copy_to_stack)
-    : "cc", "memory",
-      // Mark all the scratch registers as clobbered because they may be
-      // modified by the functions, called from this inline assembly block
-      "r0", "r1", "r2", "r3", "ip", "lr",
-      "d0",  "d1",  "d2",  "d3",  "d4",  "d5",  "d6",  "d7",
-      // Also unconditionally mark d16-d31 registers as clobbered even though
-      // they actually don't exist in vfpv2 and vfpv3-d16 variants. There is
-      // no way to identify VFP variant using preprocessor at the momemnt
-      // (see http://gcc.gnu.org/PR46128 for more details), but fortunately
-      // current versions of gcc do not seem to complain about these registers
-      // even when this code is compiled with '-mfpu=vfpv3-d16' option.
-      // If gcc becomes more strict in the future and/or provides a way to
-      // identify VFP variant, the following d16-d31 registers list needs
-      // to be wrapped into some #ifdef
-      "d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23",
-      "d24", "d25", "d26", "d27", "d28", "d29", "d30", "d31"
-  );
-  return result;
-}
-
-#endif

From f1e4d22897f1bde14711619955a65af434d78c3a Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Wed, 27 Oct 2010 14:16:17 -0700
Subject: [PATCH 15/57] Bug 575485 - Refactor commonDialog code into a sharable
 JSM (Part 1, cleanup). r=gavin, a=beltzner

---
 .../prompts/content/commonDialog.js           | 116 +++++++-----------
 .../prompts/content/commonDialog.xul          |  18 +--
 .../prompts/content/selectDialog.js           |   8 +-
 .../prompts/content/selectDialog.xul          |   8 +-
 4 files changed, 63 insertions(+), 87 deletions(-)

diff --git a/toolkit/components/prompts/content/commonDialog.js b/toolkit/components/prompts/content/commonDialog.js
index 10bab3cca36..72609c16a68 100644
--- a/toolkit/components/prompts/content/commonDialog.js
+++ b/toolkit/components/prompts/content/commonDialog.js
@@ -46,17 +46,17 @@ const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 
-let gArgs = window.arguments[0].QueryInterface(Ci.nsIWritablePropertyBag2)
-                               .QueryInterface(Ci.nsIWritablePropertyBag);
-
-let promptType, numButtons, iconClass, soundID, hasInputField = true;
-
+let gArgs, promptType, numButtons, iconClass, soundID, hasInputField = true;
+let gDelayExpired = false, gBlurred = false;
 
 function earlyInit() {
     // This is called before onload fires, so we can't be certain that any elements
     // in the document have their bindings ready, so don't call any methods/properties
     // here on xul elements that come from xbl bindings.
 
+    gArgs = window.arguments[0].QueryInterface(Ci.nsIWritablePropertyBag2)
+                               .QueryInterface(Ci.nsIWritablePropertyBag);
+
     promptType = gArgs.getProperty("promptType");
 
     switch (promptType) {
@@ -124,7 +124,7 @@ function initTextbox(aName, aValue) {
     document.getElementById(aName + "Textbox").setAttribute("value", aValue);
 }
 
-function setLabelForNode(aNode, aLabel, aIsLabelFlag) {
+function setLabelForNode(aNode, aLabel) {
     // This is for labels which may contain embedded access keys.
     // If we end in (&X) where X represents the access key, optionally preceded
     // by spaces and/or followed by the ':' character, store the access key and
@@ -145,11 +145,7 @@ function setLabelForNode(aNode, aLabel, aIsLabelFlag) {
 
     // && is the magic sequence to embed an & in your label.
     aLabel = aLabel.replace(/\&\&/g, "&");
-    if (aIsLabelFlag) {    // Set text for <label> element
-        aNode.setAttribute("value", aLabel);
-    } else {    // Set text for other xul elements
-        aNode.label = aLabel;
-    }
+    aNode.label = aLabel;
 
     // XXXjag bug 325251
     // Need to set this after aNode.setAttribute("value", aLabel);
@@ -174,44 +170,34 @@ function commonDialogOnLoad() {
 
     // set the document title
     let title = gArgs.getProperty("title");
-#ifdef XP_MACOSX
-    document.getElementById("info.title").appendChild(document.createTextNode(title));
-#else
     document.title = title;
-#endif
+    // OS X doesn't have a title on modal dialogs, this is hidden on other platforms.
+    document.getElementById("info.title").appendChild(document.createTextNode(title));
 
     Services.obs.addObserver(softkbObserver, "softkb-change", false);
 
-    // Set button visibility
+    // Set button labels and visibility
     let dialog = document.documentElement;
     switch (numButtons) {
+      case 4:
+        setLabelForNode(dialog.getButton("extra2"), gArgs.getProperty("button3Label"));
+        dialog.getButton("extra2").hidden = false;
+        // fall through
+      case 3:
+        setLabelForNode(dialog.getButton("extra1"), gArgs.getProperty("button2Label"));
+        dialog.getButton("extra1").hidden = false;
+        // fall through
+      case 2:
+        if (gArgs.hasKey("button1Label"))
+            setLabelForNode(dialog.getButton("cancel"), gArgs.getProperty("button1Label"));
+        break;
+
       case 1:
         dialog.getButton("cancel").hidden = true;
         break;
-      case 4:
-        dialog.getButton("extra2").hidden = false;
-      case 3:
-        dialog.getButton("extra1").hidden = false;
-    }
-
-    // Set button labels
-    switch (numButtons) {
-      case 4:
-        setLabelForNode(document.documentElement.getButton("extra2"), gArgs.getProperty("button3Label"));
-        // fall through
-      case 3:
-        setLabelForNode(document.documentElement.getButton("extra1"), gArgs.getProperty("button2Label"));
-        // fall through
-      default:
-      case 2:
-        if (gArgs.hasKey("button1Label"))
-            setLabelForNode(document.documentElement.getButton("cancel"), gArgs.getProperty("button1Label"));
-        // fall through
-      case 1:
-        if (gArgs.hasKey("button0Label"))
-            setLabelForNode(document.documentElement.getButton("accept"), gArgs.getProperty("button0Label"));
-        break;
     }
+    if (gArgs.hasKey("button0Label"))
+        setLabelForNode(dialog.getButton("accept"), gArgs.getProperty("button0Label"));
 
     // display the main text
     // Bug 317334 - crop string length as a workaround.
@@ -248,9 +234,9 @@ function commonDialogOnLoad() {
             b = gArgs.getProperty("defaultButtonNum");
         let dButton = dlgButtons[b];
         // XXX shouldn't we set the default even when a textbox is focused?
-        document.documentElement.defaultButton = dButton;
+        dialog.defaultButton = dButton;
 #ifndef XP_MACOSX
-        document.documentElement.getButton(dButton).focus();
+        dialog.getButton(dButton).focus();
 #endif
     } else {
         if (promptType == "promptPassword")
@@ -261,12 +247,13 @@ function commonDialogOnLoad() {
 
     if (gArgs.hasKey("enableDelay") && gArgs.getProperty("enableDelay")) {
         let delayInterval = Services.prefs.getIntPref("security.dialog_enable_delay");
-
-        document.documentElement.getButton("accept").disabled = true;
-        document.documentElement.getButton("extra1").disabled = true;
-        document.documentElement.getButton("extra2").disabled = true;
-
-        setTimeout(commonDialogReenableButtons, delayInterval);
+        setButtonsEnabledState(dialog, false);
+        setTimeout(function () {
+                        // Don't automatically enable the buttons if we're not in the foreground
+                        if (!gBlurred)
+                            setButtonsEnabledState(dialog, true);
+                        gDelayExpired = true;
+                    }, delayInterval);
 
         addEventListener("blur", commonDialogBlur, false);
         addEventListener("focus", commonDialogFocus, false);
@@ -286,46 +273,33 @@ function commonDialogOnLoad() {
     Services.obs.notifyObservers(window, "common-dialog-loaded", null);
 }
 
+function setButtonsEnabledState(dialog, enabled) {
+    dialog.getButton("accept").disabled = !enabled;
+    dialog.getButton("extra1").disabled = !enabled;
+    dialog.getButton("extra2").disabled = !enabled;
+}
+
 function commonDialogOnUnload() {
     Services.obs.removeObserver(softkbObserver, "softkb-change");
 }
 
-
-var gDelayExpired = false;
-var gBlurred = false;
-
 function commonDialogBlur(aEvent) {
     if (aEvent.target != document)
         return;
     gBlurred = true;
-    document.documentElement.getButton("accept").disabled = true;
-    document.documentElement.getButton("extra1").disabled = true;
-    document.documentElement.getButton("extra2").disabled = true;
+    let dialog = document.documentElement;
+    setButtonsEnabledState(dialog, false);
 }
 
 function commonDialogFocus(aEvent) {
     if (aEvent.target != document)
         return;
     gBlurred = false;
+    let dialog = document.documentElement;
     // When refocusing the window, don't enable the buttons unless the countdown
     // delay has expired.
-    if (gDelayExpired) {
-        let script;
-        script  = "document.documentElement.getButton('accept').disabled = false; ";
-        script += "document.documentElement.getButton('extra1').disabled = false; ";
-        script += "document.documentElement.getButton('extra2').disabled = false;";
-        setTimeout(script, 250);
-    }
-}
-
-function commonDialogReenableButtons() {
-    // Don't automatically enable the buttons if we're not in the foreground
-    if (!gBlurred) {
-        document.documentElement.getButton("accept").disabled = false;
-        document.documentElement.getButton("extra1").disabled = false;
-        document.documentElement.getButton("extra2").disabled = false;
-    }
-    gDelayExpired = true;
+    if (gDelayExpired)
+        setTimeout(setButtonsEnabledState, 250, dialog, true);
 }
 
 function onCheckboxClick(aCheckboxElement) {
diff --git a/toolkit/components/prompts/content/commonDialog.xul b/toolkit/components/prompts/content/commonDialog.xul
index f6e4cedcc53..b18a33cb3cf 100644
--- a/toolkit/components/prompts/content/commonDialog.xul
+++ b/toolkit/components/prompts/content/commonDialog.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://global/content/commonDialog.css" type="text/css"?>
@@ -7,7 +7,7 @@
 <!DOCTYPE dialog SYSTEM "chrome://global/locale/commonDialog.dtd">
 
 <dialog id="commonDialog"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         aria-describedby="info.body"
         onload="commonDialogOnLoad();"
         onunload="commonDialogOnUnload();"
@@ -15,7 +15,7 @@
         ondialogextra1="return commonDialogOnExtra1();"
         ondialogextra2="return commonDialogOnExtra2();"
         buttonpack="center">
-    
+
   <script type="application/javascript" src="chrome://global/content/commonDialog.js"/>
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
@@ -55,10 +55,12 @@
           <image id="info.icon" class="spaced"/>
         </hbox>
         <vbox id="infoContainer">
-#ifdef XP_MACOSX
-          <!-- Dialog title is inside dialog for OS X -->
-          <description id="info.title"/>
+          <!-- Only shown on OS X, since it has no dialog title -->
+          <description id="info.title"
+#ifndef XP_MACOSX
+            style="display: none"
 #endif
+          />
           <spacer style="height: 1em"/>
           <description id="info.body" context="contentAreaContextMenu" noinitialfocus="true"/>
         </vbox>
@@ -80,8 +82,8 @@
 
 
   <!-- This method is called inline because it may unset hidden="true" on the
-       above boxes, causing their frames to be build and bindings to load.  
-       So, by calling this inline, we guarantee the textboxes and checkboxes 
+       above boxes, causing their frames to be build and bindings to load.
+       So, by calling this inline, we guarantee the textboxes and checkboxes
        above will have their bindings before initButtons is called, and the
        dialog will be intrinsically sized correctly. -->
   <script type="application/javascript">earlyInit();</script>
diff --git a/toolkit/components/prompts/content/selectDialog.js b/toolkit/components/prompts/content/selectDialog.js
index 9a7756f9134..cd27f1d3db3 100644
--- a/toolkit/components/prompts/content/selectDialog.js
+++ b/toolkit/components/prompts/content/selectDialog.js
@@ -41,12 +41,12 @@ const Cr = Components.results;
 const Cc = Components.classes;
 const Cu = Components.utils;
 
-let gArgs = window.arguments[0].QueryInterface(Ci.nsIWritablePropertyBag2)
-                               .QueryInterface(Ci.nsIWritablePropertyBag);
-
-let listBox;
+let gArgs, listBox;
 
 function dialogOnLoad() {
+    gArgs = window.arguments[0].QueryInterface(Ci.nsIWritablePropertyBag2)
+                               .QueryInterface(Ci.nsIWritablePropertyBag);
+
     let promptType = gArgs.getProperty("promptType");
     if (promptType != "select") {
         Cu.reportError("selectDialog opened for unknown type: " + promptType);
diff --git a/toolkit/components/prompts/content/selectDialog.xul b/toolkit/components/prompts/content/selectDialog.xul
index 9e2e3b22ac1..de4b02c5c39 100644
--- a/toolkit/components/prompts/content/selectDialog.xul
+++ b/toolkit/components/prompts/content/selectDialog.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 
 <!-- ***** BEGIN LICENSE BLOCK *****
  Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -37,10 +37,10 @@
 
  ***** END LICENSE BLOCK ***** -->
 
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <!DOCTYPE dialog SYSTEM "chrome://global/locale/commonDialog.dtd">
- 
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
+
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="dialogOnLoad()"
       ondialogaccept="return dialogOK();">
 

From 49cc6fea7838aa081be180702f422e52a4da882c Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Wed, 27 Oct 2010 14:16:17 -0700
Subject: [PATCH 16/57] Bug 575485 - Refactor commonDialog code into a sharable
 JSM (Part 2, refactor). r=gavin, a=beltzner

---
 toolkit/components/prompts/src/nsPrompter.js | 254 +++++++++++--------
 1 file changed, 142 insertions(+), 112 deletions(-)

diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js
index faabd01c4db..e282a4d45d1 100644
--- a/toolkit/components/prompts/src/nsPrompter.js
+++ b/toolkit/components/prompts/src/nsPrompter.js
@@ -322,6 +322,25 @@ let PromptUtils = {
         return text;
     },
 
+    objectToPropBag : function (obj) {
+        let bag = Cc["@mozilla.org/hash-property-bag;1"].
+                  createInstance(Ci.nsIWritablePropertyBag2);
+        bag.QueryInterface(Ci.nsIWritablePropertyBag);
+
+        for (let propName in obj)
+            bag.setProperty(propName, obj[propName]);
+
+        return bag;
+    },
+
+    propBagToObject : function (propBag, obj) {
+        // Here we iterate over the object's original properties, not the bag
+        // (ie, the prompt can't return more/different properties than were
+        // passed in). This just helps ensure that the caller provides default
+        // values, lest the prompt forget to set them.
+        for (let propName in obj)
+            obj[propName] = propBag.getProperty(propName);
+    },
 };
 
 XPCOMUtils.defineLazyGetter(PromptUtils, "strBundle", function () {
@@ -343,8 +362,19 @@ XPCOMUtils.defineLazyGetter(PromptUtils, "ellipsis", function () {
 
 
 
-const COMMON_DIALOG = "chrome://global/content/commonDialog.xul";
-const SELECT_DIALOG = "chrome://global/content/selectDialog.xul";
+function openModalWindow(domWin, uri, args) {
+    // XXX do we want to do modal state if we fall back to .activeWindow?
+    if (!domWin)
+        domWin = Services.ww.activeWindow;
+
+    // XXX domWin may still be null here if there are _no_ windows open.
+
+    // Note that we don't need to fire DOMWillOpenModalDialog and
+    // DOMModalDialogClosed events here, wwatcher's OpenWindowJSInternal
+    // will do that. Similarly for enterModalState / leaveModalState.
+
+    Services.ww.openWindow(domWin, uri, "_blank", "centerscreen,chrome,modal,titlebar", args);
+}
 
 function ModalPrompter(domWin) {
     this.domWin = domWin;
@@ -358,25 +388,15 @@ ModalPrompter.prototype = {
     /* ---------- internal methods ---------- */
 
 
-    newPropBag : function () {
-        let bag = Cc["@mozilla.org/hash-property-bag;1"].
-                  createInstance(Ci.nsIWritablePropertyBag2);
-        return bag.QueryInterface(Ci.nsIWritablePropertyBag);
-    },
+    openPrompt : function (args) {
+        const COMMON_DIALOG = "chrome://global/content/commonDialog.xul";
+        const SELECT_DIALOG = "chrome://global/content/selectDialog.xul";
 
-    openPrompt : function (uri, args) {
-        // XXX do we want to do modal state if we fall back to .activeWindow?
-        let domWin = this.domWin;
-        if (!domWin)
-            domWin = Services.ww.activeWindow;
+        let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG;
 
-        // XXX domWin may still be null here if there are _no_ windows open.
-
-        // Note that we don't need to fire DOMWillOpenModalDialog and
-        // DOMModalDialogClosed events here, wwatcher's OpenWindowJSInternal
-        // will do that. Similarly for enterModalState / leaveModalState.
-
-        Services.ww.openWindow(domWin, uri, "_blank", "centerscreen,chrome,modal,titlebar", args);
+        let propBag = PromptUtils.objectToPropBag(args);
+        openModalWindow(this.domWin, uri, propBag);
+        PromptUtils.propBagToObject(propBag, args);
     },
 
 
@@ -421,66 +441,70 @@ ModalPrompter.prototype = {
         if (!title)
             title = PromptUtils.getLocalizedString("Alert");
 
-        let args = this.newPropBag();
-        args.setProperty("promptType", "alert");
-        args.setProperty("title", title);
-        args.setProperty("text",  text);
+        let args = {
+            promptType: "alert",
+            title:      title,
+            text:       text,
+        };
 
-        this.openPrompt(COMMON_DIALOG, args);
+        this.openPrompt(args);
     },
 
     alertCheck : function (title, text, checkLabel, checkValue) {
         if (!title)
             title = PromptUtils.getLocalizedString("Alert");
 
-        let args = this.newPropBag();
-        args.setProperty("promptType", "alertCheck");
-        args.setProperty("title",      title);
-        args.setProperty("text",       text);
-        args.setProperty("checkLabel", checkLabel);
-        args.setProperty("checked",    checkValue.value);
+        let args = {
+            promptType: "alertCheck",
+            title:      title,
+            text:       text,
+            checkLabel: checkLabel,
+            checked:    checkValue.value,
+        };
 
-        this.openPrompt(COMMON_DIALOG, args);
+        this.openPrompt(args);
 
         // Checkbox state always returned, even if cancel clicked.
-        checkValue.value = args.getProperty("checked");
+        checkValue.value = args.checked;
     },
 
     confirm : function (title, text) {
         if (!title)
             title = PromptUtils.getLocalizedString("Confirm");
 
-        let args = this.newPropBag();
-        args.setProperty("promptType", "confirm");
-        args.setProperty("title",      title);
-        args.setProperty("text",       text);
-        args.setProperty("ok",         false);
+        let args = {
+            promptType: "confirm",
+            title:      title,
+            text:       text,
+            ok:         false,
+        };
 
-        this.openPrompt(COMMON_DIALOG, args);
+        this.openPrompt(args);
 
         // Did user click Ok or Cancel?
-        return args.getProperty("ok");
+        return args.ok;
     },
 
     confirmCheck : function (title, text, checkLabel, checkValue) {
         if (!title)
             title = PromptUtils.getLocalizedString("ConfirmCheck");
 
-        let args = this.newPropBag();
-        args.setProperty("promptType", "confirmCheck");
-        args.setProperty("title",      title);
-        args.setProperty("text",       text);
-        args.setProperty("checkLabel", checkLabel);
-        args.setProperty("checked",    checkValue.value);
-        args.setProperty("ok",         false);
+        let args = {
+            promptType: "confirmCheck",
+            title:      title,
+            text:       text,
+            checkLabel: checkLabel,
+            checked:    checkValue.value,
+            ok:         false,
+        };
 
-        this.openPrompt(COMMON_DIALOG, args);
+        this.openPrompt(args);
 
         // Checkbox state always returned, even if cancel clicked.
-        checkValue.value = args.getProperty("checked");
+        checkValue.value = args.checked;
 
         // Did user click Ok or Cancel?
-        return args.getProperty("ok");
+        return args.ok;
     },
 
     confirmEx : function (title, text, flags, button0, button1, button2,
@@ -489,60 +513,62 @@ ModalPrompter.prototype = {
         if (!title)
             title = PromptUtils.getLocalizedString("Confirm");
 
-        let args = this.newPropBag();
-        args.setProperty("promptType", "confirmEx");
-        args.setProperty("title",      title);
-        args.setProperty("text",       text);
-        args.setProperty("checkLabel", checkLabel);
-        args.setProperty("checked",    checkValue.value);
-        args.setProperty("ok",         false);
-        args.setProperty("buttonNumClicked", 1);
+        let args = {
+            promptType:  "confirmEx",
+            title:       title,
+            text:        text,
+            checkLabel:  checkLabel,
+            checked:     checkValue.value,
+            ok:          false,
+            buttonNumClicked: 1,
+        };
 
         let [label0, label1, label2, defaultButtonNum, isDelayEnabled] =
             PromptUtils.confirmExHelper(flags, button0, button1, button2);
 
-        args.setProperty("defaultButtonNum", defaultButtonNum);
-        args.setProperty("enableDelay", isDelayEnabled);
+        args.defaultButtonNum = defaultButtonNum;
+        args.enableDelay = isDelayEnabled;
 
         if (label0) {
-            args.setProperty("button0Label", label0);
+            args.button0Label = label0;
             if (label1) {
-                args.setProperty("button1Label", label1);
+                args.button1Label = label1;
                 if (label2) {
-                    args.setProperty("button2Label", label2);
+                    args.button2Label = label2;
                 }
             }
         }
 
-        this.openPrompt(COMMON_DIALOG, args);
+        this.openPrompt(args);
 
         // Checkbox state always returned, even if cancel clicked.
-        checkValue.value = args.getProperty("checked");
+        checkValue.value = args.checked;
 
         // Get the number of the button the user clicked.
-        return args.getProperty("buttonNumClicked");
+        return args.buttonNumClicked;
     },
 
     nsIPrompt_prompt : function (title, text, value, checkLabel, checkValue) {
         if (!title)
             title = PromptUtils.getLocalizedString("Prompt");
 
-        let args = this.newPropBag();
-        args.setProperty("promptType", "prompt");
-        args.setProperty("title",      title);
-        args.setProperty("text",       text);
-        args.setProperty("value",      value.value);
-        args.setProperty("checkLabel", checkLabel);
-        args.setProperty("checked",    checkValue.value);
-        args.setProperty("ok",         false);
+        let args = {
+            promptType: "prompt",
+            title:      title,
+            text:       text,
+            value:      value.value,
+            checkLabel: checkLabel,
+            checked:    checkValue.value,
+            ok:         false,
+        };
 
-        this.openPrompt(COMMON_DIALOG, args);
+        this.openPrompt(args);
 
         // Did user click Ok or Cancel?
-        let ok  = args.getProperty("ok");
+        let ok  = args.ok;
         if (ok) {
-            checkValue.value = args.getProperty("checked");
-            value.value      = args.getProperty("value");
+            checkValue.value = args.checked;
+            value.value      = args.value;
         }
 
         return ok;
@@ -552,24 +578,25 @@ ModalPrompter.prototype = {
         if (!title)
             title = PromptUtils.getLocalizedString("PromptUsernameAndPassword2");
 
-        let args = this.newPropBag();
-        args.setProperty("promptType", "promptUserAndPass");
-        args.setProperty("title",      title);
-        args.setProperty("text",       text);
-        args.setProperty("user",       user.value);
-        args.setProperty("pass",       pass.value);
-        args.setProperty("checkLabel", checkLabel);
-        args.setProperty("checked",    checkValue.value);
-        args.setProperty("ok",         false);
+        let args = {
+            promptType: "promptUserAndPass",
+            title:      title,
+            text:       text,
+            user:       user.value,
+            pass:       pass.value,
+            checkLabel: checkLabel,
+            checked:    checkValue.value,
+            ok:         false,
+        };
 
-        this.openPrompt(COMMON_DIALOG, args);
+        this.openPrompt(args);
 
         // Did user click Ok or Cancel?
-        let ok  = args.getProperty("ok");
+        let ok  = args.ok;
         if (ok) {
-            checkValue.value = args.getProperty("checked");
-            user.value       = args.getProperty("user");
-            pass.value       = args.getProperty("pass");
+            checkValue.value = args.checked;
+            user.value       = args.user;
+            pass.value       = args.pass;
         }
 
         return ok;
@@ -579,22 +606,23 @@ ModalPrompter.prototype = {
         if (!title)
             title = PromptUtils.getLocalizedString("PromptPassword2");
 
-        let args = this.newPropBag();
-        args.setProperty("promptType", "promptPassword");
-        args.setProperty("title",      title);
-        args.setProperty("text",       text);
-        args.setProperty("pass",       pass.value);
-        args.setProperty("checkLabel", checkLabel);
-        args.setProperty("checked",    checkValue.value);
-        args.setProperty("ok",         false);
+        let args = {
+            promptType: "promptPassword",
+            title:      title,
+            text:       text,
+            pass:       pass.value,
+            checkLabel: checkLabel,
+            checked:    checkValue.value,
+            ok:         false,
+        }
 
-        this.openPrompt(COMMON_DIALOG, args);
+        this.openPrompt(args);
 
         // Did user click Ok or Cancel?
-        let ok  = args.getProperty("ok");
+        let ok  = args.ok;
         if (ok) {
-            checkValue.value = args.getProperty("checked");
-            pass.value       = args.getProperty("pass");
+            checkValue.value = args.checked;
+            pass.value       = args.pass;
         }
 
         return ok;
@@ -604,19 +632,21 @@ ModalPrompter.prototype = {
         if (!title)
             title = PromptUtils.getLocalizedString("Select");
 
-        let args = this.newPropBag();
-        args.setProperty("promptType", "select");
-        args.setProperty("title",      title);
-        args.setProperty("text",       text);
-        args.setProperty("list",       list);
-        args.setProperty("ok",         false);
+        let args = {
+            promptType: "select",
+            title:      title,
+            text:       text,
+            list:       list,
+            selected:   -1,
+            ok:         false,
+        };
 
-        this.openPrompt(SELECT_DIALOG, args);
+        this.openPrompt(args);
 
         // Did user click Ok or Cancel?
-        let ok  = args.getProperty("ok");
+        let ok  = args.ok;
         if (ok)
-            selected.value = args.getProperty("selected");
+            selected.value = args.selected;
 
         return ok;
     },

From f213997f26ba838fa9dc74537d88ff0b0ef8e9b7 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Wed, 27 Oct 2010 14:16:17 -0700
Subject: [PATCH 17/57] Bug 575485 - Refactor commonDialog code into a sharable
 JSM (Part 3, JSM). r=gavin, a=beltzner

---
 .../prompts/content/commonDialog.js           | 322 +++-------------
 .../prompts/content/commonDialog.xul          |  16 +-
 .../components/prompts/src/CommonDialog.jsm   | 350 ++++++++++++++++++
 toolkit/components/prompts/src/Makefile.in    |   4 +
 .../prompts/test/test_modal_prompts.html      |  52 +++
 5 files changed, 456 insertions(+), 288 deletions(-)
 create mode 100644 toolkit/components/prompts/src/CommonDialog.jsm

diff --git a/toolkit/components/prompts/content/commonDialog.js b/toolkit/components/prompts/content/commonDialog.js
index 72609c16a68..f7f0c87902f 100644
--- a/toolkit/components/prompts/content/commonDialog.js
+++ b/toolkit/components/prompts/content/commonDialog.js
@@ -45,112 +45,56 @@ const Cc = Components.classes;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/CommonDialog.jsm");
 
-let gArgs, promptType, numButtons, iconClass, soundID, hasInputField = true;
-let gDelayExpired = false, gBlurred = false;
+let propBag, args, Dialog;
 
-function earlyInit() {
-    // This is called before onload fires, so we can't be certain that any elements
-    // in the document have their bindings ready, so don't call any methods/properties
-    // here on xul elements that come from xbl bindings.
-
-    gArgs = window.arguments[0].QueryInterface(Ci.nsIWritablePropertyBag2)
-                               .QueryInterface(Ci.nsIWritablePropertyBag);
-
-    promptType = gArgs.getProperty("promptType");
-
-    switch (promptType) {
-      case "alert":
-      case "alertCheck":
-        hasInputField = false;
-        numButtons    = 1;
-        iconClass     = "alert-icon";
-        soundID       = Ci.nsISound.EVENT_ALERT_DIALOG_OPEN;
-        break;
-      case "confirmCheck":
-      case "confirm":
-        hasInputField = false;
-        numButtons    = 2;
-        iconClass     = "question-icon";
-        soundID       = Ci.nsISound.EVENT_CONFIRM_DIALOG_OPEN;
-        break;
-      case "confirmEx":
-        numButtons = 0;
-        if (gArgs.hasKey("button0Label"))
-            numButtons++;
-        if (gArgs.hasKey("button1Label"))
-            numButtons++;
-        if (gArgs.hasKey("button2Label"))
-            numButtons++;
-        if (gArgs.hasKey("button3Label"))
-            numButtons++;
-        if (numButtons == 0)
-            throw "A dialog with no buttons? Can not haz.";
-        hasInputField = false;
-        iconClass     = "question-icon";
-        soundID       = Ci.nsISound.EVENT_CONFIRM_DIALOG_OPEN;
-        break;
-      case "prompt":
-        numButtons = 2;
-        iconClass  = "question-icon";
-        soundID    = Ci.nsISound.EVENT_PROMPT_DIALOG_OPEN;
-        initTextbox("login", gArgs.getProperty("value"));
-        // Clear the label, since this isn't really a username prompt.
-        document.getElementById("loginLabel").setAttribute("value", "");
-        break;
-      case "promptUserAndPass":
-        numButtons = 2;
-        iconClass  = "authentication-icon question-icon";
-        soundID    = Ci.nsISound.EVENT_PROMPT_DIALOG_OPEN;
-        initTextbox("login",     gArgs.getProperty("user"));
-        initTextbox("password1", gArgs.getProperty("pass"));
-        break;
-      case "promptPassword":
-        numButtons = 2;
-        iconClass  = "authentication-icon question-icon";
-        soundID    = Ci.nsISound.EVENT_PROMPT_DIALOG_OPEN;
-        initTextbox("password1", gArgs.getProperty("pass"));
-        // Clear the label, since the message presumably indicates its purpose.
-        document.getElementById("password1Label").setAttribute("value", "");
-        break;
-      default:
-        Cu.reportError("commonDialog opened for unknown type: " + promptType);
-        window.close();
-    }
-}
-
-function initTextbox(aName, aValue) {
-    document.getElementById(aName + "Container").hidden = false;
-    document.getElementById(aName + "Textbox").setAttribute("value", aValue);
-}
-
-function setLabelForNode(aNode, aLabel) {
-    // This is for labels which may contain embedded access keys.
-    // If we end in (&X) where X represents the access key, optionally preceded
-    // by spaces and/or followed by the ':' character, store the access key and
-    // remove the access key placeholder + leading spaces from the label.
-    // Otherwise a character preceded by one but not two &s is the access key.
-    // Store it and remove the &.
-
-    // Note that if you change the following code, see the comment of
-    // nsTextBoxFrame::UpdateAccessTitle.
-    var accessKey = null;
-    if (/ *\(\&([^&])\)(:)?$/.test(aLabel)) {
-        aLabel = RegExp.leftContext + RegExp.$2;
-        accessKey = RegExp.$1;
-    } else if (/^(.*[^&])?\&(([^&]).*$)/.test(aLabel)) {
-        aLabel = RegExp.$1 + RegExp.$2;
-        accessKey = RegExp.$3;
+function commonDialogOnLoad() {
+    propBag = window.arguments[0].QueryInterface(Ci.nsIWritablePropertyBag2)
+                                 .QueryInterface(Ci.nsIWritablePropertyBag);
+    // Convert to a JS object
+    args = {};
+    let propEnum = propBag.enumerator;
+    while (propEnum.hasMoreElements()) {
+        let prop = propEnum.getNext().QueryInterface(Ci.nsIProperty);
+        args[prop.name] = prop.value;
     }
 
-    // && is the magic sequence to embed an & in your label.
-    aLabel = aLabel.replace(/\&\&/g, "&");
-    aNode.label = aLabel;
+    let dialog = document.documentElement;
 
-    // XXXjag bug 325251
-    // Need to set this after aNode.setAttribute("value", aLabel);
-    if (accessKey)
-        aNode.accessKey = accessKey;
+    let ui = {
+        loginContainer     : document.getElementById("loginContainer"),
+        loginTextbox       : document.getElementById("loginTextbox"),
+        loginLabel         : document.getElementById("loginLabel"),
+        password1Container : document.getElementById("password1Container"),
+        password1Textbox   : document.getElementById("password1Textbox"),
+        password1Label     : document.getElementById("password1Label"),
+        infoBody           : document.getElementById("info.body"),
+        infoTitle          : document.getElementById("info.title"),
+        infoIcon           : document.getElementById("info.icon"),
+        checkbox           : document.getElementById("checkbox"),
+        checkboxContainer  : document.getElementById("checkboxContainer"),
+        button3            : dialog.getButton("extra2"),
+        button2            : dialog.getButton("extra1"),
+        button1            : dialog.getButton("cancel"),
+        button0            : dialog.getButton("accept"),
+        focusTarget        : window,
+    };
+
+    // limit the dialog to the screen width
+    document.getElementById("filler").maxWidth = screen.availWidth;
+    Services.obs.addObserver(softkbObserver, "softkb-change", false);
+
+    Dialog = new CommonDialog(args, ui);
+    Dialog.onLoad(dialog);
+    window.getAttention();
+}
+
+function commonDialogOnUnload() {
+    Services.obs.removeObserver(softkbObserver, "softkb-change");
+    // Convert args back into property bag
+    for (let propName in args)
+        propBag.setProperty(propName, args[propName]);
 }
 
 function softkbObserver(subject, topic, data) {
@@ -163,179 +107,3 @@ function softkbObserver(subject, topic, data) {
         window.moveTo(left, top);
     }
 }
-
-function commonDialogOnLoad() {
-    // limit the dialog to the screen width
-    document.getElementById("filler").maxWidth = screen.availWidth;
-
-    // set the document title
-    let title = gArgs.getProperty("title");
-    document.title = title;
-    // OS X doesn't have a title on modal dialogs, this is hidden on other platforms.
-    document.getElementById("info.title").appendChild(document.createTextNode(title));
-
-    Services.obs.addObserver(softkbObserver, "softkb-change", false);
-
-    // Set button labels and visibility
-    let dialog = document.documentElement;
-    switch (numButtons) {
-      case 4:
-        setLabelForNode(dialog.getButton("extra2"), gArgs.getProperty("button3Label"));
-        dialog.getButton("extra2").hidden = false;
-        // fall through
-      case 3:
-        setLabelForNode(dialog.getButton("extra1"), gArgs.getProperty("button2Label"));
-        dialog.getButton("extra1").hidden = false;
-        // fall through
-      case 2:
-        if (gArgs.hasKey("button1Label"))
-            setLabelForNode(dialog.getButton("cancel"), gArgs.getProperty("button1Label"));
-        break;
-
-      case 1:
-        dialog.getButton("cancel").hidden = true;
-        break;
-    }
-    if (gArgs.hasKey("button0Label"))
-        setLabelForNode(dialog.getButton("accept"), gArgs.getProperty("button0Label"));
-
-    // display the main text
-    // Bug 317334 - crop string length as a workaround.
-    let croppedMessage = gArgs.getProperty("text").substr(0, 10000);
-    document.getElementById("info.body").appendChild(document.createTextNode(croppedMessage));
-
-    if (gArgs.hasKey("checkLabel")) {
-        let label = gArgs.getProperty("checkLabel")
-        // Only show the checkbox if label has a value.
-        if (label) {
-            document.getElementById("checkboxContainer").hidden = false;
-            let checkboxElement = document.getElementById("checkbox");
-            setLabelForNode(checkboxElement, label);
-            checkboxElement.checked = gArgs.getProperty("checked");
-        }
-    }
-
-    // set the icon
-    document.getElementById("info.icon").className += " " + iconClass;
-
-    // set default result to cancelled
-    gArgs.setProperty("ok", false);
-    gArgs.setProperty("buttonNumClicked", 1);
-
-
-    // If there are no input fields on the dialog, select the default button.
-    // Otherwise, select the appropriate input field.
-    if (!hasInputField) {
-        let dlgButtons = ['accept', 'cancel', 'extra1', 'extra2'];
-
-        // Set the default button and focus it on non-OS X systems
-        let b = 0;
-        if (gArgs.hasKey("defaultButtonNum"))
-            b = gArgs.getProperty("defaultButtonNum");
-        let dButton = dlgButtons[b];
-        // XXX shouldn't we set the default even when a textbox is focused?
-        dialog.defaultButton = dButton;
-#ifndef XP_MACOSX
-        dialog.getButton(dButton).focus();
-#endif
-    } else {
-        if (promptType == "promptPassword")
-            document.getElementById("password1Textbox").select();
-        else
-            document.getElementById("loginTextbox").select();
-    }
-
-    if (gArgs.hasKey("enableDelay") && gArgs.getProperty("enableDelay")) {
-        let delayInterval = Services.prefs.getIntPref("security.dialog_enable_delay");
-        setButtonsEnabledState(dialog, false);
-        setTimeout(function () {
-                        // Don't automatically enable the buttons if we're not in the foreground
-                        if (!gBlurred)
-                            setButtonsEnabledState(dialog, true);
-                        gDelayExpired = true;
-                    }, delayInterval);
-
-        addEventListener("blur", commonDialogBlur, false);
-        addEventListener("focus", commonDialogFocus, false);
-    }
-
-    window.getAttention();
-
-    // play sound
-    try {
-        if (soundID) {
-            Cc["@mozilla.org/sound;1"].
-            createInstance(Ci.nsISound).
-            playEventSound(soundID);
-        }
-    } catch (e) { }
-
-    Services.obs.notifyObservers(window, "common-dialog-loaded", null);
-}
-
-function setButtonsEnabledState(dialog, enabled) {
-    dialog.getButton("accept").disabled = !enabled;
-    dialog.getButton("extra1").disabled = !enabled;
-    dialog.getButton("extra2").disabled = !enabled;
-}
-
-function commonDialogOnUnload() {
-    Services.obs.removeObserver(softkbObserver, "softkb-change");
-}
-
-function commonDialogBlur(aEvent) {
-    if (aEvent.target != document)
-        return;
-    gBlurred = true;
-    let dialog = document.documentElement;
-    setButtonsEnabledState(dialog, false);
-}
-
-function commonDialogFocus(aEvent) {
-    if (aEvent.target != document)
-        return;
-    gBlurred = false;
-    let dialog = document.documentElement;
-    // When refocusing the window, don't enable the buttons unless the countdown
-    // delay has expired.
-    if (gDelayExpired)
-        setTimeout(setButtonsEnabledState, 250, dialog, true);
-}
-
-function onCheckboxClick(aCheckboxElement) {
-    gArgs.setProperty("checked", aCheckboxElement.checked);
-}
-
-function commonDialogOnAccept() {
-    gArgs.setProperty("ok", true);
-    gArgs.setProperty("buttonNumClicked", 0);
-
-    let username = document.getElementById("loginTextbox").value;
-    let password = document.getElementById("password1Textbox").value;
-
-    // Return textfield values
-    switch (promptType) {
-      case "prompt":
-        gArgs.setProperty("value", username);
-        break;
-      case "promptUserAndPass":
-        gArgs.setProperty("user", username);
-        gArgs.setProperty("pass", password);
-        break;
-      case "promptPassword":
-        gArgs.setProperty("pass", password);
-        break;
-    }
-}
-
-function commonDialogOnExtra1() {
-    // .setProperty("ok", true)?
-    gArgs.setProperty("buttonNumClicked", 2);
-    window.close();
-}
-
-function commonDialogOnExtra2() {
-    // .setProperty("ok", true)?
-    gArgs.setProperty("buttonNumClicked", 3);
-    window.close();
-}
diff --git a/toolkit/components/prompts/content/commonDialog.xul b/toolkit/components/prompts/content/commonDialog.xul
index b18a33cb3cf..5f88b60e433 100644
--- a/toolkit/components/prompts/content/commonDialog.xul
+++ b/toolkit/components/prompts/content/commonDialog.xul
@@ -11,9 +11,10 @@
         aria-describedby="info.body"
         onload="commonDialogOnLoad();"
         onunload="commonDialogOnUnload();"
-        ondialogaccept="return commonDialogOnAccept();"
-        ondialogextra1="return commonDialogOnExtra1();"
-        ondialogextra2="return commonDialogOnExtra2();"
+        ondialogaccept="Dialog.onButton0(); return true;"
+        ondialogcancel="Dialog.onButton1(); return true;"
+        ondialogextra1="Dialog.onButton2(); window.close();"
+        ondialogextra2="Dialog.onButton3(); window.close();"
         buttonpack="center">
 
   <script type="application/javascript" src="chrome://global/content/commonDialog.js"/>
@@ -75,16 +76,9 @@
       </row>
       <row id="checkboxContainer" hidden="true">
         <spacer/>
-        <checkbox id="checkbox" oncommand="onCheckboxClick(this);"/>
+        <checkbox id="checkbox" oncommand="Dialog.onCheckbox()"/>
       </row>
     </rows>
   </grid>
 
-
-  <!-- This method is called inline because it may unset hidden="true" on the
-       above boxes, causing their frames to be build and bindings to load.
-       So, by calling this inline, we guarantee the textboxes and checkboxes
-       above will have their bindings before initButtons is called, and the
-       dialog will be intrinsically sized correctly. -->
-  <script type="application/javascript">earlyInit();</script>
 </dialog>
diff --git a/toolkit/components/prompts/src/CommonDialog.jsm b/toolkit/components/prompts/src/CommonDialog.jsm
new file mode 100644
index 00000000000..79b8190d6d3
--- /dev/null
+++ b/toolkit/components/prompts/src/CommonDialog.jsm
@@ -0,0 +1,350 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is CommonDialog.jsm code.
+ *
+ * The Initial Developer of the Original Code is the Mozilla Foundation
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Justin Dolske <dolske@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var EXPORTED_SYMBOLS = ["CommonDialog"];
+
+const Ci = Components.interfaces;
+const Cr = Components.results;
+const Cc = Components.classes;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+
+function CommonDialog(args, ui) {
+    this.args = args;
+    this.ui   = ui;
+}
+
+CommonDialog.prototype = {
+    args : null,
+    ui   : null,
+
+    hasInputField : true,
+    numButtons    : undefined,
+    iconClass     : undefined,
+    soundID       : undefined,
+    focusTimer    : null,
+
+    onLoad : function(xulDialog) {
+        switch (this.args.promptType) {
+          case "alert":
+          case "alertCheck":
+            this.hasInputField = false;
+            this.numButtons    = 1;
+            this.iconClass     = ["alert-icon"];
+            this.soundID       = Ci.nsISound.EVENT_ALERT_DIALOG_OPEN;
+            break;
+          case "confirmCheck":
+          case "confirm":
+            this.hasInputField = false;
+            this.numButtons    = 2;
+            this.iconClass     = ["question-icon"];
+            this.soundID       = Ci.nsISound.EVENT_CONFIRM_DIALOG_OPEN;
+            break;
+          case "confirmEx":
+            var numButtons = 0;
+            if (this.args.button0Label)
+                numButtons++;
+            if (this.args.button1Label)
+                numButtons++;
+            if (this.args.button2Label)
+                numButtons++;
+            if (this.args.button3Label)
+                numButtons++;
+            if (numButtons == 0)
+                throw "A dialog with no buttons? Can not haz.";
+            this.numButtons    = numButtons;
+            this.hasInputField = false;
+            this.iconClass     = ["question-icon"];
+            this.soundID       = Ci.nsISound.EVENT_CONFIRM_DIALOG_OPEN;
+            break;
+          case "prompt":
+            this.numButtons = 2;
+            this.iconClass  = ["question-icon"];
+            this.soundID    = Ci.nsISound.EVENT_PROMPT_DIALOG_OPEN;
+            this.initTextbox("login", this.args.value);
+            // Clear the label, since this isn't really a username prompt.
+            this.ui.loginLabel.setAttribute("value", "");
+            break;
+          case "promptUserAndPass":
+            this.numButtons = 2;
+            this.iconClass  = ["authentication-icon", "question-icon"];
+            this.soundID    = Ci.nsISound.EVENT_PROMPT_DIALOG_OPEN;
+            this.initTextbox("login",     this.args.user);
+            this.initTextbox("password1", this.args.pass);
+            break;
+          case "promptPassword":
+            this.numButtons = 2;
+            this.iconClass  = ["authentication-icon", "question-icon"];
+            this.soundID    = Ci.nsISound.EVENT_PROMPT_DIALOG_OPEN;
+            this.initTextbox("password1", this.args.pass);
+            // Clear the label, since the message presumably indicates its purpose.
+            this.ui.password1Label.setAttribute("value", "");
+            break;
+          default:
+            Cu.reportError("commonDialog opened for unknown type: " + this.args.promptType);
+            throw "unknown dialog type";
+        }
+
+        // set the document title
+        let title = this.args.title;
+        // OS X doesn't have a title on modal dialogs, this is hidden on other platforms.
+        let infoTitle = this.ui.infoTitle;
+        infoTitle.appendChild(infoTitle.ownerDocument.createTextNode(title));
+        if (xulDialog)
+            xulDialog.ownerDocument.title = title;
+
+        // Set button labels and visibility
+        //
+        // This assumes that button0 defaults to a visible "ok" button, and
+        // button1 defaults to a visible "cancel" button. The other 2 buttons
+        // have no default labels (and are hidden).
+        switch (this.numButtons) {
+          case 4:
+            this.setLabelForNode(this.ui.button3, this.args.button3Label);
+            this.ui.button3.hidden = false;
+            // fall through
+          case 3:
+            this.setLabelForNode(this.ui.button2, this.args.button2Label);
+            this.ui.button2.hidden = false;
+            // fall through
+          case 2:
+            // Defaults to a visible "cancel" button
+            if (this.args.button1Label)
+                this.setLabelForNode(this.ui.button1, this.args.button1Label);
+            break;
+
+          case 1:
+            this.ui.button1.hidden = true;
+            break;
+        }
+        // Defaults to a visible "ok" button
+        if (this.args.button0Label)
+            this.setLabelForNode(this.ui.button0, this.args.button0Label);
+
+        // display the main text
+        // Bug 317334 - crop string length as a workaround.
+        let croppedMessage = this.args.text.substr(0, 10000);
+        let infoBody = this.ui.infoBody;
+        infoBody.appendChild(infoBody.ownerDocument.createTextNode(croppedMessage));
+
+        let label = this.args.checkLabel;
+        if (label) {
+            // Only show the checkbox if label has a value.
+            this.ui.checkboxContainer.hidden = false;
+            this.setLabelForNode(this.ui.checkbox, label);
+            this.ui.checkbox.checked = this.args.checked;
+        }
+
+        // set the icon
+        let icon = this.ui.infoIcon;
+        this.iconClass.forEach(function(el,idx,arr) icon.classList.add(el));
+
+        // set default result to cancelled
+        this.args.ok = false;
+        this.args.buttonNumClicked = 1;
+
+
+        // If there are no input fields on the dialog, select the default button.
+        // Otherwise, select the appropriate input field.
+        // XXX shouldn't we set an unfocused default even when a textbox is focused?
+        if (!this.hasInputField) {
+            // Set the default button (and focus it on non-OS X systems)
+            let b = 0;
+            if (this.args.defaultButtonNum)
+                b = this.args.defaultButtonNum;
+            let button = this.ui["button" + b];
+            if (xulDialog) {
+                xulDialog.defaultButton = ['accept', 'cancel', 'extra1', 'extra2'][b];
+                let isOSX = ("nsILocalFileMac" in Components.interfaces);
+                if (!isOSX)
+                    button.focus();
+            }
+            // TODO:
+            // else
+            //     (tabmodal prompts need to set a default button for Enter to act upon)
+        } else {
+            if (this.args.promptType == "promptPassword")
+                this.ui.password1Textbox.select();
+            else
+                this.ui.loginTextbox.select();
+        }
+
+        if (this.args.enableDelay) {
+            this.setButtonsEnabledState(false);
+            // Use a longer, pref-controlled delay when the dialog is first opened.
+            let delayTime = Services.prefs.getIntPref("security.dialog_enable_delay");
+            this.startOnFocusDelay(delayTime);
+            let self = this;
+            this.ui.focusTarget.addEventListener("blur",  function(e) { self.onBlur(e);  }, false);
+            this.ui.focusTarget.addEventListener("focus", function(e) { self.onFocus(e); }, false);
+        }
+
+        // play sound
+        try {
+            if (this.soundID) {
+                Cc["@mozilla.org/sound;1"].
+                createInstance(Ci.nsISound).
+                playEventSound(soundID);
+            }
+        } catch (e) { }
+
+        if (xulDialog)
+            Services.obs.notifyObservers(xulDialog.ownerDocument.defaultView, "common-dialog-loaded", null);
+        // TODO:
+        // else
+        //    (notify using what as the subject?)
+    },
+
+    setLabelForNode: function(aNode, aLabel) {
+        // This is for labels which may contain embedded access keys.
+        // If we end in (&X) where X represents the access key, optionally preceded
+        // by spaces and/or followed by the ':' character, store the access key and
+        // remove the access key placeholder + leading spaces from the label.
+        // Otherwise a character preceded by one but not two &s is the access key.
+        // Store it and remove the &.
+
+        // Note that if you change the following code, see the comment of
+        // nsTextBoxFrame::UpdateAccessTitle.
+        var accessKey = null;
+        if (/ *\(\&([^&])\)(:)?$/.test(aLabel)) {
+            aLabel = RegExp.leftContext + RegExp.$2;
+            accessKey = RegExp.$1;
+        } else if (/^(.*[^&])?\&(([^&]).*$)/.test(aLabel)) {
+            aLabel = RegExp.$1 + RegExp.$2;
+            accessKey = RegExp.$3;
+        }
+
+        // && is the magic sequence to embed an & in your label.
+        aLabel = aLabel.replace(/\&\&/g, "&");
+        aNode.label = aLabel;
+
+        // XXXjag bug 325251
+        // Need to set this after aNode.setAttribute("value", aLabel);
+        if (accessKey)
+            aNode.accessKey = accessKey;
+    },
+
+
+    initTextbox : function (aName, aValue) {
+        this.ui[aName + "Container"].hidden = false;
+        this.ui[aName + "Textbox"].setAttribute("value", aValue);
+    },
+
+    setButtonsEnabledState : function(enabled) {
+        this.ui.button0.disabled = !enabled;
+        // button1 (cancel) remains enabled.
+        this.ui.button2.disabled = !enabled;
+        this.ui.button3.disabled = !enabled;
+    },
+
+    onBlur : function (aEvent) {
+        if (aEvent.target != this.ui.focusTarget)
+            return;
+        this.setButtonsEnabledState(false);
+
+        // If we blur while waiting to enable the buttons, just cancel the
+        // timer to ensure the delay doesn't fire while not focused.
+        if (this.focusTimer) {
+            this.focusTimer.cancel();
+            this.focusTimer = null;
+        }
+    },
+
+    onFocus : function (aEvent) {
+        if (aEvent.target != this.ui.focusTarget)
+            return;
+        this.startOnFocusDelay();
+    },
+
+    startOnFocusDelay : function(delayTime) {
+        // Shouldn't already have a timer, but just in case...
+        if (this.focusTimer)
+            return;
+        // If no delay specified, use 250ms. (This is the normal case for when
+        // after the dialog has been opened and focus shifts.)
+        if (!delayTime)
+            delayTime = 250;
+        let self = this;
+        this.focusTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+        this.focusTimer.initWithCallback(function() { self.onFocusTimeout(); },
+                                         delayTime, Ci.nsITimer.TYPE_ONE_SHOT);
+    },
+
+    onFocusTimeout : function() {
+        this.focusTimer = null;
+        this.setButtonsEnabledState(true);
+    },
+
+    onCheckbox : function() {
+        this.args.checked = this.ui.checkbox.checked;
+    },
+
+    onButton0 : function() {
+        this.args.ok = true;
+        this.args.buttonNumClicked = 0;
+
+        let username = this.ui.loginTextbox.value;
+        let password = this.ui.password1Textbox.value;
+
+        // Return textfield values
+        switch (this.args.promptType) {
+          case "prompt":
+            this.args.value = username;
+            break;
+          case "promptUserAndPass":
+            this.args.user = username;
+            this.args.pass = password;
+            break;
+          case "promptPassword":
+            this.args.pass = password;
+            break;
+        }
+    },
+
+    onButton1 : function() {
+        this.args.buttonNumClicked = 1;
+    },
+
+    onButton2 : function() {
+        this.args.buttonNumClicked = 2;
+    },
+
+    onButton3 : function() {
+        this.args.buttonNumClicked = 3;
+    },
+};
diff --git a/toolkit/components/prompts/src/Makefile.in b/toolkit/components/prompts/src/Makefile.in
index c866e5215ac..09beeafe26f 100644
--- a/toolkit/components/prompts/src/Makefile.in
+++ b/toolkit/components/prompts/src/Makefile.in
@@ -48,4 +48,8 @@ EXTRA_COMPONENTS = \
     nsPrompter.manifest \
     $(NULL)
 
+EXTRA_JS_MODULES = \
+    CommonDialog.jsm \
+    $(NULL)
+
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/prompts/test/test_modal_prompts.html b/toolkit/components/prompts/test/test_modal_prompts.html
index b12015a9104..4e93586373c 100644
--- a/toolkit/components/prompts/test/test_modal_prompts.html
+++ b/toolkit/components/prompts/test/test_modal_prompts.html
@@ -24,6 +24,20 @@ let prompter = Cc["@mozilla.org/embedcomp/prompt-service;1"].
                getService(Ci.nsIPromptService2);
 let ioService = Cc["@mozilla.org/network/io-service;1"].
                 getService(Ci.nsIIOService);
+let pollTimer;
+
+function pollDialog(dialog) {
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+
+    if (dialog.getButton("accept").disabled)
+        return;
+
+    ok(true, "dialog button is enabled now");
+    pollTimer.cancel();
+    pollTimer = null;
+    dialog.acceptDialog();
+    didDialog = true;
+}
 
 function checkExpectedState(doc, state) {
     let msg        = doc.getElementById("info.body").textContent;
@@ -654,6 +668,27 @@ function handleDialog(doc, testNum) {
         checkExpectedState(doc, state);
         break;
 
+      case 30:
+        // ConfirmEx (with delay, ok)
+        state = {
+            msg   : "This is the confirmEx delay text.",
+            title : "TestTitle",
+            iconClass   : "question-icon",
+            textHidden  : true,
+            passHidden  : true,
+            checkHidden : true,
+            textValue   : "",
+            passValue   : "",
+            checkMsg    : "",
+            checked     : false,
+        };
+        is(dialog.getButton("accept").label, "OK",     "Checking accept-button label");
+        is(dialog.getButton("cancel").label, "Cancel", "Checking cancel-button label");
+        is(dialog.getButton("accept").disabled, true,  "Checking accept-button is disabled");
+        is(dialog.getButton("cancel").disabled, false, "Checking cancel-button isn't disabled ");
+        checkExpectedState(doc, state);
+        break;
+
 
       case 100:
         // PromptAuth (no realm, ok, with checkbox)
@@ -711,6 +746,14 @@ function handleDialog(doc, testNum) {
 
     if (testNum == 28) {
         dialog._doButtonCommand("extra1");
+    } else if (testNum == 30) {
+        // Buttons are disabled at the moment, poll until they're reenabled.
+        // Can't use setInterval here, because the window's in a modal state
+        // and thus DOM events are suppressed.
+        pollTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+        pollTimer.initWithCallback(function() { pollDialog(dialog); },
+                                   100, Ci.nsITimer.TYPE_REPEATING_SLACK);
+        return;
     } else {
         if (clickOK)
             dialog.acceptDialog();
@@ -1049,6 +1092,15 @@ prompter.alert(null, "TestTitle", "This is the alert text.");
 ok(didDialog, "handleDialog was invoked");
 
 
+// ===== test 30 =====
+// ConfirmEx (delay, ok)
+testNum++;
+startCallbackTimer();
+flags = (Ci.nsIPromptService.STD_OK_CANCEL_BUTTONS | Ci.nsIPromptService.BUTTON_DELAY_ENABLE);
+clickedButton = prompter.confirmEx(window, "TestTitle", "This is the confirmEx delay text.", flags, null, null, null, null, {});
+is(clickedButton, 0, "checked expected button num click");
+ok(didDialog, "handleDialog was invoked");
+
 // promptAuth already tested via password manager but do a few specific things here.
 
 

From e9f0a7bfd12b6acb4266573aff4c250c68eff564 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Wed, 27 Oct 2010 14:16:17 -0700
Subject: [PATCH 18/57] Bug 575485 - Refactor commonDialog code into a sharable
 JSM (Part 4, test fixes). r=gavin, a=beltzner

---
 toolkit/mozapps/extensions/test/xpinstall/head.js | 2 +-
 xpinstall/tests/harness.js                        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/toolkit/mozapps/extensions/test/xpinstall/head.js b/toolkit/mozapps/extensions/test/xpinstall/head.js
index 6bfd6005028..a7923a8cf80 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/head.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/head.js
@@ -165,7 +165,7 @@ var Harness = {
       }
     }
     else if (window.document.location.href == PROMPT_URL) {
-        var promptType = window.gArgs.getProperty("promptType");
+        var promptType = window.args.promptType;
         switch (promptType) {
           case "alert":
           case "alertCheck":
diff --git a/xpinstall/tests/harness.js b/xpinstall/tests/harness.js
index f958afccca8..778ac5a61c1 100644
--- a/xpinstall/tests/harness.js
+++ b/xpinstall/tests/harness.js
@@ -127,15 +127,16 @@ var Harness = {
       }
     }
     else if (window.document.location.href == PROMPT_URL) {
-      switch (window.gCommonDialogParam.GetInt(3)) {
-        case 0: if (window.opener.document.location.href == ADDONS_URL) {
+      switch (window.args.promptType) {
+        default:
+                if (window.opener.document.location.href == ADDONS_URL) {
                   // A prompt opened by the add-ons manager is liable to be an
                   // xpinstall error, just close it, we'll see the error in
                   // onInstallEnded anyway.
                   window.document.documentElement.acceptDialog();
                 }
                 break;
-        case 2: if (window.gCommonDialogParam.GetInt(4) != 1) {
+        case "promptUserAndPass":
                   // This is a login dialog, hopefully an authentication prompt
                   // for the xpi.
                   if (this.authenticationCallback) {
@@ -152,7 +153,6 @@ var Harness = {
                   else {
                     window.document.documentElement.cancelDialog();
                   }
-                }
                 break;
       }
     }

From f08efb3976c99334ae46788120dbf6da33e777d3 Mon Sep 17 00:00:00 2001
From: Andreas Gal <gal@uci.edu>
Date: Wed, 27 Oct 2010 17:30:59 -0700
Subject: [PATCH 19/57] Bug 606875 - Object.prototype.toString no longer works
 for arrays created in sandboxes or windows from a different principal.
 r=mrbkap, a=blocker

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

diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 9f6d9ddc9e6..b3f4da8cfdf 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -255,7 +255,7 @@ JSWrapper::obj_toString(JSContext *cx, JSObject *wrapper)
     JSString *str;
     if (!enter(cx, wrapper, JSID_VOID, GET))
         return NULL;
-    str = JSProxyHandler::obj_toString(cx, wrapper);
+    str = obj_toStringHelper(cx, wrappedObject(wrapper));
     leave(cx, wrapper);
     return str;
 }

From 0bf3214567f7e5e240faba0e0f68520427fd3abe Mon Sep 17 00:00:00 2001
From: Siarhei Siamashka <siarhei.siamashka@gmail.com>
Date: Wed, 27 Oct 2010 08:15:08 +0300
Subject: [PATCH 20/57] Bug 601914 - XPCOM does not work with ARM hardfp ABI.
 r=Jacob.Bramley a=blocking-fennec

---
 .../xptcall/src/md/unix/xptcinvoke_arm.cpp    | 257 ++++++++++++++++++
 1 file changed, 257 insertions(+)

diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
index a269fa3b9f4..96aa49899b4 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
@@ -21,6 +21,7 @@
  *
  * Contributor(s):
  * Mike Hommey <mh@glandium.org>
+ * Siarhei Siamashka <siarhei.siamashka@nokia.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -44,6 +45,13 @@
 #error "This code is for Linux ARM only. Check that it works on your system, too.\nBeware that this code is highly compiler dependent."
 #endif
 
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) \
+    && defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP) && !defined(__ARM_PCS)
+#error "Can't identify floating point calling conventions.\nPlease ensure that your toolchain defines __ARM_PCS or __ARM_PCS_VFP."
+#endif
+
+#ifndef __ARM_PCS_VFP
+
 /* This function copies a 64-bits word from dw to the given pointer in
  * a buffer delimited by start and end, possibly wrapping around the
  * buffer boundaries, and/or properly aligning the data at 64-bits word
@@ -189,3 +197,252 @@ NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
                     stack_space[base_size * 2 - 2],
                     stack_space[base_size * 2 - 1]);
 }    
+
+#else /* __ARM_PCS_VFP */
+
+/* "Procedure Call Standard for the ARM Architecture" document, sections
+ * "5.5 Parameter Passing" and "6.1.2 Procedure Calling" contain all the
+ * needed information.
+ *
+ * http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042d/IHI0042D_aapcs.pdf
+ */
+
+#if defined(__thumb__) && !defined(__thumb2__)
+#error "Thumb1 is not supported"
+#endif
+
+#ifndef __ARMEL__
+#error "Only little endian compatibility was tested"
+#endif
+
+/*
+ * Allocation of integer function arguments initially to registers r1-r3
+ * and then to stack. Handling of 'this' argument which goes to r0 registers
+ * is handled separately and does not belong to these two inline functions.
+ *
+ * The doubleword arguments are allocated to even:odd
+ * register pairs or get aligned at 8-byte boundary on stack. The "holes"
+ * which may appear as a result of this realignment remain unused.
+ *
+ * 'ireg_args'  - pointer to the current position in the buffer,
+ *                corresponding to the register arguments
+ * 'stack_args' - pointer to the current position in the buffer,
+ *                corresponding to the arguments on stack
+ * 'end'        - pointer to the end of the registers argument
+ *                buffer (it is guaranteed to be 8-bytes aligned)
+ */
+
+static inline void copy_word(PRUint32* &ireg_args,
+                             PRUint32* &stack_args,
+                             PRUint32* end,
+                             PRUint32  data)
+{
+  if (ireg_args < end) {
+    *ireg_args = data;
+    ireg_args++;
+  } else {
+    *stack_args = data;
+    stack_args++;
+  }
+}
+
+static inline void copy_dword(PRUint32* &ireg_args,
+                              PRUint32* &stack_args,
+                              PRUint32* end,
+                              PRUint64  data)
+{
+  if (ireg_args + 1 < end) {
+    if ((PRUint32)ireg_args & 4) {
+      ireg_args++;
+    }
+    *(PRUint64 *)ireg_args = data;
+    ireg_args += 2;
+  } else {
+    if ((PRUint32)stack_args & 4) {
+      stack_args++;
+    }
+    *(PRUint64 *)stack_args = data;
+    stack_args += 2;
+  }
+}
+
+/*
+ * Allocation of floating point arguments to VFP registers (s0-s15, d0-d7).
+ *
+ * Unlike integer registers allocation, "back-filling" needs to be
+ * supported. For example, the third floating point argument in the
+ * following function is going to be allocated to s1 register, back-filling
+ * the "hole":
+ *    void f(float s0, double d1, float s1)
+ *
+ * Refer to the "Procedure Call Standard for the ARM Architecture" document
+ * for more details.
+ *
+ * 'vfp_s_args' - pointer to the current position in the buffer with
+ *                the next unallocated single precision register
+ * 'vfp_d_args' - pointer to the current position in the buffer with
+ *                the next unallocated double precision register,
+ *                it has the same value as 'vfp_s_args' when back-filling
+ *                is not used
+ * 'end'        - pointer to the end of the vfp registers argument
+ *                buffer (it is guaranteed to be 8-bytes aligned)
+ *
+ * Mozilla bugtracker has a test program attached which be used for
+ * experimenting with VFP registers allocation code and testing its
+ * correctness:
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=601914#c19
+ */
+
+static inline bool copy_vfp_single(float* &vfp_s_args, double* &vfp_d_args,
+                                   float* end, float data)
+{
+  if (vfp_s_args >= end)
+    return false;
+
+  *vfp_s_args = data;
+  vfp_s_args++;
+  if (vfp_s_args < (float *)vfp_d_args) {
+    // It was the case of back-filling, now the next free single precision
+    // register should overlap with the next free double precision register
+    vfp_s_args = (float *)vfp_d_args;
+  } else if (vfp_s_args > (float *)vfp_d_args) {
+    // also update the pointer to the next free double precision register
+    vfp_d_args++;
+  }
+  return true;
+}
+
+static inline bool copy_vfp_double(float* &vfp_s_args, double* &vfp_d_args,
+                                   float* end, double data)
+{
+  if (vfp_d_args >= (double *)end) {
+    // The back-filling continues only so long as no VFP CPRC has been
+    // allocated to a slot on the stack. Basically no VFP registers can
+    // be allocated after this point.
+    vfp_s_args = end;
+    return false;
+  }
+
+  if (vfp_s_args == (float *)vfp_d_args) {
+    // also update the pointer to the next free single precision register
+    vfp_s_args += 2;
+  }
+  *vfp_d_args = data;
+  vfp_d_args++;
+  return true;
+}
+
+static void
+invoke_copy_to_stack(PRUint32* stk, PRUint32 *end,
+                     PRUint32 paramCount, nsXPTCVariant* s)
+{
+  PRUint32 *ireg_args  = end - 3;
+  float    *vfp_s_args = (float *)end;
+  double   *vfp_d_args = (double *)end;
+  float    *vfp_end    = vfp_s_args + 16;
+
+  for (PRUint32 i = 0; i < paramCount; i++, s++) {
+    if (s->IsPtrData()) {
+      copy_word(ireg_args, stk, end, (PRUint32)s->ptr);
+      continue;
+    }
+    // According to the ARM EABI, integral types that are smaller than a word
+    // are to be sign/zero-extended to a full word and treated as 4-byte values
+    switch (s->type)
+    {
+      case nsXPTType::T_FLOAT:
+        if (!copy_vfp_single(vfp_s_args, vfp_d_args, vfp_end, s->val.f)) {
+          copy_word(end, stk, end, reinterpret_cast<PRUint32&>(s->val.f));
+        }
+        break;
+      case nsXPTType::T_DOUBLE:
+        if (!copy_vfp_double(vfp_s_args, vfp_d_args, vfp_end, s->val.d)) {
+          copy_dword(end, stk, end, reinterpret_cast<PRUint64&>(s->val.d));
+        }
+        break;
+      case nsXPTType::T_I8:  copy_word(ireg_args, stk, end, s->val.i8);   break;
+      case nsXPTType::T_I16: copy_word(ireg_args, stk, end, s->val.i16);  break;
+      case nsXPTType::T_I32: copy_word(ireg_args, stk, end, s->val.i32);  break;
+      case nsXPTType::T_I64: copy_dword(ireg_args, stk, end, s->val.i64); break;
+      case nsXPTType::T_U8:  copy_word(ireg_args, stk, end, s->val.u8);   break;
+      case nsXPTType::T_U16: copy_word(ireg_args, stk, end, s->val.u16);  break;
+      case nsXPTType::T_U32: copy_word(ireg_args, stk, end, s->val.u32);  break;
+      case nsXPTType::T_U64: copy_dword(ireg_args, stk, end, s->val.u64); break;
+      case nsXPTType::T_BOOL: copy_word(ireg_args, stk, end, s->val.b);   break;
+      case nsXPTType::T_CHAR: copy_word(ireg_args, stk, end, s->val.c);   break;
+      case nsXPTType::T_WCHAR: copy_word(ireg_args, stk, end, s->val.wc); break;
+      default:
+        // all the others are plain pointer types
+        copy_word(ireg_args, stk, end, reinterpret_cast<PRUint32>(s->val.p));
+        break;
+    }
+  }
+}
+
+typedef PRUint32 (*vtable_func)(nsISupports *, PRUint32, PRUint32, PRUint32);
+
+EXPORT_XPCOM_API(nsresult)
+NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+                   PRUint32 paramCount, nsXPTCVariant* params)
+{
+  vtable_func *vtable = *reinterpret_cast<vtable_func **>(that);
+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
+  vtable_func func = vtable[methodIndex];
+#else /* non G++ V3 ABI */
+  vtable_func func = vtable[2 + methodIndex];
+#endif
+  // 'register PRUint32 result asm("r0")' could be used here, but it does not
+  //  seem to be reliable in all cases: http://gcc.gnu.org/PR46164
+  PRUint32 result;
+  asm (
+    "mov    %[stack_space_size], %[param_count_plus_2], lsl #3\n"
+    "tst    sp, #4\n" /* check stack alignment */
+
+    "add    %[stack_space_size], #(4 * 16)\n" /* space for VFP registers */
+    "mov    r3, %[params]\n"
+
+    "it     ne\n"
+    "addne  %[stack_space_size], %[stack_space_size], #4\n"
+    "sub    r0, sp, %[stack_space_size]\n" /* allocate space on stack */
+
+    "sub    r2, %[param_count_plus_2], #2\n"
+    "mov    sp, r0\n"
+
+    "add    r1, r0, %[param_count_plus_2], lsl #3\n"
+    "blx    %[invoke_copy_to_stack]\n"
+
+    "add    ip, sp, %[param_count_plus_2], lsl #3\n"
+    "mov    r0, %[that]\n"
+    "ldmdb  ip, {r1, r2, r3}\n"
+    "vldm   ip, {d0, d1, d2, d3, d4, d5, d6, d7}\n"
+    "blx    %[func]\n"
+
+    "add    sp, sp, %[stack_space_size]\n" /* cleanup stack */
+    "mov    %[stack_space_size], r0\n" /* it's actually 'result' variable */
+    : [stack_space_size]     "=&r" (result)
+    : [func]                 "r"   (func),
+      [that]                 "r"   (that),
+      [params]               "r"   (params),
+      [param_count_plus_2]   "r"   (paramCount + 2),
+      [invoke_copy_to_stack] "r"   (invoke_copy_to_stack)
+    : "cc", "memory",
+      // Mark all the scratch registers as clobbered because they may be
+      // modified by the functions, called from this inline assembly block
+      "r0", "r1", "r2", "r3", "ip", "lr",
+      "d0",  "d1",  "d2",  "d3",  "d4",  "d5",  "d6",  "d7",
+      // Also unconditionally mark d16-d31 registers as clobbered even though
+      // they actually don't exist in vfpv2 and vfpv3-d16 variants. There is
+      // no way to identify VFP variant using preprocessor at the momemnt
+      // (see http://gcc.gnu.org/PR46128 for more details), but fortunately
+      // current versions of gcc do not seem to complain about these registers
+      // even when this code is compiled with '-mfpu=vfpv3-d16' option.
+      // If gcc becomes more strict in the future and/or provides a way to
+      // identify VFP variant, the following d16-d31 registers list needs
+      // to be wrapped into some #ifdef
+      "d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23",
+      "d24", "d25", "d26", "d27", "d28", "d29", "d30", "d31"
+  );
+  return result;
+}
+
+#endif

From c3bb43a3ee57a35f48592ae419f69e58218d1438 Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Thu, 28 Oct 2010 18:34:26 +0900
Subject: [PATCH 21/57] Bug 607882 - shutdown document accessible may stay in
 cache, r=ginn.chen, a=blocking

---
 accessible/src/base/nsAccDocManager.cpp       | 61 +++----------------
 accessible/src/base/nsAccDocManager.h         | 26 +++-----
 .../src/base/nsAccessibilityService.cpp       |  5 +-
 accessible/src/base/nsDocAccessible.cpp       |  6 ++
 accessible/src/base/nsOuterDocAccessible.cpp  |  2 +-
 5 files changed, 27 insertions(+), 73 deletions(-)

diff --git a/accessible/src/base/nsAccDocManager.cpp b/accessible/src/base/nsAccDocManager.cpp
index e677463d34e..f64fd16136b 100644
--- a/accessible/src/base/nsAccDocManager.cpp
+++ b/accessible/src/base/nsAccDocManager.cpp
@@ -91,14 +91,6 @@ nsAccDocManager::FindAccessibleInCache(nsINode* aNode) const
   return arg.mAccessible;
 }
 
-void
-nsAccDocManager::ShutdownDocAccessiblesInTree(nsIDocument *aDocument)
-{
-  nsCOMPtr<nsISupports> container = aDocument->GetContainer();
-  nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryInterface(container);
-  ShutdownDocAccessiblesInTree(treeItem, aDocument);
-}
-
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsAccDocManager protected
@@ -132,21 +124,6 @@ nsAccDocManager::Shutdown()
   ClearDocCache();
 }
 
-void
-nsAccDocManager::ShutdownDocAccessible(nsIDocument *aDocument)
-{
-  nsDocAccessible* docAccessible = mDocAccessibleCache.GetWeak(aDocument);
-  if (!docAccessible)
-    return;
-
-  // We're allowed to not remove listeners when accessible document is shutdown
-  // since we don't keep strong reference on chrome event target and listeners
-  // are removed automatically when chrome event target goes away.
-
-  docAccessible->Shutdown();
-  mDocAccessibleCache.Remove(aDocument);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports
 
@@ -316,7 +293,14 @@ nsAccDocManager::HandleEvent(nsIDOMEvent *aEvent)
       return NS_OK;
 
     // Shutdown this one and sub document accessibles.
-    ShutdownDocAccessiblesInTree(document);
+
+    // We're allowed to not remove listeners when accessible document is
+    // shutdown since we don't keep strong reference on chrome event target and
+    // listeners are removed automatically when chrome event target goes away.
+    nsDocAccessible* docAccessible = mDocAccessibleCache.GetWeak(document);
+    if (docAccessible)
+      docAccessible->Shutdown();
+
     return NS_OK;
   }
 
@@ -500,35 +484,6 @@ nsAccDocManager::CreateDocOrRootAccessible(nsIDocument *aDocument)
   return docAcc;
 }
 
-void
-nsAccDocManager::ShutdownDocAccessiblesInTree(nsIDocShellTreeItem *aTreeItem,
-                                              nsIDocument *aDocument)
-{
-  nsCOMPtr<nsIDocShellTreeNode> treeNode(do_QueryInterface(aTreeItem));
-
-  if (treeNode) {
-    PRInt32 subDocumentsCount = 0;
-    treeNode->GetChildCount(&subDocumentsCount);
-    for (PRInt32 idx = 0; idx < subDocumentsCount; idx++) {
-      nsCOMPtr<nsIDocShellTreeItem> treeItemChild;
-      treeNode->GetChildAt(idx, getter_AddRefs(treeItemChild));
-      NS_ASSERTION(treeItemChild, "No tree item when there should be");
-      if (!treeItemChild)
-        continue;
-
-      nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(treeItemChild));
-      nsCOMPtr<nsIContentViewer> contentViewer;
-      docShell->GetContentViewer(getter_AddRefs(contentViewer));
-      if (!contentViewer)
-        continue;
-
-      ShutdownDocAccessiblesInTree(treeItemChild, contentViewer->GetDocument());
-    }
-  }
-
-  ShutdownDocAccessible(aDocument);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // nsAccDocManager static
 
diff --git a/accessible/src/base/nsAccDocManager.h b/accessible/src/base/nsAccDocManager.h
index 4b8aa2ddeb6..2f9b097950c 100644
--- a/accessible/src/base/nsAccDocManager.h
+++ b/accessible/src/base/nsAccDocManager.h
@@ -75,13 +75,6 @@ public:
    */
   nsAccessible* FindAccessibleInCache(nsINode* aNode) const;
 
-  /**
-   * Shutdown document accessibles in the tree starting from the given one.
-   *
-   * @param  aDocument  [in] the DOM document of start document accessible
-   */
-  void ShutdownDocAccessiblesInTree(nsIDocument *aDocument);
-
   /**
    * Return document accessible from the cache. Convenient method for testing.
    */
@@ -90,6 +83,14 @@ public:
     return mDocAccessibleCache.GetWeak(aDocument);
   }
 
+  /**
+   * Called by document accessible when it gets shutdown.
+   */
+  inline void NotifyOfDocumentShutdown(nsIDocument* aDocument)
+  {
+    mDocAccessibleCache.Remove(aDocument);
+  }
+
 protected:
   nsAccDocManager() { };
 
@@ -103,11 +104,6 @@ protected:
    */
   void Shutdown();
 
-  /**
-   * Shutdown the document accessible.
-   */
-  void ShutdownDocAccessible(nsIDocument* aDocument);
-
 private:
   nsAccDocManager(const nsAccDocManager&);
   nsAccDocManager& operator =(const nsAccDocManager&);
@@ -156,12 +152,6 @@ private:
    */
   nsDocAccessible *CreateDocOrRootAccessible(nsIDocument *aDocument);
 
-  /**
-   * Shutdown document accessibles in the tree starting from given tree item.
-   */
-  void ShutdownDocAccessiblesInTree(nsIDocShellTreeItem *aTreeItem,
-                                    nsIDocument *aDocument);
-
   typedef nsRefPtrHashtable<nsPtrHashKey<const nsIDocument>, nsDocAccessible>
     nsDocAccessibleHashtable;
 
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 163b38508da..8436481ff2f 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -543,7 +543,10 @@ nsAccessibilityService::PresShellDestroyed(nsIPresShell *aPresShell)
     return;
 
   NS_LOG_ACCDOCDESTROY("presshell destroyed", doc)
-  ShutdownDocAccessible(doc);
+
+  nsDocAccessible* docAccessible = GetDocAccessibleFromCache(doc);
+  if (docAccessible)
+    docAccessible->Shutdown();
 }
 
 void
diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp
index db7376de5c4..cff7c23b926 100644
--- a/accessible/src/base/nsDocAccessible.cpp
+++ b/accessible/src/base/nsDocAccessible.cpp
@@ -675,6 +675,10 @@ nsDocAccessible::Shutdown()
     mParent->RemoveChild(this);
   }
 
+  PRUint32 childDocCount = mChildDocuments.Length();
+  for (PRUint32 idx = 0; idx < childDocCount; idx++)
+    mChildDocuments[idx]->Shutdown();
+
   mChildDocuments.Clear();
 
   mWeakShell = nsnull;  // Avoid reentrancy
@@ -686,6 +690,8 @@ nsDocAccessible::Shutdown()
   mDocument = nsnull;
 
   nsHyperTextAccessibleWrap::Shutdown();
+
+  GetAccService()->NotifyOfDocumentShutdown(kungFuDeathGripDoc);
 }
 
 nsIFrame*
diff --git a/accessible/src/base/nsOuterDocAccessible.cpp b/accessible/src/base/nsOuterDocAccessible.cpp
index 0983f34fcb3..580bfa935d1 100644
--- a/accessible/src/base/nsOuterDocAccessible.cpp
+++ b/accessible/src/base/nsOuterDocAccessible.cpp
@@ -169,7 +169,7 @@ nsOuterDocAccessible::Shutdown()
   if (childAcc) {
     NS_LOG_ACCDOCDESTROY("outerdoc's child document shutdown",
                          childAcc->GetDocumentNode())
-    GetAccService()->ShutdownDocAccessiblesInTree(childAcc->GetDocumentNode());
+    childAcc->Shutdown();
   }
 
   nsAccessibleWrap::Shutdown();

From 3c550368c447bb7c983aaa625bb7c4f0e4b03a47 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Thu, 28 Oct 2010 12:14:00 +0200
Subject: [PATCH 22/57] Bug 578589 - Intermittent failure in
 toolkit/content/tests/widgets/test_toolbar.xul. r=enn ab7=beltzner

---
 toolkit/content/widgets/toolbar.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/toolkit/content/widgets/toolbar.xml b/toolkit/content/widgets/toolbar.xml
index 913f6695bee..b0c8e612ea3 100644
--- a/toolkit/content/widgets/toolbar.xml
+++ b/toolkit/content/widgets/toolbar.xml
@@ -259,6 +259,7 @@
         </setter>
       </property>
 
+      <field name="_newElementCount">0</field>
       <method name="_getToolbarItem">
         <parameter name="aId"/>
         <body>
@@ -273,7 +274,10 @@
               case "spring":
               case "spacer":
                 newItem = document.createElementNS(XUL_NS, "toolbar" + aId);
-                newItem.id = aId + Date.now() + this.childNodes.length;
+                // Due to timers resolution Date.now() can be the same for
+                // elements created in small timeframes.  So ids are
+                // differentiated through a unique count suffix.
+                newItem.id = aId + Date.now() + (++this._newElementCount);
                 if (aId == "spring")
                   newItem.flex = 1;
                 break;

From 7f6f3ca7bc377b4cb3c2737ba9d0c1e90a5ebc09 Mon Sep 17 00:00:00 2001
From: Jason Duell <jduell.mcbugs@gmail.com>
Date: Thu, 28 Oct 2010 03:44:48 -0700
Subject: [PATCH 23/57] Bug 559714 - bustage fix. a=fennec-2.0b2

---
 netwerk/cache/nsCacheService.cpp | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp
index b57d8eb2fc4..2d8a8b63af3 100644
--- a/netwerk/cache/nsCacheService.cpp
+++ b/netwerk/cache/nsCacheService.cpp
@@ -793,14 +793,6 @@ nsCacheService::DispatchToCacheIOThread(nsIRunnable* event)
 PRBool
 nsCacheProfilePrefObserver::DiskCacheEnabled()
 {
-#ifdef MOZ_IPC
-    // Bad Things (tm) are likely to happen if child and parent both write to
-    // disk cache.  
-    // - TODO: remove once we turn off caching entirely in child (bug 559714)
-    if (mozilla::net::IsNeckoChild())
-        return PR_FALSE;
-#endif
-
     if ((mDiskCacheCapacity == 0) || (!mDiskCacheParentDirectory))  return PR_FALSE;
     return mDiskCacheEnabled;
 }
@@ -858,13 +850,6 @@ nsCacheProfilePrefObserver::MemoryCacheEnabled()
 PRInt32
 nsCacheProfilePrefObserver::MemoryCacheCapacity()
 {
-#ifdef MOZ_IPC
-    // For now use small memory cache (1 MB) on child, just for FTP/wyciwyg
-    // - TODO: remove once we turn off caching entirely in child (bug 559714)
-    if (mozilla::net::IsNeckoChild())
-        return 1024; 
-#endif
-
     PRInt32 capacity = mMemoryCacheCapacity;
     if (capacity >= 0) {
         CACHE_LOG_DEBUG(("Memory cache capacity forced to %d\n", capacity));

From 857e4b192dc7883aa440491188cd6b8454c0fef8 Mon Sep 17 00:00:00 2001
From: Gervase Markham <gerv@gerv.net>
Date: Thu, 28 Oct 2010 12:51:06 +0100
Subject: [PATCH 24/57] relic master copy is now defined as the one in Hg
 rather than CVS. Copy ing over all the changes from CVS since Hg branched
 off. a=NPOTB.

---
 tools/relic/make-id-list                      |  30 ++--
 tools/relic/relic                             | 166 +++++++++---------
 tools/relic/test/BrowserToolTip.cpp           |   0
 .../addlicense_inputs/emacs_local_vars_line.c |  33 +++-
 .../test/addlicense_inputs/utf8_xml_file.xml  |   0
 .../relic/test/addlicense_inputs/xml_file.rdf |   0
 .../emacs_local_vars_line.c                   |  32 +++-
 .../test/addlicense_outputs/utf8_xml_file.xml |   0
 .../test/addlicense_outputs/xml_file.rdf      |   0
 .../bad_contributor_section.cpp               |   0
 .../relicense_inputs/ibm_copyright_suffix.c   |   0
 .../relic/test/relicense_inputs/just_mpl.xul  |   0
 .../test/relicense_inputs/need_to_relicense.h |   5 +-
 .../no_initialcopyrightyear_section.xml       |   0
 ...o_initialcopyrightyear_section.xml.options |   0
 .../relicense_inputs/no_origcodeis_section.h  |   0
 .../no_origcodeis_section.h.options           |   0
 tools/relic/test/relicense_inputs/npl.h       |   5 +-
 ...eparated_license_comment_blocks.pl.options |   0
 .../test/relicense_inputs/unknown_license.c   |   0
 .../bad_contributor_section.cpp.error         |   0
 .../relicense_outputs/ibm_copyright_suffix.c  |   0
 .../relic/test/relicense_outputs/just_mpl.xul |   0
 .../relicense_outputs/need_to_relicense.h     |   5 +-
 .../no_initialcopyrightyear_section.xml       |   0
 .../relicense_outputs/no_origcodeis_section.h |   0
 tools/relic/test/relicense_outputs/npl.h      |   5 +-
 .../relicense_outputs/unknown_license.c.error |   0
 28 files changed, 173 insertions(+), 108 deletions(-)
 mode change 100644 => 100755 tools/relic/test/BrowserToolTip.cpp
 mode change 100644 => 100755 tools/relic/test/addlicense_inputs/emacs_local_vars_line.c
 mode change 100644 => 100755 tools/relic/test/addlicense_inputs/utf8_xml_file.xml
 mode change 100644 => 100755 tools/relic/test/addlicense_inputs/xml_file.rdf
 mode change 100644 => 100755 tools/relic/test/addlicense_outputs/emacs_local_vars_line.c
 mode change 100644 => 100755 tools/relic/test/addlicense_outputs/utf8_xml_file.xml
 mode change 100644 => 100755 tools/relic/test/addlicense_outputs/xml_file.rdf
 mode change 100644 => 100755 tools/relic/test/relicense_inputs/bad_contributor_section.cpp
 mode change 100644 => 100755 tools/relic/test/relicense_inputs/ibm_copyright_suffix.c
 mode change 100644 => 100755 tools/relic/test/relicense_inputs/just_mpl.xul
 mode change 100644 => 100755 tools/relic/test/relicense_inputs/need_to_relicense.h
 mode change 100644 => 100755 tools/relic/test/relicense_inputs/no_initialcopyrightyear_section.xml
 mode change 100644 => 100755 tools/relic/test/relicense_inputs/no_initialcopyrightyear_section.xml.options
 mode change 100644 => 100755 tools/relic/test/relicense_inputs/no_origcodeis_section.h
 mode change 100644 => 100755 tools/relic/test/relicense_inputs/no_origcodeis_section.h.options
 mode change 100644 => 100755 tools/relic/test/relicense_inputs/npl.h
 mode change 100644 => 100755 tools/relic/test/relicense_inputs/separated_license_comment_blocks.pl.options
 mode change 100644 => 100755 tools/relic/test/relicense_inputs/unknown_license.c
 mode change 100644 => 100755 tools/relic/test/relicense_outputs/bad_contributor_section.cpp.error
 mode change 100644 => 100755 tools/relic/test/relicense_outputs/ibm_copyright_suffix.c
 mode change 100644 => 100755 tools/relic/test/relicense_outputs/just_mpl.xul
 mode change 100644 => 100755 tools/relic/test/relicense_outputs/need_to_relicense.h
 mode change 100644 => 100755 tools/relic/test/relicense_outputs/no_initialcopyrightyear_section.xml
 mode change 100644 => 100755 tools/relic/test/relicense_outputs/no_origcodeis_section.h
 mode change 100644 => 100755 tools/relic/test/relicense_outputs/npl.h
 mode change 100644 => 100755 tools/relic/test/relicense_outputs/unknown_license.c.error

diff --git a/tools/relic/make-id-list b/tools/relic/make-id-list
index b77347f88a7..9a29e5f5c14 100755
--- a/tools/relic/make-id-list
+++ b/tools/relic/make-id-list
@@ -8,7 +8,11 @@
 # to make them all use the same variant of each name.
 #
 # Procedure:
+# Need to be in the top-level dir otherwise relic exclusions don't work.
+# Edit relic to set quiet to 1 on line 1471 or thereabouts
 # relic -I -f * > names.txt
+# Tidy up names.txt
+# and make one unified file if you ran relic over multiple trees.
 # make-id-list < names.txt > final.txt
 
 my %equivalents = (
@@ -24,22 +28,26 @@ my %equivalents = (
   "IBM Corp" => "IBM Corporation",
   "International Business Machines Corporation" => "IBM Corporation",
 
+  "Mozilla.com" => "Mozilla Corporation",
+  "Mozilla Corp" => "Mozilla Corporation",
+  
   "None" => "Mozilla Foundation",
   "a mozilla.org contributor" => "Mozilla Foundation",
   "person recorded in the version control logs" => "Mozilla Foundation",
   "Mozilla" => "Mozilla Foundation",
-  "Mozilla.com" => "Mozilla Corporation",
   "Mozilla.org" => "Mozilla Foundation",
   "Mozilla Organization" => "Mozilla Foundation",
   "mozilla.org" => "Mozilla Foundation",
-  
+  "example Inc" => "Mozilla Foundation",
+  "SeaMonkey team" => "Mozilla Foundation",  
   "mozilla.org SeaMonkey project" => "Mozilla Foundation",
   "SeaMonkey project" => "Mozilla Foundation",
   "SeaMonkey project at mozilla.org" => "Mozilla Foundation",
   "Mozilla Calendar Squad" => "Mozilla Foundation",
+  "mozilla.org code" => "Mozilla Foundation",
+  
+  "Mozilla Messaging Corporation" => "Mozilla Messaging",
   
-  "Mozilla Corp" => "Mozilla Corporation",
-
   "Netscape" => "Netscape Communications Corporation",
   "Netscape Corp" => "Netscape Communications Corporation",
   "Netscape Communications" => "Netscape Communications Corporation",
@@ -70,6 +78,7 @@ my %equivalents = (
 
   "bmlk\@gmx.de" => "Bernd Mielke",
   "davel\@mozilla.com" => "Dave Liebreich",
+  "dschaffe\@adobe.com" => "Dan Schaffer",
   "Digital Creations 2" => "Digital Creations 2 Inc",
   "Douglas F. Turner II" => "Doug Turner",
   "Kenneth Herron" => "Ken Herron",
@@ -88,6 +97,8 @@ my %equivalents = (
   "Richard L Walsh" => "Richard L. Walsh",
   "timeless" => "Josh Soref",
   "Olivier Parniere BT Global Services / Etat francais Ministere de la Defense" => "Olivier Parniere",
+  "Craig Toppper" => "Craig Topper",
+  "Mook" => "Mark 'Mook' Yen",
   
   "Frank Schoenheit" => "Frank Sch&ouml;nheit",
   "Frank Schönheit" => "Frank Sch&ouml;nheit",
@@ -98,13 +109,9 @@ my %equivalents = (
   "Vincent Béron" => "Vincent B&eacute;ron",
   "Tomas Mšller" => "Tomas M&uuml;ller",
   "Dão Gottwald" => "D&atilde;o Gottwald",
-  "László Németh" => "L&aacute;szl&oacute; N&eacutre;meth",
+  "László Németh" => "L&aacute;szl&oacute; N&eacute;meth",
   "Björn Jacke" => "Bj&ouml;rn Jacke",
-  
-  "example Inc" => "Mozilla Foundation",
-  "SeaMonkey team" => "Mozilla Foundation",
-  "person recorded in the version control logs" => "Mozilla Foundation",
-  "None" => "Mozilla Foundation"
+  "Žiga Sancin" => "&#x017d;iga Sancin",
 );
 
 # 'indevs' == "Initial Developers"
@@ -119,13 +126,14 @@ while (<>)
     # Chop off email addresses and suchlike
     $indev =~ s/[<,\(].*$//;
     $indev =~ s/^The\s+//i;
+    $indev =~ s/\.?\s*Portions created.*$//;
 
     # Trim whitespace
     $indev =~ s/^\s*//;
     $indev =~ s/\s*$//;
 
     $indev = $equivalents{$indev} || $indev;
-    $indevs{$indev} = 1;
+    $indevs{$indev} = 1 if $indev;
   }
 }
 
diff --git a/tools/relic/relic b/tools/relic/relic
index 1595008eaa4..955b8e2a5e6 100755
--- a/tools/relic/relic
+++ b/tools/relic/relic
@@ -188,6 +188,7 @@ _g_skip_files = [
     "gfx/cairo/cairo/COPYING-MPL-1.1",
     
     # Files containing global licensing information
+    "xpfe/global/resources/content/license.html",
     "toolkit/content/license.html",
     
     # Ben Bucksch - files are tri-licensed with an extra clause.
@@ -338,29 +339,30 @@ _g_basename_to_comment_info = {
     "awk_pkginfo-sparc": (["#"], ),
     "pkgdepend_64bit": (["#"], ),
     "WIN32": (["#"], ),
+    "WIN16": (["#"], ),
     "Makefile.linux": (["#"], ),
 
     "README": ([""], ["#"]),
     "copyright": ([""], ),
 
-    "xptcstubs_asm_ppc_darwin.s.m4": (["/*", " *", "*/"], ),
-    "xptcstubs_asm_mips.s.m4": (["/*", " *", "*/"], ),
+    "xptcstubs_asm_ppc_darwin.s.m4": (["/*", "*", "*/"], ),
+    "xptcstubs_asm_mips.s.m4": (["/*", "*", "*/"], ),
 
-    "nsIDocCharsetTest.txt": (["<!--", "   -", "-->"], ),
-    "nsIFontListTest.txt": (["<!--", "   -", "-->"], ),
-    "ComponentListTest.txt": (["<!--", "   -", "-->"], ),
-    "nsIWebBrowserPersistTest1.txt": (["<!--", "   -", "-->"], ),
-    "nsIWebBrowserPersistTest2.txt": (["<!--", "   -", "-->"], ),
-    "nsIWebBrowserPersistTest3.txt": (["<!--", "   -", "-->"], ),
-    "plugins.txt": (["<!--", "   -", "-->"], ),
-    "NsISHistoryTestCase1.txt": (["<!--", "   -", "-->"], ),
-    "EmbedSmokeTest.txt": (["<!--", "   -", "-->"], ),
+    "nsIDocCharsetTest.txt": (["<!--", "-", "-->"], ),
+    "nsIFontListTest.txt": (["<!--", "-", "-->"], ),
+    "ComponentListTest.txt": (["<!--", "-", "-->"], ),
+    "nsIWebBrowserPersistTest1.txt": (["<!--", "-", "-->"], ),
+    "nsIWebBrowserPersistTest2.txt": (["<!--", "-", "-->"], ),
+    "nsIWebBrowserPersistTest3.txt": (["<!--", "-", "-->"], ),
+    "plugins.txt": (["<!--", "-", "-->"], ),
+    "NsISHistoryTestCase1.txt": (["<!--", "-", "-->"], ),
+    "EmbedSmokeTest.txt": (["<!--", "-", "-->"], ),
 
-    "lineterm_LICENSE": (["/*", " *", "*/"], ),
-    "XMLterm_LICENSE": (["/*", " *", "*/"], ),
-    "BrowserView.cpp.mod": (["/*", " *", "*/"], ),
-    "header_template": (["/*", " *", "*/"], ),
-    "cpp_template": (["/*", " *", "*/"], ),
+    "lineterm_LICENSE": (["/*", "*", "*/"], ),
+    "XMLterm_LICENSE": (["/*", "*", "*/"], ),
+    "BrowserView.cpp.mod": (["/*", "*", "*/"], ),
+    "header_template": (["/*", "*", "*/"], ),
+    "cpp_template": (["/*", "*", "*/"], ),
 
     "abcFormat470.txt": (["//"], ),
     "opcodes.tbl": (["//"], ),
@@ -377,70 +379,71 @@ _g_ext_to_comment_info = {
     ".FP":    (["", ]),
     ".spec":  (["", ]),
 
-    ".CPP":    (["/*", " *", "*/"], ),
-    ".cpp":    (["/*", " *", "*/"], ),
-    ".H":      (["/*", " *", "*/"], ),
-    ".h":      (["/*", " *", "*/"], ),
-    ".hxx":    (["/*", " *", "*/"], ),
-    ".c":      (["/*", " *", "*/"], ),
-    ".css":    (["/*", " *", "*/"], ['#']),
-    ".js":     (["/*", " *", "*/"], ['#']),
-    ".idl":    (["/*", " *", "*/"], ),
-    ".ut":     (["/*", " *", "*/"], ),
-    ".rc":     (["/*", " *", "*/"], ),
-    ".rc2":    (["/*", " *", "*/"], ),
-    ".RC":     (["/*", " *", "*/"], ),
-    ".Prefix": (["/*", " *", "*/"], ),
-    ".prefix": (["/*", " *", "*/"], ),
-    ".cfg":    (["/*", " *", "*/"], ["#"]),
-    ".cp":     (["/*", " *", "*/"], ),
-    ".cs":     (["/*", " *", "*/"], ),
-    ".java":   (["/*", " *", "*/"], ),
-    ".jst":    (["/*", " *", "*/"], ),
-    ".tbl":    (["/*", " *", "*/"], ),
-    ".tab":    (["/*", " *", "*/"], ),
-    ".cc":     (["/*", " *", "*/"], ),
-    ".msg":    (["/*", " *", "*/"], ),
-    ".y":      (["/*", " *", "*/"], ),
-    ".r":      (["/*", " *", "*/"], ),
-    ".mm":     (["/*", " *", "*/"], ),
-    ".x-ccmap":(["/*", " *", "*/"], ),
-    ".ccmap":  (["/*", " *", "*/"], ),
-    ".sql":    (["/*", " *", "*/"], ),
-    ".pch++":  (["/*", " *", "*/"], ),
-    ".xpm":    (["/*", " *", "*/"], ),
-    ".uih":    (["/*", " *", "*/"], ),
-    ".uil":    (["/*", " *", "*/"], ),
-    ".ccmap":  (["/*", " *", "*/"], ),
-    ".map":    (["/*", " *", "*/"], ),
-    ".win98":  (["/*", " *", "*/"], ),
-    ".php":    (["/*", " *", "*/"], ),
-    ".m":      (["/*", " *", "*/"], ),
-    ".jnot":   (["/*", " *", "*/"], ),
-    ".l":      (["/*", " *", "*/"], ),
-    ".htp":    (["/*", " *", "*/"], ),
-    ".xs":     (["/*", " *", "*/"], ),
-    ".as":     (["/*", " *", "*/"], ),
-    ".api":    (["/*", " *", "*/"], ['#']),
+    ".CPP":    (["/*", "*", "*/"], ),
+    ".cpp":    (["/*", "*", "*/"], ),
+    ".H":      (["/*", "*", "*/"], ),
+    ".h":      (["/*", "*", "*/"], ),
+    ".hxx":    (["/*", "*", "*/"], ),
+    ".c":      (["/*", "*", "*/"], ),
+    ".css":    (["/*", "*", "*/"], ['#']),
+    ".js":     (["/*", "*", "*/"], ['#']),
+    ".idl":    (["/*", "*", "*/"], ),
+    ".ut":     (["/*", "*", "*/"], ),
+    ".rc":     (["/*", "*", "*/"], ),
+    ".rc2":    (["/*", "*", "*/"], ),
+    ".RC":     (["/*", "*", "*/"], ),
+    ".Prefix": (["/*", "*", "*/"], ),
+    ".prefix": (["/*", "*", "*/"], ),
+    ".cfg":    (["/*", "*", "*/"], ["#"]),
+    ".cp":     (["/*", "*", "*/"], ),
+    ".cs":     (["/*", "*", "*/"], ),
+    ".java":   (["/*", "*", "*/"], ),
+    ".jst":    (["/*", "*", "*/"], ),
+    ".tbl":    (["/*", "*", "*/"], ),
+    ".tab":    (["/*", "*", "*/"], ),
+    ".cc":     (["/*", "*", "*/"], ),
+    ".msg":    (["/*", "*", "*/"], ),
+    ".y":      (["/*", "*", "*/"], ),
+    ".r":      (["/*", "*", "*/"], ),
+    ".mm":     (["/*", "*", "*/"], ),
+    ".x-ccmap":(["/*", "*", "*/"], ),
+    ".ccmap":  (["/*", "*", "*/"], ),
+    ".sql":    (["/*", "*", "*/"], ),
+    ".pch++":  (["/*", "*", "*/"], ),
+    ".xpm":    (["/*", "*", "*/"], ),
+    ".uih":    (["/*", "*", "*/"], ),
+    ".uil":    (["/*", "*", "*/"], ),
+    ".ccmap":  (["/*", "*", "*/"], ),
+    ".map":    (["/*", "*", "*/"], ),
+    ".win98":  (["/*", "*", "*/"], ),
+    ".php":    (["/*", "*", "*/"], ),
+    ".m":      (["/*", "*", "*/"], ),
+    ".jnot":   (["/*", "*", "*/"], ),
+    ".l":      (["/*", "*", "*/"], ),
+    ".htp":    (["/*", "*", "*/"], ),
+    ".xs":     (["/*", "*", "*/"], ),
+    ".as":     (["/*", "*", "*/"], ),
+    ".api":    (["/*", "*", "*/"], ['#']),
+    ".applescript": (["(*", "*", "*)"], ["--"], ["#"]),
 
-    ".html": (["<!--", "   -", "-->"], ["#"]),
-    ".xml":  (["<!--", "   -", "-->"], ["#"]),
-    ".xbl":  (["<!--", "   -", "-->"], ["#"]),
-    ".xsl":  (["<!--", "   -", "-->"], ),
-    ".xul":  (["<!--", "   -", "-->"], ["#"]),
-    ".dtd":  (["<!--", "   -", "-->"], ["#"]),
-    ".rdf":  (["<!--", "   -", "-->"], ["#"]),
-    ".htm":  (["<!--", "   -", "-->"], ),
-    ".out":  (["<!--", "   -", "-->"], ),
-    ".resx": (["<!--", "   -", "-->"], ),
-    ".bl":   (["<!--", "   -", "-->"], ),
-    ".xif":  (["<!--", "   -", "-->"], ),
-    ".xhtml":(["<!--", "   -", "-->"], ["#"]),
+    ".html": (["<!--", "-", "-->"], ["#"]),
+    ".xml":  (["<!--", "-", "-->"], ["#"]),
+    ".xbl":  (["<!--", "-", "-->"], ["#"]),
+    ".xsl":  (["<!--", "-", "-->"], ),
+    ".xul":  (["<!--", "-", "-->"], ["#"]),
+    ".dtd":  (["<!--", "-", "-->"], ["#"]),
+    ".rdf":  (["<!--", "-", "-->"], ["#"]),
+    ".htm":  (["<!--", "-", "-->"], ),
+    ".out":  (["<!--", "-", "-->"], ),
+    ".resx": (["<!--", "-", "-->"], ),
+    ".bl":   (["<!--", "-", "-->"], ),
+    ".xif":  (["<!--", "-", "-->"], ),
+    ".xhtml":(["<!--", "-", "-->"], ["#"]),
 
-    ".inc":  (["<!--", "   -", "-->"], 
+    ".inc":  (["<!--", "-", "-->"], 
               ["#"],
               ["@!"],
-              ["/*", " *", "*/"]),
+              ["/*", "*", "*/"]),
 
     ".properties": (["#"], ),
     ".win":        (["#"], ),
@@ -522,7 +525,7 @@ _g_ext_to_comment_info = {
     ".3x":  (['.\\"'], ),
 	    
     # What a mess...
-    ".s": (["#"], ["//"], ["/*", " *", "*/"], ["!"], [";"], ["/"]),
+    ".s": (["#"], ["//"], ["/*", "*", "*/"], ["!"], [";"], ["/"]),
 }
 _g_shebang_pattern_to_comment_info = [
     (re.compile(ur'\A#!.*/bin/(ba)?sh.*$', re.IGNORECASE), (["#"], )),
@@ -896,8 +899,9 @@ def _get_license_info(filename, show_initial=0, quick=0):
     lines = content.splitlines()
     for comment_delims in comment_delim_sets:
         if len(comment_delims) == 3:
-            prefix_pattern = "%s|%s|" % (re.escape(comment_delims[0]),
-                                         re.escape(comment_delims[1]))
+            # Note: allow for whitespace before continuation character
+            prefix_pattern = "%s|\s*%s|" % (re.escape(comment_delims[0]),
+                                            re.escape(comment_delims[1]))
             suffix_pattern = "%s" % re.escape(comment_delims[2])
         elif len(comment_delims) == 2:
             prefix_pattern = "%s|" % re.escape(comment_delims[0])
@@ -1466,11 +1470,11 @@ def _make_backup_path(path):
     raise RelicError("Could not find an unused backup path for '%s'." % path)
 
 
-def _relicensing_error(err, path, cache=None, quiet=0):
+def _relicensing_error(err, path, cache=None, quiet=1):
     """Handle an error during relicensing.
     
         "err" may be an error string or an exception instance.
-        "path" is the path of the file on which this error occurred.
+        "path" is the path of the file on which this error occured.
         "cache" is a mapping of path to errors on which errors may be
             stored for later reporting.
         "quiet" optionally allows one to silence the stdout output when
diff --git a/tools/relic/test/BrowserToolTip.cpp b/tools/relic/test/BrowserToolTip.cpp
old mode 100644
new mode 100755
diff --git a/tools/relic/test/addlicense_inputs/emacs_local_vars_line.c b/tools/relic/test/addlicense_inputs/emacs_local_vars_line.c
old mode 100644
new mode 100755
index 5ef62784daf..76e7e45e4d0
--- a/tools/relic/test/addlicense_inputs/emacs_local_vars_line.c
+++ b/tools/relic/test/addlicense_inputs/emacs_local_vars_line.c
@@ -5,10 +5,12 @@
 
 #if defined(VMS)
 #include <sys/timeb.h>
-#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
+#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS)
 #include <sys/time.h>
 #elif defined(WIN32)
 #include <windows.h>
+#elif defined(XP_OS2_VACPP)
+#include <sys/timeb.h>
 #else
 #error "Architecture not supported"
 #endif
@@ -35,7 +37,7 @@ int main(int argc, char **argv)
     now *= 1000000;
     now += (1000 * b.millitm);
     fprintf(stdout, "%Ld", now);
-#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
+#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS)
     long long now;
     struct timeval tv;
 #ifdef HAVE_SVID_GETTOD
@@ -68,6 +70,33 @@ int main(int argc, char **argv)
     now = (now - 116444736000000000i64) / 10i64;
     fprintf(stdout, "%I64d", now);
 #endif
+
+#elif defined(XP_OS2_VACPP)
+/* no long long or i64 so we use a string */
+#include <string.h>
+  char buf[24];
+  char tbuf[7];
+  time_t now;
+  long mtime;
+  int i;
+
+  struct timeb b;
+  ftime(&b);
+  now = b.time;
+  _ltoa(now, buf, 10);
+
+  mtime = b.millitm * 1000;
+  if (mtime == 0){
+    ++now;
+    strcat(buf, "000000");
+  } else {
+     _ltoa(mtime, tbuf, 10);
+     for (i = strlen(tbuf); i < 6; ++i)
+       strcat(buf, "0");
+     strcat(buf, tbuf);
+  }
+  fprintf(stdout, "%s", buf);
+
 #else
 #error "Architecture not supported"
 #endif
diff --git a/tools/relic/test/addlicense_inputs/utf8_xml_file.xml b/tools/relic/test/addlicense_inputs/utf8_xml_file.xml
old mode 100644
new mode 100755
diff --git a/tools/relic/test/addlicense_inputs/xml_file.rdf b/tools/relic/test/addlicense_inputs/xml_file.rdf
old mode 100644
new mode 100755
diff --git a/tools/relic/test/addlicense_outputs/emacs_local_vars_line.c b/tools/relic/test/addlicense_outputs/emacs_local_vars_line.c
old mode 100644
new mode 100755
index 44c23827938..038d98d7d8d
--- a/tools/relic/test/addlicense_outputs/emacs_local_vars_line.c
+++ b/tools/relic/test/addlicense_outputs/emacs_local_vars_line.c
@@ -41,10 +41,12 @@
 
 #if defined(VMS)
 #include <sys/timeb.h>
-#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
+#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS)
 #include <sys/time.h>
 #elif defined(WIN32)
 #include <windows.h>
+#elif defined(XP_OS2_VACPP)
+#include <sys/timeb.h>
 #else
 #error "Architecture not supported"
 #endif
@@ -71,7 +73,7 @@ int main(int argc, char **argv)
     now *= 1000000;
     now += (1000 * b.millitm);
     fprintf(stdout, "%Ld", now);
-#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
+#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS)
     long long now;
     struct timeval tv;
 #ifdef HAVE_SVID_GETTOD
@@ -105,6 +107,32 @@ int main(int argc, char **argv)
     fprintf(stdout, "%I64d", now);
 #endif
 
+#elif defined(XP_OS2_VACPP)
+/* no long long or i64 so we use a string */
+#include <string.h>
+  char buf[24];
+  char tbuf[7];
+  time_t now;
+  long mtime;
+  int i;
+
+  struct timeb b;
+  ftime(&b);
+  now = b.time;
+  _ltoa(now, buf, 10);
+
+  mtime = b.millitm * 1000;
+  if (mtime == 0){
+    ++now;
+    strcat(buf, "000000");
+  } else {
+     _ltoa(mtime, tbuf, 10);
+     for (i = strlen(tbuf); i < 6; ++i)
+       strcat(buf, "0");
+     strcat(buf, tbuf);
+  }
+  fprintf(stdout, "%s", buf);
+
 #else
 #error "Architecture not supported"
 #endif
diff --git a/tools/relic/test/addlicense_outputs/utf8_xml_file.xml b/tools/relic/test/addlicense_outputs/utf8_xml_file.xml
old mode 100644
new mode 100755
diff --git a/tools/relic/test/addlicense_outputs/xml_file.rdf b/tools/relic/test/addlicense_outputs/xml_file.rdf
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_inputs/bad_contributor_section.cpp b/tools/relic/test/relicense_inputs/bad_contributor_section.cpp
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_inputs/ibm_copyright_suffix.c b/tools/relic/test/relicense_inputs/ibm_copyright_suffix.c
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_inputs/just_mpl.xul b/tools/relic/test/relicense_inputs/just_mpl.xul
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_inputs/need_to_relicense.h b/tools/relic/test/relicense_inputs/need_to_relicense.h
old mode 100644
new mode 100755
index 6bc02a580e9..5691db2b3e0
--- a/tools/relic/test/relicense_inputs/need_to_relicense.h
+++ b/tools/relic/test/relicense_inputs/need_to_relicense.h
@@ -49,7 +49,6 @@
 #include "ChangeCSSInlineStyleTxn.h"
 #include "nsEditProperty.h"
 #include "nsIDOMCSSStyleDeclaration.h"
-#include "nsTArray.h"
 
 #define SPECIFIED_STYLE_TYPE    1
 #define COMPUTED_STYLE_TYPE     2
@@ -338,7 +337,7 @@ private:
     */
 
   void      BuildCSSDeclarations(nsVoidArray & aPropertyArray,
-                                 nsTArray<nsString> & cssValueArray,
+                                 nsStringArray & cssValueArray,
                                  const CSSEquivTable * aEquivTable,
                                  const nsAString * aValue,
                                  PRBool aGetOrRemoveRequest);
@@ -361,7 +360,7 @@ private:
                                                  const nsAString *aAttribute,
                                                  const nsAString *aValue,
                                                  nsVoidArray & aPropertyArray,
-                                                 nsTArray<nsString> & aValueArray,
+                                                 nsStringArray & aValueArray,
                                                  PRBool aGetOrRemoveRequest);
 
   /** creates a Transaction for setting or removing a css property
diff --git a/tools/relic/test/relicense_inputs/no_initialcopyrightyear_section.xml b/tools/relic/test/relicense_inputs/no_initialcopyrightyear_section.xml
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_inputs/no_initialcopyrightyear_section.xml.options b/tools/relic/test/relicense_inputs/no_initialcopyrightyear_section.xml.options
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_inputs/no_origcodeis_section.h b/tools/relic/test/relicense_inputs/no_origcodeis_section.h
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_inputs/no_origcodeis_section.h.options b/tools/relic/test/relicense_inputs/no_origcodeis_section.h.options
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_inputs/npl.h b/tools/relic/test/relicense_inputs/npl.h
old mode 100644
new mode 100755
index c5db9926263..b71071e78bb
--- a/tools/relic/test/relicense_inputs/npl.h
+++ b/tools/relic/test/relicense_inputs/npl.h
@@ -34,7 +34,6 @@
 #include "ChangeCSSInlineStyleTxn.h"
 #include "nsEditProperty.h"
 #include "nsIDOMCSSStyleDeclaration.h"
-#include "nsTArray.h"
 
 #define SPECIFIED_STYLE_TYPE    1
 #define COMPUTED_STYLE_TYPE     2
@@ -323,7 +322,7 @@ private:
     */
 
   void      BuildCSSDeclarations(nsVoidArray & aPropertyArray,
-                                 nsTArray<nsString> & cssValueArray,
+                                 nsStringArray & cssValueArray,
                                  const CSSEquivTable * aEquivTable,
                                  const nsAString * aValue,
                                  PRBool aGetOrRemoveRequest);
@@ -346,7 +345,7 @@ private:
                                                  const nsAString *aAttribute,
                                                  const nsAString *aValue,
                                                  nsVoidArray & aPropertyArray,
-                                                 nsTArray<nsString> & aValueArray,
+                                                 nsStringArray & aValueArray,
                                                  PRBool aGetOrRemoveRequest);
 
   /** creates a Transaction for setting or removing a css property
diff --git a/tools/relic/test/relicense_inputs/separated_license_comment_blocks.pl.options b/tools/relic/test/relicense_inputs/separated_license_comment_blocks.pl.options
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_inputs/unknown_license.c b/tools/relic/test/relicense_inputs/unknown_license.c
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_outputs/bad_contributor_section.cpp.error b/tools/relic/test/relicense_outputs/bad_contributor_section.cpp.error
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_outputs/ibm_copyright_suffix.c b/tools/relic/test/relicense_outputs/ibm_copyright_suffix.c
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_outputs/just_mpl.xul b/tools/relic/test/relicense_outputs/just_mpl.xul
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_outputs/need_to_relicense.h b/tools/relic/test/relicense_outputs/need_to_relicense.h
old mode 100644
new mode 100755
index 11a7c44bebf..bafc5805c61
--- a/tools/relic/test/relicense_outputs/need_to_relicense.h
+++ b/tools/relic/test/relicense_outputs/need_to_relicense.h
@@ -41,7 +41,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsString.h"
-#include "nsTArray.h"
 #include "nsIDOMViewCSS.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMElement.h"
@@ -337,7 +336,7 @@ private:
     */
 
   void      BuildCSSDeclarations(nsVoidArray & aPropertyArray,
-                                 nsTArray<nsString> & cssValueArray,
+                                 nsStringArray & cssValueArray,
                                  const CSSEquivTable * aEquivTable,
                                  const nsAString * aValue,
                                  PRBool aGetOrRemoveRequest);
@@ -360,7 +359,7 @@ private:
                                                  const nsAString *aAttribute,
                                                  const nsAString *aValue,
                                                  nsVoidArray & aPropertyArray,
-                                                 nsTArray<nsString> & aValueArray,
+                                                 nsStringArray & aValueArray,
                                                  PRBool aGetOrRemoveRequest);
 
   /** creates a Transaction for setting or removing a css property
diff --git a/tools/relic/test/relicense_outputs/no_initialcopyrightyear_section.xml b/tools/relic/test/relicense_outputs/no_initialcopyrightyear_section.xml
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_outputs/no_origcodeis_section.h b/tools/relic/test/relicense_outputs/no_origcodeis_section.h
old mode 100644
new mode 100755
diff --git a/tools/relic/test/relicense_outputs/npl.h b/tools/relic/test/relicense_outputs/npl.h
old mode 100644
new mode 100755
index 63e5267360e..cdec11e2d53
--- a/tools/relic/test/relicense_outputs/npl.h
+++ b/tools/relic/test/relicense_outputs/npl.h
@@ -41,7 +41,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsString.h"
-#include "nsTArray.h"
 #include "nsIDOMViewCSS.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMElement.h"
@@ -337,7 +336,7 @@ private:
     */
 
   void      BuildCSSDeclarations(nsVoidArray & aPropertyArray,
-                                 nsTArray<nsString> & cssValueArray,
+                                 nsStringArray & cssValueArray,
                                  const CSSEquivTable * aEquivTable,
                                  const nsAString * aValue,
                                  PRBool aGetOrRemoveRequest);
@@ -360,7 +359,7 @@ private:
                                                  const nsAString *aAttribute,
                                                  const nsAString *aValue,
                                                  nsVoidArray & aPropertyArray,
-                                                 nsTArray<nsString> & aValueArray,
+                                                 nsStringArray & aValueArray,
                                                  PRBool aGetOrRemoveRequest);
 
   /** creates a Transaction for setting or removing a css property
diff --git a/tools/relic/test/relicense_outputs/unknown_license.c.error b/tools/relic/test/relicense_outputs/unknown_license.c.error
old mode 100644
new mode 100755

From 04e283f7d7d2279a65f5e1d9276fe834a8439663 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Wed, 27 Oct 2010 18:36:01 -0400
Subject: [PATCH 25/57] bug 606539 - Report Android specific info in crash
 reports r=mwu a=stuart

---
 embedding/android/CrashReporter.java.in | 28 ++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/embedding/android/CrashReporter.java.in b/embedding/android/CrashReporter.java.in
index 810de2c273e..31753ed517f 100644
--- a/embedding/android/CrashReporter.java.in
+++ b/embedding/android/CrashReporter.java.in
@@ -57,6 +57,7 @@ public class CrashReporter extends Activity
 {
   static final String kMiniDumpPathKey = "upload_file_minidump";
   static final String kPageURLKey = "URL";
+  static final String kNotesKey = "Notes";
   ProgressDialog mProgressDialog;
   File mPendingMinidumpFile;
   File mPendingExtrasFile;
@@ -230,10 +231,35 @@ public class CrashReporter extends Activity
         if (key.equals(kPageURLKey)) {
           if (includeURLCheckbox.isChecked())
             sendPart(os, boundary, key, extras.get(key));
-        } else if (!key.equals("ServerURL")){
+        } else if (!key.equals("ServerURL") && !key.equals(kNotesKey)) {
           sendPart(os, boundary, key, extras.get(key));
         }
       }
+
+      // Add some extra information to notes so its displayed by 
+      // crash-stats.mozilla.org. Remove this when bug 607942 is fixed.
+      String notes = extras.containsKey(kNotesKey) ? extras.get(kNotesKey) + 
+        "\n" : "";
+      if (@MOZ_MIN_CPU_VERSION@ < 7)
+        notes += "nothumb Build\n";
+      notes += Build.MANUFACTURER + " ";
+      notes += Build.MODEL + "\n";
+      notes += Build.FINGERPRINT;
+      sendPart(os, boundary, kNotesKey, notes);
+
+      sendPart(os, boundary, "Min_ARM_Version", "@MOZ_MIN_CPU_VERSION@");
+      sendPart(os, boundary, "Android_Manufacturer", Build.MANUFACTURER);
+      sendPart(os, boundary, "Android_Model", Build.MODEL);
+      sendPart(os, boundary, "Android_Board", Build.BOARD);
+      sendPart(os, boundary, "Android_Brand", Build.BRAND);
+      sendPart(os, boundary, "Android_CPU_ABI", Build.CPU_ABI); 
+      sendPart(os, boundary, "Android_CPU_ABI2", Build.CPU_ABI2);
+      sendPart(os, boundary, "Android_Device", Build.DEVICE);
+      sendPart(os, boundary, "Android_Display", Build.DISPLAY);
+      sendPart(os, boundary, "Android_Fingerprint", Build.FINGERPRINT);
+      sendPart(os, boundary, "Android_Hardware", Build.HARDWARE);
+      sendPart(os, boundary, "Android_Version",  Build.VERSION.SDK_INT + " (" + Build.VERSION.CODENAME + ")");
+
       sendFile(os, boundary, kMiniDumpPathKey, minidumpFile);
       os.write(("\r\n--" + boundary + "--\r\n").getBytes());
       os.flush();

From c9a489bbd572e3b233963f7c0ebe560c956cab94 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Thu, 28 Oct 2010 17:11:15 +0300
Subject: [PATCH 26/57] Bug 606192 - After drag & drop any link/text/image to
 contents area, mouse click chrome elements does not work, r=enndeakin,
 a=beltzner

---
 content/base/src/nsGenericElement.cpp         |  2 +-
 content/events/src/nsEventStateManager.cpp    | 19 ++++---
 content/events/src/nsEventStateManager.h      |  8 +--
 .../html/content/src/nsHTMLButtonElement.cpp  |  2 +-
 layout/base/tests/test_bug603550.html         | 49 ++++++++++++++++++-
 5 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 9914309f194..556e2fb40dd 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -5325,7 +5325,7 @@ nsGenericElement::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor)
 
           nsIEventStateManager* esm =
             aVisitor.mPresContext->EventStateManager();
-          nsEventStateManager::SetGlobalActiveContent(
+          nsEventStateManager::SetActiveManager(
             static_cast<nsEventStateManager*>(esm), this);
         }
       }
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 84f440ab501..7bb2c4be10a 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -2074,6 +2074,7 @@ nsEventStateManager::GenerateDragGesture(nsPresContext* aPresContext,
         PRBool dragStarted = DoDefaultDragStart(aPresContext, event, dataTransfer,
                                                 targetContent, isSelection);
         if (dragStarted) {
+          sActiveESM = nsnull;
           aEvent->flags |= NS_EVENT_FLAG_STOP_DISPATCH;
         }
       }
@@ -2935,7 +2936,6 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
             if (par)
               activeContent = par;
           }
-          SetGlobalActiveContent(this, activeContent);
         }
       }
       else {
@@ -2943,11 +2943,12 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
         // any of our own processing of a drag. Workaround for bug 43258.
         StopTrackingDragGesture();
       }
+      SetActiveManager(this, activeContent);
     }
     break;
   case NS_MOUSE_BUTTON_UP:
     {
-      ClearGlobalActiveContent();
+      ClearGlobalActiveContent(this);
       if (IsMouseEventReal(aEvent)) {
         if (!mCurrentTarget) {
           nsIFrame* targ;
@@ -3206,6 +3207,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
                                            targetContent, &status);
         }
       }
+      ClearGlobalActiveContent(this);
       break;
     }
   case NS_DRAGDROP_EXIT:
@@ -4706,22 +4708,25 @@ nsEventStateManager::DoContentCommandScrollEvent(nsContentCommandEvent* aEvent)
 }
 
 void
-nsEventStateManager::SetGlobalActiveContent(nsEventStateManager* aNewESM,
-                                            nsIContent* aContent)
+nsEventStateManager::SetActiveManager(nsEventStateManager* aNewESM,
+                                      nsIContent* aContent)
 {
   if (sActiveESM && aNewESM != sActiveESM) {
     sActiveESM->SetContentState(nsnull, NS_EVENT_STATE_ACTIVE);
   }
   sActiveESM = aNewESM;
-  if (sActiveESM) {
+  if (sActiveESM && aContent) {
     sActiveESM->SetContentState(aContent, NS_EVENT_STATE_ACTIVE);
   }
 }
 
 void
-nsEventStateManager::ClearGlobalActiveContent()
+nsEventStateManager::ClearGlobalActiveContent(nsEventStateManager* aClearer)
 {
-  if (sActiveESM) {
+  if (aClearer) {
+    aClearer->SetContentState(nsnull, NS_EVENT_STATE_ACTIVE);
+  }
+  if (sActiveESM && aClearer != sActiveESM) {
     sActiveESM->SetContentState(nsnull, NS_EVENT_STATE_ACTIVE);
   }
   sActiveESM = nsnull;
diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h
index af1c64e61f0..4a7d85ba7cd 100644
--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@@ -159,8 +159,10 @@ public:
 
   static nsIEventStateManager* GetActiveEventStateManager() { return sActiveESM; }
 
-  static void SetGlobalActiveContent(nsEventStateManager* aNewESM,
-                                     nsIContent* aContent);
+  // Sets aNewESM to be the active event state manager, and
+  // if aContent is non-null, marks the object as active.
+  static void SetActiveManager(nsEventStateManager* aNewESM,
+                               nsIContent* aContent);
 protected:
   void UpdateCursor(nsPresContext* aPresContext, nsEvent* aEvent, nsIFrame* aTargetFrame, nsEventStatus* aStatus);
   /**
@@ -415,7 +417,7 @@ protected:
 
   static nsEventStateManager* sActiveESM;
   
-  static void ClearGlobalActiveContent();
+  static void ClearGlobalActiveContent(nsEventStateManager* aClearer);
 
   // Functions used for click hold context menus
   PRBool mClickHoldContextMenu;
diff --git a/content/html/content/src/nsHTMLButtonElement.cpp b/content/html/content/src/nsHTMLButtonElement.cpp
index 091230e4aab..2420d21242a 100644
--- a/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/content/html/content/src/nsHTMLButtonElement.cpp
@@ -439,7 +439,7 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
               if (NS_IS_TRUSTED_EVENT(aVisitor.mEvent)) {
                 nsIEventStateManager* esm =
                   aVisitor.mPresContext->EventStateManager();
-                nsEventStateManager::SetGlobalActiveContent(
+                nsEventStateManager::SetActiveManager(
                   static_cast<nsEventStateManager*>(esm), this);
               }
               nsIFocusManager* fm = nsFocusManager::GetFocusManager();
diff --git a/layout/base/tests/test_bug603550.html b/layout/base/tests/test_bug603550.html
index daeb46c710c..e639035d1e5 100644
--- a/layout/base/tests/test_bug603550.html
+++ b/layout/base/tests/test_bug603550.html
@@ -54,6 +54,33 @@ function sendMouseUp(el) {
   utils.sendMouseEvent('mouseup', rect.left + 5, rect.top + 5, 0, 1, 0);
 }
 
+function fireEvent(target, event) {
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+  var utils =
+    window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
+           getInterface(Components.interfaces.nsIDOMWindowUtils);
+  utils.dispatchDOMEventViaPresShell(target, event, true);
+}
+
+function fireDrop(element) {
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+  var ds = Components.classes["@mozilla.org/widget/dragservice;1"].
+    getService(Components.interfaces.nsIDragService);
+
+  ds.startDragSession();
+
+  var event = document.createEvent("DragEvents");
+  event.initDragEvent("dragover", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null, null);
+  fireEvent(element, event);
+
+  event = document.createEvent("DragEvents");
+  event.initDragEvent("drop", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null, null);
+  fireEvent(element, event);
+
+  ds.endDragSession(false);
+  ok(!ds.getCurrentSession(), "There shouldn't be a drag session anymore!");
+}
+
 function runTest() {
   var d1 = document.getElementById("d1");
   var didGetMouseMove = false;
@@ -65,7 +92,27 @@ function runTest() {
     true);
   sendMouseMoveFaraway(d1);
   ok(didGetMouseMove, "Should have got mousemove!");
-  sendMouseUp(d1)
+  sendMouseUp(d1);
+  
+  didGetMouseMove = false;
+  document.addEventListener("mousedown",
+    function (e) {
+      e.preventDefault();
+    },
+    true);
+  sendMouseDown(d1);
+  sendMouseMoveFaraway(d1);
+  ok(didGetMouseMove, "Should have got mousemove! (2)");
+  sendMouseUp(d1);
+  
+  didGetMouseMove = false;
+  sendMouseDown(d1);
+  fireDrop(d1);
+  sendMouseMoveFaraway(d1);
+  ok(!didGetMouseMove, "Shouldn't have got mousemove!");
+  
+  
+  
   SimpleTest.finish();
 }
 

From fe340c9a46fa53aa7248a818c1c025a45c25b2e2 Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Wed, 27 Oct 2010 14:35:00 -0400
Subject: [PATCH 27/57] Bug 566478 - Invalid SSL cert error is not
 mobile-friendly [r=kaie a=blocking-fennecb2]

---
 .../http/HttpChannelParentListener.cpp        |   6 +
 security/manager/ssl/src/Makefile.in          |   1 +
 security/manager/ssl/src/NSSErrorsService.cpp | 189 ++++++++++++++++++
 security/manager/ssl/src/NSSErrorsService.h   |  68 +++++++
 security/manager/ssl/src/nsNSSComponent.cpp   | 111 +---------
 security/manager/ssl/src/nsNSSComponent.h     |   4 +-
 security/manager/ssl/src/nsNSSIOLayer.cpp     |  91 +++++----
 security/manager/ssl/src/nsNSSModule.cpp      |   8 +-
 8 files changed, 324 insertions(+), 154 deletions(-)
 create mode 100644 security/manager/ssl/src/NSSErrorsService.cpp
 create mode 100644 security/manager/ssl/src/NSSErrorsService.h

diff --git a/netwerk/protocol/http/HttpChannelParentListener.cpp b/netwerk/protocol/http/HttpChannelParentListener.cpp
index 8eaeee8c822..74fe14c70e4 100644
--- a/netwerk/protocol/http/HttpChannelParentListener.cpp
+++ b/netwerk/protocol/http/HttpChannelParentListener.cpp
@@ -143,6 +143,12 @@ HttpChannelParentListener::GetInterface(const nsIID& aIID, void **result)
     return mActiveChannel->mTabParent->QueryInterface(aIID, result);
   }
 
+  if (aIID.Equals(NS_GET_IID(nsISecureBrowserUI))) {
+    if (!mActiveChannel && !mActiveChannel->mTabParent)
+      return NS_NOINTERFACE;
+    return mActiveChannel->mTabParent->QueryInterface(aIID, result);
+  }
+
   if (aIID.Equals(NS_GET_IID(nsIProgressEventSink))) {
     if (!mActiveChannel)
       return NS_NOINTERFACE;
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
index 021aaf9841a..3709bf2ab87 100644
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -102,6 +102,7 @@ CPPSRCS = 				\
   nsIdentityChecking.cpp \
   nsDataSignatureVerifier.cpp \
   nsRandomGenerator.cpp \
+  NSSErrorsService.cpp \
   $(NULL)
 
 ifdef MOZ_XUL
diff --git a/security/manager/ssl/src/NSSErrorsService.cpp b/security/manager/ssl/src/NSSErrorsService.cpp
new file mode 100644
index 00000000000..1133012c7eb
--- /dev/null
+++ b/security/manager/ssl/src/NSSErrorsService.cpp
@@ -0,0 +1,189 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Personal Security Manager.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ *   Mitch Stoltz <mstoltz@netscape.com>
+ *   Brian Ryner <bryner@brianryner.com>
+ *   Kai Engert <kaie@netscape.com>
+ *   Vipul Gupta <vipul.gupta@sun.com>
+ *   Douglas Stebila <douglas@stebila.ca>
+ *   Kai Engert <kengert@redhat.com>
+ *   honzab.moz@firemni.cz
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "NSSErrorsService.h"
+
+#include "nsNSSComponent.h"
+#include "nsServiceManagerUtils.h"
+#include "secerr.h"
+#include "sslerr.h"
+
+#define PIPNSS_STRBUNDLE_URL "chrome://pipnss/locale/pipnss.properties"
+#define NSSERR_STRBUNDLE_URL "chrome://pipnss/locale/nsserrors.properties"
+
+namespace mozilla {
+namespace psm {
+
+NS_IMPL_ISUPPORTS1(NSSErrorsService, nsINSSErrorsService)
+
+nsresult
+NSSErrorsService::Init()
+{
+  nsresult rv;
+  nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
+  if (NS_FAILED(rv) || !bundleService) 
+    return NS_ERROR_FAILURE;
+  
+  bundleService->CreateBundle(PIPNSS_STRBUNDLE_URL,
+                              getter_AddRefs(mPIPNSSBundle));
+  if (!mPIPNSSBundle)
+    rv = NS_ERROR_FAILURE;
+
+  bundleService->CreateBundle(NSSERR_STRBUNDLE_URL,
+                              getter_AddRefs(mNSSErrorsBundle));
+  if (!mNSSErrorsBundle)
+    rv = NS_ERROR_FAILURE;
+
+  return rv;
+}
+
+#define EXPECTED_SEC_ERROR_BASE (-0x2000)
+#define EXPECTED_SSL_ERROR_BASE (-0x3000)
+
+#if SEC_ERROR_BASE != EXPECTED_SEC_ERROR_BASE || SSL_ERROR_BASE != EXPECTED_SSL_ERROR_BASE
+#error "Unexpected change of error code numbers in lib NSS, please adjust the mapping code"
+/*
+ * Please ensure the NSS error codes are mapped into the positive range 0x1000 to 0xf000
+ * Search for NS_ERROR_MODULE_SECURITY to ensure there are no conflicts.
+ * The current code also assumes that NSS library error codes are negative.
+ */
+#endif
+
+NS_IMETHODIMP
+NSSErrorsService::IsNSSErrorCode(PRInt32 aNSPRCode, PRBool *_retval)
+{
+  if (!_retval)
+    return NS_ERROR_FAILURE;
+
+  *_retval = IS_SEC_ERROR(aNSPRCode) || IS_SSL_ERROR(aNSPRCode);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+NSSErrorsService::GetXPCOMFromNSSError(PRInt32 aNSPRCode, nsresult *aXPCOMErrorCode)
+{
+  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
+    return NS_ERROR_FAILURE;
+
+  if (!aXPCOMErrorCode)
+    return NS_ERROR_INVALID_ARG;
+
+  // The error codes within each module may be a 16 bit value.
+  // For simplicity let's use the positive value of the NSS code.
+
+  *aXPCOMErrorCode =
+    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY,
+                              -1 * aNSPRCode);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+NSSErrorsService::GetErrorClass(nsresult aXPCOMErrorCode, PRUint32 *aErrorClass)
+{
+  NS_ENSURE_ARG(aErrorClass);
+
+  if (NS_ERROR_GET_MODULE(aXPCOMErrorCode) != NS_ERROR_MODULE_SECURITY
+      || NS_ERROR_GET_SEVERITY(aXPCOMErrorCode) != NS_ERROR_SEVERITY_ERROR)
+    return NS_ERROR_FAILURE;
+  
+  PRInt32 aNSPRCode = -1 * NS_ERROR_GET_CODE(aXPCOMErrorCode);
+
+  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
+    return NS_ERROR_FAILURE;
+
+  switch (aNSPRCode)
+  {
+    case SEC_ERROR_UNKNOWN_ISSUER:
+    case SEC_ERROR_CA_CERT_INVALID:
+    case SEC_ERROR_UNTRUSTED_ISSUER:
+    case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
+    case SEC_ERROR_UNTRUSTED_CERT:
+    case SEC_ERROR_INADEQUATE_KEY_USAGE:
+    case SSL_ERROR_BAD_CERT_DOMAIN:
+    case SEC_ERROR_EXPIRED_CERTIFICATE:
+      *aErrorClass = ERROR_CLASS_BAD_CERT;
+      break;
+    default:
+      *aErrorClass = ERROR_CLASS_SSL_PROTOCOL;
+      break;
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+NSSErrorsService::GetErrorMessage(nsresult aXPCOMErrorCode, nsAString &aErrorMessage)
+{
+  if (NS_ERROR_GET_MODULE(aXPCOMErrorCode) != NS_ERROR_MODULE_SECURITY
+      || NS_ERROR_GET_SEVERITY(aXPCOMErrorCode) != NS_ERROR_SEVERITY_ERROR)
+    return NS_ERROR_FAILURE;
+  
+  PRInt32 aNSPRCode = -1 * NS_ERROR_GET_CODE(aXPCOMErrorCode);
+
+  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
+    return NS_ERROR_FAILURE;
+
+  nsCOMPtr<nsIStringBundle> theBundle = mPIPNSSBundle;
+  const char *id_str = nsNSSErrors::getOverrideErrorStringName(aNSPRCode);
+
+  if (!id_str) {
+    id_str = nsNSSErrors::getDefaultErrorStringName(aNSPRCode);
+    theBundle = mNSSErrorsBundle;
+  }
+
+  if (!id_str || !theBundle)
+    return NS_ERROR_FAILURE;
+
+  nsAutoString msg;
+  nsresult rv =
+    theBundle->GetStringFromName(NS_ConvertASCIItoUTF16(id_str).get(),
+                                 getter_Copies(msg));
+  if (NS_SUCCEEDED(rv)) {
+    aErrorMessage = msg;
+  }
+  return rv;
+}
+
+} // psm
+} // mozilla
diff --git a/security/manager/ssl/src/NSSErrorsService.h b/security/manager/ssl/src/NSSErrorsService.h
new file mode 100644
index 00000000000..c87d9b79a81
--- /dev/null
+++ b/security/manager/ssl/src/NSSErrorsService.h
@@ -0,0 +1,68 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Personal Security Manager.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ *   Brian Ryner <bryner@brianryner.com>
+ *   Kai Engert <kaie@netscape.com>
+ *   Kai Engert <kengert@redhat.com>
+ *   honzab.moz@firemni.cz
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsINSSErrorsService.h"
+
+#include "nsIStringBundle.h"
+#include "nsCOMPtr.h"
+
+namespace mozilla {
+namespace psm {
+
+class NSSErrorsService : public nsINSSErrorsService
+{
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSINSSERRORSSERVICE
+
+public:
+  nsresult Init();
+
+private:
+  nsCOMPtr<nsIStringBundle> mPIPNSSBundle;
+  nsCOMPtr<nsIStringBundle> mNSSErrorsBundle;
+};
+
+} // psm
+} // mozilla
+
+#define NS_NSSERRORSSERVICE_CID \
+  { 0x9ef18451, 0xa157, 0x4d17, { 0x81, 0x32, 0x47, 0xaf, 0xef, 0x21, 0x36, 0x89 } }
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index 487dc513bd3..e2340c9dff6 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -1953,14 +1953,13 @@ nsNSSComponent::Init()
 }
 
 /* nsISupports Implementation for the class */
-NS_IMPL_THREADSAFE_ISUPPORTS7(nsNSSComponent,
+NS_IMPL_THREADSAFE_ISUPPORTS6(nsNSSComponent,
                               nsISignatureVerifier,
                               nsIEntropyCollector,
                               nsINSSComponent,
                               nsIObserver,
                               nsISupportsWeakReference,
-                              nsITimerCallback,
-                              nsINSSErrorsService)
+                              nsITimerCallback)
 
 
 /* Callback functions for decoder. For now, use empty/default functions. */
@@ -2453,112 +2452,6 @@ nsNSSComponent::RememberCert(CERTCertificate *cert)
   return NS_OK;
 }
 
-#define EXPECTED_SEC_ERROR_BASE (-0x2000)
-#define EXPECTED_SSL_ERROR_BASE (-0x3000)
-
-#if SEC_ERROR_BASE != EXPECTED_SEC_ERROR_BASE || SSL_ERROR_BASE != EXPECTED_SSL_ERROR_BASE
-#error "Unexpected change of error code numbers in lib NSS, please adjust the mapping code"
-/*
- * Please ensure the NSS error codes are mapped into the positive range 0x1000 to 0xf000
- * Search for NS_ERROR_MODULE_SECURITY to ensure there are no conflicts.
- * The current code also assumes that NSS library error codes are negative.
- */
-#endif
-
-NS_IMETHODIMP
-nsNSSComponent::IsNSSErrorCode(PRInt32 aNSPRCode, PRBool *_retval)
-{
-  if (!_retval)
-    return NS_ERROR_FAILURE;
-
-  *_retval = IS_SEC_ERROR(aNSPRCode) || IS_SSL_ERROR(aNSPRCode);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSComponent::GetXPCOMFromNSSError(PRInt32 aNSPRCode, nsresult *aXPCOMErrorCode)
-{
-  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
-    return NS_ERROR_FAILURE;
-
-  if (!aXPCOMErrorCode)
-    return NS_ERROR_INVALID_ARG;
-
-  // The error codes within each module may be a 16 bit value.
-  // For simplicity let's use the positive value of the NSS code.
-
-  *aXPCOMErrorCode =
-    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY,
-                              -1 * aNSPRCode);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSComponent::GetErrorClass(nsresult aXPCOMErrorCode, PRUint32 *aErrorClass)
-{
-  NS_ENSURE_ARG(aErrorClass);
-
-  if (NS_ERROR_GET_MODULE(aXPCOMErrorCode) != NS_ERROR_MODULE_SECURITY
-      || NS_ERROR_GET_SEVERITY(aXPCOMErrorCode) != NS_ERROR_SEVERITY_ERROR)
-    return NS_ERROR_FAILURE;
-  
-  PRInt32 aNSPRCode = -1 * NS_ERROR_GET_CODE(aXPCOMErrorCode);
-
-  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
-    return NS_ERROR_FAILURE;
-
-  switch (aNSPRCode)
-  {
-    case SEC_ERROR_UNKNOWN_ISSUER:
-    case SEC_ERROR_CA_CERT_INVALID:
-    case SEC_ERROR_UNTRUSTED_ISSUER:
-    case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
-    case SEC_ERROR_UNTRUSTED_CERT:
-    case SEC_ERROR_INADEQUATE_KEY_USAGE:
-    case SSL_ERROR_BAD_CERT_DOMAIN:
-    case SEC_ERROR_EXPIRED_CERTIFICATE:
-      *aErrorClass = ERROR_CLASS_BAD_CERT;
-      break;
-    default:
-      *aErrorClass = ERROR_CLASS_SSL_PROTOCOL;
-      break;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSComponent::GetErrorMessage(nsresult aXPCOMErrorCode, nsAString &aErrorMessage)
-{
-  if (NS_ERROR_GET_MODULE(aXPCOMErrorCode) != NS_ERROR_MODULE_SECURITY
-      || NS_ERROR_GET_SEVERITY(aXPCOMErrorCode) != NS_ERROR_SEVERITY_ERROR)
-    return NS_ERROR_FAILURE;
-  
-  PRInt32 aNSPRCode = -1 * NS_ERROR_GET_CODE(aXPCOMErrorCode);
-
-  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIStringBundle> theBundle = mPIPNSSBundle;
-  const char *id_str = nsNSSErrors::getOverrideErrorStringName(aNSPRCode);
-
-  if (!id_str) {
-    id_str = nsNSSErrors::getDefaultErrorStringName(aNSPRCode);
-    theBundle = mNSSErrorsBundle;
-  }
-
-  if (!id_str || !theBundle)
-    return NS_ERROR_FAILURE;
-
-  nsAutoString msg;
-  nsresult rv =
-    theBundle->GetStringFromName(NS_ConvertASCIItoUTF16(id_str).get(),
-                                 getter_Copies(msg));
-  if (NS_SUCCEEDED(rv)) {
-    aErrorMessage = msg;
-  }
-  return rv;
-}
-
 void
 nsNSSComponent::DoProfileApproveChange(nsISupports* aSubject)
 {
diff --git a/security/manager/ssl/src/nsNSSComponent.h b/security/manager/ssl/src/nsNSSComponent.h
index 2066ef59a47..7f255e5a309 100644
--- a/security/manager/ssl/src/nsNSSComponent.h
+++ b/security/manager/ssl/src/nsNSSComponent.h
@@ -239,8 +239,7 @@ class nsNSSComponent : public nsISignatureVerifier,
                        public nsINSSComponent,
                        public nsIObserver,
                        public nsSupportsWeakReference,
-                       public nsITimerCallback,
-                       public nsINSSErrorsService
+                       public nsITimerCallback
 {
 public:
   NS_DEFINE_STATIC_CID_ACCESSOR( NS_NSSCOMPONENT_CID )
@@ -253,7 +252,6 @@ public:
   NS_DECL_NSIENTROPYCOLLECTOR
   NS_DECL_NSIOBSERVER
   NS_DECL_NSITIMERCALLBACK
-  NS_DECL_NSINSSERRORSSERVICE
 
   NS_METHOD Init();
 
diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
index 80a5a398d20..5b8bcd1dfd7 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -379,54 +379,63 @@ nsNSSSocketInfo::EnsureDocShellDependentStuffKnown()
   // with a socket close, and the socket transport might detach the callbacks 
   // instance prior to our error reporting.
 
-  nsCOMPtr<nsIDocShell> docshell;
+  nsISecureBrowserUI* secureUI = nsnull;
+#ifdef MOZ_IPC
+  CallGetInterface(proxiedCallbacks.get(), &secureUI);
+#endif
 
-  nsCOMPtr<nsIDocShellTreeItem> item(do_GetInterface(proxiedCallbacks));
-  if (item)
+  if (!secureUI)
   {
-    nsCOMPtr<nsIDocShellTreeItem> proxiedItem;
-    nsCOMPtr<nsIDocShellTreeItem> rootItem;
-    NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
-                         NS_GET_IID(nsIDocShellTreeItem),
-                         item.get(),
-                         NS_PROXY_SYNC,
-                         getter_AddRefs(proxiedItem));
+    nsCOMPtr<nsIDocShell> docshell;
 
-    proxiedItem->GetSameTypeRootTreeItem(getter_AddRefs(rootItem));
-    docshell = do_QueryInterface(rootItem);
-    NS_ASSERTION(docshell, "rootItem do_QI is null");
+    nsCOMPtr<nsIDocShellTreeItem> item(do_GetInterface(proxiedCallbacks));
+    if (item)
+    {
+      nsCOMPtr<nsIDocShellTreeItem> proxiedItem;
+      nsCOMPtr<nsIDocShellTreeItem> rootItem;
+      NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
+                           NS_GET_IID(nsIDocShellTreeItem),
+                           item.get(),
+                           NS_PROXY_SYNC,
+                           getter_AddRefs(proxiedItem));
+
+      proxiedItem->GetSameTypeRootTreeItem(getter_AddRefs(rootItem));
+      docshell = do_QueryInterface(rootItem);
+      NS_ASSERTION(docshell, "rootItem do_QI is null");
+    }
+
+    if (docshell)
+    {
+      nsCOMPtr<nsIDocShell> proxiedDocShell;
+      NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
+                           NS_GET_IID(nsIDocShell),
+                           docshell.get(),
+                           NS_PROXY_SYNC,
+                           getter_AddRefs(proxiedDocShell));
+      nsISecureBrowserUI* secureUI = nsnull;
+      if (proxiedDocShell)
+        proxiedDocShell->GetSecurityUI(&secureUI);
+    }
   }
 
-  if (docshell)
+  if (secureUI)
   {
-    nsCOMPtr<nsIDocShell> proxiedDocShell;
-    NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
-                         NS_GET_IID(nsIDocShell),
-                         docshell.get(),
-                         NS_PROXY_SYNC,
-                         getter_AddRefs(proxiedDocShell));
-    nsISecureBrowserUI* secureUI = nsnull;
-    if (proxiedDocShell)
-      proxiedDocShell->GetSecurityUI(&secureUI);
-    if (secureUI)
-    {
-      nsCOMPtr<nsIThread> mainThread(do_GetMainThread());
-      NS_ProxyRelease(mainThread, secureUI, PR_FALSE);
-      mExternalErrorReporting = PR_TRUE;
+    nsCOMPtr<nsIThread> mainThread(do_GetMainThread());
+    NS_ProxyRelease(mainThread, secureUI, PR_FALSE);
+    mExternalErrorReporting = PR_TRUE;
 
-      // If this socket is associated to a docshell, let's try to remember
-      // the currently used cert. If this socket gets a notification from NSS
-      // having the same raw socket, we can keep the PSM wrapper object
-      // and all the data it has cached (like verification results).
-      nsCOMPtr<nsISSLStatusProvider> statprov = do_QueryInterface(secureUI);
-      if (statprov) {
-        nsCOMPtr<nsISupports> isup_stat;
-        statprov->GetSSLStatus(getter_AddRefs(isup_stat));
-        if (isup_stat) {
-          nsCOMPtr<nsISSLStatus> sslstat = do_QueryInterface(isup_stat);
-          if (sslstat) {
-            sslstat->GetServerCert(getter_AddRefs(mPreviousCert));
-          }
+    // If this socket is associated to a docshell, let's try to remember
+    // the currently used cert. If this socket gets a notification from NSS
+    // having the same raw socket, we can keep the PSM wrapper object
+    // and all the data it has cached (like verification results).
+    nsCOMPtr<nsISSLStatusProvider> statprov = do_QueryInterface(secureUI);
+    if (statprov) {
+      nsCOMPtr<nsISupports> isup_stat;
+      statprov->GetSSLStatus(getter_AddRefs(isup_stat));
+      if (isup_stat) {
+        nsCOMPtr<nsISSLStatus> sslstat = do_QueryInterface(isup_stat);
+        if (sslstat) {
+          sslstat->GetServerCert(getter_AddRefs(mPreviousCert));
         }
       }
     }
diff --git a/security/manager/ssl/src/nsNSSModule.cpp b/security/manager/ssl/src/nsNSSModule.cpp
index e6ec05c8e3b..178dc7424fb 100644
--- a/security/manager/ssl/src/nsNSSModule.cpp
+++ b/security/manager/ssl/src/nsNSSModule.cpp
@@ -78,6 +78,7 @@
 #include "nsRecentBadCerts.h"
 #include "nsSSLStatus.h"
 #include "nsNSSIOLayer.h"
+#include "NSSErrorsService.h"
 
 #ifdef MOZ_IPC
 #include "nsXULAppAPI.h"
@@ -261,6 +262,9 @@ NS_NSS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nssEnsure, nsRecentBadCertsService, Init
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsureOnChromeOnly, nsSSLStatus)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsureOnChromeOnly, nsNSSSocketInfo)
 
+typedef mozilla::psm::NSSErrorsService NSSErrorsService;
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(NSSErrorsService, Init)
+
 NS_DEFINE_NAMED_CID(NS_NSSCOMPONENT_CID);
 NS_DEFINE_NAMED_CID(NS_SSLSOCKETPROVIDER_CID);
 NS_DEFINE_NAMED_CID(NS_STARTTLSSOCKETPROVIDER_CID);
@@ -296,6 +300,7 @@ NS_DEFINE_NAMED_CID(NS_RANDOMGENERATOR_CID);
 NS_DEFINE_NAMED_CID(NS_RECENTBADCERTS_CID);
 NS_DEFINE_NAMED_CID(NS_SSLSTATUS_CID);
 NS_DEFINE_NAMED_CID(NS_NSSSOCKETINFO_CID);
+NS_DEFINE_NAMED_CID(NS_NSSERRORSSERVICE_CID);
 
 
 static const mozilla::Module::CIDEntry kNSSCIDs[] = {
@@ -334,12 +339,13 @@ static const mozilla::Module::CIDEntry kNSSCIDs[] = {
   { &kNS_RECENTBADCERTS_CID, false, NULL, nsRecentBadCertsServiceConstructor },
   { &kNS_SSLSTATUS_CID, false, NULL, nsSSLStatusConstructor },
   { &kNS_NSSSOCKETINFO_CID, false, NULL, nsNSSSocketInfoConstructor },
+  { &kNS_NSSERRORSSERVICE_CID, false, NULL, NSSErrorsServiceConstructor },
   { NULL }
 };
 
 static const mozilla::Module::ContractIDEntry kNSSContracts[] = {
   { PSM_COMPONENT_CONTRACTID, &kNS_NSSCOMPONENT_CID },
-  { NS_NSS_ERRORS_SERVICE_CONTRACTID, &kNS_NSSCOMPONENT_CID },
+  { NS_NSS_ERRORS_SERVICE_CONTRACTID, &kNS_NSSERRORSSERVICE_CID },
   { NS_SSLSOCKETPROVIDER_CONTRACTID, &kNS_SSLSOCKETPROVIDER_CID },
   { NS_STARTTLSSOCKETPROVIDER_CONTRACTID, &kNS_STARTTLSSOCKETPROVIDER_CID },
   { NS_SDR_CONTRACTID, &kNS_SDR_CID },

From 0f0e4dd504b4be80d8ce3208070309a151084751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 27 Oct 2010 17:32:14 -0400
Subject: [PATCH 28/57] Bug 593823: put tabs on top by default for Linux,
 r=gavin, a=beltzner for b7

---
 browser/base/content/browser.xul | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 53858613f3b..d629ad790fc 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -826,12 +826,7 @@
 #ifdef WINCE
            defaulticonsize="small" iconsize="small"
 #endif
-#ifdef XP_WIN
            tabsontop="true"
-#endif
-#ifdef XP_MACOSX
-           tabsontop="true"
-#endif
            persist="tabsontop">
     <!-- Menu -->
     <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"

From e4730af01f11626c0e384a07ca7860df2647c18e Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Thu, 28 Oct 2010 11:46:00 -0400
Subject: [PATCH 29/57] Bug 566478 - Invalid SSL cert error is not
 mobile-friendly [r=mayhemer a=blocking-fennecb2]

---
 .../http/HttpChannelParentListener.cpp        |   6 +
 security/manager/ssl/src/Makefile.in          |   1 +
 security/manager/ssl/src/NSSErrorsService.cpp | 189 ++++++++++++++++++
 security/manager/ssl/src/NSSErrorsService.h   |  68 +++++++
 security/manager/ssl/src/nsNSSComponent.cpp   | 111 +---------
 security/manager/ssl/src/nsNSSComponent.h     |   4 +-
 security/manager/ssl/src/nsNSSIOLayer.cpp     |  45 +++--
 security/manager/ssl/src/nsNSSModule.cpp      |   8 +-
 8 files changed, 299 insertions(+), 133 deletions(-)
 create mode 100644 security/manager/ssl/src/NSSErrorsService.cpp
 create mode 100644 security/manager/ssl/src/NSSErrorsService.h

diff --git a/netwerk/protocol/http/HttpChannelParentListener.cpp b/netwerk/protocol/http/HttpChannelParentListener.cpp
index 8eaeee8c822..74fe14c70e4 100644
--- a/netwerk/protocol/http/HttpChannelParentListener.cpp
+++ b/netwerk/protocol/http/HttpChannelParentListener.cpp
@@ -143,6 +143,12 @@ HttpChannelParentListener::GetInterface(const nsIID& aIID, void **result)
     return mActiveChannel->mTabParent->QueryInterface(aIID, result);
   }
 
+  if (aIID.Equals(NS_GET_IID(nsISecureBrowserUI))) {
+    if (!mActiveChannel && !mActiveChannel->mTabParent)
+      return NS_NOINTERFACE;
+    return mActiveChannel->mTabParent->QueryInterface(aIID, result);
+  }
+
   if (aIID.Equals(NS_GET_IID(nsIProgressEventSink))) {
     if (!mActiveChannel)
       return NS_NOINTERFACE;
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
index 021aaf9841a..3709bf2ab87 100644
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -102,6 +102,7 @@ CPPSRCS = 				\
   nsIdentityChecking.cpp \
   nsDataSignatureVerifier.cpp \
   nsRandomGenerator.cpp \
+  NSSErrorsService.cpp \
   $(NULL)
 
 ifdef MOZ_XUL
diff --git a/security/manager/ssl/src/NSSErrorsService.cpp b/security/manager/ssl/src/NSSErrorsService.cpp
new file mode 100644
index 00000000000..1133012c7eb
--- /dev/null
+++ b/security/manager/ssl/src/NSSErrorsService.cpp
@@ -0,0 +1,189 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Personal Security Manager.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ *   Mitch Stoltz <mstoltz@netscape.com>
+ *   Brian Ryner <bryner@brianryner.com>
+ *   Kai Engert <kaie@netscape.com>
+ *   Vipul Gupta <vipul.gupta@sun.com>
+ *   Douglas Stebila <douglas@stebila.ca>
+ *   Kai Engert <kengert@redhat.com>
+ *   honzab.moz@firemni.cz
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "NSSErrorsService.h"
+
+#include "nsNSSComponent.h"
+#include "nsServiceManagerUtils.h"
+#include "secerr.h"
+#include "sslerr.h"
+
+#define PIPNSS_STRBUNDLE_URL "chrome://pipnss/locale/pipnss.properties"
+#define NSSERR_STRBUNDLE_URL "chrome://pipnss/locale/nsserrors.properties"
+
+namespace mozilla {
+namespace psm {
+
+NS_IMPL_ISUPPORTS1(NSSErrorsService, nsINSSErrorsService)
+
+nsresult
+NSSErrorsService::Init()
+{
+  nsresult rv;
+  nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
+  if (NS_FAILED(rv) || !bundleService) 
+    return NS_ERROR_FAILURE;
+  
+  bundleService->CreateBundle(PIPNSS_STRBUNDLE_URL,
+                              getter_AddRefs(mPIPNSSBundle));
+  if (!mPIPNSSBundle)
+    rv = NS_ERROR_FAILURE;
+
+  bundleService->CreateBundle(NSSERR_STRBUNDLE_URL,
+                              getter_AddRefs(mNSSErrorsBundle));
+  if (!mNSSErrorsBundle)
+    rv = NS_ERROR_FAILURE;
+
+  return rv;
+}
+
+#define EXPECTED_SEC_ERROR_BASE (-0x2000)
+#define EXPECTED_SSL_ERROR_BASE (-0x3000)
+
+#if SEC_ERROR_BASE != EXPECTED_SEC_ERROR_BASE || SSL_ERROR_BASE != EXPECTED_SSL_ERROR_BASE
+#error "Unexpected change of error code numbers in lib NSS, please adjust the mapping code"
+/*
+ * Please ensure the NSS error codes are mapped into the positive range 0x1000 to 0xf000
+ * Search for NS_ERROR_MODULE_SECURITY to ensure there are no conflicts.
+ * The current code also assumes that NSS library error codes are negative.
+ */
+#endif
+
+NS_IMETHODIMP
+NSSErrorsService::IsNSSErrorCode(PRInt32 aNSPRCode, PRBool *_retval)
+{
+  if (!_retval)
+    return NS_ERROR_FAILURE;
+
+  *_retval = IS_SEC_ERROR(aNSPRCode) || IS_SSL_ERROR(aNSPRCode);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+NSSErrorsService::GetXPCOMFromNSSError(PRInt32 aNSPRCode, nsresult *aXPCOMErrorCode)
+{
+  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
+    return NS_ERROR_FAILURE;
+
+  if (!aXPCOMErrorCode)
+    return NS_ERROR_INVALID_ARG;
+
+  // The error codes within each module may be a 16 bit value.
+  // For simplicity let's use the positive value of the NSS code.
+
+  *aXPCOMErrorCode =
+    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY,
+                              -1 * aNSPRCode);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+NSSErrorsService::GetErrorClass(nsresult aXPCOMErrorCode, PRUint32 *aErrorClass)
+{
+  NS_ENSURE_ARG(aErrorClass);
+
+  if (NS_ERROR_GET_MODULE(aXPCOMErrorCode) != NS_ERROR_MODULE_SECURITY
+      || NS_ERROR_GET_SEVERITY(aXPCOMErrorCode) != NS_ERROR_SEVERITY_ERROR)
+    return NS_ERROR_FAILURE;
+  
+  PRInt32 aNSPRCode = -1 * NS_ERROR_GET_CODE(aXPCOMErrorCode);
+
+  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
+    return NS_ERROR_FAILURE;
+
+  switch (aNSPRCode)
+  {
+    case SEC_ERROR_UNKNOWN_ISSUER:
+    case SEC_ERROR_CA_CERT_INVALID:
+    case SEC_ERROR_UNTRUSTED_ISSUER:
+    case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
+    case SEC_ERROR_UNTRUSTED_CERT:
+    case SEC_ERROR_INADEQUATE_KEY_USAGE:
+    case SSL_ERROR_BAD_CERT_DOMAIN:
+    case SEC_ERROR_EXPIRED_CERTIFICATE:
+      *aErrorClass = ERROR_CLASS_BAD_CERT;
+      break;
+    default:
+      *aErrorClass = ERROR_CLASS_SSL_PROTOCOL;
+      break;
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+NSSErrorsService::GetErrorMessage(nsresult aXPCOMErrorCode, nsAString &aErrorMessage)
+{
+  if (NS_ERROR_GET_MODULE(aXPCOMErrorCode) != NS_ERROR_MODULE_SECURITY
+      || NS_ERROR_GET_SEVERITY(aXPCOMErrorCode) != NS_ERROR_SEVERITY_ERROR)
+    return NS_ERROR_FAILURE;
+  
+  PRInt32 aNSPRCode = -1 * NS_ERROR_GET_CODE(aXPCOMErrorCode);
+
+  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
+    return NS_ERROR_FAILURE;
+
+  nsCOMPtr<nsIStringBundle> theBundle = mPIPNSSBundle;
+  const char *id_str = nsNSSErrors::getOverrideErrorStringName(aNSPRCode);
+
+  if (!id_str) {
+    id_str = nsNSSErrors::getDefaultErrorStringName(aNSPRCode);
+    theBundle = mNSSErrorsBundle;
+  }
+
+  if (!id_str || !theBundle)
+    return NS_ERROR_FAILURE;
+
+  nsAutoString msg;
+  nsresult rv =
+    theBundle->GetStringFromName(NS_ConvertASCIItoUTF16(id_str).get(),
+                                 getter_Copies(msg));
+  if (NS_SUCCEEDED(rv)) {
+    aErrorMessage = msg;
+  }
+  return rv;
+}
+
+} // psm
+} // mozilla
diff --git a/security/manager/ssl/src/NSSErrorsService.h b/security/manager/ssl/src/NSSErrorsService.h
new file mode 100644
index 00000000000..c87d9b79a81
--- /dev/null
+++ b/security/manager/ssl/src/NSSErrorsService.h
@@ -0,0 +1,68 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Personal Security Manager.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ *   Brian Ryner <bryner@brianryner.com>
+ *   Kai Engert <kaie@netscape.com>
+ *   Kai Engert <kengert@redhat.com>
+ *   honzab.moz@firemni.cz
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsINSSErrorsService.h"
+
+#include "nsIStringBundle.h"
+#include "nsCOMPtr.h"
+
+namespace mozilla {
+namespace psm {
+
+class NSSErrorsService : public nsINSSErrorsService
+{
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSINSSERRORSSERVICE
+
+public:
+  nsresult Init();
+
+private:
+  nsCOMPtr<nsIStringBundle> mPIPNSSBundle;
+  nsCOMPtr<nsIStringBundle> mNSSErrorsBundle;
+};
+
+} // psm
+} // mozilla
+
+#define NS_NSSERRORSSERVICE_CID \
+  { 0x9ef18451, 0xa157, 0x4d17, { 0x81, 0x32, 0x47, 0xaf, 0xef, 0x21, 0x36, 0x89 } }
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index 487dc513bd3..e2340c9dff6 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -1953,14 +1953,13 @@ nsNSSComponent::Init()
 }
 
 /* nsISupports Implementation for the class */
-NS_IMPL_THREADSAFE_ISUPPORTS7(nsNSSComponent,
+NS_IMPL_THREADSAFE_ISUPPORTS6(nsNSSComponent,
                               nsISignatureVerifier,
                               nsIEntropyCollector,
                               nsINSSComponent,
                               nsIObserver,
                               nsISupportsWeakReference,
-                              nsITimerCallback,
-                              nsINSSErrorsService)
+                              nsITimerCallback)
 
 
 /* Callback functions for decoder. For now, use empty/default functions. */
@@ -2453,112 +2452,6 @@ nsNSSComponent::RememberCert(CERTCertificate *cert)
   return NS_OK;
 }
 
-#define EXPECTED_SEC_ERROR_BASE (-0x2000)
-#define EXPECTED_SSL_ERROR_BASE (-0x3000)
-
-#if SEC_ERROR_BASE != EXPECTED_SEC_ERROR_BASE || SSL_ERROR_BASE != EXPECTED_SSL_ERROR_BASE
-#error "Unexpected change of error code numbers in lib NSS, please adjust the mapping code"
-/*
- * Please ensure the NSS error codes are mapped into the positive range 0x1000 to 0xf000
- * Search for NS_ERROR_MODULE_SECURITY to ensure there are no conflicts.
- * The current code also assumes that NSS library error codes are negative.
- */
-#endif
-
-NS_IMETHODIMP
-nsNSSComponent::IsNSSErrorCode(PRInt32 aNSPRCode, PRBool *_retval)
-{
-  if (!_retval)
-    return NS_ERROR_FAILURE;
-
-  *_retval = IS_SEC_ERROR(aNSPRCode) || IS_SSL_ERROR(aNSPRCode);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSComponent::GetXPCOMFromNSSError(PRInt32 aNSPRCode, nsresult *aXPCOMErrorCode)
-{
-  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
-    return NS_ERROR_FAILURE;
-
-  if (!aXPCOMErrorCode)
-    return NS_ERROR_INVALID_ARG;
-
-  // The error codes within each module may be a 16 bit value.
-  // For simplicity let's use the positive value of the NSS code.
-
-  *aXPCOMErrorCode =
-    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY,
-                              -1 * aNSPRCode);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSComponent::GetErrorClass(nsresult aXPCOMErrorCode, PRUint32 *aErrorClass)
-{
-  NS_ENSURE_ARG(aErrorClass);
-
-  if (NS_ERROR_GET_MODULE(aXPCOMErrorCode) != NS_ERROR_MODULE_SECURITY
-      || NS_ERROR_GET_SEVERITY(aXPCOMErrorCode) != NS_ERROR_SEVERITY_ERROR)
-    return NS_ERROR_FAILURE;
-  
-  PRInt32 aNSPRCode = -1 * NS_ERROR_GET_CODE(aXPCOMErrorCode);
-
-  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
-    return NS_ERROR_FAILURE;
-
-  switch (aNSPRCode)
-  {
-    case SEC_ERROR_UNKNOWN_ISSUER:
-    case SEC_ERROR_CA_CERT_INVALID:
-    case SEC_ERROR_UNTRUSTED_ISSUER:
-    case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
-    case SEC_ERROR_UNTRUSTED_CERT:
-    case SEC_ERROR_INADEQUATE_KEY_USAGE:
-    case SSL_ERROR_BAD_CERT_DOMAIN:
-    case SEC_ERROR_EXPIRED_CERTIFICATE:
-      *aErrorClass = ERROR_CLASS_BAD_CERT;
-      break;
-    default:
-      *aErrorClass = ERROR_CLASS_SSL_PROTOCOL;
-      break;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNSSComponent::GetErrorMessage(nsresult aXPCOMErrorCode, nsAString &aErrorMessage)
-{
-  if (NS_ERROR_GET_MODULE(aXPCOMErrorCode) != NS_ERROR_MODULE_SECURITY
-      || NS_ERROR_GET_SEVERITY(aXPCOMErrorCode) != NS_ERROR_SEVERITY_ERROR)
-    return NS_ERROR_FAILURE;
-  
-  PRInt32 aNSPRCode = -1 * NS_ERROR_GET_CODE(aXPCOMErrorCode);
-
-  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIStringBundle> theBundle = mPIPNSSBundle;
-  const char *id_str = nsNSSErrors::getOverrideErrorStringName(aNSPRCode);
-
-  if (!id_str) {
-    id_str = nsNSSErrors::getDefaultErrorStringName(aNSPRCode);
-    theBundle = mNSSErrorsBundle;
-  }
-
-  if (!id_str || !theBundle)
-    return NS_ERROR_FAILURE;
-
-  nsAutoString msg;
-  nsresult rv =
-    theBundle->GetStringFromName(NS_ConvertASCIItoUTF16(id_str).get(),
-                                 getter_Copies(msg));
-  if (NS_SUCCEEDED(rv)) {
-    aErrorMessage = msg;
-  }
-  return rv;
-}
-
 void
 nsNSSComponent::DoProfileApproveChange(nsISupports* aSubject)
 {
diff --git a/security/manager/ssl/src/nsNSSComponent.h b/security/manager/ssl/src/nsNSSComponent.h
index 2066ef59a47..7f255e5a309 100644
--- a/security/manager/ssl/src/nsNSSComponent.h
+++ b/security/manager/ssl/src/nsNSSComponent.h
@@ -239,8 +239,7 @@ class nsNSSComponent : public nsISignatureVerifier,
                        public nsINSSComponent,
                        public nsIObserver,
                        public nsSupportsWeakReference,
-                       public nsITimerCallback,
-                       public nsINSSErrorsService
+                       public nsITimerCallback
 {
 public:
   NS_DEFINE_STATIC_CID_ACCESSOR( NS_NSSCOMPONENT_CID )
@@ -253,7 +252,6 @@ public:
   NS_DECL_NSIENTROPYCOLLECTOR
   NS_DECL_NSIOBSERVER
   NS_DECL_NSITIMERCALLBACK
-  NS_DECL_NSINSSERRORSSERVICE
 
   NS_METHOD Init();
 
diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
index 80a5a398d20..88f0c98531a 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -379,6 +379,11 @@ nsNSSSocketInfo::EnsureDocShellDependentStuffKnown()
   // with a socket close, and the socket transport might detach the callbacks 
   // instance prior to our error reporting.
 
+  nsISecureBrowserUI* secureUI = nsnull;
+#ifdef MOZ_IPC
+  CallGetInterface(proxiedCallbacks.get(), &secureUI);
+#endif
+
   nsCOMPtr<nsIDocShell> docshell;
 
   nsCOMPtr<nsIDocShellTreeItem> item(do_GetInterface(proxiedCallbacks));
@@ -397,7 +402,7 @@ nsNSSSocketInfo::EnsureDocShellDependentStuffKnown()
     NS_ASSERTION(docshell, "rootItem do_QI is null");
   }
 
-  if (docshell)
+  if (docshell && !secureUI)
   {
     nsCOMPtr<nsIDocShell> proxiedDocShell;
     NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
@@ -405,28 +410,28 @@ nsNSSSocketInfo::EnsureDocShellDependentStuffKnown()
                          docshell.get(),
                          NS_PROXY_SYNC,
                          getter_AddRefs(proxiedDocShell));
-    nsISecureBrowserUI* secureUI = nsnull;
     if (proxiedDocShell)
       proxiedDocShell->GetSecurityUI(&secureUI);
-    if (secureUI)
-    {
-      nsCOMPtr<nsIThread> mainThread(do_GetMainThread());
-      NS_ProxyRelease(mainThread, secureUI, PR_FALSE);
-      mExternalErrorReporting = PR_TRUE;
+  }
 
-      // If this socket is associated to a docshell, let's try to remember
-      // the currently used cert. If this socket gets a notification from NSS
-      // having the same raw socket, we can keep the PSM wrapper object
-      // and all the data it has cached (like verification results).
-      nsCOMPtr<nsISSLStatusProvider> statprov = do_QueryInterface(secureUI);
-      if (statprov) {
-        nsCOMPtr<nsISupports> isup_stat;
-        statprov->GetSSLStatus(getter_AddRefs(isup_stat));
-        if (isup_stat) {
-          nsCOMPtr<nsISSLStatus> sslstat = do_QueryInterface(isup_stat);
-          if (sslstat) {
-            sslstat->GetServerCert(getter_AddRefs(mPreviousCert));
-          }
+  if (secureUI)
+  {
+    nsCOMPtr<nsIThread> mainThread(do_GetMainThread());
+    NS_ProxyRelease(mainThread, secureUI, PR_FALSE);
+    mExternalErrorReporting = PR_TRUE;
+
+    // If this socket is associated to a docshell, let's try to remember
+    // the currently used cert. If this socket gets a notification from NSS
+    // having the same raw socket, we can keep the PSM wrapper object
+    // and all the data it has cached (like verification results).
+    nsCOMPtr<nsISSLStatusProvider> statprov = do_QueryInterface(secureUI);
+    if (statprov) {
+      nsCOMPtr<nsISupports> isup_stat;
+      statprov->GetSSLStatus(getter_AddRefs(isup_stat));
+      if (isup_stat) {
+        nsCOMPtr<nsISSLStatus> sslstat = do_QueryInterface(isup_stat);
+        if (sslstat) {
+          sslstat->GetServerCert(getter_AddRefs(mPreviousCert));
         }
       }
     }
diff --git a/security/manager/ssl/src/nsNSSModule.cpp b/security/manager/ssl/src/nsNSSModule.cpp
index e6ec05c8e3b..178dc7424fb 100644
--- a/security/manager/ssl/src/nsNSSModule.cpp
+++ b/security/manager/ssl/src/nsNSSModule.cpp
@@ -78,6 +78,7 @@
 #include "nsRecentBadCerts.h"
 #include "nsSSLStatus.h"
 #include "nsNSSIOLayer.h"
+#include "NSSErrorsService.h"
 
 #ifdef MOZ_IPC
 #include "nsXULAppAPI.h"
@@ -261,6 +262,9 @@ NS_NSS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nssEnsure, nsRecentBadCertsService, Init
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsureOnChromeOnly, nsSSLStatus)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsureOnChromeOnly, nsNSSSocketInfo)
 
+typedef mozilla::psm::NSSErrorsService NSSErrorsService;
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(NSSErrorsService, Init)
+
 NS_DEFINE_NAMED_CID(NS_NSSCOMPONENT_CID);
 NS_DEFINE_NAMED_CID(NS_SSLSOCKETPROVIDER_CID);
 NS_DEFINE_NAMED_CID(NS_STARTTLSSOCKETPROVIDER_CID);
@@ -296,6 +300,7 @@ NS_DEFINE_NAMED_CID(NS_RANDOMGENERATOR_CID);
 NS_DEFINE_NAMED_CID(NS_RECENTBADCERTS_CID);
 NS_DEFINE_NAMED_CID(NS_SSLSTATUS_CID);
 NS_DEFINE_NAMED_CID(NS_NSSSOCKETINFO_CID);
+NS_DEFINE_NAMED_CID(NS_NSSERRORSSERVICE_CID);
 
 
 static const mozilla::Module::CIDEntry kNSSCIDs[] = {
@@ -334,12 +339,13 @@ static const mozilla::Module::CIDEntry kNSSCIDs[] = {
   { &kNS_RECENTBADCERTS_CID, false, NULL, nsRecentBadCertsServiceConstructor },
   { &kNS_SSLSTATUS_CID, false, NULL, nsSSLStatusConstructor },
   { &kNS_NSSSOCKETINFO_CID, false, NULL, nsNSSSocketInfoConstructor },
+  { &kNS_NSSERRORSSERVICE_CID, false, NULL, NSSErrorsServiceConstructor },
   { NULL }
 };
 
 static const mozilla::Module::ContractIDEntry kNSSContracts[] = {
   { PSM_COMPONENT_CONTRACTID, &kNS_NSSCOMPONENT_CID },
-  { NS_NSS_ERRORS_SERVICE_CONTRACTID, &kNS_NSSCOMPONENT_CID },
+  { NS_NSS_ERRORS_SERVICE_CONTRACTID, &kNS_NSSERRORSSERVICE_CID },
   { NS_SSLSOCKETPROVIDER_CONTRACTID, &kNS_SSLSOCKETPROVIDER_CID },
   { NS_STARTTLSSOCKETPROVIDER_CONTRACTID, &kNS_STARTTLSSOCKETPROVIDER_CID },
   { NS_SDR_CONTRACTID, &kNS_SDR_CID },

From 4ee17793533b5fc618ab40fba456ab65809df11b Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Thu, 28 Oct 2010 13:01:36 -0300
Subject: [PATCH 30/57] Bug 599940 - Web Console fails to get results of
 instanceof correctly, r=mossop, a=beltzner

---
 .../console/hudservice/HUDService.jsm         | 307 +++++++++---------
 .../browser/browser_webconsole_jsterm.js      |  16 +
 2 files changed, 165 insertions(+), 158 deletions(-)

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 83daefef8cf..f9c0385cad1 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -3907,159 +3907,152 @@ function JSPropertyProvider(aScope, aInputValue)
  */
 function JSTermHelper(aJSTerm)
 {
-  return {
-    /**
-     * Returns the result of document.getElementById(aId).
-     *
-     * @param string aId
-     *        A string that is passed to window.document.getElementById.
-     * @returns nsIDOMNode or null
-     */
-    $: function JSTH_$(aId)
-    {
-      try {
-        return aJSTerm._window.document.getElementById(aId);
-      }
-      catch (ex) {
-        aJSTerm.console.error(ex.message);
-      }
-    },
-
-    /**
-     * Returns the result of document.querySelectorAll(aSelector).
-     *
-     * @param string aSelector
-     *        A string that is passed to window.document.querySelectorAll.
-     * @returns array of nsIDOMNode
-     */
-    $$: function JSTH_$$(aSelector)
-    {
-      try {
-        return aJSTerm._window.document.querySelectorAll(aSelector);
-      }
-      catch (ex) {
-        aJSTerm.console.error(ex.message);
-      }
-    },
-
-    /**
-     * Runs a xPath query and returns all matched nodes.
-     *
-     * @param string aXPath
-     *        xPath search query to execute.
-     * @param [optional] nsIDOMNode aContext
-     *        Context to run the xPath query on. Uses window.document if not set.
-     * @returns array of nsIDOMNode
-     */
-    $x: function JSTH_$x(aXPath, aContext)
-    {
-      let nodes = [];
-      let doc = aJSTerm._window.wrappedJSObject.document;
-      let aContext = aContext || doc;
-
-      try {
-        let results = doc.evaluate(aXPath, aContext, null,
-                                    Ci.nsIDOMXPathResult.ANY_TYPE, null);
-
-        let node;
-        while (node = results.iterateNext()) {
-          nodes.push(node);
-        }
-      }
-      catch (ex) {
-        aJSTerm.console.error(ex.message);
-      }
-
-      return nodes;
-    },
-
-    /**
-     * Clears the output of the JSTerm.
-     */
-    clear: function JSTH_clear()
-    {
-      aJSTerm.clearOutput();
-    },
-
-    /**
-     * Returns the result of Object.keys(aObject).
-     *
-     * @param object aObject
-     *        Object to return the property names from.
-     * @returns array of string
-     */
-    keys: function JSTH_keys(aObject)
-    {
-      try {
-        return Object.keys(XPCNativeWrapper.unwrap(aObject));
-      }
-      catch (ex) {
-        aJSTerm.console.error(ex.message);
-      }
-    },
-
-    /**
-     * Returns the values of all properties on aObject.
-     *
-     * @param object aObject
-     *        Object to display the values from.
-     * @returns array of string
-     */
-    values: function JSTH_values(aObject)
-    {
-      let arrValues = [];
-      let obj = XPCNativeWrapper.unwrap(aObject);
-
-      try {
-        for (let prop in obj) {
-          arrValues.push(obj[prop]);
-        }
-      }
-      catch (ex) {
-        aJSTerm.console.error(ex.message);
-      }
-      return arrValues;
-    },
-
-    /**
-     * Inspects the passed aObject. This is done by opening the PropertyPanel.
-     *
-     * @param object aObject
-     *        Object to inspect.
-     * @returns void
-     */
-    inspect: function JSTH_inspect(aObject)
-    {
-      let obj = XPCNativeWrapper.unwrap(aObject);
-      aJSTerm.openPropertyPanel(null, obj);
-    },
-
-    /**
-     * Prints aObject to the output.
-     *
-     * @param object aObject
-     *        Object to print to the output.
-     * @returns void
-     */
-    pprint: function JSTH_pprint(aObject)
-    {
-      if (aObject === null || aObject === undefined || aObject === true || aObject === false) {
-        aJSTerm.console.error(HUDService.getStr("helperFuncUnsupportedTypeError"));
-        return;
-      }
-      let output = [];
-      if (typeof aObject != "string") {
-        aObject = XPCNativeWrapper.unwrap(aObject);
-      }
-      let pairs = namesAndValuesOf(aObject);
-
-      pairs.forEach(function(pair) {
-        output.push("  " + pair.display);
-      });
-
-      aJSTerm.writeOutput(output.join("\n"));
+  /**
+   * Returns the result of document.getElementById(aId).
+   *
+   * @param string aId
+   *        A string that is passed to window.document.getElementById.
+   * @returns nsIDOMNode or null
+   */
+  aJSTerm.sandbox.$ = function JSTH_$(aId)
+  {
+    try {
+      return aJSTerm._window.document.getElementById(aId);
     }
-  }
+    catch (ex) {
+      aJSTerm.console.error(ex.message);
+    }
+  };
+
+  /**
+   * Returns the result of document.querySelectorAll(aSelector).
+   *
+   * @param string aSelector
+   *        A string that is passed to window.document.querySelectorAll.
+   * @returns array of nsIDOMNode
+   */
+  aJSTerm.sandbox.$$ = function JSTH_$$(aSelector)
+  {
+    try {
+      return aJSTerm._window.document.querySelectorAll(aSelector);
+    }
+    catch (ex) {
+      aJSTerm.console.error(ex.message);
+    }
+  };
+
+  /**
+   * Runs a xPath query and returns all matched nodes.
+   *
+   * @param string aXPath
+   *        xPath search query to execute.
+   * @param [optional] nsIDOMNode aContext
+   *        Context to run the xPath query on. Uses window.document if not set.
+   * @returns array of nsIDOMNode
+   */
+  aJSTerm.sandbox.$x = function JSTH_$x(aXPath, aContext)
+  {
+    let nodes = [];
+    let doc = aJSTerm._window.document;
+    let aContext = aContext || doc;
+
+    try {
+      let results = doc.evaluate(aXPath, aContext, null,
+                                  Ci.nsIDOMXPathResult.ANY_TYPE, null);
+
+      let node;
+      while (node = results.iterateNext()) {
+        nodes.push(node);
+      }
+    }
+    catch (ex) {
+      aJSTerm.console.error(ex.message);
+    }
+
+    return nodes;
+  };
+
+  /**
+   * Clears the output of the JSTerm.
+   */
+  aJSTerm.sandbox.clear = function JSTH_clear()
+  {
+    aJSTerm.clearOutput();
+  };
+
+  /**
+   * Returns the result of Object.keys(aObject).
+   *
+   * @param object aObject
+   *        Object to return the property names from.
+   * @returns array of string
+   */
+  aJSTerm.sandbox.keys = function JSTH_keys(aObject)
+  {
+    try {
+      return Object.keys(aObject);
+    }
+    catch (ex) {
+      aJSTerm.console.error(ex.message);
+    }
+  };
+
+  /**
+   * Returns the values of all properties on aObject.
+   *
+   * @param object aObject
+   *        Object to display the values from.
+   * @returns array of string
+   */
+  aJSTerm.sandbox.values = function JSTH_values(aObject)
+  {
+    let arrValues = [];
+
+    try {
+      for (let prop in aObject) {
+        arrValues.push(aObject[prop]);
+      }
+    }
+    catch (ex) {
+      aJSTerm.console.error(ex.message);
+    }
+    return arrValues;
+  };
+
+  /**
+   * Inspects the passed aObject. This is done by opening the PropertyPanel.
+   *
+   * @param object aObject
+   *        Object to inspect.
+   * @returns void
+   */
+  aJSTerm.sandbox.inspect = function JSTH_inspect(aObject)
+  {
+    aJSTerm.openPropertyPanel(null, aObject);
+  };
+
+  /**
+   * Prints aObject to the output.
+   *
+   * @param object aObject
+   *        Object to print to the output.
+   * @returns void
+   */
+  aJSTerm.sandbox.pprint = function JSTH_pprint(aObject)
+  {
+    if (aObject === null || aObject === undefined || aObject === true || aObject === false) {
+      aJSTerm.console.error(HUDService.getStr("helperFuncUnsupportedTypeError"));
+      return;
+    }
+    let output = [];
+    let pairs = namesAndValuesOf(aObject);
+
+    pairs.forEach(function(pair) {
+      output.push("  " + pair.display);
+    });
+
+    aJSTerm.writeOutput(output.join("\n"));
+  };
 }
 
 /**
@@ -4146,11 +4139,10 @@ JSTerm.prototype = {
   createSandbox: function JST_setupSandbox()
   {
     // create a JS Sandbox out of this.context
-    this.sandbox = new Cu.Sandbox(this._window);
-    this.sandbox.window = this._window;
+    this.sandbox = new Cu.Sandbox(this._window,
+      { sandboxPrototype: this._window, wantXrays: false });
     this.sandbox.console = this.console;
-    this.sandbox.__helperFunctions__ = JSTermHelper(this);
-    this.sandbox.__proto__ = this._window.wrappedJSObject;
+    JSTermHelper(this);
   },
 
   get _window()
@@ -4168,8 +4160,7 @@ JSTerm.prototype = {
    */
   evalInSandbox: function JST_evalInSandbox(aString)
   {
-    let execStr = "with(__helperFunctions__) { with(window) {" + aString + "} }";
-    return Cu.evalInSandbox(execStr,  this.sandbox, "default", "HUD Console", 1);
+    return Cu.evalInSandbox(aString, this.sandbox, "1.8", "HUD Console", 1);
   },
 
 
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js
index bd309296d72..051676055c2 100644
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js
@@ -98,5 +98,21 @@ function testJSTerm()
   let label = jsterm.outputNode.querySelector(".jsterm-output-line");
   is(label.textContent.trim(), "a: 1\n  b: 2", "pprint() worked");
 
+  // check instanceof correctness, bug 599940
+  jsterm.clearOutput();
+  jsterm.execute("[] instanceof Array");
+  checkResult("true", "[] instanceof Array == true", 1);
+
+  jsterm.clearOutput();
+  jsterm.execute("({}) instanceof Object");
+  checkResult("true", "({}) instanceof Object == true", 1);
+
+  // check for occurrences of Object XRayWrapper, bug 604430
+  jsterm.clearOutput();
+  jsterm.execute("document");
+  let label = jsterm.outputNode.querySelector(".jsterm-output-line");
+  is(label.textContent.trim().search(/\[object XrayWrapper/), -1,
+    "check for non-existence of [object XrayWrapper ");
+
   finishTest();
 }

From ff976caf4556d4319bac091dd04e4e55fa7f3a71 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <msucan@mozilla.com>
Date: Thu, 28 Oct 2010 13:01:37 -0300
Subject: [PATCH 31/57] Bug 601352 - Console does not scroll expression result
 into view, r+a=roc

---
 accessible/src/base/nsAccessNode.cpp          |   3 +-
 accessible/src/base/nsAccessible.cpp          |   3 +-
 .../html/content/src/nsGenericHTMLElement.cpp |   3 +-
 dom/base/nsFocusManager.cpp                   |   3 +-
 layout/base/nsDocumentViewer.cpp              |   3 +-
 layout/base/nsIPresShell.h                    |  15 ++-
 layout/base/nsPresShell.cpp                   |  32 +++--
 layout/inspector/src/inFlasher.cpp            |   3 +-
 layout/xul/base/src/nsScrollBoxObject.cpp     | 120 +++---------------
 .../hudservice/tests/browser/Makefile.in      |   1 +
 .../browser_webconsole_bug_601352_scroll.js   |  62 +++++++++
 .../satchel/src/nsFormFillController.cpp      |   3 +-
 12 files changed, 126 insertions(+), 125 deletions(-)
 create mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601352_scroll.js

diff --git a/accessible/src/base/nsAccessNode.cpp b/accessible/src/base/nsAccessNode.cpp
index a8a5908f6c7..27338cd6199 100644
--- a/accessible/src/base/nsAccessNode.cpp
+++ b/accessible/src/base/nsAccessNode.cpp
@@ -382,7 +382,8 @@ nsAccessNode::ScrollTo(PRUint32 aScrollType)
 
   PRInt16 vPercent, hPercent;
   nsCoreUtils::ConvertScrollTypeToPercents(aScrollType, &vPercent, &hPercent);
-  return shell->ScrollContentIntoView(content, vPercent, hPercent);
+  return shell->ScrollContentIntoView(content, vPercent, hPercent,
+                                      nsIPresShell::SCROLL_OVERFLOW_HIDDEN);
 }
 
 NS_IMETHODIMP
diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp
index ba85647ea2f..5f40a401bcd 100644
--- a/accessible/src/base/nsAccessible.cpp
+++ b/accessible/src/base/nsAccessible.cpp
@@ -2368,7 +2368,8 @@ nsAccessible::DispatchClickEvent(nsIContent *aContent, PRUint32 aActionIndex)
 
   // Scroll into view.
   presShell->ScrollContentIntoView(aContent, NS_PRESSHELL_SCROLL_ANYWHERE,
-                                   NS_PRESSHELL_SCROLL_ANYWHERE);
+                                   NS_PRESSHELL_SCROLL_ANYWHERE,
+                                   nsIPresShell::SCROLL_OVERFLOW_HIDDEN);
 
   // Fire mouse down and mouse up events.
   PRBool res = nsCoreUtils::DispatchMouseEvent(NS_MOUSE_BUTTON_DOWN, presShell,
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 2a169e30eb1..8ffe0c2a15a 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -808,7 +808,8 @@ nsGenericHTMLElement::ScrollIntoView(PRBool aTop, PRUint8 optional_argc)
     NS_PRESSHELL_SCROLL_BOTTOM;
 
   presShell->ScrollContentIntoView(this, vpercent,
-                                   NS_PRESSHELL_SCROLL_ANYWHERE);
+                                   NS_PRESSHELL_SCROLL_ANYWHERE,
+                                   nsIPresShell::SCROLL_OVERFLOW_HIDDEN);
 
   return NS_OK;
 }
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index cc3f7fe7cd7..f252ba6bfab 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -1800,7 +1800,8 @@ nsFocusManager::ScrollIntoView(nsIPresShell* aPresShell,
   if (!(aFlags & FLAG_NOSCROLL))
     aPresShell->ScrollContentIntoView(aContent,
                                       NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,
-                                      NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
+                                      NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,
+                                      nsIPresShell::SCROLL_OVERFLOW_HIDDEN);
 }
 
 
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 9907a5bc899..8d9e5c9d7d7 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -2681,7 +2681,8 @@ NS_IMETHODIMP DocumentViewerImpl::ScrollToNode(nsIDOMNode* aNode)
    // Tell the PresShell to scroll to the primary frame of the content.
    NS_ENSURE_SUCCESS(presShell->ScrollContentIntoView(content,
                                                       NS_PRESSHELL_SCROLL_TOP,
-                                                      NS_PRESSHELL_SCROLL_ANYWHERE),
+                                                      NS_PRESSHELL_SCROLL_ANYWHERE,
+                                                      nsIPresShell::SCROLL_OVERFLOW_HIDDEN),
                      NS_ERROR_FAILURE);
    return NS_OK;
 }
diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index 6df24965c69..f032fbdd8b2 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -22,6 +22,7 @@
  * Contributor(s):
  *   Steve Clark <buster@netscape.com>
  *   Dan Rosen <dr@netscape.com>
+ *   Mihai Șucan <mihai.sucan@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -139,8 +140,8 @@ typedef struct CapturingContentInfo {
 } CapturingContentInfo;
 
 #define NS_IPRESSHELL_IID     \
- { 0xb79574cd, 0x2555, 0x4b57, \
-    { 0xb3, 0xf8, 0x27, 0x57, 0x3e, 0x60, 0x74, 0x01 } }
+ { 0xd1978bee, 0x43b9, 0x40de, \
+    { 0x95, 0x47, 0x85, 0x06, 0x5e, 0x02, 0xec, 0xb4 } }
 
 // Constants for ScrollContentIntoView() function
 #define NS_PRESSHELL_SCROLL_TOP      0
@@ -544,10 +545,18 @@ public:
    *                  horizontally . A value of NS_PRESSHELL_SCROLL_ANYWHERE means move
    *                  the frame the minimum amount necessary in order for the entire
    *                  frame to be visible horizontally (if possible)
+   * @param aFlags    If SCROLL_FIRST_ANCESTOR_ONLY is set, only the nearest
+   *                  scrollable ancestor is scrolled, otherwise all
+   *                  scrollable ancestors may be scrolled if necessary.
+   *                  If SCROLL_OVERFLOW_HIDDEN is set then we may scroll in a
+   *                  direction even if overflow:hidden is specified in that
+   *                  direction; otherwise we will not scroll in that direction
+   *                  when overflow:hidden is set for that direction.
    */
   virtual NS_HIDDEN_(nsresult) ScrollContentIntoView(nsIContent* aContent,
                                                      PRIntn      aVPercent,
-                                                     PRIntn      aHPercent) = 0;
+                                                     PRIntn      aHPercent,
+                                                     PRUint32    aFlags) = 0;
 
   enum {
     SCROLL_FIRST_ANCESTOR_ONLY = 0x01,
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 4734b5d8edc..657718cf579 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -26,6 +26,7 @@
  *   Dan Rosen <dr@netscape.com>
  *   Daniel Glazman <glazman@netscape.com>
  *   Mats Palmgren <matspal@gmail.com>
+ *   Mihai Șucan <mihai.sucan@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -773,7 +774,8 @@ public:
 
   virtual NS_HIDDEN_(nsresult) ScrollContentIntoView(nsIContent* aContent,
                                                      PRIntn      aVPercent,
-                                                     PRIntn      aHPercent);
+                                                     PRIntn      aHPercent,
+                                                     PRUint32    aFlags);
   virtual PRBool ScrollFrameRectIntoView(nsIFrame*     aFrame,
                                          const nsRect& aRect,
                                          PRIntn        aVPercent,
@@ -1005,7 +1007,8 @@ protected:
   // Helper for ScrollContentIntoView
   void DoScrollContentIntoView(nsIContent* aContent,
                                PRIntn      aVPercent,
-                               PRIntn      aHPercent);
+                               PRIntn      aHPercent,
+                               PRUint32    aFlags);
 
   friend struct AutoRenderingStateSaveRestore;
   friend struct RenderingState;
@@ -3906,7 +3909,8 @@ PresShell::GoToAnchor(const nsAString& aAnchorName, PRBool aScroll)
   if (content) {
     if (aScroll) {
       rv = ScrollContentIntoView(content, NS_PRESSHELL_SCROLL_TOP,
-                                 NS_PRESSHELL_SCROLL_ANYWHERE);
+                                 NS_PRESSHELL_SCROLL_ANYWHERE,
+                                 SCROLL_OVERFLOW_HIDDEN);
       NS_ENSURE_SUCCESS(rv, rv);
 
       nsIScrollableFrame* rootScroll = GetRootScrollFrameAsScrollable();
@@ -4013,7 +4017,8 @@ PresShell::ScrollToAnchor()
     return NS_OK;
 
   nsresult rv = ScrollContentIntoView(mLastAnchorScrolledTo, NS_PRESSHELL_SCROLL_TOP,
-                                      NS_PRESSHELL_SCROLL_ANYWHERE);
+                                      NS_PRESSHELL_SCROLL_ANYWHERE,
+                                      SCROLL_OVERFLOW_HIDDEN);
   mLastAnchorScrolledTo = nsnull;
   return rv;
 }
@@ -4196,7 +4201,8 @@ static void ScrollToShowRect(nsIScrollableFrame* aScrollFrame,
 nsresult
 PresShell::ScrollContentIntoView(nsIContent* aContent,
                                  PRIntn      aVPercent,
-                                 PRIntn      aHPercent)
+                                 PRIntn      aHPercent,
+                                 PRUint32    aFlags)
 {
   nsCOMPtr<nsIContent> content = aContent; // Keep content alive while flushing.
   NS_ENSURE_TRUE(content, NS_ERROR_NULL_POINTER);
@@ -4221,7 +4227,7 @@ PresShell::ScrollContentIntoView(nsIContent* aContent,
   // than a single best-effort scroll followed by one final scroll on the first
   // completed reflow.
   if (mContentToScrollTo) {
-    DoScrollContentIntoView(content, aVPercent, aHPercent);
+    DoScrollContentIntoView(content, aVPercent, aHPercent, aFlags);
   }
   return NS_OK;
 }
@@ -4229,7 +4235,8 @@ PresShell::ScrollContentIntoView(nsIContent* aContent,
 void
 PresShell::DoScrollContentIntoView(nsIContent* aContent,
                                    PRIntn      aVPercent,
-                                   PRIntn      aHPercent)
+                                   PRIntn      aHPercent,
+                                   PRUint32    aFlags)
 {
   NS_ASSERTION(mDidInitialReflow, "should have done initial reflow by now");
 
@@ -4272,7 +4279,7 @@ PresShell::DoScrollContentIntoView(nsIContent* aContent,
   } while ((frame = frame->GetNextContinuation()));
 
   ScrollFrameRectIntoView(container, frameBounds, aVPercent, aHPercent,
-                          SCROLL_OVERFLOW_HIDDEN);
+                          aFlags);
 }
 
 PRBool
@@ -4873,7 +4880,8 @@ PresShell::FlushPendingNotifications(mozFlushType aType)
       if (ProcessReflowCommands(aType < Flush_Layout) && mContentToScrollTo) {
         // We didn't get interrupted.  Go ahead and scroll to our content
         DoScrollContentIntoView(mContentToScrollTo, mContentScrollVPosition,
-                                mContentScrollHPosition);
+                                mContentScrollHPosition,
+                                SCROLL_OVERFLOW_HIDDEN);
         mContentToScrollTo = nsnull;
       }
     }
@@ -7161,7 +7169,8 @@ PresShell::PrepareToUseCaretPosition(nsIWidget* aEventWidget, nsIntPoint& aTarge
     // an edit box below the current view, you'll get the edit box aligned with
     // the top of the window. This is arguably better behavior anyway.
     rv = ScrollContentIntoView(content, NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,
-                                        NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
+                                        NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,
+                                        SCROLL_OVERFLOW_HIDDEN);
     NS_ENSURE_SUCCESS(rv, PR_FALSE);
     frame = content->GetPrimaryFrame();
     NS_WARN_IF_FALSE(frame, "No frame for focused content?");
@@ -7224,7 +7233,8 @@ PresShell::GetCurrentItemAndPositionForElement(nsIDOMElement *aCurrentEl,
 {
   nsCOMPtr<nsIContent> focusedContent(do_QueryInterface(aCurrentEl));
   ScrollContentIntoView(focusedContent, NS_PRESSHELL_SCROLL_ANYWHERE,
-                                        NS_PRESSHELL_SCROLL_ANYWHERE);
+                                        NS_PRESSHELL_SCROLL_ANYWHERE,
+                                        SCROLL_OVERFLOW_HIDDEN);
 
   nsPresContext* presContext = GetPresContext();
 
diff --git a/layout/inspector/src/inFlasher.cpp b/layout/inspector/src/inFlasher.cpp
index 79499ca4228..75c3603b127 100644
--- a/layout/inspector/src/inFlasher.cpp
+++ b/layout/inspector/src/inFlasher.cpp
@@ -196,7 +196,8 @@ inFlasher::ScrollElementIntoView(nsIDOMElement *aElement)
   nsCOMPtr<nsIContent> content = do_QueryInterface(aElement);
   presShell->ScrollContentIntoView(content,
                                    NS_PRESSHELL_SCROLL_ANYWHERE /* VPercent */,
-                                   NS_PRESSHELL_SCROLL_ANYWHERE /* HPercent */);
+                                   NS_PRESSHELL_SCROLL_ANYWHERE /* HPercent */,
+                                   nsIPresShell::SCROLL_OVERFLOW_HIDDEN);
 
   return NS_OK;
 }
diff --git a/layout/xul/base/src/nsScrollBoxObject.cpp b/layout/xul/base/src/nsScrollBoxObject.cpp
index 17877956faa..46783ac3bf1 100644
--- a/layout/xul/base/src/nsScrollBoxObject.cpp
+++ b/layout/xul/base/src/nsScrollBoxObject.cpp
@@ -21,6 +21,7 @@
  *
  * Contributor(s):
  *   Original Author: David W. Hyatt (hyatt@netscape.com)
+ *   Mihai Șucan <mihai.sucan@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -254,56 +255,18 @@ NS_IMETHODIMP nsScrollBoxObject::ScrollToLine(PRInt32 line)
 NS_IMETHODIMP nsScrollBoxObject::ScrollToElement(nsIDOMElement *child)
 {
     NS_ENSURE_ARG_POINTER(child);
-    nsIScrollableFrame* sf = GetScrollFrame();
-    if (!sf)
-       return NS_ERROR_FAILURE;
 
     nsCOMPtr<nsIPresShell> shell = GetPresShell(PR_FALSE);
     if (!shell) {
       return NS_ERROR_UNEXPECTED;
     }
 
-    nsIFrame* scrolledBox = GetScrolledBox(this);
-    if (!scrolledBox)
-       return NS_ERROR_FAILURE;
-
-    nsRect rect, crect;
-    nsCOMPtr<nsIDOMDocument> doc;
-    child->GetOwnerDocument(getter_AddRefs(doc));
-    nsCOMPtr<nsIDocument> nsDoc(do_QueryInterface(doc));
-    if(!nsDoc)
-      return NS_ERROR_UNEXPECTED;
-
-    nsCOMPtr<nsIBoxObject> childBoxObject;
-    nsDoc->GetBoxObjectFor(child, getter_AddRefs(childBoxObject));
-    if(!childBoxObject)
-      return NS_ERROR_UNEXPECTED;
-
-    PRInt32 x,y;
-    childBoxObject->GetX(&x);
-    childBoxObject->GetY(&y);
-    // get the twips rectangle from the boxobject (which has pixels)    
-    rect.x = nsPresContext::CSSPixelsToAppUnits(x);
-    rect.y = nsPresContext::CSSPixelsToAppUnits(y);
-
-    // TODO: make sure the child is inside the box
-
-    // get our current info
-    nsPoint cp = sf->GetScrollPosition();
-    nsIntRect prect;
-    GetOffsetRect(prect);
-    crect = prect.ToAppUnits(nsPresContext::AppUnitsPerCSSPixel());
-    nscoord newx=cp.x, newy=cp.y;
-
-    // we only scroll in the direction of the scrollbox orientation
-    // always scroll to left or top edge of child element
-    if (scrolledBox->IsHorizontal()) {
-        newx = rect.x - crect.x;
-    } else {
-        newy = rect.y - crect.y;
-    }
-    // scroll away
-    sf->ScrollTo(nsPoint(newx, newy), nsIScrollableFrame::INSTANT);
+    nsCOMPtr<nsIContent> content = do_QueryInterface(child);
+    shell->ScrollContentIntoView(content,
+                                 NS_PRESSHELL_SCROLL_TOP,
+                                 NS_PRESSHELL_SCROLL_LEFT,
+                                 nsIPresShell::SCROLL_FIRST_ANCESTOR_ONLY |
+                                 nsIPresShell::SCROLL_OVERFLOW_HIDDEN);
     return NS_OK;
 }
 
@@ -347,68 +310,17 @@ NS_IMETHODIMP nsScrollBoxObject::EnsureElementIsVisible(nsIDOMElement *child)
 {
     NS_ENSURE_ARG_POINTER(child);
 
-    // Start with getting info about the child, since that will flush
-    // layout and possibly destroy scrollable views, presshells, etc.
-    nsCOMPtr<nsIDOMDocument> doc;
-    // XXXbz sXBL/XBL2 issue -- which document?
-    child->GetOwnerDocument(getter_AddRefs(doc));
-    nsCOMPtr<nsIDocument> nsDoc(do_QueryInterface(doc));
-    if(!nsDoc)
-        return NS_ERROR_UNEXPECTED;
-
-    nsCOMPtr<nsIBoxObject> childBoxObject;
-    nsDoc->GetBoxObjectFor(child, getter_AddRefs(childBoxObject));
-    if(!childBoxObject)
+    nsCOMPtr<nsIPresShell> shell = GetPresShell(PR_FALSE);
+    if (!shell) {
       return NS_ERROR_UNEXPECTED;
-
-    PRInt32 x, y, width, height;
-    childBoxObject->GetX(&x);
-    childBoxObject->GetY(&y);
-    childBoxObject->GetWidth(&width);
-    childBoxObject->GetHeight(&height);
-
-    nsIScrollableFrame* sf = GetScrollFrame();
-    if (!sf)
-       return NS_ERROR_FAILURE;
-
-    nsIFrame* scrolledBox = GetScrolledBox(this);
-    if (!scrolledBox)
-       return NS_ERROR_FAILURE;
-
-    nsRect rect, crect;
-    // get the twips rectangle from the boxobject (which has pixels)    
-    rect.x = nsPresContext::CSSPixelsToAppUnits(x);
-    rect.y = nsPresContext::CSSPixelsToAppUnits(y);
-    rect.width = nsPresContext::CSSPixelsToAppUnits(width);
-    rect.height = nsPresContext::CSSPixelsToAppUnits(height);
-
-    // TODO: make sure the child is inside the box
-
-    // get our current info
-    nsPoint cp = sf->GetScrollPosition();
-    nsIntRect prect;
-    GetOffsetRect(prect);
-    crect = prect.ToAppUnits(nsPresContext::AppUnitsPerCSSPixel());
-
-    nscoord newx=cp.x, newy=cp.y;
-
-    // we only scroll in the direction of the scrollbox orientation
-    if (scrolledBox->IsHorizontal()) {
-        if ((rect.x - crect.x) + rect.width > cp.x + crect.width) {
-            newx = cp.x + (((rect.x - crect.x) + rect.width)-(cp.x + crect.width));
-        } else if (rect.x - crect.x < cp.x) {
-            newx = rect.x - crect.x;
-        }
-    } else {
-        if ((rect.y - crect.y) + rect.height > cp.y + crect.height) {
-            newy = cp.y + (((rect.y - crect.y) + rect.height)-(cp.y + crect.height));
-        } else if (rect.y - crect.y < cp.y) {
-            newy = rect.y - crect.y;
-        }
     }
-    
-    // scroll away
-    sf->ScrollTo(nsPoint(newx, newy), nsIScrollableFrame::INSTANT);
+
+    nsCOMPtr<nsIContent> content = do_QueryInterface(child);
+    shell->ScrollContentIntoView(content,
+                                 NS_PRESSHELL_SCROLL_ANYWHERE,
+                                 NS_PRESSHELL_SCROLL_ANYWHERE,
+                                 nsIPresShell::SCROLL_FIRST_ANCESTOR_ONLY |
+                                 nsIPresShell::SCROLL_OVERFLOW_HIDDEN);
     return NS_OK;
 }
 
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index a0c7ac3b07b..113f1901085 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -98,6 +98,7 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_594497_history_arrow_keys.js \
 	browser_webconsole_bug_588342_document_focus.js \
 	browser_webconsole_bug_595934_message_categories.js \
+	browser_webconsole_bug_601352_scroll.js \
 	head.js \
 	$(NULL)
 
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601352_scroll.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601352_scroll.js
new file mode 100644
index 00000000000..c3994d7b413
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601352_scroll.js
@@ -0,0 +1,62 @@
+/* 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 ***** */
+
+function tabLoad(aEvent) {
+  browser.removeEventListener(aEvent.type, arguments.callee, true);
+
+  openConsole();
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  let HUD = HUDService.hudWeakReferences[hudId].get();
+
+  let longMessage = "";
+  for (let i = 0; i < 20; i++) {
+    longMessage += "LongNonwrappingMessage";
+  }
+
+  for (let i = 0; i < 100; i++) {
+    HUD.console.log("test message " + i);
+  }
+
+  HUD.console.log(longMessage);
+
+  for (let i = 0; i < 100; i++) {
+    HUD.console.log("test message " + i);
+  }
+
+  HUD.jsterm.execute("1+1");
+
+  executeSoon(function() {
+    isnot(HUD.outputNode.scrollTop, 0, "scroll location is not at the top");
+
+    let node = HUD.outputNode.querySelector(".hud-group > *:last-child");
+    let rectNode = node.getBoundingClientRect();
+    let rectOutput = HUD.outputNode.getBoundingClientRect();
+
+    // Visible scroll viewport.
+    let height = HUD.outputNode.scrollHeight - HUD.outputNode.scrollTop;
+
+    // Top position of the last message node, relative to the outputNode.
+    let top = rectNode.top - rectOutput.top;
+
+    // Bottom position of the last message node, relative to the outputNode.
+    let bottom = rectNode.bottom - rectOutput.top;
+
+    ok(top >= 0 && bottom <= height, "last message is visible");
+
+    finishTest();
+  });
+}
+
+function test() {
+  addTab("data:text/html,Web Console test for bug 601352");
+  browser.addEventListener("load", tabLoad, true);
+}
+
diff --git a/toolkit/components/satchel/src/nsFormFillController.cpp b/toolkit/components/satchel/src/nsFormFillController.cpp
index 5cb5b035c40..ccd6d953993 100644
--- a/toolkit/components/satchel/src/nsFormFillController.cpp
+++ b/toolkit/components/satchel/src/nsFormFillController.cpp
@@ -294,7 +294,8 @@ nsFormFillController::SetPopupOpen(PRBool aPopupOpen)
       NS_ENSURE_STATE(presShell);
       presShell->ScrollContentIntoView(content,
                                        NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,
-                                       NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE);
+                                       NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,
+                                       nsIPresShell::SCROLL_OVERFLOW_HIDDEN);
       // mFocusedPopup can be destroyed after ScrollContentIntoView, see bug 420089
       if (mFocusedPopup)
         mFocusedPopup->OpenAutocompletePopup(this, mFocusedInput);

From b09ca98a428b9dffdbaee14aa90d83580f16cf27 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Thu, 28 Oct 2010 12:17:01 -0400
Subject: [PATCH 32/57] Backout bug 566478 due to test orange a=orangehurts

---
 .../http/HttpChannelParentListener.cpp        |   6 -
 security/manager/ssl/src/Makefile.in          |   1 -
 security/manager/ssl/src/NSSErrorsService.cpp | 189 ------------------
 security/manager/ssl/src/NSSErrorsService.h   |  68 -------
 security/manager/ssl/src/nsNSSComponent.cpp   | 111 +++++++++-
 security/manager/ssl/src/nsNSSComponent.h     |   4 +-
 security/manager/ssl/src/nsNSSIOLayer.cpp     |  91 ++++-----
 security/manager/ssl/src/nsNSSModule.cpp      |   8 +-
 8 files changed, 154 insertions(+), 324 deletions(-)
 delete mode 100644 security/manager/ssl/src/NSSErrorsService.cpp
 delete mode 100644 security/manager/ssl/src/NSSErrorsService.h

diff --git a/netwerk/protocol/http/HttpChannelParentListener.cpp b/netwerk/protocol/http/HttpChannelParentListener.cpp
index 74fe14c70e4..8eaeee8c822 100644
--- a/netwerk/protocol/http/HttpChannelParentListener.cpp
+++ b/netwerk/protocol/http/HttpChannelParentListener.cpp
@@ -143,12 +143,6 @@ HttpChannelParentListener::GetInterface(const nsIID& aIID, void **result)
     return mActiveChannel->mTabParent->QueryInterface(aIID, result);
   }
 
-  if (aIID.Equals(NS_GET_IID(nsISecureBrowserUI))) {
-    if (!mActiveChannel && !mActiveChannel->mTabParent)
-      return NS_NOINTERFACE;
-    return mActiveChannel->mTabParent->QueryInterface(aIID, result);
-  }
-
   if (aIID.Equals(NS_GET_IID(nsIProgressEventSink))) {
     if (!mActiveChannel)
       return NS_NOINTERFACE;
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
index 3709bf2ab87..021aaf9841a 100644
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -102,7 +102,6 @@ CPPSRCS = 				\
   nsIdentityChecking.cpp \
   nsDataSignatureVerifier.cpp \
   nsRandomGenerator.cpp \
-  NSSErrorsService.cpp \
   $(NULL)
 
 ifdef MOZ_XUL
diff --git a/security/manager/ssl/src/NSSErrorsService.cpp b/security/manager/ssl/src/NSSErrorsService.cpp
deleted file mode 100644
index 1133012c7eb..00000000000
--- a/security/manager/ssl/src/NSSErrorsService.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Personal Security Manager.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
- *   Mitch Stoltz <mstoltz@netscape.com>
- *   Brian Ryner <bryner@brianryner.com>
- *   Kai Engert <kaie@netscape.com>
- *   Vipul Gupta <vipul.gupta@sun.com>
- *   Douglas Stebila <douglas@stebila.ca>
- *   Kai Engert <kengert@redhat.com>
- *   honzab.moz@firemni.cz
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "NSSErrorsService.h"
-
-#include "nsNSSComponent.h"
-#include "nsServiceManagerUtils.h"
-#include "secerr.h"
-#include "sslerr.h"
-
-#define PIPNSS_STRBUNDLE_URL "chrome://pipnss/locale/pipnss.properties"
-#define NSSERR_STRBUNDLE_URL "chrome://pipnss/locale/nsserrors.properties"
-
-namespace mozilla {
-namespace psm {
-
-NS_IMPL_ISUPPORTS1(NSSErrorsService, nsINSSErrorsService)
-
-nsresult
-NSSErrorsService::Init()
-{
-  nsresult rv;
-  nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
-  if (NS_FAILED(rv) || !bundleService) 
-    return NS_ERROR_FAILURE;
-  
-  bundleService->CreateBundle(PIPNSS_STRBUNDLE_URL,
-                              getter_AddRefs(mPIPNSSBundle));
-  if (!mPIPNSSBundle)
-    rv = NS_ERROR_FAILURE;
-
-  bundleService->CreateBundle(NSSERR_STRBUNDLE_URL,
-                              getter_AddRefs(mNSSErrorsBundle));
-  if (!mNSSErrorsBundle)
-    rv = NS_ERROR_FAILURE;
-
-  return rv;
-}
-
-#define EXPECTED_SEC_ERROR_BASE (-0x2000)
-#define EXPECTED_SSL_ERROR_BASE (-0x3000)
-
-#if SEC_ERROR_BASE != EXPECTED_SEC_ERROR_BASE || SSL_ERROR_BASE != EXPECTED_SSL_ERROR_BASE
-#error "Unexpected change of error code numbers in lib NSS, please adjust the mapping code"
-/*
- * Please ensure the NSS error codes are mapped into the positive range 0x1000 to 0xf000
- * Search for NS_ERROR_MODULE_SECURITY to ensure there are no conflicts.
- * The current code also assumes that NSS library error codes are negative.
- */
-#endif
-
-NS_IMETHODIMP
-NSSErrorsService::IsNSSErrorCode(PRInt32 aNSPRCode, PRBool *_retval)
-{
-  if (!_retval)
-    return NS_ERROR_FAILURE;
-
-  *_retval = IS_SEC_ERROR(aNSPRCode) || IS_SSL_ERROR(aNSPRCode);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-NSSErrorsService::GetXPCOMFromNSSError(PRInt32 aNSPRCode, nsresult *aXPCOMErrorCode)
-{
-  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
-    return NS_ERROR_FAILURE;
-
-  if (!aXPCOMErrorCode)
-    return NS_ERROR_INVALID_ARG;
-
-  // The error codes within each module may be a 16 bit value.
-  // For simplicity let's use the positive value of the NSS code.
-
-  *aXPCOMErrorCode =
-    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY,
-                              -1 * aNSPRCode);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-NSSErrorsService::GetErrorClass(nsresult aXPCOMErrorCode, PRUint32 *aErrorClass)
-{
-  NS_ENSURE_ARG(aErrorClass);
-
-  if (NS_ERROR_GET_MODULE(aXPCOMErrorCode) != NS_ERROR_MODULE_SECURITY
-      || NS_ERROR_GET_SEVERITY(aXPCOMErrorCode) != NS_ERROR_SEVERITY_ERROR)
-    return NS_ERROR_FAILURE;
-  
-  PRInt32 aNSPRCode = -1 * NS_ERROR_GET_CODE(aXPCOMErrorCode);
-
-  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
-    return NS_ERROR_FAILURE;
-
-  switch (aNSPRCode)
-  {
-    case SEC_ERROR_UNKNOWN_ISSUER:
-    case SEC_ERROR_CA_CERT_INVALID:
-    case SEC_ERROR_UNTRUSTED_ISSUER:
-    case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
-    case SEC_ERROR_UNTRUSTED_CERT:
-    case SEC_ERROR_INADEQUATE_KEY_USAGE:
-    case SSL_ERROR_BAD_CERT_DOMAIN:
-    case SEC_ERROR_EXPIRED_CERTIFICATE:
-      *aErrorClass = ERROR_CLASS_BAD_CERT;
-      break;
-    default:
-      *aErrorClass = ERROR_CLASS_SSL_PROTOCOL;
-      break;
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-NSSErrorsService::GetErrorMessage(nsresult aXPCOMErrorCode, nsAString &aErrorMessage)
-{
-  if (NS_ERROR_GET_MODULE(aXPCOMErrorCode) != NS_ERROR_MODULE_SECURITY
-      || NS_ERROR_GET_SEVERITY(aXPCOMErrorCode) != NS_ERROR_SEVERITY_ERROR)
-    return NS_ERROR_FAILURE;
-  
-  PRInt32 aNSPRCode = -1 * NS_ERROR_GET_CODE(aXPCOMErrorCode);
-
-  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIStringBundle> theBundle = mPIPNSSBundle;
-  const char *id_str = nsNSSErrors::getOverrideErrorStringName(aNSPRCode);
-
-  if (!id_str) {
-    id_str = nsNSSErrors::getDefaultErrorStringName(aNSPRCode);
-    theBundle = mNSSErrorsBundle;
-  }
-
-  if (!id_str || !theBundle)
-    return NS_ERROR_FAILURE;
-
-  nsAutoString msg;
-  nsresult rv =
-    theBundle->GetStringFromName(NS_ConvertASCIItoUTF16(id_str).get(),
-                                 getter_Copies(msg));
-  if (NS_SUCCEEDED(rv)) {
-    aErrorMessage = msg;
-  }
-  return rv;
-}
-
-} // psm
-} // mozilla
diff --git a/security/manager/ssl/src/NSSErrorsService.h b/security/manager/ssl/src/NSSErrorsService.h
deleted file mode 100644
index c87d9b79a81..00000000000
--- a/security/manager/ssl/src/NSSErrorsService.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Personal Security Manager.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
- *   Brian Ryner <bryner@brianryner.com>
- *   Kai Engert <kaie@netscape.com>
- *   Kai Engert <kengert@redhat.com>
- *   honzab.moz@firemni.cz
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsINSSErrorsService.h"
-
-#include "nsIStringBundle.h"
-#include "nsCOMPtr.h"
-
-namespace mozilla {
-namespace psm {
-
-class NSSErrorsService : public nsINSSErrorsService
-{
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSINSSERRORSSERVICE
-
-public:
-  nsresult Init();
-
-private:
-  nsCOMPtr<nsIStringBundle> mPIPNSSBundle;
-  nsCOMPtr<nsIStringBundle> mNSSErrorsBundle;
-};
-
-} // psm
-} // mozilla
-
-#define NS_NSSERRORSSERVICE_CID \
-  { 0x9ef18451, 0xa157, 0x4d17, { 0x81, 0x32, 0x47, 0xaf, 0xef, 0x21, 0x36, 0x89 } }
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index e2340c9dff6..487dc513bd3 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -1953,13 +1953,14 @@ nsNSSComponent::Init()
 }
 
 /* nsISupports Implementation for the class */
-NS_IMPL_THREADSAFE_ISUPPORTS6(nsNSSComponent,
+NS_IMPL_THREADSAFE_ISUPPORTS7(nsNSSComponent,
                               nsISignatureVerifier,
                               nsIEntropyCollector,
                               nsINSSComponent,
                               nsIObserver,
                               nsISupportsWeakReference,
-                              nsITimerCallback)
+                              nsITimerCallback,
+                              nsINSSErrorsService)
 
 
 /* Callback functions for decoder. For now, use empty/default functions. */
@@ -2452,6 +2453,112 @@ nsNSSComponent::RememberCert(CERTCertificate *cert)
   return NS_OK;
 }
 
+#define EXPECTED_SEC_ERROR_BASE (-0x2000)
+#define EXPECTED_SSL_ERROR_BASE (-0x3000)
+
+#if SEC_ERROR_BASE != EXPECTED_SEC_ERROR_BASE || SSL_ERROR_BASE != EXPECTED_SSL_ERROR_BASE
+#error "Unexpected change of error code numbers in lib NSS, please adjust the mapping code"
+/*
+ * Please ensure the NSS error codes are mapped into the positive range 0x1000 to 0xf000
+ * Search for NS_ERROR_MODULE_SECURITY to ensure there are no conflicts.
+ * The current code also assumes that NSS library error codes are negative.
+ */
+#endif
+
+NS_IMETHODIMP
+nsNSSComponent::IsNSSErrorCode(PRInt32 aNSPRCode, PRBool *_retval)
+{
+  if (!_retval)
+    return NS_ERROR_FAILURE;
+
+  *_retval = IS_SEC_ERROR(aNSPRCode) || IS_SSL_ERROR(aNSPRCode);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsNSSComponent::GetXPCOMFromNSSError(PRInt32 aNSPRCode, nsresult *aXPCOMErrorCode)
+{
+  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
+    return NS_ERROR_FAILURE;
+
+  if (!aXPCOMErrorCode)
+    return NS_ERROR_INVALID_ARG;
+
+  // The error codes within each module may be a 16 bit value.
+  // For simplicity let's use the positive value of the NSS code.
+
+  *aXPCOMErrorCode =
+    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY,
+                              -1 * aNSPRCode);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsNSSComponent::GetErrorClass(nsresult aXPCOMErrorCode, PRUint32 *aErrorClass)
+{
+  NS_ENSURE_ARG(aErrorClass);
+
+  if (NS_ERROR_GET_MODULE(aXPCOMErrorCode) != NS_ERROR_MODULE_SECURITY
+      || NS_ERROR_GET_SEVERITY(aXPCOMErrorCode) != NS_ERROR_SEVERITY_ERROR)
+    return NS_ERROR_FAILURE;
+  
+  PRInt32 aNSPRCode = -1 * NS_ERROR_GET_CODE(aXPCOMErrorCode);
+
+  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
+    return NS_ERROR_FAILURE;
+
+  switch (aNSPRCode)
+  {
+    case SEC_ERROR_UNKNOWN_ISSUER:
+    case SEC_ERROR_CA_CERT_INVALID:
+    case SEC_ERROR_UNTRUSTED_ISSUER:
+    case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
+    case SEC_ERROR_UNTRUSTED_CERT:
+    case SEC_ERROR_INADEQUATE_KEY_USAGE:
+    case SSL_ERROR_BAD_CERT_DOMAIN:
+    case SEC_ERROR_EXPIRED_CERTIFICATE:
+      *aErrorClass = ERROR_CLASS_BAD_CERT;
+      break;
+    default:
+      *aErrorClass = ERROR_CLASS_SSL_PROTOCOL;
+      break;
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsNSSComponent::GetErrorMessage(nsresult aXPCOMErrorCode, nsAString &aErrorMessage)
+{
+  if (NS_ERROR_GET_MODULE(aXPCOMErrorCode) != NS_ERROR_MODULE_SECURITY
+      || NS_ERROR_GET_SEVERITY(aXPCOMErrorCode) != NS_ERROR_SEVERITY_ERROR)
+    return NS_ERROR_FAILURE;
+  
+  PRInt32 aNSPRCode = -1 * NS_ERROR_GET_CODE(aXPCOMErrorCode);
+
+  if (!IS_SEC_ERROR(aNSPRCode) && !IS_SSL_ERROR(aNSPRCode))
+    return NS_ERROR_FAILURE;
+
+  nsCOMPtr<nsIStringBundle> theBundle = mPIPNSSBundle;
+  const char *id_str = nsNSSErrors::getOverrideErrorStringName(aNSPRCode);
+
+  if (!id_str) {
+    id_str = nsNSSErrors::getDefaultErrorStringName(aNSPRCode);
+    theBundle = mNSSErrorsBundle;
+  }
+
+  if (!id_str || !theBundle)
+    return NS_ERROR_FAILURE;
+
+  nsAutoString msg;
+  nsresult rv =
+    theBundle->GetStringFromName(NS_ConvertASCIItoUTF16(id_str).get(),
+                                 getter_Copies(msg));
+  if (NS_SUCCEEDED(rv)) {
+    aErrorMessage = msg;
+  }
+  return rv;
+}
+
 void
 nsNSSComponent::DoProfileApproveChange(nsISupports* aSubject)
 {
diff --git a/security/manager/ssl/src/nsNSSComponent.h b/security/manager/ssl/src/nsNSSComponent.h
index 7f255e5a309..2066ef59a47 100644
--- a/security/manager/ssl/src/nsNSSComponent.h
+++ b/security/manager/ssl/src/nsNSSComponent.h
@@ -239,7 +239,8 @@ class nsNSSComponent : public nsISignatureVerifier,
                        public nsINSSComponent,
                        public nsIObserver,
                        public nsSupportsWeakReference,
-                       public nsITimerCallback
+                       public nsITimerCallback,
+                       public nsINSSErrorsService
 {
 public:
   NS_DEFINE_STATIC_CID_ACCESSOR( NS_NSSCOMPONENT_CID )
@@ -252,6 +253,7 @@ public:
   NS_DECL_NSIENTROPYCOLLECTOR
   NS_DECL_NSIOBSERVER
   NS_DECL_NSITIMERCALLBACK
+  NS_DECL_NSINSSERRORSSERVICE
 
   NS_METHOD Init();
 
diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
index 5b8bcd1dfd7..80a5a398d20 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -379,63 +379,54 @@ nsNSSSocketInfo::EnsureDocShellDependentStuffKnown()
   // with a socket close, and the socket transport might detach the callbacks 
   // instance prior to our error reporting.
 
-  nsISecureBrowserUI* secureUI = nsnull;
-#ifdef MOZ_IPC
-  CallGetInterface(proxiedCallbacks.get(), &secureUI);
-#endif
+  nsCOMPtr<nsIDocShell> docshell;
 
-  if (!secureUI)
+  nsCOMPtr<nsIDocShellTreeItem> item(do_GetInterface(proxiedCallbacks));
+  if (item)
   {
-    nsCOMPtr<nsIDocShell> docshell;
+    nsCOMPtr<nsIDocShellTreeItem> proxiedItem;
+    nsCOMPtr<nsIDocShellTreeItem> rootItem;
+    NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
+                         NS_GET_IID(nsIDocShellTreeItem),
+                         item.get(),
+                         NS_PROXY_SYNC,
+                         getter_AddRefs(proxiedItem));
 
-    nsCOMPtr<nsIDocShellTreeItem> item(do_GetInterface(proxiedCallbacks));
-    if (item)
-    {
-      nsCOMPtr<nsIDocShellTreeItem> proxiedItem;
-      nsCOMPtr<nsIDocShellTreeItem> rootItem;
-      NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
-                           NS_GET_IID(nsIDocShellTreeItem),
-                           item.get(),
-                           NS_PROXY_SYNC,
-                           getter_AddRefs(proxiedItem));
-
-      proxiedItem->GetSameTypeRootTreeItem(getter_AddRefs(rootItem));
-      docshell = do_QueryInterface(rootItem);
-      NS_ASSERTION(docshell, "rootItem do_QI is null");
-    }
-
-    if (docshell)
-    {
-      nsCOMPtr<nsIDocShell> proxiedDocShell;
-      NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
-                           NS_GET_IID(nsIDocShell),
-                           docshell.get(),
-                           NS_PROXY_SYNC,
-                           getter_AddRefs(proxiedDocShell));
-      nsISecureBrowserUI* secureUI = nsnull;
-      if (proxiedDocShell)
-        proxiedDocShell->GetSecurityUI(&secureUI);
-    }
+    proxiedItem->GetSameTypeRootTreeItem(getter_AddRefs(rootItem));
+    docshell = do_QueryInterface(rootItem);
+    NS_ASSERTION(docshell, "rootItem do_QI is null");
   }
 
-  if (secureUI)
+  if (docshell)
   {
-    nsCOMPtr<nsIThread> mainThread(do_GetMainThread());
-    NS_ProxyRelease(mainThread, secureUI, PR_FALSE);
-    mExternalErrorReporting = PR_TRUE;
+    nsCOMPtr<nsIDocShell> proxiedDocShell;
+    NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
+                         NS_GET_IID(nsIDocShell),
+                         docshell.get(),
+                         NS_PROXY_SYNC,
+                         getter_AddRefs(proxiedDocShell));
+    nsISecureBrowserUI* secureUI = nsnull;
+    if (proxiedDocShell)
+      proxiedDocShell->GetSecurityUI(&secureUI);
+    if (secureUI)
+    {
+      nsCOMPtr<nsIThread> mainThread(do_GetMainThread());
+      NS_ProxyRelease(mainThread, secureUI, PR_FALSE);
+      mExternalErrorReporting = PR_TRUE;
 
-    // If this socket is associated to a docshell, let's try to remember
-    // the currently used cert. If this socket gets a notification from NSS
-    // having the same raw socket, we can keep the PSM wrapper object
-    // and all the data it has cached (like verification results).
-    nsCOMPtr<nsISSLStatusProvider> statprov = do_QueryInterface(secureUI);
-    if (statprov) {
-      nsCOMPtr<nsISupports> isup_stat;
-      statprov->GetSSLStatus(getter_AddRefs(isup_stat));
-      if (isup_stat) {
-        nsCOMPtr<nsISSLStatus> sslstat = do_QueryInterface(isup_stat);
-        if (sslstat) {
-          sslstat->GetServerCert(getter_AddRefs(mPreviousCert));
+      // If this socket is associated to a docshell, let's try to remember
+      // the currently used cert. If this socket gets a notification from NSS
+      // having the same raw socket, we can keep the PSM wrapper object
+      // and all the data it has cached (like verification results).
+      nsCOMPtr<nsISSLStatusProvider> statprov = do_QueryInterface(secureUI);
+      if (statprov) {
+        nsCOMPtr<nsISupports> isup_stat;
+        statprov->GetSSLStatus(getter_AddRefs(isup_stat));
+        if (isup_stat) {
+          nsCOMPtr<nsISSLStatus> sslstat = do_QueryInterface(isup_stat);
+          if (sslstat) {
+            sslstat->GetServerCert(getter_AddRefs(mPreviousCert));
+          }
         }
       }
     }
diff --git a/security/manager/ssl/src/nsNSSModule.cpp b/security/manager/ssl/src/nsNSSModule.cpp
index 178dc7424fb..e6ec05c8e3b 100644
--- a/security/manager/ssl/src/nsNSSModule.cpp
+++ b/security/manager/ssl/src/nsNSSModule.cpp
@@ -78,7 +78,6 @@
 #include "nsRecentBadCerts.h"
 #include "nsSSLStatus.h"
 #include "nsNSSIOLayer.h"
-#include "NSSErrorsService.h"
 
 #ifdef MOZ_IPC
 #include "nsXULAppAPI.h"
@@ -262,9 +261,6 @@ NS_NSS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nssEnsure, nsRecentBadCertsService, Init
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsureOnChromeOnly, nsSSLStatus)
 NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsureOnChromeOnly, nsNSSSocketInfo)
 
-typedef mozilla::psm::NSSErrorsService NSSErrorsService;
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(NSSErrorsService, Init)
-
 NS_DEFINE_NAMED_CID(NS_NSSCOMPONENT_CID);
 NS_DEFINE_NAMED_CID(NS_SSLSOCKETPROVIDER_CID);
 NS_DEFINE_NAMED_CID(NS_STARTTLSSOCKETPROVIDER_CID);
@@ -300,7 +296,6 @@ NS_DEFINE_NAMED_CID(NS_RANDOMGENERATOR_CID);
 NS_DEFINE_NAMED_CID(NS_RECENTBADCERTS_CID);
 NS_DEFINE_NAMED_CID(NS_SSLSTATUS_CID);
 NS_DEFINE_NAMED_CID(NS_NSSSOCKETINFO_CID);
-NS_DEFINE_NAMED_CID(NS_NSSERRORSSERVICE_CID);
 
 
 static const mozilla::Module::CIDEntry kNSSCIDs[] = {
@@ -339,13 +334,12 @@ static const mozilla::Module::CIDEntry kNSSCIDs[] = {
   { &kNS_RECENTBADCERTS_CID, false, NULL, nsRecentBadCertsServiceConstructor },
   { &kNS_SSLSTATUS_CID, false, NULL, nsSSLStatusConstructor },
   { &kNS_NSSSOCKETINFO_CID, false, NULL, nsNSSSocketInfoConstructor },
-  { &kNS_NSSERRORSSERVICE_CID, false, NULL, NSSErrorsServiceConstructor },
   { NULL }
 };
 
 static const mozilla::Module::ContractIDEntry kNSSContracts[] = {
   { PSM_COMPONENT_CONTRACTID, &kNS_NSSCOMPONENT_CID },
-  { NS_NSS_ERRORS_SERVICE_CONTRACTID, &kNS_NSSERRORSSERVICE_CID },
+  { NS_NSS_ERRORS_SERVICE_CONTRACTID, &kNS_NSSCOMPONENT_CID },
   { NS_SSLSOCKETPROVIDER_CONTRACTID, &kNS_SSLSOCKETPROVIDER_CID },
   { NS_STARTTLSSOCKETPROVIDER_CONTRACTID, &kNS_STARTTLSSOCKETPROVIDER_CID },
   { NS_SDR_CONTRACTID, &kNS_SDR_CID },

From a05d4c63fedaa3a425703e36ce548edb650575ad Mon Sep 17 00:00:00 2001
From: Dan Witte <dwitte@mozilla.com>
Date: Thu, 28 Oct 2010 10:09:08 -0700
Subject: [PATCH 33/57] Bug 606719 - Browser stalls with connections left
 hanging in TCP close wait state. Part 1: rename LOG to SOCKET_LOG. r=mcmanus,
 a=b7+

---
 netwerk/base/src/nsServerSocket.cpp           |   4 +-
 netwerk/base/src/nsSocketTransport2.cpp       | 114 +++++++++---------
 .../base/src/nsSocketTransportService2.cpp    |  54 ++++-----
 netwerk/base/src/nsSocketTransportService2.h  |   4 +-
 4 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/netwerk/base/src/nsServerSocket.cpp b/netwerk/base/src/nsServerSocket.cpp
index f0fd3a49776..82f3e909036 100644
--- a/netwerk/base/src/nsServerSocket.cpp
+++ b/netwerk/base/src/nsServerSocket.cpp
@@ -99,7 +99,7 @@ nsServerSocket::~nsServerSocket()
 void
 nsServerSocket::OnMsgClose()
 {
-  LOG(("nsServerSocket::OnMsgClose [this=%p]\n", this));
+  SOCKET_LOG(("nsServerSocket::OnMsgClose [this=%p]\n", this));
 
   if (NS_FAILED(mCondition))
     return;
@@ -116,7 +116,7 @@ nsServerSocket::OnMsgClose()
 void
 nsServerSocket::OnMsgAttach()
 {
-  LOG(("nsServerSocket::OnMsgAttach [this=%p]\n", this));
+  SOCKET_LOG(("nsServerSocket::OnMsgAttach [this=%p]\n", this));
 
   if (NS_FAILED(mCondition))
     return;
diff --git a/netwerk/base/src/nsSocketTransport2.cpp b/netwerk/base/src/nsSocketTransport2.cpp
index c8f7e925dc6..da79e43e0df 100644
--- a/netwerk/base/src/nsSocketTransport2.cpp
+++ b/netwerk/base/src/nsSocketTransport2.cpp
@@ -140,7 +140,7 @@ static PRErrorCode RandomizeConnectError(PRErrorCode code)
         };
         n = n % (sizeof(errors)/sizeof(errors[0]));
         code = errors[n].err_code;
-        LOG(("simulating NSPR error %d [%s]\n", code, errors[n].err_name));
+        SOCKET_LOG(("simulating NSPR error %d [%s]\n", code, errors[n].err_name));
     }
     return code;
 }
@@ -202,7 +202,7 @@ ErrorAccordingToNSPR(PRErrorCode errorCode)
             rv = GetXPCOMFromNSSError(errorCode);
         break;
     }
-    LOG(("ErrorAccordingToNSPR [in=%d out=%x]\n", errorCode, rv));
+    SOCKET_LOG(("ErrorAccordingToNSPR [in=%d out=%x]\n", errorCode, rv));
     return rv;
 }
 
@@ -230,7 +230,7 @@ nsSocketInputStream::~nsSocketInputStream()
 void
 nsSocketInputStream::OnSocketReady(nsresult condition)
 {
-    LOG(("nsSocketInputStream::OnSocketReady [this=%x cond=%x]\n",
+    SOCKET_LOG(("nsSocketInputStream::OnSocketReady [this=%x cond=%x]\n",
         this, condition));
 
     NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
@@ -284,7 +284,7 @@ nsSocketInputStream::Close()
 NS_IMETHODIMP
 nsSocketInputStream::Available(PRUint32 *avail)
 {
-    LOG(("nsSocketInputStream::Available [this=%x]\n", this));
+    SOCKET_LOG(("nsSocketInputStream::Available [this=%x]\n", this));
 
     *avail = 0;
 
@@ -329,7 +329,7 @@ nsSocketInputStream::Available(PRUint32 *avail)
 NS_IMETHODIMP
 nsSocketInputStream::Read(char *buf, PRUint32 count, PRUint32 *countRead)
 {
-    LOG(("nsSocketInputStream::Read [this=%x count=%u]\n", this, count));
+    SOCKET_LOG(("nsSocketInputStream::Read [this=%x count=%u]\n", this, count));
 
     *countRead = 0;
 
@@ -345,14 +345,14 @@ nsSocketInputStream::Read(char *buf, PRUint32 count, PRUint32 *countRead)
             return NS_BASE_STREAM_WOULD_BLOCK;
     }
 
-    LOG(("  calling PR_Read [count=%u]\n", count));
+    SOCKET_LOG(("  calling PR_Read [count=%u]\n", count));
 
     // cannot hold lock while calling NSPR.  (worried about the fact that PSM
     // synchronously proxies notifications over to the UI thread, which could
     // mistakenly try to re-enter this code.)
     PRInt32 n = PR_Read(fd, buf, count);
 
-    LOG(("  PR_Read returned [n=%d]\n", n));
+    SOCKET_LOG(("  PR_Read returned [n=%d]\n", n));
 
     nsresult rv;
     {
@@ -403,7 +403,7 @@ nsSocketInputStream::IsNonBlocking(PRBool *nonblocking)
 NS_IMETHODIMP
 nsSocketInputStream::CloseWithStatus(nsresult reason)
 {
-    LOG(("nsSocketInputStream::CloseWithStatus [this=%x reason=%x]\n", this, reason));
+    SOCKET_LOG(("nsSocketInputStream::CloseWithStatus [this=%x reason=%x]\n", this, reason));
 
     // may be called from any thread
  
@@ -427,7 +427,7 @@ nsSocketInputStream::AsyncWait(nsIInputStreamCallback *callback,
                                PRUint32 amount,
                                nsIEventTarget *target)
 {
-    LOG(("nsSocketInputStream::AsyncWait [this=%x]\n", this));
+    SOCKET_LOG(("nsSocketInputStream::AsyncWait [this=%x]\n", this));
 
     // This variable will be non-null when we want to call the callback
     // directly from this function, but outside the lock.
@@ -489,7 +489,7 @@ nsSocketOutputStream::~nsSocketOutputStream()
 void
 nsSocketOutputStream::OnSocketReady(nsresult condition)
 {
-    LOG(("nsSocketOutputStream::OnSocketReady [this=%x cond=%x]\n",
+    SOCKET_LOG(("nsSocketOutputStream::OnSocketReady [this=%x cond=%x]\n",
         this, condition));
 
     NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
@@ -549,7 +549,7 @@ nsSocketOutputStream::Flush()
 NS_IMETHODIMP
 nsSocketOutputStream::Write(const char *buf, PRUint32 count, PRUint32 *countWritten)
 {
-    LOG(("nsSocketOutputStream::Write [this=%x count=%u]\n", this, count));
+    SOCKET_LOG(("nsSocketOutputStream::Write [this=%x count=%u]\n", this, count));
 
     *countWritten = 0;
 
@@ -568,14 +568,14 @@ nsSocketOutputStream::Write(const char *buf, PRUint32 count, PRUint32 *countWrit
             return NS_BASE_STREAM_WOULD_BLOCK;
     }
 
-    LOG(("  calling PR_Write [count=%u]\n", count));
+    SOCKET_LOG(("  calling PR_Write [count=%u]\n", count));
 
     // cannot hold lock while calling NSPR.  (worried about the fact that PSM
     // synchronously proxies notifications over to the UI thread, which could
     // mistakenly try to re-enter this code.)
     PRInt32 n = PR_Write(fd, buf, count);
 
-    LOG(("  PR_Write returned [n=%d]\n", n));
+    SOCKET_LOG(("  PR_Write returned [n=%d]\n", n));
     NS_ASSERTION(n != 0, "unexpected return value");
 
     nsresult rv;
@@ -645,7 +645,7 @@ nsSocketOutputStream::IsNonBlocking(PRBool *nonblocking)
 NS_IMETHODIMP
 nsSocketOutputStream::CloseWithStatus(nsresult reason)
 {
-    LOG(("nsSocketOutputStream::CloseWithStatus [this=%x reason=%x]\n", this, reason));
+    SOCKET_LOG(("nsSocketOutputStream::CloseWithStatus [this=%x reason=%x]\n", this, reason));
 
     // may be called from any thread
  
@@ -669,7 +669,7 @@ nsSocketOutputStream::AsyncWait(nsIOutputStreamCallback *callback,
                                 PRUint32 amount,
                                 nsIEventTarget *target)
 {
-    LOG(("nsSocketOutputStream::AsyncWait [this=%x]\n", this));
+    SOCKET_LOG(("nsSocketOutputStream::AsyncWait [this=%x]\n", this));
 
     {
         nsAutoLock lock(mTransport->mLock);
@@ -721,7 +721,7 @@ nsSocketTransport::nsSocketTransport()
     , mOutput(this)
     , mQoSBits(0x00)
 {
-    LOG(("creating nsSocketTransport @%x\n", this));
+    SOCKET_LOG(("creating nsSocketTransport @%x\n", this));
 
     NS_ADDREF(gSocketTransportService);
 
@@ -731,7 +731,7 @@ nsSocketTransport::nsSocketTransport()
 
 nsSocketTransport::~nsSocketTransport()
 {
-    LOG(("destroying nsSocketTransport @%x\n", this));
+    SOCKET_LOG(("destroying nsSocketTransport @%x\n", this));
 
     // cleanup socket type info
     if (mTypes) {
@@ -779,7 +779,7 @@ nsSocketTransport::Init(const char **types, PRUint32 typeCount,
             proxyType = nsnull;
     }
 
-    LOG(("nsSocketTransport::Init [this=%x host=%s:%hu proxy=%s:%hu]\n",
+    SOCKET_LOG(("nsSocketTransport::Init [this=%x host=%s:%hu proxy=%s:%hu]\n",
         this, mHost.get(), mPort, mProxyHost.get(), mProxyPort));
 
     // include proxy type as a socket type if proxy type is not "http"
@@ -869,7 +869,7 @@ nsSocketTransport::InitWithConnectedSocket(PRFileDesc *fd, const PRNetAddr *addr
     opt.value.non_blocking = PR_TRUE;
     PR_SetSocketOption(mFD, &opt);
 
-    LOG(("nsSocketTransport::InitWithConnectedSocket [this=%p addr=%s:%hu]\n",
+    SOCKET_LOG(("nsSocketTransport::InitWithConnectedSocket [this=%p addr=%s:%hu]\n",
         this, mHost.get(), mPort));
 
     // jump to InitiateSocket to get ourselves attached to the STS poll list.
@@ -879,7 +879,7 @@ nsSocketTransport::InitWithConnectedSocket(PRFileDesc *fd, const PRNetAddr *addr
 nsresult
 nsSocketTransport::PostEvent(PRUint32 type, nsresult status, nsISupports *param)
 {
-    LOG(("nsSocketTransport::PostEvent [this=%p type=%u status=%x param=%p]\n",
+    SOCKET_LOG(("nsSocketTransport::PostEvent [this=%p type=%u status=%x param=%p]\n",
         this, type, status, param));
 
     nsCOMPtr<nsIRunnable> event = new nsSocketEvent(this, type, status, param);
@@ -892,7 +892,7 @@ nsSocketTransport::PostEvent(PRUint32 type, nsresult status, nsISupports *param)
 void
 nsSocketTransport::SendStatus(nsresult status)
 {
-    LOG(("nsSocketTransport::SendStatus [this=%x status=%x]\n", this, status));
+    SOCKET_LOG(("nsSocketTransport::SendStatus [this=%x status=%x]\n", this, status));
 
     nsCOMPtr<nsITransportEventSink> sink;
     PRUint64 progress;
@@ -918,7 +918,7 @@ nsSocketTransport::SendStatus(nsresult status)
 nsresult
 nsSocketTransport::ResolveHost()
 {
-    LOG(("nsSocketTransport::ResolveHost [this=%x]\n", this));
+    SOCKET_LOG(("nsSocketTransport::ResolveHost [this=%x]\n", this));
 
     nsresult rv;
 
@@ -955,7 +955,7 @@ nsSocketTransport::ResolveHost()
     rv = dns->AsyncResolve(SocketHost(), dnsFlags, this, nsnull,
                            getter_AddRefs(mDNSRequest));
     if (NS_SUCCEEDED(rv)) {
-        LOG(("  advancing to STATE_RESOLVING\n"));
+        SOCKET_LOG(("  advancing to STATE_RESOLVING\n"));
         mState = STATE_RESOLVING;
         // only report that we are resolving if we are still resolving...
         if (mResolving)
@@ -967,7 +967,7 @@ nsSocketTransport::ResolveHost()
 nsresult
 nsSocketTransport::BuildSocket(PRFileDesc *&fd, PRBool &proxyTransparent, PRBool &usingSSL)
 {
-    LOG(("nsSocketTransport::BuildSocket [this=%x]\n", this));
+    SOCKET_LOG(("nsSocketTransport::BuildSocket [this=%x]\n", this));
 
     nsresult rv;
 
@@ -995,7 +995,7 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, PRBool &proxyTransparent, PRBool
         for (i=0; i<mTypeCount; ++i) {
             nsCOMPtr<nsISocketProvider> provider;
 
-            LOG(("  pushing io layer [%u:%s]\n", i, mTypes[i]));
+            SOCKET_LOG(("  pushing io layer [%u:%s]\n", i, mTypes[i]));
 
             rv = spserv->GetSocketProvider(mTypes[i], getter_AddRefs(provider));
             if (NS_FAILED(rv))
@@ -1043,7 +1043,7 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, PRBool &proxyTransparent, PRBool
                     nsAutoLock lock(mLock);
                     mSecInfo = secinfo;
                     callbacks = mCallbacks;
-                    LOG(("  [secinfo=%x callbacks=%x]\n", mSecInfo.get(), mCallbacks.get()));
+                    SOCKET_LOG(("  [secinfo=%x callbacks=%x]\n", mSecInfo.get(), mCallbacks.get()));
                 }
                 // don't call into PSM while holding mLock!!
                 nsCOMPtr<nsISSLSocketControl> secCtrl(do_QueryInterface(secinfo));
@@ -1063,7 +1063,7 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, PRBool &proxyTransparent, PRBool
         }
 
         if (NS_FAILED(rv)) {
-            LOG(("  error pushing io layer [%u:%s rv=%x]\n", i, mTypes[i], rv));
+            SOCKET_LOG(("  error pushing io layer [%u:%s rv=%x]\n", i, mTypes[i], rv));
             if (fd)
                 PR_Close(fd);
         }
@@ -1075,7 +1075,7 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, PRBool &proxyTransparent, PRBool
 nsresult
 nsSocketTransport::InitiateSocket()
 {
-    LOG(("nsSocketTransport::InitiateSocket [this=%x]\n", this));
+    SOCKET_LOG(("nsSocketTransport::InitiateSocket [this=%x]\n", this));
 
     nsresult rv;
 
@@ -1118,7 +1118,7 @@ nsSocketTransport::InitiateSocket()
 
     rv = BuildSocket(fd, proxyTransparent, usingSSL);
     if (NS_FAILED(rv)) {
-        LOG(("  BuildSocket failed [rv=%x]\n", rv));
+        SOCKET_LOG(("  BuildSocket failed [rv=%x]\n", rv));
         return rv;
     }
 
@@ -1165,16 +1165,16 @@ nsSocketTransport::InitiateSocket()
         mFDconnected = PR_FALSE;
     }
 
-    LOG(("  advancing to STATE_CONNECTING\n"));
+    SOCKET_LOG(("  advancing to STATE_CONNECTING\n"));
     mState = STATE_CONNECTING;
     mPollTimeout = mTimeouts[TIMEOUT_CONNECT];
     SendStatus(STATUS_CONNECTING_TO);
 
 #if defined(PR_LOGGING)
-    if (LOG_ENABLED()) {
+    if (SOCKET_LOG_ENABLED()) {
         char buf[64];
         PR_NetAddrToString(&mNetAddr, buf, sizeof(buf));
-        LOG(("  trying address: %s\n", buf));
+        SOCKET_LOG(("  trying address: %s\n", buf));
     }
 #endif
 
@@ -1215,7 +1215,7 @@ nsSocketTransport::InitiateSocket()
                 nsCOMPtr<nsISSLSocketControl> secCtrl =
                     do_QueryInterface(mSecInfo);
                 if (secCtrl) {
-                    LOG(("  calling ProxyStartSSL()\n"));
+                    SOCKET_LOG(("  calling ProxyStartSSL()\n"));
                     secCtrl->ProxyStartSSL();
                 }
                 // XXX what if we were forced to poll on the socket for a successful
@@ -1243,7 +1243,7 @@ nsSocketTransport::RecoverFromError()
 {
     NS_ASSERTION(NS_FAILED(mCondition), "there should be something wrong");
 
-    LOG(("nsSocketTransport::RecoverFromError [this=%x state=%x cond=%x]\n",
+    SOCKET_LOG(("nsSocketTransport::RecoverFromError [this=%x state=%x cond=%x]\n",
         this, mState, mCondition));
 
     // can only recover from errors in these states
@@ -1267,7 +1267,7 @@ nsSocketTransport::RecoverFromError()
     if (mState == STATE_CONNECTING && mDNSRecord) {
         nsresult rv = mDNSRecord->GetNextAddr(SocketPort(), &mNetAddr);
         if (NS_SUCCEEDED(rv)) {
-            LOG(("  trying again with next ip address\n"));
+            SOCKET_LOG(("  trying again with next ip address\n"));
             tryAgain = PR_TRUE;
         }
     }
@@ -1311,7 +1311,7 @@ nsSocketTransport::RecoverFromError()
 void
 nsSocketTransport::OnMsgInputClosed(nsresult reason)
 {
-    LOG(("nsSocketTransport::OnMsgInputClosed [this=%x reason=%x]\n",
+    SOCKET_LOG(("nsSocketTransport::OnMsgInputClosed [this=%x reason=%x]\n",
         this, reason));
 
     NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
@@ -1333,7 +1333,7 @@ nsSocketTransport::OnMsgInputClosed(nsresult reason)
 void
 nsSocketTransport::OnMsgOutputClosed(nsresult reason)
 {
-    LOG(("nsSocketTransport::OnMsgOutputClosed [this=%x reason=%x]\n",
+    SOCKET_LOG(("nsSocketTransport::OnMsgOutputClosed [this=%x reason=%x]\n",
         this, reason));
 
     NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
@@ -1354,7 +1354,7 @@ nsSocketTransport::OnMsgOutputClosed(nsresult reason)
 void
 nsSocketTransport::OnSocketConnected()
 {
-    LOG(("  advancing to STATE_TRANSFERRING\n"));
+    SOCKET_LOG(("  advancing to STATE_TRANSFERRING\n"));
 
     mPollFlags = (PR_POLL_READ | PR_POLL_WRITE | PR_POLL_EXCEPT);
     mPollTimeout = mTimeouts[TIMEOUT_READ_WRITE];
@@ -1391,7 +1391,7 @@ nsSocketTransport::ReleaseFD_Locked(PRFileDesc *fd)
     NS_ASSERTION(mFD == fd, "wrong fd");
 
     if (--mFDref == 0) {
-        LOG(("nsSocketTransport: calling PR_Close [this=%x]\n", this));
+        SOCKET_LOG(("nsSocketTransport: calling PR_Close [this=%x]\n", this));
         PR_Close(mFD);
         mFD = nsnull;
     }
@@ -1403,12 +1403,12 @@ nsSocketTransport::ReleaseFD_Locked(PRFileDesc *fd)
 void
 nsSocketTransport::OnSocketEvent(PRUint32 type, nsresult status, nsISupports *param)
 {
-    LOG(("nsSocketTransport::OnSocketEvent [this=%p type=%u status=%x param=%p]\n",
+    SOCKET_LOG(("nsSocketTransport::OnSocketEvent [this=%p type=%u status=%x param=%p]\n",
         this, type, status, param));
 
     if (NS_FAILED(mCondition)) {
         // block event since we're apparently already dead.
-        LOG(("  blocking event [condition=%x]\n", mCondition));
+        SOCKET_LOG(("  blocking event [condition=%x]\n", mCondition));
         //
         // notify input/output streams in case either has a pending notify.
         //
@@ -1419,7 +1419,7 @@ nsSocketTransport::OnSocketEvent(PRUint32 type, nsresult status, nsISupports *pa
 
     switch (type) {
     case MSG_ENSURE_CONNECT:
-        LOG(("  MSG_ENSURE_CONNECT\n"));
+        SOCKET_LOG(("  MSG_ENSURE_CONNECT\n"));
         //
         // ensure that we have created a socket, attached it, and have a
         // connection.
@@ -1427,11 +1427,11 @@ nsSocketTransport::OnSocketEvent(PRUint32 type, nsresult status, nsISupports *pa
         if (mState == STATE_CLOSED)
             mCondition = ResolveHost();
         else
-            LOG(("  ignoring redundant event\n"));
+            SOCKET_LOG(("  ignoring redundant event\n"));
         break;
 
     case MSG_DNS_LOOKUP_COMPLETE:
-        LOG(("  MSG_DNS_LOOKUP_COMPLETE\n"));
+        SOCKET_LOG(("  MSG_DNS_LOOKUP_COMPLETE\n"));
         mDNSRequest = 0;
         if (param) {
             mDNSRecord = static_cast<nsIDNSRecord *>(param);
@@ -1459,35 +1459,35 @@ nsSocketTransport::OnSocketEvent(PRUint32 type, nsresult status, nsISupports *pa
         break;
 
     case MSG_INPUT_CLOSED:
-        LOG(("  MSG_INPUT_CLOSED\n"));
+        SOCKET_LOG(("  MSG_INPUT_CLOSED\n"));
         OnMsgInputClosed(status);
         break;
 
     case MSG_INPUT_PENDING:
-        LOG(("  MSG_INPUT_PENDING\n"));
+        SOCKET_LOG(("  MSG_INPUT_PENDING\n"));
         OnMsgInputPending();
         break;
 
     case MSG_OUTPUT_CLOSED:
-        LOG(("  MSG_OUTPUT_CLOSED\n"));
+        SOCKET_LOG(("  MSG_OUTPUT_CLOSED\n"));
         OnMsgOutputClosed(status);
         break;
 
     case MSG_OUTPUT_PENDING:
-        LOG(("  MSG_OUTPUT_PENDING\n"));
+        SOCKET_LOG(("  MSG_OUTPUT_PENDING\n"));
         OnMsgOutputPending();
         break;
     case MSG_TIMEOUT_CHANGED:
-        LOG(("  MSG_TIMEOUT_CHANGED\n"));
+        SOCKET_LOG(("  MSG_TIMEOUT_CHANGED\n"));
         mPollTimeout = mTimeouts[(mState == STATE_TRANSFERRING)
           ? TIMEOUT_READ_WRITE : TIMEOUT_CONNECT];
         break;
     default:
-        LOG(("  unhandled event!\n"));
+        SOCKET_LOG(("  unhandled event!\n"));
     }
     
     if (NS_FAILED(mCondition)) {
-        LOG(("  after event [this=%x cond=%x]\n", this, mCondition));
+        SOCKET_LOG(("  after event [this=%x cond=%x]\n", this, mCondition));
         if (!mAttached) // need to process this error ourselves...
             OnSocketDetached(nsnull);
     }
@@ -1501,11 +1501,11 @@ nsSocketTransport::OnSocketEvent(PRUint32 type, nsresult status, nsISupports *pa
 void
 nsSocketTransport::OnSocketReady(PRFileDesc *fd, PRInt16 outFlags)
 {
-    LOG(("nsSocketTransport::OnSocketReady [this=%x outFlags=%hd]\n",
+    SOCKET_LOG(("nsSocketTransport::OnSocketReady [this=%x outFlags=%hd]\n",
         this, outFlags));
 
     if (outFlags == -1) {
-        LOG(("socket timeout expired\n"));
+        SOCKET_LOG(("socket timeout expired\n"));
         mCondition = NS_ERROR_NET_TIMEOUT;
         return;
     }
@@ -1557,7 +1557,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, PRInt16 outFlags)
                 mCondition = ErrorAccordingToNSPR(code);
                 if ((mCondition == NS_ERROR_CONNECTION_REFUSED) && !mProxyHost.IsEmpty())
                     mCondition = NS_ERROR_PROXY_CONNECTION_REFUSED;
-                LOG(("  connection failed! [reason=%x]\n", mCondition));
+                SOCKET_LOG(("  connection failed! [reason=%x]\n", mCondition));
             }
         }
     }
@@ -1574,7 +1574,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, PRInt16 outFlags)
 void
 nsSocketTransport::OnSocketDetached(PRFileDesc *fd)
 {
-    LOG(("nsSocketTransport::OnSocketDetached [this=%x cond=%x]\n",
+    SOCKET_LOG(("nsSocketTransport::OnSocketDetached [this=%x cond=%x]\n",
         this, mCondition));
 
     NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
@@ -1651,7 +1651,7 @@ nsSocketTransport::OpenInputStream(PRUint32 flags,
                                    PRUint32 segcount,
                                    nsIInputStream **result)
 {
-    LOG(("nsSocketTransport::OpenInputStream [this=%x flags=%x]\n",
+    SOCKET_LOG(("nsSocketTransport::OpenInputStream [this=%x flags=%x]\n",
         this, flags));
 
     NS_ENSURE_TRUE(!mInput.IsReferenced(), NS_ERROR_UNEXPECTED);
@@ -1699,7 +1699,7 @@ nsSocketTransport::OpenOutputStream(PRUint32 flags,
                                     PRUint32 segcount,
                                     nsIOutputStream **result)
 {
-    LOG(("nsSocketTransport::OpenOutputStream [this=%x flags=%x]\n",
+    SOCKET_LOG(("nsSocketTransport::OpenOutputStream [this=%x flags=%x]\n",
         this, flags));
 
     NS_ENSURE_TRUE(!mOutput.IsReferenced(), NS_ERROR_UNEXPECTED);
diff --git a/netwerk/base/src/nsSocketTransportService2.cpp b/netwerk/base/src/nsSocketTransportService2.cpp
index ac372674c02..7d21140f287 100644
--- a/netwerk/base/src/nsSocketTransportService2.cpp
+++ b/netwerk/base/src/nsSocketTransportService2.cpp
@@ -117,7 +117,7 @@ nsSocketTransportService::GetThreadSafely()
 NS_IMETHODIMP
 nsSocketTransportService::Dispatch(nsIRunnable *event, PRUint32 flags)
 {
-    LOG(("STS dispatch [%p]\n", event));
+    SOCKET_LOG(("STS dispatch [%p]\n", event));
 
     nsCOMPtr<nsIThread> thread = GetThreadSafely();
     NS_ENSURE_TRUE(thread, NS_ERROR_NOT_INITIALIZED);
@@ -144,7 +144,7 @@ nsSocketTransportService::IsOnCurrentThread(PRBool *result)
 NS_IMETHODIMP
 nsSocketTransportService::NotifyWhenCanAttachSocket(nsIRunnable *event)
 {
-    LOG(("nsSocketTransportService::NotifyWhenCanAttachSocket\n"));
+    SOCKET_LOG(("nsSocketTransportService::NotifyWhenCanAttachSocket\n"));
 
     NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
 
@@ -159,7 +159,7 @@ nsSocketTransportService::NotifyWhenCanAttachSocket(nsIRunnable *event)
 NS_IMETHODIMP
 nsSocketTransportService::AttachSocket(PRFileDesc *fd, nsASocketHandler *handler)
 {
-    LOG(("nsSocketTransportService::AttachSocket [handler=%x]\n", handler));
+    SOCKET_LOG(("nsSocketTransportService::AttachSocket [handler=%x]\n", handler));
 
     NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
 
@@ -181,7 +181,7 @@ nsSocketTransportService::AttachSocket(PRFileDesc *fd, nsASocketHandler *handler
 nsresult
 nsSocketTransportService::DetachSocket(SocketContext *sock)
 {
-    LOG(("nsSocketTransportService::DetachSocket [handler=%x]\n", sock->mHandler));
+    SOCKET_LOG(("nsSocketTransportService::DetachSocket [handler=%x]\n", sock->mHandler));
 
     // inform the handler that this socket is going away
     sock->mHandler->OnSocketDetached(sock->mFD);
@@ -213,7 +213,7 @@ nsSocketTransportService::DetachSocket(SocketContext *sock)
 nsresult
 nsSocketTransportService::AddToPollList(SocketContext *sock)
 {
-    LOG(("nsSocketTransportService::AddToPollList [handler=%x]\n", sock->mHandler));
+    SOCKET_LOG(("nsSocketTransportService::AddToPollList [handler=%x]\n", sock->mHandler));
 
     if (mActiveCount == NS_SOCKET_MAX_COUNT) {
         NS_ERROR("too many active sockets");
@@ -227,19 +227,19 @@ nsSocketTransportService::AddToPollList(SocketContext *sock)
     mPollList[mActiveCount].in_flags = sock->mHandler->mPollFlags;
     mPollList[mActiveCount].out_flags = 0;
 
-    LOG(("  active=%u idle=%u\n", mActiveCount, mIdleCount));
+    SOCKET_LOG(("  active=%u idle=%u\n", mActiveCount, mIdleCount));
     return NS_OK;
 }
 
 void
 nsSocketTransportService::RemoveFromPollList(SocketContext *sock)
 {
-    LOG(("nsSocketTransportService::RemoveFromPollList [handler=%x]\n", sock->mHandler));
+    SOCKET_LOG(("nsSocketTransportService::RemoveFromPollList [handler=%x]\n", sock->mHandler));
 
     PRUint32 index = sock - mActiveList;
     NS_ASSERTION(index < NS_SOCKET_MAX_COUNT, "invalid index");
 
-    LOG(("  index=%u mActiveCount=%u\n", index, mActiveCount));
+    SOCKET_LOG(("  index=%u mActiveCount=%u\n", index, mActiveCount));
 
     if (index != mActiveCount-1) {
         mActiveList[index] = mActiveList[mActiveCount-1];
@@ -247,13 +247,13 @@ nsSocketTransportService::RemoveFromPollList(SocketContext *sock)
     }
     mActiveCount--;
 
-    LOG(("  active=%u idle=%u\n", mActiveCount, mIdleCount));
+    SOCKET_LOG(("  active=%u idle=%u\n", mActiveCount, mIdleCount));
 }
 
 nsresult
 nsSocketTransportService::AddToIdleList(SocketContext *sock)
 {
-    LOG(("nsSocketTransportService::AddToIdleList [handler=%x]\n", sock->mHandler));
+    SOCKET_LOG(("nsSocketTransportService::AddToIdleList [handler=%x]\n", sock->mHandler));
 
     if (mIdleCount == NS_SOCKET_MAX_COUNT) {
         NS_ERROR("too many idle sockets");
@@ -263,14 +263,14 @@ nsSocketTransportService::AddToIdleList(SocketContext *sock)
     mIdleList[mIdleCount] = *sock;
     mIdleCount++;
 
-    LOG(("  active=%u idle=%u\n", mActiveCount, mIdleCount));
+    SOCKET_LOG(("  active=%u idle=%u\n", mActiveCount, mIdleCount));
     return NS_OK;
 }
 
 void
 nsSocketTransportService::RemoveFromIdleList(SocketContext *sock)
 {
-    LOG(("nsSocketTransportService::RemoveFromIdleList [handler=%x]\n", sock->mHandler));
+    SOCKET_LOG(("nsSocketTransportService::RemoveFromIdleList [handler=%x]\n", sock->mHandler));
 
     PRUint32 index = sock - &mIdleList[0];
     NS_ASSERTION(index < NS_SOCKET_MAX_COUNT, "invalid index");
@@ -279,7 +279,7 @@ nsSocketTransportService::RemoveFromIdleList(SocketContext *sock)
         mIdleList[index] = mIdleList[mIdleCount-1];
     mIdleCount--;
 
-    LOG(("  active=%u idle=%u\n", mActiveCount, mIdleCount));
+    SOCKET_LOG(("  active=%u idle=%u\n", mActiveCount, mIdleCount));
 }
 
 void
@@ -320,7 +320,7 @@ nsSocketTransportService::PollTimeout()
         if (r < minR)
             minR = r;
     }
-    LOG(("poll timeout: %lu\n", minR));
+    SOCKET_LOG(("poll timeout: %lu\n", minR));
     return PR_SecondsToInterval(minR);
 }
 
@@ -352,13 +352,13 @@ nsSocketTransportService::Poll(PRBool wait, PRUint32 *interval)
 
     PRIntervalTime ts = PR_IntervalNow();
 
-    LOG(("    timeout = %i milliseconds\n",
+    SOCKET_LOG(("    timeout = %i milliseconds\n",
          PR_IntervalToMilliseconds(pollTimeout)));
     PRInt32 rv = PR_Poll(pollList, pollCount, pollTimeout);
 
     PRIntervalTime passedInterval = PR_IntervalNow() - ts;
 
-    LOG(("    ...returned after %i milliseconds\n",
+    SOCKET_LOG(("    ...returned after %i milliseconds\n",
          PR_IntervalToMilliseconds(passedInterval))); 
 
     *interval = PR_IntervalToSeconds(passedInterval);
@@ -409,7 +409,7 @@ nsSocketTransportService::Init()
         //
         if (!mThreadEvent) {
             NS_WARNING("running socket transport thread without a pollable event");
-            LOG(("running socket transport thread without a pollable event"));
+            SOCKET_LOG(("running socket transport thread without a pollable event"));
         }
     }
     
@@ -440,7 +440,7 @@ nsSocketTransportService::Init()
 NS_IMETHODIMP
 nsSocketTransportService::Shutdown()
 {
-    LOG(("nsSocketTransportService::Shutdown\n"));
+    SOCKET_LOG(("nsSocketTransportService::Shutdown\n"));
 
     NS_ENSURE_STATE(NS_IsMainThread());
 
@@ -559,7 +559,7 @@ nsSocketTransportService::AfterProcessNextEvent(nsIThreadInternal* thread,
 NS_IMETHODIMP
 nsSocketTransportService::Run()
 {
-    LOG(("STS thread init\n"));
+    SOCKET_LOG(("STS thread init\n"));
 
     gSocketThread = PR_GetCurrentThread();
 
@@ -589,7 +589,7 @@ nsSocketTransportService::Run()
         NS_ProcessNextEvent(thread);
     }
 
-    LOG(("STS shutting down thread\n"));
+    SOCKET_LOG(("STS shutting down thread\n"));
 
     // detach any sockets
     PRInt32 i;
@@ -604,14 +604,14 @@ nsSocketTransportService::Run()
 
     gSocketThread = nsnull;
 
-    LOG(("STS thread exit\n"));
+    SOCKET_LOG(("STS thread exit\n"));
     return NS_OK;
 }
 
 nsresult
 nsSocketTransportService::DoPollIteration(PRBool wait)
 {
-    LOG(("STS poll iter [%d]\n", wait));
+    SOCKET_LOG(("STS poll iter [%d]\n", wait));
 
     PRInt32 i, count;
 
@@ -629,7 +629,7 @@ nsSocketTransportService::DoPollIteration(PRBool wait)
     count = mIdleCount;
     for (i=mActiveCount-1; i>=0; --i) {
         //---
-        LOG(("  active [%u] { handler=%x condition=%x pollflags=%hu }\n", i,
+        SOCKET_LOG(("  active [%u] { handler=%x condition=%x pollflags=%hu }\n", i,
             mActiveList[i].mHandler,
             mActiveList[i].mHandler->mCondition,
             mActiveList[i].mHandler->mPollFlags));
@@ -649,7 +649,7 @@ nsSocketTransportService::DoPollIteration(PRBool wait)
     }
     for (i=count-1; i>=0; --i) {
         //---
-        LOG(("  idle [%u] { handler=%x condition=%x pollflags=%hu }\n", i,
+        SOCKET_LOG(("  idle [%u] { handler=%x condition=%x pollflags=%hu }\n", i,
             mIdleList[i].mHandler,
             mIdleList[i].mHandler->mCondition,
             mIdleList[i].mHandler->mPollFlags));
@@ -660,14 +660,14 @@ nsSocketTransportService::DoPollIteration(PRBool wait)
             MoveToPollList(&mIdleList[i]);
     }
 
-    LOG(("  calling PR_Poll [active=%u idle=%u]\n", mActiveCount, mIdleCount));
+    SOCKET_LOG(("  calling PR_Poll [active=%u idle=%u]\n", mActiveCount, mIdleCount));
 
     // Measures seconds spent while blocked on PR_Poll
     PRUint32 pollInterval;
 
     PRInt32 n = Poll(wait, &pollInterval);
     if (n < 0) {
-        LOG(("  PR_Poll error [%d]\n", PR_GetError()));
+        SOCKET_LOG(("  PR_Poll error [%d]\n", PR_GetError()));
         pollError = PR_TRUE;
     }
     else {
@@ -722,7 +722,7 @@ nsSocketTransportService::DoPollIteration(PRBool wait)
                 if (!mThreadEvent) {
                     NS_WARNING("running socket transport thread without "
                                "a pollable event");
-                    LOG(("running socket transport thread without "
+                    SOCKET_LOG(("running socket transport thread without "
                          "a pollable event"));
                 }
                 mPollList[0].fd = mThreadEvent;
diff --git a/netwerk/base/src/nsSocketTransportService2.h b/netwerk/base/src/nsSocketTransportService2.h
index 727a0fb2b2f..b21c1bd240f 100644
--- a/netwerk/base/src/nsSocketTransportService2.h
+++ b/netwerk/base/src/nsSocketTransportService2.h
@@ -59,8 +59,8 @@
 //
 extern PRLogModuleInfo *gSocketTransportLog;
 #endif
-#define LOG(args)     PR_LOG(gSocketTransportLog, PR_LOG_DEBUG, args)
-#define LOG_ENABLED() PR_LOG_TEST(gSocketTransportLog, PR_LOG_DEBUG)
+#define SOCKET_LOG(args)     PR_LOG(gSocketTransportLog, PR_LOG_DEBUG, args)
+#define SOCKET_LOG_ENABLED() PR_LOG_TEST(gSocketTransportLog, PR_LOG_DEBUG)
 
 //-----------------------------------------------------------------------------
 

From 1e0ea7a95f436009bac08e79a837be019fc6c21e Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Thu, 28 Oct 2010 10:10:03 -0700
Subject: [PATCH 34/57] Bug 606719 - Browser stalls with connections left
 hanging in TCP close wait state. Part 2: fix it. r=dwitte, a=b7+

---
 netwerk/protocol/http/nsHttpConnectionMgr.cpp | 49 +++++++++++--------
 netwerk/protocol/http/nsHttpHandler.cpp       |  3 +-
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
index 3768d396a5f..0ffe6b8a306 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -206,6 +206,8 @@ nsHttpConnectionMgr::StopPruneDeadConnectionsTimer()
 {
     LOG(("nsHttpConnectionMgr::StopPruneDeadConnectionsTimer\n"));
 
+    // Reset mTimeOfNextWakeUp so that we can find a new shortest value.
+    mTimeOfNextWakeUp = LL_MAXUINT;
     if (mTimer) {
         mTimer->Cancel();
         mTimer = NULL;
@@ -412,8 +414,8 @@ nsHttpConnectionMgr::PruneDeadConnectionsCB(nsHashKey *key, void *data, void *cl
 
     // If time to next expire found is shorter than time to next wake-up, we need to
     // change the time for next wake-up.
+    PRUint32 now = NowInSeconds();
     if (0 < ent->mIdleConns.Length()) {
-        PRUint32 now = NowInSeconds();
         PRUint64 timeOfNextExpire = now + timeToNextExpire;
         // If pruning of dead connections is not already scheduled to happen
         // or time found for next connection to expire is is before
@@ -556,7 +558,8 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap
     LOG(("nsHttpConnectionMgr::AtActiveConnectionLimit [ci=%s caps=%x]\n",
         ci->HashKey().get(), caps));
 
-    // use >= just to be safe
+    // If we have more active connections than the limit, then we're done --
+    // purging idle connections won't get us below it.
     if (mNumActiveConns >= mMaxConns) {
         LOG(("  num active conns == max conns\n"));
         return PR_TRUE;
@@ -602,11 +605,6 @@ nsHttpConnectionMgr::GetConnection(nsConnectionEntry *ent, PRUint8 caps,
 
     *result = nsnull;
 
-    if (AtActiveConnectionLimit(ent, caps)) {
-        LOG(("  at active connection limit!\n"));
-        return;
-    }
-
     nsHttpConnection *conn = nsnull;
 
     if (caps & NS_HTTP_ALLOW_KEEPALIVE) {
@@ -624,15 +622,31 @@ nsHttpConnectionMgr::GetConnection(nsConnectionEntry *ent, PRUint8 caps,
                 LOG(("   reusing connection [conn=%x]\n", conn));
             ent->mIdleConns.RemoveElementAt(0);
             mNumIdleConns--;
+
+            // If there are no idle connections left at all, we need to make
+            // sure that we are not pruning dead connections anymore.
+            if (0 == mNumIdleConns)
+                StopPruneDeadConnectionsTimer();
         }
     }
 
     if (!conn) {
-        // No reusable idle connection found for this entry. If there are no
-        // idle connections left at all, we need to make sure that we are not
-        // pruning dead connections anymore.
-        if (0 == mNumIdleConns)
-            StopPruneDeadConnectionsTimer();
+        // Check if we need to purge an idle connection. Note that we may have
+        // removed one above; if so, this will be a no-op. We do this before
+        // checking the active connection limit to catch the case where we do
+        // have an idle connection, but the purge timer hasn't fired yet.
+        // XXX this just purges a random idle connection.  we should instead
+        // enumerate the entire hash table to find the eldest idle connection.
+        if (mNumIdleConns && mNumIdleConns + mNumActiveConns + 1 >= mMaxConns)
+            mCT.Enumerate(PurgeOneIdleConnectionCB, this);
+
+        // Need to make a new TCP connection. First, we check if we've hit
+        // either the maximum connection limit globally or for this particular
+        // host or proxy. If we have, we're done.
+        if (AtActiveConnectionLimit(ent, caps)) {
+            LOG(("  at active connection limit!\n"));
+            return;
+        }
 
         conn = new nsHttpConnection();
         if (!conn)
@@ -644,15 +658,6 @@ nsHttpConnectionMgr::GetConnection(nsConnectionEntry *ent, PRUint8 caps,
             NS_RELEASE(conn);
             return;
         }
-        
-        // We created a new connection that will become active, purge the
-        // oldest idle connection if we've reached the upper limit.
-        // This only needs to be done if there is a idle connection.
-        if (0 < mNumIdleConns && mNumIdleConns + mNumActiveConns + 1 > mMaxConns)
-            mCT.Enumerate(PurgeOneIdleConnectionCB, this);
-
-        // XXX this just purges a random idle connection.  we should instead
-        // enumerate the entire hash table to find the eldest idle connection.
     }
 
     *result = conn;
@@ -932,6 +937,8 @@ nsHttpConnectionMgr::OnMsgPruneDeadConnections(PRInt32, void *)
 {
     LOG(("nsHttpConnectionMgr::OnMsgPruneDeadConnections\n"));
 
+    // Reset mTimeOfNextWakeUp so that we can find a new shortest value.
+    mTimeOfNextWakeUp = LL_MAXUINT;
     if (mNumIdleConns > 0) 
         mCT.Enumerate(PruneDeadConnectionsCB, this);
 }
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 84ca43b6acc..96b0a8ab4fb 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -76,6 +76,7 @@
 #include "nsNetUtil.h"
 #include "nsIOService.h"
 #include "nsAsyncRedirectVerifyHelper.h"
+#include "nsSocketTransportService2.h"
 
 #include "nsIXULAppInfo.h"
 
@@ -854,7 +855,7 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
     if (PREF_CHANGED(HTTP_PREF("max-connections"))) {
         rv = prefs->GetIntPref(HTTP_PREF("max-connections"), &val);
         if (NS_SUCCEEDED(rv)) {
-            mMaxConnections = (PRUint16) NS_CLAMP(val, 1, 0xffff);
+            mMaxConnections = (PRUint16) NS_CLAMP(val, 1, NS_SOCKET_MAX_COUNT);
             if (mConnMgr)
                 mConnMgr->UpdateParam(nsHttpConnectionMgr::MAX_CONNECTIONS,
                                       mMaxConnections);

From 56ab4247188b00ff7811ec174ddfee5fe1738c42 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Thu, 28 Oct 2010 12:21:04 -0700
Subject: [PATCH 35/57] Bug 606076: XUL fastload is not cleared when new
 extensions are installed. r=bsmedberg, a=blocks-beta7

---
 .../xul/document/src/nsXULPrototypeCache.cpp  | 42 ++++++++++++-------
 .../test/xpcshell/test_bug594058.js           | 20 ++++++++-
 .../extensions/test/xpcshell/test_startup.js  | 31 ++++++++++++++
 3 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/content/xul/document/src/nsXULPrototypeCache.cpp b/content/xul/document/src/nsXULPrototypeCache.cpp
index 9639526ede4..b71fdd2518e 100644
--- a/content/xul/document/src/nsXULPrototypeCache.cpp
+++ b/content/xul/document/src/nsXULPrototypeCache.cpp
@@ -145,6 +145,7 @@ NS_NewXULPrototypeCache(nsISupports* aOuter, REFNSIID aIID, void** aResult)
         nsXULPrototypeCache *p = result;
         obsSvc->AddObserver(p, "chrome-flush-skin-caches", PR_FALSE);
         obsSvc->AddObserver(p, "chrome-flush-caches", PR_FALSE);
+        obsSvc->AddObserver(p, "startupcache-invalidate", PR_FALSE);
     }
 
     return rv;
@@ -410,10 +411,6 @@ nsXULPrototypeCache::AbortFastLoads()
     NS_BREAK();
 #endif
 
-    // Save a strong ref to the FastLoad file, so we can remove it after we
-    // close open streams to it.
-    nsCOMPtr<nsIFile> file = gFastLoadFile;
-
     // Flush the XUL cache for good measure, in case we cached a bogus/downrev
     // script, somehow.
     Flush();
@@ -421,29 +418,42 @@ nsXULPrototypeCache::AbortFastLoads()
     // Clear the FastLoad set
     mFastLoadURITable.Clear();
 
-    if (! gFastLoadService)
-        return;
+    nsCOMPtr<nsIFastLoadService> fastLoadService = gFastLoadService;
+    nsCOMPtr<nsIFile> file = gFastLoadFile;
+
+    nsresult rv;
+
+    if (! fastLoadService) {
+        fastLoadService = do_GetFastLoadService();
+        if (! fastLoadService)
+            return;
+
+        rv = fastLoadService->NewFastLoadFile(XUL_FASTLOAD_FILE_BASENAME,
+                                              getter_AddRefs(file));
+        if (NS_FAILED(rv))
+            return;
+    }
 
     // Fetch the current input (if FastLoad file existed) or output (if we're
     // creating the FastLoad file during this app startup) stream.
     nsCOMPtr<nsIObjectInputStream> objectInput;
     nsCOMPtr<nsIObjectOutputStream> objectOutput;
-    gFastLoadService->GetInputStream(getter_AddRefs(objectInput));
-    gFastLoadService->GetOutputStream(getter_AddRefs(objectOutput));
+    fastLoadService->GetInputStream(getter_AddRefs(objectInput));
+    fastLoadService->GetOutputStream(getter_AddRefs(objectOutput));
 
     if (objectOutput) {
-        gFastLoadService->SetOutputStream(nsnull);
+        fastLoadService->SetOutputStream(nsnull);
 
         if (NS_SUCCEEDED(objectOutput->Close()) && gChecksumXULFastLoadFile)
-            gFastLoadService->CacheChecksum(gFastLoadFile,
-                                            objectOutput);
+            fastLoadService->CacheChecksum(file,
+                                           objectOutput);
     }
 
     if (objectInput) {
         // If this is the last of one or more XUL master documents loaded
         // together at app startup, close the FastLoad service's singleton
         // input stream now.
-        gFastLoadService->SetInputStream(nsnull);
+        fastLoadService->SetInputStream(nsnull);
         objectInput->Close();
     }
 
@@ -462,13 +472,15 @@ nsXULPrototypeCache::AbortFastLoads()
         }
         file->MoveToNative(nsnull, NS_LITERAL_CSTRING("Aborted.mfasl"));
 #else
-        file->Remove(PR_FALSE);
+        rv = file->Remove(PR_FALSE);
+        if (NS_FAILED(rv))
+            NS_WARNING("Failed to remove fastload file, fastload data may be outdated");
 #endif
     }
 
     // If the list is empty now, the FastLoad process is done.
-    NS_RELEASE(gFastLoadService);
-    NS_RELEASE(gFastLoadFile);
+    NS_IF_RELEASE(gFastLoadService);
+    NS_IF_RELEASE(gFastLoadFile);
 }
 
 
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js
index 3f8f4801582..1ed8a3638a8 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js
@@ -12,6 +12,10 @@ const Ci = Components.interfaces;
 const extDir = gProfD.clone();
 extDir.append("extensions");
 
+var gFastLoadService = AM_Cc["@mozilla.org/fast-load-service;1"].
+                       getService(AM_Ci.nsIFastLoadService);
+var gFastLoadFile = null;
+
 /**
  * Start the test by installing extensions.
  */
@@ -27,10 +31,19 @@ function run_test() {
     }
   }, "startupcache-invalidate", false);
   createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");
+
+  gFastLoadFile = gFastLoadService.newFastLoadFile("XUL");
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+
   startupManager();
+  // nsAppRunner takes care of clearing this when a new app is installed
+  do_check_true(gFastLoadFile.exists());
 
   installAllFiles([do_get_addon("test_bug594058")], function() {
     restartManager();
+    do_check_false(gFastLoadFile.exists());
+    gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
     do_check_true(cachePurged);
     cachePurged = false;
 
@@ -47,15 +60,20 @@ function run_test() {
     otherFile.lastModifiedTime = pastTime;
 
     restartManager();
+    do_check_false(gFastLoadFile.exists());
+    gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
     cachePurged = false;
 
     otherFile.lastModifiedTime = pastTime + 5000;
     restartManager();
+    do_check_false(gFastLoadFile.exists());
+    gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
     do_check_true(cachePurged);
     cachePurged = false;
 
     restartManager();
-    do_check_true(!cachePurged);
+    do_check_true(gFastLoadFile.exists());
+    do_check_false(cachePurged);
 
     do_test_finished();
   });  
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_startup.js b/toolkit/mozapps/extensions/test/xpcshell/test_startup.js
index d9d9a0c0d5c..e3a4d87d2d8 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_startup.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_startup.js
@@ -85,11 +85,19 @@ registerDirectory("XREUSysExt", userDir.parent);
 const profileDir = gProfD.clone();
 profileDir.append("extensions");
 
+var gFastLoadService = AM_Cc["@mozilla.org/fast-load-service;1"].
+                       getService(AM_Ci.nsIFastLoadService);
+var gFastLoadFile = null;
+
 // Set up the profile
 function run_test() {
   do_test_pending();
   startupManager();
 
+  gFastLoadFile = gFastLoadService.newFastLoadFile("XUL");
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
                                "addon3@tests.mozilla.org",
@@ -127,6 +135,9 @@ function run_test_1() {
   writeInstallRDFForExtension(addon5, profileDir);
 
   restartManager();
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
                                "addon3@tests.mozilla.org",
@@ -203,6 +214,8 @@ function run_test_2() {
   dest.remove(true);
 
   restartManager();
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -257,6 +270,8 @@ function run_test_3() {
   writeInstallRDFForExtension(addon3, profileDir, "addon4@tests.mozilla.org");
 
   restartManager();
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -308,6 +323,8 @@ function run_test_4() {
   Services.prefs.setIntPref("extensions.enabledScopes", AddonManager.SCOPE_SYSTEM);
 
   restartManager();
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -340,6 +357,8 @@ function run_test_5() {
   Services.prefs.setIntPref("extensions.enabledScopes", AddonManager.SCOPE_USER);
 
   restartManager();
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -378,6 +397,8 @@ function run_test_6() {
   Services.prefs.clearUserPref("extensions.enabledScopes");
 
   restartManager();
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -420,6 +441,8 @@ function run_test_7() {
   dest.remove(true);
 
   restartManager();
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -467,6 +490,8 @@ function run_test_8() {
   Services.prefs.setIntPref("extensions.enabledScopes", 0);
 
   restartManager();
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -508,6 +533,8 @@ function run_test_9() {
   writeInstallRDFForExtension(addon2, profileDir);
 
   restartManager();
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -558,6 +585,8 @@ function run_test_10() {
   writeInstallRDFForExtension(addon1, userDir);
 
   restartManager();
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -608,6 +637,8 @@ function run_test_11() {
   dest.remove(true);
 
   restartManager();
+  do_check_false(gFastLoadFile.exists());
+  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",

From 718a765e5ea0c1f008140843c620fe3a15c04109 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Thu, 28 Oct 2010 22:27:52 +0200
Subject: [PATCH 36/57] Delay hiding the plugin window when a delayed stop is
 requested (eg. during frame destruction).  b=604734 r=roc a=blocking2.0:beta7

---
 layout/generic/nsObjectFrame.cpp | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 839c47913d1..59b639b8f7c 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -365,6 +365,7 @@ public:
   static void RemoveFromCARefreshTimer(nsPluginInstanceOwner *aPluginInstance);
   void SetupCARefresh();
   void* FixUpPluginWindow(PRInt32 inPaintState);
+  void HidePluginWindow();
   // Set a flag that (if true) indicates the plugin port info has changed and
   // SetWindow() needs to be called.
   void SetPluginPortChanged(PRBool aState) { mPluginPortChanged = aState; }
@@ -1102,8 +1103,6 @@ nsObjectFrame::CallSetWindow()
   if (IsHidden())
     return;
 
-  PRBool windowless = (window->type == NPWindowTypeDrawable);
-
   // refresh the plugin port as well
   window->window = mInstanceOwner->GetPluginPortFromWidget();
 
@@ -2463,7 +2462,11 @@ DoStopPlugin(nsPluginInstanceOwner *aInstanceOwner, PRBool aDelayedStop)
     
     if (DoDelayedStop(aInstanceOwner, aDelayedStop))
       return;
-    
+
+#if defined(XP_MACOSX)
+    aInstanceOwner->HidePluginWindow();
+#endif
+
     inst->Stop();
 
     nsCOMPtr<nsIPluginHost> pluginHost = do_GetService(MOZ_PLUGIN_HOST_CONTRACTID);
@@ -2554,7 +2557,6 @@ nsObjectFrame::StopPluginInternal(PRBool aDelayedStop)
         nsTArray<nsIWidget::Configuration> configurations;
         GetEmptyClipConfiguration(&configurations);
         parent->ConfigureChildren(configurations);
-        DidSetWidgetGeometry();
       }
     }
     else {
@@ -6429,6 +6431,19 @@ void* nsPluginInstanceOwner::FixUpPluginWindow(PRInt32 inPaintState)
   return nsnull;
 }
 
+void
+nsPluginInstanceOwner::HidePluginWindow()
+{
+  if (!mPluginWindow || !mInstance) {
+    return;
+  }
+
+  mPluginWindow->clipRect.bottom = mPluginWindow->clipRect.top;
+  mPluginWindow->clipRect.right  = mPluginWindow->clipRect.left;
+  mWidgetVisible = PR_FALSE;
+  mInstance->SetWindow(mPluginWindow);
+}
+
 #endif // XP_MACOSX
 
 // Little helper function to resolve relative URL in

From 36138021e18d449613a631b2cec897c2dd39be01 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Thu, 28 Oct 2010 22:48:06 +0200
Subject: [PATCH 37/57] Bug 607974 - Write tests for bug 297761. r=bz a=tests

---
 content/html/content/test/Makefile.in         |  2 +
 content/html/content/test/file_bug297761.html | 13 ++++
 content/html/content/test/test_bug297761.html | 78 +++++++++++++++++++
 3 files changed, 93 insertions(+)
 create mode 100644 content/html/content/test/file_bug297761.html
 create mode 100644 content/html/content/test/test_bug297761.html

diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in
index 53e49ff5975..7170818b06c 100644
--- a/content/html/content/test/Makefile.in
+++ b/content/html/content/test/Makefile.in
@@ -236,6 +236,8 @@ _TEST_FILES = \
 		test_bug600155.html \
 		test_bug556007.html \
 		test_bug606817.html \
+		test_bug297761.html \
+		file_bug297761.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/html/content/test/file_bug297761.html b/content/html/content/test/file_bug297761.html
new file mode 100644
index 00000000000..5e861a00fd3
--- /dev/null
+++ b/content/html/content/test/file_bug297761.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <base href="http://www.mozilla.org/">
+  </head>
+  <body>
+    <form action="">
+      <input type='submit' formaction="">
+      <button type='submit' formaction=""></button>
+      <input id='i' type='image' formaction="">
+    </form>
+  </body>
+</html>
diff --git a/content/html/content/test/test_bug297761.html b/content/html/content/test/test_bug297761.html
new file mode 100644
index 00000000000..4869c8bd4c9
--- /dev/null
+++ b/content/html/content/test/test_bug297761.html
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=297761
+-->
+<head>
+  <title>Test for Bug 297761</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=297761">Mozilla Bug 297761</a>
+<p id="display"></p>
+<div id="content">
+  <iframe src="file_bug297761.html"></iframe>
+  <iframe src="file_bug297761.html"></iframe>
+  <iframe src="file_bug297761.html"></iframe>
+  <iframe src="file_bug297761.html"></iframe>
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 297761 **/
+
+SimpleTest.waitForExplicitFinish();
+
+var nbTests = 4;
+var curTest = 0;
+
+function nextTest()
+{
+  if (curTest == 3) {
+    frames[curTest].document.forms[0].submit();
+  } else {
+    var el = null;
+    if (curTest == 2) {
+      el = frames[curTest].document.getElementById('i');
+    } else {
+      el = frames[curTest].document.forms[0].elements[curTest];
+    }
+
+    el.focus();
+    el.click();
+  }
+}
+
+function frameLoaded(aFrame)
+{
+  var documentLocation = location.href.replace(/\.html.*/, "\.html");
+  is(aFrame.contentWindow.location.href.replace(/\?x=0&y=0/, ""),
+     documentLocation.replace(/test_bug/, "file_bug"),
+     "form should have been submitted to the document location");
+
+  if (++curTest == nbTests) {
+    SimpleTest.finish();
+  } else {
+    nextTest();
+  }
+}
+
+function runTest()
+{
+  // Initialize event handlers.
+  var frames = document.getElementsByTagName('iframe');
+  for (var i=0; i<nbTests; ++i) {
+    frames[i].setAttribute('onload', "frameLoaded(this);");
+  }
+
+  nextTest();
+}
+
+addLoadEvent(runTest);
+
+</script>
+</pre>
+</body>
+</html>

From 90b5861bf19235f4857ec8b20742dcf4b7efed5b Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Thu, 28 Oct 2010 22:48:24 +0200
Subject: [PATCH 38/57] Bug 607957 - Fix test_bug392567.html. r=bz a=tests

---
 content/html/content/test/test_bug392567.html | 101 ++++++++++--------
 1 file changed, 56 insertions(+), 45 deletions(-)

diff --git a/content/html/content/test/test_bug392567.html b/content/html/content/test/test_bug392567.html
index a059dc8144c..e7e76d8d081 100644
--- a/content/html/content/test/test_bug392567.html
+++ b/content/html/content/test/test_bug392567.html
@@ -22,57 +22,68 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=392567
 
 /** Test for Bug 392567 **/
 
-var dataUrl = "http://mochi.test:8888/tests/content/html/content/test/bug392567.jar";
-var jarUrl = "jar:" + dataUrl + "!/index.html";
-var httpUrl = location.href.replace(/\.html.*/, "_404");
-var previousDir = location.href.replace(/test\/[^\/]*$/, "");
+SimpleTest.waitForExplicitFinish();
 
-var form = document.forms.testForm;
-var frame = frames.testFrame;
-document.getElementById("testFrame").onload = processTestResult;
-
-// List of tests to run, each test consists of form action URL and expected result URL
-var tests = [
-  [jarUrl, jarUrl + "?$PARAMS", null],
-  [jarUrl + "?jarTest1=jarTest2", jarUrl + "?$PARAMS", null],
-  [jarUrl + "?jarTest3=jarTest4#jarTest5", jarUrl + "?$PARAMS#jarTest5", null],
-  ["data:text/html,<html></html>", "data:text/html,<html></html>?$PARAMS", null],
-  ["data:text/html,<html>How%20about%20this?</html>", "data:text/html,<html>How%20about%20this?$PARAMS", null],
-  [httpUrl, httpUrl + "?$PARAMS", null],
-  [httpUrl + "?httpTest1=httpTest2", httpUrl + "?$PARAMS", null ],
-  [httpUrl + "?httpTest3=httpTest4#httpTest5", httpUrl + "?$PARAMS#httpTest5", null],
-  ["", jarUrl + "?key=value0", null],
-  [" ", jarUrl + "?key=value0", document.location],
-  ["../", previousDir + "?$PARAMS", previousDir],
-];
-
-var currentTest = -1;
-
-SimpleTest.waitForExplicitFinish(); 
-runNextTest();
-
-function runNextTest() {
-  currentTest++;
-  if (currentTest >= tests.length) {
-    SimpleTest.finish();
+function runTests()
+{
+  if (window.location.search.match(/\?key=value/)) {
     return;
   }
 
-  form.setAttribute("action", tests[currentTest][0]);
-  is(form.action, tests[currentTest][0],
-     "action IDL attribute should reflect the action content attribute");
-  is(form.mozActionUri, tests[currentTest][2] ? tests[currentTest][2] : tests[currentTest][0],
-     "mozActionUri IDL attribute should resolve the action URI");
-  form.key.value = "value" + currentTest;
-  form.submit();
+  var dataUrl = "http://mochi.test:8888/tests/content/html/content/test/bug392567.jar";
+  var jarUrl = "jar:" + dataUrl + "!/index.html";
+  var httpUrl = location.href.replace(/\.html.*/, "_404");
+  var previousDir = location.href.replace(/test\/[^\/]*$/, "");
+  var documentURL = location.href.replace(/\.html.*/, "\.html");
+
+  var form = document.forms.testForm;
+  var frame = frames.testFrame;
+  document.getElementById("testFrame").onload = processTestResult;
+
+  // List of tests to run, each test consists of form action URL and expected result URL
+  var tests = [
+    [jarUrl, jarUrl + "?$PARAMS", null],
+    [jarUrl + "?jarTest1=jarTest2", jarUrl + "?$PARAMS", null],
+    [jarUrl + "?jarTest3=jarTest4#jarTest5", jarUrl + "?$PARAMS#jarTest5", null],
+    ["data:text/html,<html></html>", "data:text/html,<html></html>?$PARAMS", null],
+    ["data:text/html,<html>How%20about%20this?</html>", "data:text/html,<html>How%20about%20this?$PARAMS", null],
+    [httpUrl, httpUrl + "?$PARAMS", null],
+    [httpUrl + "?httpTest1=httpTest2", httpUrl + "?$PARAMS", null ],
+    [httpUrl + "?httpTest3=httpTest4#httpTest5", httpUrl + "?$PARAMS#httpTest5", null],
+    ["", documentURL + "?$PARAMS", null],
+    [" ", documentURL + "?$PARAMS", document.location],
+    ["../", previousDir + "?$PARAMS", previousDir],
+  ];
+
+  var currentTest = -1;
+
+  runNextTest();
+
+  function runNextTest() {
+    currentTest++;
+    if (currentTest >= tests.length) {
+      SimpleTest.finish();
+      return;
+    }
+
+    form.setAttribute("action", tests[currentTest][0]);
+    is(form.action, tests[currentTest][0],
+       "action IDL attribute should reflect the action content attribute");
+    is(form.mozActionUri, tests[currentTest][2] ? tests[currentTest][2] : tests[currentTest][0],
+       "mozActionUri IDL attribute should resolve the action URI");
+    form.key.value = "value" + currentTest;
+    form.submit();
+  }
+
+  function processTestResult() {
+    var expected = tests[currentTest][1].replace(/\$PARAMS/, "key=value" + currentTest);
+    is(frame.location.href, expected, "Submitting to " + tests[currentTest][0]);
+
+    setTimeout(runNextTest, 0);
+  }
 }
 
-function processTestResult() {
-  var expected = tests[currentTest][1].replace(/\$PARAMS/, "key=value" + currentTest);
-  is(frame.location.href, expected, "Submitting to " + tests[currentTest][0]);
-
-  setTimeout(runNextTest, 0);
-}
+addLoadEvent(runTests);
 
 </script>
 </pre>

From 73cab9aeb820bbe03a677094c0446341c45cb6b7 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Thu, 28 Oct 2010 22:49:14 +0200
Subject: [PATCH 39/57] Bug 607145 - form.action, button.formAction and
 input.formAction should be reflected as URL. r=bz a=blocking-b7

---
 .../html/content/src/nsGenericHTMLElement.cpp | 12 ++-
 .../html/content/src/nsHTMLButtonElement.cpp  |  2 +-
 .../html/content/src/nsHTMLFormElement.cpp    | 22 ++----
 .../html/content/src/nsHTMLInputElement.cpp   |  2 +-
 content/html/content/test/Makefile.in         |  1 +
 content/html/content/test/test_bug392567.html | 26 +++----
 content/html/content/test/test_bug566160.html | 33 ---------
 content/html/content/test/test_bug607145.html | 74 +++++++++++++++++++
 dom/interfaces/html/nsIDOMHTMLFormElement.idl |  5 +-
 .../passwordmgr/src/nsLoginManager.js         |  7 +-
 10 files changed, 106 insertions(+), 78 deletions(-)
 create mode 100644 content/html/content/test/test_bug607145.html

diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 8ffe0c2a15a..3f4f67f2f90 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -2131,14 +2131,12 @@ nsGenericHTMLElement::GetURIAttr(nsIAtom* aAttr, nsIAtom* aBaseAttr, nsAString&
 {
   nsCOMPtr<nsIURI> uri;
   PRBool hadAttr = GetURIAttr(aAttr, aBaseAttr, PR_FALSE, getter_AddRefs(uri));
-  if (!hadAttr) {
-    aResult.Truncate();
-    return NS_OK;
-  }
 
-  if (!uri) {
-    // Just return the attr value
-    GetAttr(kNameSpaceID_None, aAttr, aResult);
+  // If the content attribute isn't set or the URL is invalid, the default value
+  // should be returned. The default default value is the empty string and it
+  // looks like no attribute have a specified default value.
+  if (!hadAttr || !uri) {
+    aResult.Truncate();
     return NS_OK;
   }
 
diff --git a/content/html/content/src/nsHTMLButtonElement.cpp b/content/html/content/src/nsHTMLButtonElement.cpp
index 2420d21242a..e9cb26fc35c 100644
--- a/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/content/html/content/src/nsHTMLButtonElement.cpp
@@ -218,7 +218,7 @@ nsHTMLButtonElement::GetForm(nsIDOMHTMLFormElement** aForm)
 NS_IMPL_STRING_ATTR(nsHTMLButtonElement, AccessKey, accesskey)
 NS_IMPL_BOOL_ATTR(nsHTMLButtonElement, Autofocus, autofocus)
 NS_IMPL_BOOL_ATTR(nsHTMLButtonElement, Disabled, disabled)
-NS_IMPL_STRING_ATTR(nsHTMLButtonElement, FormAction, formaction)
+NS_IMPL_URI_ATTR(nsHTMLButtonElement, FormAction, formaction)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLButtonElement, FormEnctype, formenctype,
                                 kFormDefaultEnctype->tag)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLButtonElement, FormMethod, formmethod,
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index bb62ab3ac2c..ffca7972054 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -375,7 +375,7 @@ nsHTMLFormElement::SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
 }
 
 NS_IMPL_STRING_ATTR(nsHTMLFormElement, AcceptCharset, acceptcharset)
-NS_IMPL_STRING_ATTR(nsHTMLFormElement, Action, action)
+NS_IMPL_URI_ATTR(nsHTMLFormElement, Action, action)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLFormElement, Autocomplete, autocomplete,
                                 kFormDefaultAutocomplete->tag)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLFormElement, Enctype, enctype,
@@ -386,17 +386,6 @@ NS_IMPL_BOOL_ATTR(nsHTMLFormElement, NoValidate, novalidate)
 NS_IMPL_STRING_ATTR(nsHTMLFormElement, Name, name)
 NS_IMPL_STRING_ATTR(nsHTMLFormElement, Target, target)
 
-NS_IMETHODIMP
-nsHTMLFormElement::GetMozActionUri(nsAString& aValue)
-{
-  GetAttr(kNameSpaceID_None, nsGkAtoms::action, aValue);
-  if (aValue.IsEmpty()) {
-    // Avoid resolving action="" to the base uri, bug 297761.
-    return NS_OK;
-  }
-  return GetURIAttr(nsGkAtoms::action, nsnull, aValue);
-}
-
 NS_IMETHODIMP
 nsHTMLFormElement::Submit()
 {
@@ -1430,18 +1419,23 @@ nsHTMLFormElement::GetActionURL(nsIURI** aActionURL,
   // attribute specified, it should be used. Otherwise, the action attribute
   // from the form element should be used.
   //
+  // In addition, if action="" or formaction="", we need to make sure we don't
+  // try to resolve the URL but we should submit to the current document.
+  //
   nsAutoString action;
   nsCOMPtr<nsIFormControl> formControl = do_QueryInterface(aOriginatingElement);
   if (formControl && formControl->IsSubmitControl() &&
       aOriginatingElement->GetAttr(kNameSpaceID_None, nsGkAtoms::formaction,
                                    action)) {
-    // Avoid resolving action="" to the base uri, bug 297761.
     if (!action.IsEmpty()) {
       static_cast<nsGenericHTMLElement*>(aOriginatingElement)->
         GetURIAttr(nsGkAtoms::formaction, nsnull, action);
     }
   } else {
-    GetMozActionUri(action);
+    GetAttr(kNameSpaceID_None, nsGkAtoms::action, action);
+    if (!action.IsEmpty()) {
+      GetAction(action);
+    }
   }
 
   //
diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index f56251136a4..cce840d6d78 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -962,7 +962,7 @@ NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLInputElement, Autocomplete, autocomplete,
 NS_IMPL_BOOL_ATTR(nsHTMLInputElement, Autofocus, autofocus)
 //NS_IMPL_BOOL_ATTR(nsHTMLInputElement, Checked, checked)
 NS_IMPL_BOOL_ATTR(nsHTMLInputElement, Disabled, disabled)
-NS_IMPL_STRING_ATTR(nsHTMLInputElement, FormAction, formaction)
+NS_IMPL_URI_ATTR(nsHTMLInputElement, FormAction, formaction)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLInputElement, FormEnctype, formenctype,
                                 kFormDefaultEnctype->tag)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLInputElement, FormMethod, formmethod,
diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in
index 7170818b06c..e84f741f722 100644
--- a/content/html/content/test/Makefile.in
+++ b/content/html/content/test/Makefile.in
@@ -238,6 +238,7 @@ _TEST_FILES = \
 		test_bug606817.html \
 		test_bug297761.html \
 		file_bug297761.html \
+		test_bug607145.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/html/content/test/test_bug392567.html b/content/html/content/test/test_bug392567.html
index e7e76d8d081..766c8e7b870 100644
--- a/content/html/content/test/test_bug392567.html
+++ b/content/html/content/test/test_bug392567.html
@@ -42,17 +42,17 @@ function runTests()
 
   // List of tests to run, each test consists of form action URL and expected result URL
   var tests = [
-    [jarUrl, jarUrl + "?$PARAMS", null],
-    [jarUrl + "?jarTest1=jarTest2", jarUrl + "?$PARAMS", null],
-    [jarUrl + "?jarTest3=jarTest4#jarTest5", jarUrl + "?$PARAMS#jarTest5", null],
-    ["data:text/html,<html></html>", "data:text/html,<html></html>?$PARAMS", null],
-    ["data:text/html,<html>How%20about%20this?</html>", "data:text/html,<html>How%20about%20this?$PARAMS", null],
-    [httpUrl, httpUrl + "?$PARAMS", null],
-    [httpUrl + "?httpTest1=httpTest2", httpUrl + "?$PARAMS", null ],
-    [httpUrl + "?httpTest3=httpTest4#httpTest5", httpUrl + "?$PARAMS#httpTest5", null],
-    ["", documentURL + "?$PARAMS", null],
-    [" ", documentURL + "?$PARAMS", document.location],
-    ["../", previousDir + "?$PARAMS", previousDir],
+    [jarUrl, jarUrl + "?$PARAMS"],
+    [jarUrl + "?jarTest1=jarTest2", jarUrl + "?$PARAMS"],
+    [jarUrl + "?jarTest3=jarTest4#jarTest5", jarUrl + "?$PARAMS#jarTest5"],
+    ["data:text/html,<html></html>", "data:text/html,<html></html>?$PARAMS"],
+    ["data:text/html,<html>How%20about%20this?</html>", "data:text/html,<html>How%20about%20this?$PARAMS"],
+    [httpUrl, httpUrl + "?$PARAMS"],
+    [httpUrl + "?httpTest1=httpTest2", httpUrl + "?$PARAMS"],
+    [httpUrl + "?httpTest3=httpTest4#httpTest5", httpUrl + "?$PARAMS#httpTest5"],
+    ["", documentURL + "?$PARAMS"],
+    [" ", documentURL + "?$PARAMS"],
+    ["../", previousDir + "?$PARAMS"],
   ];
 
   var currentTest = -1;
@@ -67,10 +67,6 @@ function runTests()
     }
 
     form.setAttribute("action", tests[currentTest][0]);
-    is(form.action, tests[currentTest][0],
-       "action IDL attribute should reflect the action content attribute");
-    is(form.mozActionUri, tests[currentTest][2] ? tests[currentTest][2] : tests[currentTest][0],
-       "mozActionUri IDL attribute should resolve the action URI");
     form.key.value = "value" + currentTest;
     form.submit();
   }
diff --git a/content/html/content/test/test_bug566160.html b/content/html/content/test/test_bug566160.html
index cd258ce0b14..c11faaef65d 100644
--- a/content/html/content/test/test_bug566160.html
+++ b/content/html/content/test/test_bug566160.html
@@ -83,41 +83,8 @@ var gTestResults = {
 
 var gPendingLoad = 0; // Has to be set after depending on the frames number.
 
-function checkFormActionAttribute(aElement)
-{
-  ok("formAction" in aElement, "formAction IDL attribute should be available in "
-     + aElement);
-
-  is(aElement.formAction, "", "formAction IDL attribute should be " +
-     "undefined by default");
-  is(aElement.getAttribute('formaction'), null, "formaction content attribute " +
-     "should be the empty string by default");
-
-  aElement.formAction = "foo";
-  is(aElement.getAttribute('formaction'), "foo", "formaction content attribute " +
-     "should be 'foo'.");
-  is(aElement.formAction, "foo", "formAction IDL attribute should reflect " +
-     "the content attribute");
-
-  aElement.setAttribute('formaction', 'bar');
-  is(aElement.getAttribute('formaction'), "bar", "formaction content attribute " +
-     "should be 'foo'.");
-  is(aElement.formAction, "bar", "formAction IDL attribute should reflect " +
-     "the content attribute");
-
-  aElement.removeAttribute('formaction');
-  is(aElement.formAction, "", "formAction IDL attribute should be " +
-     "undefined by default");
-  is(aElement.getAttribute('formaction'), null, "formaction content attribute " +
-     "should be the empty string by default");
-}
-
 function runTests()
 {
-  // First of all, let's check if .formAction and @formaction work correctly.
-  checkFormActionAttribute(document.createElement('input'));
-  checkFormActionAttribute(document.createElement('button'));
-
   // We add a load event for the frames which will be called when the forms
   // will be submitted.
   var frames = [ document.getElementById('frame1'),
diff --git a/content/html/content/test/test_bug607145.html b/content/html/content/test/test_bug607145.html
new file mode 100644
index 00000000000..dd72371de88
--- /dev/null
+++ b/content/html/content/test/test_bug607145.html
@@ -0,0 +1,74 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=607145
+-->
+<head>
+  <title>Test for Bug 607145</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=607145">Mozilla Bug 607145</a>
+<p id="display"></p>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 607145 **/
+
+function reflectURL(aElement, aAttr)
+{
+  var idl = aAttr;
+  var attr = aAttr.toLowerCase();
+  var elmtName = aElement.tagName.toLowerCase();
+
+  ok(idl in aElement, idl + " should be available in " + elmtName);
+
+  // Default values.
+  is(aElement[idl], "", "." + idl + " default value should be the empty string");
+  is(aElement.getAttribute(attr), null,
+     "@" + attr + " default value should be null");
+
+  var previousDir = location.href.replace(/test\/[^\/]*$/, "");
+  var dir = location.href.replace(/test_bug607145.html[^\/]*$/, "");
+  var doc = location.href.replace(/\.html.*/, ".html")
+  var values = [
+    /* value to set, resolved value */
+    [ "foo.html", dir + "foo.html" ],
+    [ "data:text/html,<html></html>", "data:text/html,<html></html>" ],
+    [ "http://example.org/", "http://example.org/" ],
+    [ "//example.org/", "http://example.org/" ],
+    [ "?foo=bar", doc + "?foo=bar" ],
+    [ "#foo", location.href + "#foo" ],
+    [ "", location.href ],
+    [ " ", location.href ],
+    [ "../", previousDir ],
+    [ "...", dir + "..." ],
+    // invalid URL
+    [ "http://a b/", "" ],
+  ];
+
+  for each (var value in values) {
+    aElement[idl] = value[0];
+    is(aElement[idl], value[1], "." + idl + " value should be " + value[1]);
+    is(aElement.getAttribute(attr), value[0],
+       "@" + attr + " value should be " + value[0]);
+  }
+
+  for each (var value in values) {
+    aElement.setAttribute(attr, value[0]);
+    is(aElement[idl], value[1], "." + idl + " value should be " + value[1]);
+    is(aElement.getAttribute(attr), value[0],
+       "@" + attr + " value should be " + value[0]);
+  }
+}
+
+reflectURL(document.createElement("form"), "action");
+reflectURL(document.createElement("input"), "formAction");
+reflectURL(document.createElement("button"), "formAction");
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/interfaces/html/nsIDOMHTMLFormElement.idl b/dom/interfaces/html/nsIDOMHTMLFormElement.idl
index 96da5649277..7d78a2d0035 100644
--- a/dom/interfaces/html/nsIDOMHTMLFormElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLFormElement.idl
@@ -47,7 +47,7 @@
  * http://www.w3.org/TR/DOM-Level-2-HTML/
  */
 
-[scriptable, uuid(653dc482-d6db-4e85-bdd9-151fd110e7b1)]
+[scriptable, uuid(0884ce23-e069-499e-a13c-a91c8ae0fc98)]
 interface nsIDOMHTMLFormElement : nsIDOMHTMLElement
 {
            attribute DOMString            name;
@@ -65,7 +65,4 @@ interface nsIDOMHTMLFormElement : nsIDOMHTMLElement
 
   void                      submit();
   void                      reset();
-
-  // This property returns the resolved action URI.
-  readonly attribute DOMString            mozActionUri;
 };
diff --git a/toolkit/components/passwordmgr/src/nsLoginManager.js b/toolkit/components/passwordmgr/src/nsLoginManager.js
index 25140729414..4b7cfb7cfcc 100644
--- a/toolkit/components/passwordmgr/src/nsLoginManager.js
+++ b/toolkit/components/passwordmgr/src/nsLoginManager.js
@@ -978,11 +978,12 @@ LoginManager.prototype = {
     },
 
     _getActionOrigin : function (form) {
-        var uriString = form.mozActionUri;
+        var uriString = form.action;
 
-        // A blank or mission action submits to where it came from.
+        // If uriString equals the empty string that means actian attribute is
+        // missing or invalid and it will submit to the baseURI.
         if (uriString == "")
-            uriString = form.baseURI; // ala bug 297761
+            uriString = form.baseURI;
 
         return this._getPasswordOrigin(uriString, true);
     },

From bd35561129a1b28cc51f22000e22378b2e57b59b Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Thu, 28 Oct 2010 14:03:26 -0700
Subject: [PATCH 40/57] test fix and some cleanup - Bug 607545 - Intermittent
 browser_bug562797.js | Test timed out *followed* by other errors.
 r=dtownsend, a=test fix

---
 .../test/browser/browser_bug557943.js         | 155 +++++++++---------
 .../test/browser/browser_bug557956.js         |   3 +-
 .../test/browser/browser_bug562797.js         |   4 +-
 3 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557943.js b/toolkit/mozapps/extensions/test/browser/browser_bug557943.js
index 34bb5ba00eb..e7f60741fa7 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug557943.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug557943.js
@@ -1,77 +1,78 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Bug 557943 - Searching for addons can result in wrong results
-
-var gManagerWindow;
-
-function test() {
-  waitForExplicitFinish();
-
-  gProvider = new MockProvider();
-
-  gProvider.createAddons([{
-    id: "addon1@tests.mozilla.org",
-    name: "Microsoft .NET Framework Assistant",
-    description: "",
-    version: "6.66"
-  }, {
-    id: "addon2@tests.mozilla.org",
-    name: "AwesomeNet Addon",
-    description: ""
-  }, {
-    id: "addon3@tests.mozilla.org",
-    name: "Dictionnaire MySpell en Francais (réforme 1990)",
-    description: ""
-  }]);
-
-  open_manager("addons://list/extension", function(aWindow) {
-    gManagerWindow = aWindow;
-    run_next_test();
-  });
-}
-
-function end_test() {
-  close_manager(gManagerWindow, function() {
-    finish();
-  });
-}
-
-
-function perform_search(aQuery, aCallback) {
-  var searchBox = gManagerWindow.document.getElementById("header-search");
-  searchBox.value = aQuery;
-
-  EventUtils.synthesizeMouse(searchBox, 2, 2, { }, gManagerWindow);
-  EventUtils.synthesizeKey("VK_RETURN", { }, gManagerWindow);
-  wait_for_view_load(gManagerWindow, function() {
-    var list = gManagerWindow.document.getElementById("search-list");
-    var rows = list.getElementsByTagName("richlistitem");
-    aCallback(rows);
-  });
-}
-
-
-add_test(function() {
-  perform_search(".net", function(aRows) {
-    is(aRows.length, 1, "Should only get one result");
-    is(aRows[0].mAddon.id, "addon1@tests.mozilla.org", "Should get expected addon as only result");
-    run_next_test();
-  });
-});
-
-add_test(function() {
-  perform_search("réf", function(aRows) {
-    is(aRows.length, 1, "Should only get one result");
-    is(aRows[0].mAddon.id, "addon3@tests.mozilla.org", "Should get expected addon as only result");
-    run_next_test();
-  });
-});
-
-add_test(function() {
-  perform_search("javascript:void()", function(aRows) {
-    is(aRows.length, 0, "Should not get any results");
-    run_next_test();
-  });
-});
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Bug 557943 - Searching for addons can result in wrong results
+
+var gManagerWindow;
+var gProvider;
+
+function test() {
+  waitForExplicitFinish();
+
+  gProvider = new MockProvider();
+
+  gProvider.createAddons([{
+    id: "addon1@tests.mozilla.org",
+    name: "Microsoft .NET Framework Assistant",
+    description: "",
+    version: "6.66"
+  }, {
+    id: "addon2@tests.mozilla.org",
+    name: "AwesomeNet Addon",
+    description: ""
+  }, {
+    id: "addon3@tests.mozilla.org",
+    name: "Dictionnaire MySpell en Francais (réforme 1990)",
+    description: ""
+  }]);
+
+  open_manager("addons://list/extension", function(aWindow) {
+    gManagerWindow = aWindow;
+    run_next_test();
+  });
+}
+
+function end_test() {
+  close_manager(gManagerWindow, function() {
+    finish();
+  });
+}
+
+
+function perform_search(aQuery, aCallback) {
+  var searchBox = gManagerWindow.document.getElementById("header-search");
+  searchBox.value = aQuery;
+
+  EventUtils.synthesizeMouse(searchBox, 2, 2, { }, gManagerWindow);
+  EventUtils.synthesizeKey("VK_RETURN", { }, gManagerWindow);
+  wait_for_view_load(gManagerWindow, function() {
+    var list = gManagerWindow.document.getElementById("search-list");
+    var rows = list.getElementsByTagName("richlistitem");
+    aCallback(rows);
+  });
+}
+
+
+add_test(function() {
+  perform_search(".net", function(aRows) {
+    is(aRows.length, 1, "Should only get one result");
+    is(aRows[0].mAddon.id, "addon1@tests.mozilla.org", "Should get expected addon as only result");
+    run_next_test();
+  });
+});
+
+add_test(function() {
+  perform_search("réf", function(aRows) {
+    is(aRows.length, 1, "Should only get one result");
+    is(aRows[0].mAddon.id, "addon3@tests.mozilla.org", "Should get expected addon as only result");
+    run_next_test();
+  });
+});
+
+add_test(function() {
+  perform_search("javascript:void()", function(aRows) {
+    is(aRows.length, 0, "Should not get any results");
+    run_next_test();
+  });
+});
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557956.js b/toolkit/mozapps/extensions/test/browser/browser_bug557956.js
index 3575dc5a5f4..8f172f6a22f 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug557956.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug557956.js
@@ -119,7 +119,8 @@ function open_compatibility_window(aInactiveAddonIds, aCallback) {
     info("Compatibility dialog opened");
 
     function page_shown(aEvent) {
-      info("Page " + aEvent.target.id + " shown");
+      if (aEvent.target.pageid)
+        info("Page " + aEvent.target.pageid + " shown");
     }
 
     win.addEventListener("pageshow", page_shown, false);
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug562797.js b/toolkit/mozapps/extensions/test/browser/browser_bug562797.js
index a54302445c5..e2f8f87f8ae 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562797.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug562797.js
@@ -7,7 +7,9 @@
  */
 
 function test() {
-  requestLongerTimeout(2);
+  // Set the timeout to 300 seconds since this test can easily take 220 seconds
+  // to run on a Windows debug build when it runs in a tab.
+  requestLongerTimeout(10);
 
   waitForExplicitFinish();
 

From 52980d792ecf9a7ad287d16e03ab54495257c81a Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Thu, 28 Oct 2010 14:03:52 -0700
Subject: [PATCH 41/57] test cleanup - Bug 607545 - Intermittent
 browser_bug562797.js | Test timed out *followed* by other errors.
 r=dtownsend, a=test fix

---
 .../extensions/test/browser/addon_prefs.xul   |  10 +-
 .../test/browser/browser_bug567127.js         | 318 ++++----
 .../test/browser/browser_bug581076.js         | 258 +++----
 .../test/browser/browser_bug587970.js         | 304 ++++----
 .../test/browser/browser_bug591465.js         | 702 +++++++++---------
 .../test/browser/browser_details.js           |   1 +
 .../test/browser/browser_globalwarnings.js    | 130 ++--
 .../test/browser/browser_manualupdates.js     | 376 +++++-----
 .../test/browser/browser_recentupdates.js     | 172 ++---
 .../mozapps/extensions/test/browser/head.js   |   4 +-
 .../test/browser/releaseNotes.xhtml           |  30 +-
 .../test/xpinstall/browser_auth4.js           |   2 +
 .../test/xpinstall/browser_cancel.js          |   3 +-
 .../test/xpinstall/browser_multipackage.js    |   1 +
 .../test/xpinstall/browser_signed_multiple.js |   1 +
 .../test/xpinstall/browser_signed_naming.js   |   1 +
 .../mozapps/extensions/test/xpinstall/head.js |   6 +-
 17 files changed, 1163 insertions(+), 1156 deletions(-)

diff --git a/toolkit/mozapps/extensions/test/browser/addon_prefs.xul b/toolkit/mozapps/extensions/test/browser/addon_prefs.xul
index 713ea86a2b9..d058af2c5cd 100644
--- a/toolkit/mozapps/extensions/test/browser/addon_prefs.xul
+++ b/toolkit/mozapps/extensions/test/browser/addon_prefs.xul
@@ -1,5 +1,5 @@
-<?xml version="1.0"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="addon-test-pref-window">
-  <label value="Oh hai!"/>
-</window>
+<?xml version="1.0"?>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        id="addon-test-pref-window">
+  <label value="Oh hai!"/>
+</window>
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug567127.js b/toolkit/mozapps/extensions/test/browser/browser_bug567127.js
index a9dfa8b12df..bed62f04f23 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug567127.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug567127.js
@@ -1,159 +1,159 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests bug 567127 - Add install button to the add-ons manager
-
-
-var gFilePickerFiles = [];
-var gMockFilePickerFactory;
-var gMockFilePickerFactoryCID;
-var gManagerWindow;
-
-function MockFilePicker() { }
-
-MockFilePicker.prototype = {
-  QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIFilePicker]),
-  init: function(aParent, aTitle, aMode) { },
-  appendFilters: function(aFilterMask) { },
-  appendFilter: function(aTitle, aFilter) { },
-  defaultString: "",
-  defaultExtension: "",
-  filterIndex: 0,
-  displayDirectory: null,
-  file: null,
-  fileURL: null,
-  get files() {
-    var i = 0;
-    return {
-      getNext: function() gFilePickerFiles[i++],
-      hasMoreElements: function() gFilePickerFiles.length > i
-    };
-  },
-  show: function() {
-    return gFilePickerFiles.length == 0 ?
-           Components.interfaces.nsIFilePicker.returnCancel :
-           Components.interfaces.nsIFilePicker.returnOK;
-  }
-};
-
-// This listens for the next opened window and checks it is of the right url.
-// opencallback is called when the new window is fully loaded
-// closecallback is called when the window is closed
-function WindowOpenListener(url, opencallback, closecallback) {
-  this.url = url;
-  this.opencallback = opencallback;
-  this.closecallback = closecallback;
-
-  var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                     .getService(Components.interfaces.nsIWindowMediator);
-  wm.addListener(this);
-}
-
-WindowOpenListener.prototype = {
-  url: null,
-  opencallback: null,
-  closecallback: null,
-  window: null,
-  domwindow: null,
-
-  handleEvent: function(event) {
-    is(this.domwindow.document.location.href, this.url, "Should have opened the correct window");
-
-    this.domwindow.removeEventListener("load", this, false);
-    // Allow any other load handlers to execute
-    var self = this;
-    executeSoon(function() { self.opencallback(self.domwindow); } );
-  },
-
-  onWindowTitleChange: function(window, title) {
-  },
-
-  onOpenWindow: function(window) {
-    if (this.window)
-      return;
-
-    this.window = window;
-    this.domwindow = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                           .getInterface(Components.interfaces.nsIDOMWindowInternal);
-    this.domwindow.addEventListener("load", this, false);
-  },
-
-  onCloseWindow: function(window) {
-    if (this.window != window)
-      return;
-
-    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                       .getService(Components.interfaces.nsIWindowMediator);
-    wm.removeListener(this);
-    this.opencallback = null;
-    this.window = null;
-    this.domwindow = null;
-
-    // Let the window close complete
-    executeSoon(this.closecallback);
-    this.closecallback = null;
-  }
-};
-
-
-function test_confirmation(aWindow, aExpectedURLs) {
-  var list = aWindow.document.getElementById("itemList");
-  is(list.childNodes.length, aExpectedURLs.length, "Should be the right number of installs");
-
-  aExpectedURLs.forEach(function(aURL) {
-    var node = list.firstChild;
-    while (node) {
-      if (node.url == aURL) {
-        ok(true, "Should have seen " + aURL + " in the list");
-        return;
-      }
-      node = node.nextSibling;
-    }
-    ok(false, "Should have seen " + aURL + " in the list");
-  });
-
-  aWindow.document.documentElement.cancelDialog();
-}
-
-
-function test() {
-  waitForExplicitFinish();
-  
-  gMockFilePickerFactoryCID = Components.ID("{4f595df2-9108-42c6-9910-0dc392a310c9}");
-  gMockFilePickerFactory = XPCOMUtils._getFactory(MockFilePicker);
-  var compReg = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
-  compReg.registerFactory(gMockFilePickerFactoryCID,
-                          "Mock FilePicker",
-                          "@mozilla.org/filepicker;1",
-                          gMockFilePickerFactory);
-
-  open_manager("addons://list/extension", function(aWindow) {
-    gManagerWindow = aWindow;
-    run_next_test();
-  });
-}
-
-function end_test() {
-  var compReg = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
-  compReg.unregisterFactory(gMockFilePickerFactoryCID,
-                            gMockFilePickerFactory);
-  close_manager(gManagerWindow, function() {
-    finish();
-  });
-}
-
-
-add_test(function() {
-  var filePaths = [
-                   get_addon_file_url("browser_bug567127_1.xpi"),
-                   get_addon_file_url("browser_bug567127_2.xpi")
-                  ];
-  gFilePickerFiles = filePaths.map(function(aPath) aPath.file);
-  
-  new WindowOpenListener(INSTALL_URI, function(aWindow) {
-    test_confirmation(aWindow, filePaths.map(function(aPath) aPath.spec));
-  }, run_next_test);
-  
-  gManagerWindow.gViewController.doCommand("cmd_installFromFile");
-});
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Tests bug 567127 - Add install button to the add-ons manager
+
+
+var gFilePickerFiles = [];
+var gMockFilePickerFactory;
+var gMockFilePickerFactoryCID;
+var gManagerWindow;
+
+function MockFilePicker() { }
+
+MockFilePicker.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIFilePicker]),
+  init: function(aParent, aTitle, aMode) { },
+  appendFilters: function(aFilterMask) { },
+  appendFilter: function(aTitle, aFilter) { },
+  defaultString: "",
+  defaultExtension: "",
+  filterIndex: 0,
+  displayDirectory: null,
+  file: null,
+  fileURL: null,
+  get files() {
+    var i = 0;
+    return {
+      getNext: function() gFilePickerFiles[i++],
+      hasMoreElements: function() gFilePickerFiles.length > i
+    };
+  },
+  show: function() {
+    return gFilePickerFiles.length == 0 ?
+           Components.interfaces.nsIFilePicker.returnCancel :
+           Components.interfaces.nsIFilePicker.returnOK;
+  }
+};
+
+// This listens for the next opened window and checks it is of the right url.
+// opencallback is called when the new window is fully loaded
+// closecallback is called when the window is closed
+function WindowOpenListener(url, opencallback, closecallback) {
+  this.url = url;
+  this.opencallback = opencallback;
+  this.closecallback = closecallback;
+
+  var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                     .getService(Components.interfaces.nsIWindowMediator);
+  wm.addListener(this);
+}
+
+WindowOpenListener.prototype = {
+  url: null,
+  opencallback: null,
+  closecallback: null,
+  window: null,
+  domwindow: null,
+
+  handleEvent: function(event) {
+    is(this.domwindow.document.location.href, this.url, "Should have opened the correct window");
+
+    this.domwindow.removeEventListener("load", this, false);
+    // Allow any other load handlers to execute
+    var self = this;
+    executeSoon(function() { self.opencallback(self.domwindow); } );
+  },
+
+  onWindowTitleChange: function(window, title) {
+  },
+
+  onOpenWindow: function(window) {
+    if (this.window)
+      return;
+
+    this.window = window;
+    this.domwindow = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                           .getInterface(Components.interfaces.nsIDOMWindowInternal);
+    this.domwindow.addEventListener("load", this, false);
+  },
+
+  onCloseWindow: function(window) {
+    if (this.window != window)
+      return;
+
+    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                       .getService(Components.interfaces.nsIWindowMediator);
+    wm.removeListener(this);
+    this.opencallback = null;
+    this.window = null;
+    this.domwindow = null;
+
+    // Let the window close complete
+    executeSoon(this.closecallback);
+    this.closecallback = null;
+  }
+};
+
+
+function test_confirmation(aWindow, aExpectedURLs) {
+  var list = aWindow.document.getElementById("itemList");
+  is(list.childNodes.length, aExpectedURLs.length, "Should be the right number of installs");
+
+  aExpectedURLs.forEach(function(aURL) {
+    var node = list.firstChild;
+    while (node) {
+      if (node.url == aURL) {
+        ok(true, "Should have seen " + aURL + " in the list");
+        return;
+      }
+      node = node.nextSibling;
+    }
+    ok(false, "Should have seen " + aURL + " in the list");
+  });
+
+  aWindow.document.documentElement.cancelDialog();
+}
+
+
+function test() {
+  waitForExplicitFinish();
+  
+  gMockFilePickerFactoryCID = Components.ID("{4f595df2-9108-42c6-9910-0dc392a310c9}");
+  gMockFilePickerFactory = XPCOMUtils._getFactory(MockFilePicker);
+  var compReg = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
+  compReg.registerFactory(gMockFilePickerFactoryCID,
+                          "Mock FilePicker",
+                          "@mozilla.org/filepicker;1",
+                          gMockFilePickerFactory);
+
+  open_manager("addons://list/extension", function(aWindow) {
+    gManagerWindow = aWindow;
+    run_next_test();
+  });
+}
+
+function end_test() {
+  var compReg = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
+  compReg.unregisterFactory(gMockFilePickerFactoryCID,
+                            gMockFilePickerFactory);
+  close_manager(gManagerWindow, function() {
+    finish();
+  });
+}
+
+
+add_test(function() {
+  var filePaths = [
+                   get_addon_file_url("browser_bug567127_1.xpi"),
+                   get_addon_file_url("browser_bug567127_2.xpi")
+                  ];
+  gFilePickerFiles = filePaths.map(function(aPath) aPath.file);
+  
+  new WindowOpenListener(INSTALL_URI, function(aWindow) {
+    test_confirmation(aWindow, filePaths.map(function(aPath) aPath.spec));
+  }, run_next_test);
+  
+  gManagerWindow.gViewController.doCommand("cmd_installFromFile");
+});
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug581076.js b/toolkit/mozapps/extensions/test/browser/browser_bug581076.js
index 63928f1ac1a..ea78b0a73f3 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug581076.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug581076.js
@@ -1,129 +1,129 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Bug 581076 - No "See all results" link present when searching for add-ons and not all are displayed (extensions.getAddons.maxResults)
-
-const PREF_GETADDONS_BROWSESEARCHRESULTS = "extensions.getAddons.search.browseURL";
-const PREF_GETADDONS_GETSEARCHRESULTS = "extensions.getAddons.search.url";
-const PREF_GETADDONS_MAXRESULTS = "extensions.getAddons.maxResults";
-const SEARCH_URL = TESTROOT + "browser_searching.xml";
-const SEARCH_EXPECTED_TOTAL = 100;
-const SEARCH_QUERY = "search";
-
-var gManagerWindow;
-
-
-function test() {
-  Services.prefs.setCharPref(PREF_GETADDONS_GETSEARCHRESULTS, SEARCH_URL);
-  Services.prefs.setIntPref(PREF_SEARCH_MAXRESULTS, 15);
-
-  waitForExplicitFinish();
-
-  open_manager("addons://list/extension", function(aWindow) {
-    gManagerWindow = aWindow;
-    run_next_test();
-  });
-}
-
-function end_test() {
-  Services.prefs.clearUserPref(PREF_GETADDONS_GETSEARCHRESULTS);
-
-  // Test generates a lot of available installs so just cancel them all
-  AddonManager.getAllInstalls(function(aInstalls) {
-    aInstalls.forEach(function(aInstall) {
-      aInstall.cancel();
-    });
-
-    close_manager(gManagerWindow, finish);
-  });
-}
-
-function search(aRemoteSearch, aCallback) {
-  var searchBox = gManagerWindow.document.getElementById("header-search");
-  searchBox.value = SEARCH_QUERY;
-
-  EventUtils.synthesizeMouseAtCenter(searchBox, { }, gManagerWindow);
-  EventUtils.synthesizeKey("VK_RETURN", { }, gManagerWindow);
-
-  wait_for_view_load(gManagerWindow, function() {
-    if (aRemoteSearch)
-      var filter = gManagerWindow.document.getElementById("search-filter-remote");
-    else
-      var filter = gManagerWindow.document.getElementById("search-filter-local");
-    EventUtils.synthesizeMouseAtCenter(filter, { }, gManagerWindow);
-
-    executeSoon(aCallback);
-  });
-}
-
-function check_allresultslink(aShouldShow) {
-  var list = gManagerWindow.document.getElementById("search-list");
-  var link = gManagerWindow.document.getElementById("search-allresults-link");
-  is(link.parentNode, list.lastChild, "Footer should be at the end of the richlistbox");
-  if (aShouldShow) {
-    is_element_visible(link, "All Results link should be visible");
-    is(link.value, "See all " + SEARCH_EXPECTED_TOTAL + " results", "All Results link should show the correct message");
-    var scope = {};
-    Components.utils.import("resource://gre/modules/AddonRepository.jsm", scope);
-    is(link.href, scope.AddonRepository.getSearchURL(SEARCH_QUERY), "All Results link should have the correct href");
-  } else {
-    is_element_hidden(link, "All Results link should be hidden");
-  }
-}
-
-add_test(function() {
-  info("Searching locally");
-  search(false, function() {
-    check_allresultslink(false);
-    restart_manager(gManagerWindow, null, function(aManager) {
-      gManagerWindow = aManager;
-      run_next_test();
-    });
-  });
-});
-
-add_test(function() {
-  info("Searching remotely - more results than cap");
-  Services.prefs.setIntPref(PREF_GETADDONS_MAXRESULTS, 3);
-  search(true, function() {
-    check_allresultslink(true);
-    restart_manager(gManagerWindow, null, function(aManager) {
-      gManagerWindow = aManager;
-      run_next_test();
-    });
-  });
-});
-
-add_test(function() {
-  info("Searching remotely - less results than cap");
-  Services.prefs.setIntPref(PREF_GETADDONS_MAXRESULTS, 200);
-  search(true, function() {
-    check_allresultslink(false);
-    restart_manager(gManagerWindow, null, function(aManager) {
-      gManagerWindow = aManager;
-      run_next_test();
-    });
-  });
-});
-
-add_test(function() {
-  info("Searching remotely - more results than cap");
-  Services.prefs.setIntPref(PREF_GETADDONS_MAXRESULTS, 3);
-  search(true, function() {
-    check_allresultslink(true);
-    run_next_test();
-  });
-});
-
-add_test(function() {
-  info("Switching views");
-  gManagerWindow.loadView("addons://list/extension");
-  wait_for_view_load(gManagerWindow, function() {
-    info("Re-loading previous search");
-    search(true, function() {
-      check_allresultslink(true);
-      run_next_test();
-    });
-  });
-});
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Bug 581076 - No "See all results" link present when searching for add-ons and not all are displayed (extensions.getAddons.maxResults)
+
+const PREF_GETADDONS_BROWSESEARCHRESULTS = "extensions.getAddons.search.browseURL";
+const PREF_GETADDONS_GETSEARCHRESULTS = "extensions.getAddons.search.url";
+const PREF_GETADDONS_MAXRESULTS = "extensions.getAddons.maxResults";
+const SEARCH_URL = TESTROOT + "browser_searching.xml";
+const SEARCH_EXPECTED_TOTAL = 100;
+const SEARCH_QUERY = "search";
+
+var gManagerWindow;
+
+
+function test() {
+  Services.prefs.setCharPref(PREF_GETADDONS_GETSEARCHRESULTS, SEARCH_URL);
+  Services.prefs.setIntPref(PREF_SEARCH_MAXRESULTS, 15);
+
+  waitForExplicitFinish();
+
+  open_manager("addons://list/extension", function(aWindow) {
+    gManagerWindow = aWindow;
+    run_next_test();
+  });
+}
+
+function end_test() {
+  Services.prefs.clearUserPref(PREF_GETADDONS_GETSEARCHRESULTS);
+
+  // Test generates a lot of available installs so just cancel them all
+  AddonManager.getAllInstalls(function(aInstalls) {
+    aInstalls.forEach(function(aInstall) {
+      aInstall.cancel();
+    });
+
+    close_manager(gManagerWindow, finish);
+  });
+}
+
+function search(aRemoteSearch, aCallback) {
+  var searchBox = gManagerWindow.document.getElementById("header-search");
+  searchBox.value = SEARCH_QUERY;
+
+  EventUtils.synthesizeMouseAtCenter(searchBox, { }, gManagerWindow);
+  EventUtils.synthesizeKey("VK_RETURN", { }, gManagerWindow);
+
+  wait_for_view_load(gManagerWindow, function() {
+    if (aRemoteSearch)
+      var filter = gManagerWindow.document.getElementById("search-filter-remote");
+    else
+      var filter = gManagerWindow.document.getElementById("search-filter-local");
+    EventUtils.synthesizeMouseAtCenter(filter, { }, gManagerWindow);
+
+    executeSoon(aCallback);
+  });
+}
+
+function check_allresultslink(aShouldShow) {
+  var list = gManagerWindow.document.getElementById("search-list");
+  var link = gManagerWindow.document.getElementById("search-allresults-link");
+  is(link.parentNode, list.lastChild, "Footer should be at the end of the richlistbox");
+  if (aShouldShow) {
+    is_element_visible(link, "All Results link should be visible");
+    is(link.value, "See all " + SEARCH_EXPECTED_TOTAL + " results", "All Results link should show the correct message");
+    var scope = {};
+    Components.utils.import("resource://gre/modules/AddonRepository.jsm", scope);
+    is(link.href, scope.AddonRepository.getSearchURL(SEARCH_QUERY), "All Results link should have the correct href");
+  } else {
+    is_element_hidden(link, "All Results link should be hidden");
+  }
+}
+
+add_test(function() {
+  info("Searching locally");
+  search(false, function() {
+    check_allresultslink(false);
+    restart_manager(gManagerWindow, null, function(aManager) {
+      gManagerWindow = aManager;
+      run_next_test();
+    });
+  });
+});
+
+add_test(function() {
+  info("Searching remotely - more results than cap");
+  Services.prefs.setIntPref(PREF_GETADDONS_MAXRESULTS, 3);
+  search(true, function() {
+    check_allresultslink(true);
+    restart_manager(gManagerWindow, null, function(aManager) {
+      gManagerWindow = aManager;
+      run_next_test();
+    });
+  });
+});
+
+add_test(function() {
+  info("Searching remotely - less results than cap");
+  Services.prefs.setIntPref(PREF_GETADDONS_MAXRESULTS, 200);
+  search(true, function() {
+    check_allresultslink(false);
+    restart_manager(gManagerWindow, null, function(aManager) {
+      gManagerWindow = aManager;
+      run_next_test();
+    });
+  });
+});
+
+add_test(function() {
+  info("Searching remotely - more results than cap");
+  Services.prefs.setIntPref(PREF_GETADDONS_MAXRESULTS, 3);
+  search(true, function() {
+    check_allresultslink(true);
+    run_next_test();
+  });
+});
+
+add_test(function() {
+  info("Switching views");
+  gManagerWindow.loadView("addons://list/extension");
+  wait_for_view_load(gManagerWindow, function() {
+    info("Re-loading previous search");
+    search(true, function() {
+      check_allresultslink(true);
+      run_next_test();
+    });
+  });
+});
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug587970.js b/toolkit/mozapps/extensions/test/browser/browser_bug587970.js
index ce44979fe3b..d48f0037c2d 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug587970.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug587970.js
@@ -1,152 +1,152 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Bug 587970 - Provide ability "Update all now" within 'Available Updates' screen
-
-var gManagerWindow;
-var gProvider;
-
-function test() {
-  waitForExplicitFinish();
-  
-  gProvider = new MockProvider();
-
-  gProvider.createAddons([{
-    id: "addon1@tests.mozilla.org",
-    name: "addon 1",
-    version: "1.0",
-    applyBackgroundUpdates: AddonManager.AUTOUPDATE_DISABLE
-  }, {
-    id: "addon2@tests.mozilla.org",
-    name: "addon 2",
-    version: "2.0",
-    applyBackgroundUpdates: AddonManager.AUTOUPDATE_DISABLE
-  }]);
-  
-
-  open_manager("addons://updates/available", function(aWindow) {
-    gManagerWindow = aWindow;
-    run_next_test();
-  });
-}
-
-
-function end_test() {
-  close_manager(gManagerWindow, finish);
-}
-
-
-add_test(function() {
-  var list = gManagerWindow.document.getElementById("updates-list");
-  is(list.childNodes.length, 0, "Available updates list should be empty");
-
-  var emptyNotice = gManagerWindow.document.getElementById("empty-availableUpdates-msg");
-  is_element_visible(emptyNotice, "Empty notice should be visible");
-  
-  var updateSelected = gManagerWindow.document.getElementById("update-selected-btn");
-  is_element_hidden(updateSelected, "Update Selected button should be hidden");
-
-  info("Adding updates");
-  gProvider.createInstalls([{
-    name: "addon 1",
-    version: "1.1",
-    existingAddon: gProvider.addons[0]
-  }, {
-    name: "addon 2",
-    version: "2.1",
-    existingAddon: gProvider.addons[1]
-  }]);
-
-  function wait_for_refresh() {
-    if (list.childNodes.length == 2 &&
-        list.childNodes[0].mManualUpdate &&
-        list.childNodes[1].mManualUpdate) {
-      run_next_test();
-    } else {
-      info("Waiting for pane to refresh");
-      setTimeout(wait_for_refresh, 10);
-    }
-  }
-  info("Waiting for pane to refresh");
-  setTimeout(wait_for_refresh, 10);
-});
-
-
-add_test(function() {
-  var list = gManagerWindow.document.getElementById("updates-list");
-  is(list.childNodes.length, 2, "Available updates list should have 2 items");
-  
-  var item1 = get_addon_element(gManagerWindow, "addon1@tests.mozilla.org");
-  isnot(item1, null, "Item for addon1@tests.mozilla.org should be in list");
-  var item2 = get_addon_element(gManagerWindow, "addon2@tests.mozilla.org");
-  isnot(item2, null, "Item for addon2@tests.mozilla.org should be in list");
-
-  var emptyNotice = gManagerWindow.document.getElementById("empty-availableUpdates-msg");
-  is_element_hidden(emptyNotice, "Empty notice should be hidden");
-
-  var updateSelected = gManagerWindow.document.getElementById("update-selected-btn");
-  is_element_visible(updateSelected, "Update Selected button should be visible");
-  is(updateSelected.disabled, false, "Update Selected button should be enabled by default");
-
-  is(item1._includeUpdate.checked, true, "Include Update checkbox should be checked by default for addon1");
-  is(item2._includeUpdate.checked, true, "Include Update checkbox should be checked by default for addon2");
-  
-  info("Unchecking Include Update checkbox for addon1");
-  EventUtils.synthesizeMouse(item1._includeUpdate, 2, 2, { }, gManagerWindow);
-  is(item1._includeUpdate.checked, false, "Include Update checkbox should now be be unchecked for addon1");
-  is(updateSelected.disabled, false, "Update Selected button should still be enabled");
-
-  info("Unchecking Include Update checkbox for addon2");
-  EventUtils.synthesizeMouse(item2._includeUpdate, 2, 2, { }, gManagerWindow);
-  is(item2._includeUpdate.checked, false, "Include Update checkbox should now be be unchecked for addon2");
-  is(updateSelected.disabled, true, "Update Selected button should now be disabled");
-
-  info("Checking Include Update checkbox for addon2");
-  EventUtils.synthesizeMouse(item2._includeUpdate, 2, 2, { }, gManagerWindow);
-  is(item2._includeUpdate.checked, true, "Include Update checkbox should now be be checked for addon2");
-  is(updateSelected.disabled, false, "Update Selected button should now be enabled");
-
-  var listener = {
-    onInstallEnded: function() {
-      gProvider.installs[1].removeTestListener(listener);
-
-      is(gProvider.installs[0].state, AddonManager.STATE_AVAILABLE, "addon1 should not have been upgraded");
-      is(gProvider.installs[1].state, AddonManager.STATE_INSTALLED, "addon2 should have been upgraded");
-    }
-  }
-  gProvider.installs[1].addTestListener(listener);
-  info("Clicking Update Selected button");
-  EventUtils.synthesizeMouse(updateSelected, 2, 2, { }, gManagerWindow);
-
-  wait_for_view_load(gManagerWindow, function() {
-    function wait_for_refresh() {
-      var item = get_addon_element(gManagerWindow, "addon1@tests.mozilla.org");
-      if (item.mManualUpdate) {
-        run_next_test();
-      } else {
-        info("Waiting for pane to refresh");
-        setTimeout(wait_for_refresh, 10);
-      }
-    }
-    info("Waiting for pane to refresh");
-    setTimeout(wait_for_refresh, 10);
-  }, true);
-});
-
-
-add_test(function() {
-  var updateSelected = gManagerWindow.document.getElementById("update-selected-btn");
-  is(updateSelected.disabled, false, "Update Selected button should now be enabled");
-
-  var item1 = get_addon_element(gManagerWindow, "addon1@tests.mozilla.org");
-  isnot(item1, null, "Item for addon1@tests.mozilla.org should be in list");
-  is(item1._includeUpdate.checked, true, "Include Update checkbox should be checked by default for addon1");
-
-  info("Unchecking Include Update checkbox for addon1");
-  EventUtils.synthesizeMouse(item1._includeUpdate, 2, 2, { }, gManagerWindow);
-  is(item1._includeUpdate.checked, false, "Include Update checkbox should now be be unchecked for addon1");
-  is(updateSelected.disabled, true, "Update Selected button should now be disabled");
-
-  run_next_test();
-});
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Bug 587970 - Provide ability "Update all now" within 'Available Updates' screen
+
+var gManagerWindow;
+var gProvider;
+
+function test() {
+  waitForExplicitFinish();
+  
+  gProvider = new MockProvider();
+
+  gProvider.createAddons([{
+    id: "addon1@tests.mozilla.org",
+    name: "addon 1",
+    version: "1.0",
+    applyBackgroundUpdates: AddonManager.AUTOUPDATE_DISABLE
+  }, {
+    id: "addon2@tests.mozilla.org",
+    name: "addon 2",
+    version: "2.0",
+    applyBackgroundUpdates: AddonManager.AUTOUPDATE_DISABLE
+  }]);
+  
+
+  open_manager("addons://updates/available", function(aWindow) {
+    gManagerWindow = aWindow;
+    run_next_test();
+  });
+}
+
+
+function end_test() {
+  close_manager(gManagerWindow, finish);
+}
+
+
+add_test(function() {
+  var list = gManagerWindow.document.getElementById("updates-list");
+  is(list.childNodes.length, 0, "Available updates list should be empty");
+
+  var emptyNotice = gManagerWindow.document.getElementById("empty-availableUpdates-msg");
+  is_element_visible(emptyNotice, "Empty notice should be visible");
+  
+  var updateSelected = gManagerWindow.document.getElementById("update-selected-btn");
+  is_element_hidden(updateSelected, "Update Selected button should be hidden");
+
+  info("Adding updates");
+  gProvider.createInstalls([{
+    name: "addon 1",
+    version: "1.1",
+    existingAddon: gProvider.addons[0]
+  }, {
+    name: "addon 2",
+    version: "2.1",
+    existingAddon: gProvider.addons[1]
+  }]);
+
+  function wait_for_refresh() {
+    if (list.childNodes.length == 2 &&
+        list.childNodes[0].mManualUpdate &&
+        list.childNodes[1].mManualUpdate) {
+      run_next_test();
+    } else {
+      info("Waiting for pane to refresh");
+      setTimeout(wait_for_refresh, 10);
+    }
+  }
+  info("Waiting for pane to refresh");
+  setTimeout(wait_for_refresh, 10);
+});
+
+
+add_test(function() {
+  var list = gManagerWindow.document.getElementById("updates-list");
+  is(list.childNodes.length, 2, "Available updates list should have 2 items");
+  
+  var item1 = get_addon_element(gManagerWindow, "addon1@tests.mozilla.org");
+  isnot(item1, null, "Item for addon1@tests.mozilla.org should be in list");
+  var item2 = get_addon_element(gManagerWindow, "addon2@tests.mozilla.org");
+  isnot(item2, null, "Item for addon2@tests.mozilla.org should be in list");
+
+  var emptyNotice = gManagerWindow.document.getElementById("empty-availableUpdates-msg");
+  is_element_hidden(emptyNotice, "Empty notice should be hidden");
+
+  var updateSelected = gManagerWindow.document.getElementById("update-selected-btn");
+  is_element_visible(updateSelected, "Update Selected button should be visible");
+  is(updateSelected.disabled, false, "Update Selected button should be enabled by default");
+
+  is(item1._includeUpdate.checked, true, "Include Update checkbox should be checked by default for addon1");
+  is(item2._includeUpdate.checked, true, "Include Update checkbox should be checked by default for addon2");
+  
+  info("Unchecking Include Update checkbox for addon1");
+  EventUtils.synthesizeMouse(item1._includeUpdate, 2, 2, { }, gManagerWindow);
+  is(item1._includeUpdate.checked, false, "Include Update checkbox should now be be unchecked for addon1");
+  is(updateSelected.disabled, false, "Update Selected button should still be enabled");
+
+  info("Unchecking Include Update checkbox for addon2");
+  EventUtils.synthesizeMouse(item2._includeUpdate, 2, 2, { }, gManagerWindow);
+  is(item2._includeUpdate.checked, false, "Include Update checkbox should now be be unchecked for addon2");
+  is(updateSelected.disabled, true, "Update Selected button should now be disabled");
+
+  info("Checking Include Update checkbox for addon2");
+  EventUtils.synthesizeMouse(item2._includeUpdate, 2, 2, { }, gManagerWindow);
+  is(item2._includeUpdate.checked, true, "Include Update checkbox should now be be checked for addon2");
+  is(updateSelected.disabled, false, "Update Selected button should now be enabled");
+
+  var listener = {
+    onInstallEnded: function() {
+      gProvider.installs[1].removeTestListener(listener);
+
+      is(gProvider.installs[0].state, AddonManager.STATE_AVAILABLE, "addon1 should not have been upgraded");
+      is(gProvider.installs[1].state, AddonManager.STATE_INSTALLED, "addon2 should have been upgraded");
+    }
+  }
+  gProvider.installs[1].addTestListener(listener);
+  info("Clicking Update Selected button");
+  EventUtils.synthesizeMouse(updateSelected, 2, 2, { }, gManagerWindow);
+
+  wait_for_view_load(gManagerWindow, function() {
+    function wait_for_refresh() {
+      var item = get_addon_element(gManagerWindow, "addon1@tests.mozilla.org");
+      if (item.mManualUpdate) {
+        run_next_test();
+      } else {
+        info("Waiting for pane to refresh");
+        setTimeout(wait_for_refresh, 10);
+      }
+    }
+    info("Waiting for pane to refresh");
+    setTimeout(wait_for_refresh, 10);
+  }, true);
+});
+
+
+add_test(function() {
+  var updateSelected = gManagerWindow.document.getElementById("update-selected-btn");
+  is(updateSelected.disabled, false, "Update Selected button should now be enabled");
+
+  var item1 = get_addon_element(gManagerWindow, "addon1@tests.mozilla.org");
+  isnot(item1, null, "Item for addon1@tests.mozilla.org should be in list");
+  is(item1._includeUpdate.checked, true, "Include Update checkbox should be checked by default for addon1");
+
+  info("Unchecking Include Update checkbox for addon1");
+  EventUtils.synthesizeMouse(item1._includeUpdate, 2, 2, { }, gManagerWindow);
+  is(item1._includeUpdate.checked, false, "Include Update checkbox should now be be unchecked for addon1");
+  is(updateSelected.disabled, true, "Update Selected button should now be disabled");
+
+  run_next_test();
+});
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug591465.js b/toolkit/mozapps/extensions/test/browser/browser_bug591465.js
index 0531d6eabe9..8e3bfadb60d 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug591465.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug591465.js
@@ -1,351 +1,351 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Bug 591465 - Context menu of add-ons miss context related state change entries
-
-const PREF_GETADDONS_MAXRESULTS = "extensions.getAddons.maxResults";
-const PREF_GETADDONS_GETSEARCHRESULTS = "extensions.getAddons.search.url";
-const SEARCH_URL = TESTROOT + "browser_bug591465.xml";
-const SEARCH_QUERY = "SEARCH";
-
-var gManagerWindow;
-var gProvider;
-var gContextMenu;
-
-
-function test() {
-  waitForExplicitFinish();
-  
-  gProvider = new MockProvider();
-
-  gProvider.createAddons([{
-    id: "addon1@tests.mozilla.org",
-    name: "addon 1",
-    version: "1.0"
-  }, {
-    id: "addon2@tests.mozilla.org",
-    name: "addon 2",
-    version: "1.0",
-    _userDisabled: true
-  }, {
-    id: "theme1@tests.mozilla.org",
-    name: "theme 1",
-    version: "1.0",
-    type: "theme"
-  }, {
-    id: "theme2@tests.mozilla.org",
-    name: "theme 2",
-    version: "1.0",
-    type: "theme",
-    _userDisabled: true
-   }, {
-    id: "theme3@tests.mozilla.org",
-    name: "theme 3",
-    version: "1.0",
-    type: "theme",
-    permissions: 0
-  }]);
-
-  open_manager("addons://list/extension", function(aWindow) {
-    gManagerWindow = aWindow;
-    gContextMenu = aWindow.document.getElementById("addonitem-popup");
-    run_next_test();
-  });
-}
-
-
-function end_test() {
-  Services.prefs.clearUserPref(PREF_GETADDONS_GETSEARCHRESULTS);
-  close_manager(gManagerWindow, finish);
-}
-
-
-function check_contextmenu(aIsTheme, aIsEnabled, aIsRemote, aIsDetails, aIsSingleItemCase) {
-  if (aIsTheme || aIsEnabled || aIsRemote)
-    is_element_hidden(gManagerWindow.document.getElementById("menuitem_enableItem"),
-                       "'Enable' should be hidden");
-  else
-    is_element_visible(gManagerWindow.document.getElementById("menuitem_enableItem"),
-                       "'Enable' should be visible");
-  
-  if (aIsTheme || !aIsEnabled || aIsRemote)
-    is_element_hidden(gManagerWindow.document.getElementById("menuitem_disableItem"),
-                       "'Disable' should be hidden");
-  else
-    is_element_visible(gManagerWindow.document.getElementById("menuitem_disableItem"),
-                       "'Disable' should be visible");
-
-  if (!aIsTheme || aIsEnabled || aIsRemote || aIsSingleItemCase)
-    is_element_hidden(gManagerWindow.document.getElementById("menuitem_enableTheme"),
-                       "'Wear Theme' should be hidden");
-  else
-    is_element_visible(gManagerWindow.document.getElementById("menuitem_enableTheme"),
-                       "'Wear Theme' should be visible");
-  
-  if (!aIsTheme || !aIsEnabled || aIsRemote || aIsSingleItemCase)
-    is_element_hidden(gManagerWindow.document.getElementById("menuitem_disableTheme"),
-                       "'Stop Wearing Theme' should be hidden");
-  else
-    is_element_visible(gManagerWindow.document.getElementById("menuitem_disableTheme"),
-                       "'Stop Wearing Theme' should be visible");
-
-  if (aIsRemote)
-    is_element_visible(gManagerWindow.document.getElementById("menuitem_installItem"),
-                       "'Install' should be visible");
-  else
-    is_element_hidden(gManagerWindow.document.getElementById("menuitem_installItem"),
-                       "'Install' should be hidden");
-                       
-  if (aIsDetails)
-    is_element_hidden(gManagerWindow.document.getElementById("menuitem_showDetails"), 
-                       "'Show More Information' should be hidden in details view");
-  else
-    is_element_visible(gManagerWindow.document.getElementById("menuitem_showDetails"), 
-                       "'Show More Information' should be visible in list view");
-                       
-  if (aIsSingleItemCase)
-    is_element_hidden(gManagerWindow.document.getElementById("addonitem-menuseparator"), 
-                       "Menu separator should be hidden with only one menu item");
-  else
-    is_element_visible(gManagerWindow.document.getElementById("addonitem-menuseparator"), 
-                       "Menu separator should be visible with multiple menu items");
-
-}
-
-
-add_test(function() {
-  var el = get_addon_element(gManagerWindow, "addon1@tests.mozilla.org");
-  isnot(el, null, "Should have found addon element");
-
-  gContextMenu.addEventListener("popupshown", function() {
-    gContextMenu.removeEventListener("popupshown", arguments.callee, false);
-
-    check_contextmenu(false, true, false, false, false);
-
-    gContextMenu.hidePopup();
-    run_next_test();
-  }, false);
-
-  info("Opening context menu on enabled extension item");
-  EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
-  EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
-});
-
-
-add_test(function() {
-  var el = get_addon_element(gManagerWindow, "addon2@tests.mozilla.org");
-
-  gContextMenu.addEventListener("popupshown", function() {
-    gContextMenu.removeEventListener("popupshown", arguments.callee, false);
-
-    check_contextmenu(false, false, false, false, false);
-
-    gContextMenu.hidePopup();
-    run_next_test();
-  }, false);
-
-  info("Opening context menu on disabled extension item");
-  EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
-  EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
-});
-
-
-add_test(function() {
-  gManagerWindow.loadView("addons://list/theme");
-  wait_for_view_load(gManagerWindow, function() {
-    var el = get_addon_element(gManagerWindow, "theme1@tests.mozilla.org");
-  
-    gContextMenu.addEventListener("popupshown", function() {
-      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
-  
-    check_contextmenu(true, true, false, false, false);
-  
-      gContextMenu.hidePopup();
-      run_next_test();
-    }, false);
-  
-    info("Opening context menu on enabled theme item");
-    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
-    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
-  });
-});
-
-
-add_test(function() {
-  var el = get_addon_element(gManagerWindow, "theme2@tests.mozilla.org");
-
-  gContextMenu.addEventListener("popupshown", function() {
-    gContextMenu.removeEventListener("popupshown", arguments.callee, false);
-
-    check_contextmenu(true, false, false, false, false);
-
-    gContextMenu.hidePopup();
-    run_next_test();
-  }, false);
-
-  info("Opening context menu on disabled theme item");
-  EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
-  EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
-});
-
-
-add_test(function() {
-  gManagerWindow.loadView("addons://detail/addon1@tests.mozilla.org");
-  wait_for_view_load(gManagerWindow, function() {
-    
-    gContextMenu.addEventListener("popupshown", function() {
-      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
-  
-      check_contextmenu(false, true, false, true, false);
-  
-      gContextMenu.hidePopup();
-      run_next_test();
-    }, false);
-
-    info("Opening context menu on enabled extension, in detail view");
-    var el = gManagerWindow.document.querySelector("#detail-view .detail-view-container");
-    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
-    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
-  });
-});
-
-
-add_test(function() {
-  gManagerWindow.loadView("addons://detail/addon2@tests.mozilla.org");
-  wait_for_view_load(gManagerWindow, function() {
-    
-    gContextMenu.addEventListener("popupshown", function() {
-      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
-  
-      check_contextmenu(false, false, false, true, false);
-  
-      gContextMenu.hidePopup();
-      run_next_test();
-    }, false);
-
-    info("Opening context menu on disabled extension, in detail view");
-    var el = gManagerWindow.document.querySelector("#detail-view .detail-view-container");
-    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
-    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
-  });
-});
-
-
-add_test(function() {
-  gManagerWindow.loadView("addons://detail/theme1@tests.mozilla.org");
-  wait_for_view_load(gManagerWindow, function() {
-    
-    gContextMenu.addEventListener("popupshown", function() {
-      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
-  
-      check_contextmenu(true, true, false, true, false);
-  
-      gContextMenu.hidePopup();
-      run_next_test();
-    }, false);
-
-    info("Opening context menu on enabled theme, in detail view");
-    var el = gManagerWindow.document.querySelector("#detail-view .detail-view-container");
-    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
-    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
-  });
-});
-
-
-add_test(function() {
-  gManagerWindow.loadView("addons://detail/theme2@tests.mozilla.org");
-  wait_for_view_load(gManagerWindow, function() {
-    
-    gContextMenu.addEventListener("popupshown", function() {
-      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
-  
-      check_contextmenu(true, false, false, true, false);
-  
-      gContextMenu.hidePopup();
-      run_next_test();
-    }, false);
-
-    info("Opening context menu on disabled theme, in detail view");
-    var el = gManagerWindow.document.querySelector("#detail-view .detail-view-container");
-    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
-    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
-  });
-});
-
-add_test(function() {
-  gManagerWindow.loadView("addons://detail/theme3@tests.mozilla.org");
-  wait_for_view_load(gManagerWindow, function() {
-    
-    gContextMenu.addEventListener("popupshown", function() {
-      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
-  
-      check_contextmenu(true, true, false, true, true);
-  
-      gContextMenu.hidePopup();
-      run_next_test();
-    }, false);
-
-    info("Opening context menu with single menu item on enabled theme, in detail view");
-    var el = gManagerWindow.document.querySelector("#detail-view .detail-view-container");
-    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
-    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
-  });
-});
-
-add_test(function() {
-  info("Searching for remote addons");
-
-  Services.prefs.setCharPref(PREF_GETADDONS_GETSEARCHRESULTS, SEARCH_URL);
-  Services.prefs.setIntPref(PREF_SEARCH_MAXRESULTS, 15);
-
-  var searchBox = gManagerWindow.document.getElementById("header-search");
-  searchBox.value = SEARCH_QUERY;
-
-  EventUtils.synthesizeMouseAtCenter(searchBox, { }, gManagerWindow);
-  EventUtils.synthesizeKey("VK_RETURN", { }, gManagerWindow);
-
-  wait_for_view_load(gManagerWindow, function() {
-    var filter = gManagerWindow.document.getElementById("search-filter-remote");
-    EventUtils.synthesizeMouseAtCenter(filter, { }, gManagerWindow);
-    executeSoon(function() {
-      
-      var el = get_addon_element(gManagerWindow, "remote1@tests.mozilla.org");
-    
-      gContextMenu.addEventListener("popupshown", function() {
-        gContextMenu.removeEventListener("popupshown", arguments.callee, false);
-    
-        check_contextmenu(false, false, true, false, false);
-    
-        gContextMenu.hidePopup();
-        run_next_test();
-      }, false);
-    
-      info("Opening context menu on remote extension item");
-      EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
-      EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
-      
-    });
-  });
-});
-
-
-add_test(function() {
-  gManagerWindow.loadView("addons://detail/remote1@tests.mozilla.org");
-  wait_for_view_load(gManagerWindow, function() {
-    
-    gContextMenu.addEventListener("popupshown", function() {
-      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
-  
-      check_contextmenu(false, false, true, true, false);
-  
-      gContextMenu.hidePopup();
-      run_next_test();
-    }, false);
-
-    info("Opening context menu on remote extension, in detail view");
-    var el = gManagerWindow.document.querySelector("#detail-view .detail-view-container");
-    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
-    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
-  });
-});
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Bug 591465 - Context menu of add-ons miss context related state change entries
+
+const PREF_GETADDONS_MAXRESULTS = "extensions.getAddons.maxResults";
+const PREF_GETADDONS_GETSEARCHRESULTS = "extensions.getAddons.search.url";
+const SEARCH_URL = TESTROOT + "browser_bug591465.xml";
+const SEARCH_QUERY = "SEARCH";
+
+var gManagerWindow;
+var gProvider;
+var gContextMenu;
+
+
+function test() {
+  waitForExplicitFinish();
+  
+  gProvider = new MockProvider();
+
+  gProvider.createAddons([{
+    id: "addon1@tests.mozilla.org",
+    name: "addon 1",
+    version: "1.0"
+  }, {
+    id: "addon2@tests.mozilla.org",
+    name: "addon 2",
+    version: "1.0",
+    _userDisabled: true
+  }, {
+    id: "theme1@tests.mozilla.org",
+    name: "theme 1",
+    version: "1.0",
+    type: "theme"
+  }, {
+    id: "theme2@tests.mozilla.org",
+    name: "theme 2",
+    version: "1.0",
+    type: "theme",
+    _userDisabled: true
+   }, {
+    id: "theme3@tests.mozilla.org",
+    name: "theme 3",
+    version: "1.0",
+    type: "theme",
+    permissions: 0
+  }]);
+
+  open_manager("addons://list/extension", function(aWindow) {
+    gManagerWindow = aWindow;
+    gContextMenu = aWindow.document.getElementById("addonitem-popup");
+    run_next_test();
+  });
+}
+
+
+function end_test() {
+  Services.prefs.clearUserPref(PREF_GETADDONS_GETSEARCHRESULTS);
+  close_manager(gManagerWindow, finish);
+}
+
+
+function check_contextmenu(aIsTheme, aIsEnabled, aIsRemote, aIsDetails, aIsSingleItemCase) {
+  if (aIsTheme || aIsEnabled || aIsRemote)
+    is_element_hidden(gManagerWindow.document.getElementById("menuitem_enableItem"),
+                       "'Enable' should be hidden");
+  else
+    is_element_visible(gManagerWindow.document.getElementById("menuitem_enableItem"),
+                       "'Enable' should be visible");
+  
+  if (aIsTheme || !aIsEnabled || aIsRemote)
+    is_element_hidden(gManagerWindow.document.getElementById("menuitem_disableItem"),
+                       "'Disable' should be hidden");
+  else
+    is_element_visible(gManagerWindow.document.getElementById("menuitem_disableItem"),
+                       "'Disable' should be visible");
+
+  if (!aIsTheme || aIsEnabled || aIsRemote || aIsSingleItemCase)
+    is_element_hidden(gManagerWindow.document.getElementById("menuitem_enableTheme"),
+                       "'Wear Theme' should be hidden");
+  else
+    is_element_visible(gManagerWindow.document.getElementById("menuitem_enableTheme"),
+                       "'Wear Theme' should be visible");
+  
+  if (!aIsTheme || !aIsEnabled || aIsRemote || aIsSingleItemCase)
+    is_element_hidden(gManagerWindow.document.getElementById("menuitem_disableTheme"),
+                       "'Stop Wearing Theme' should be hidden");
+  else
+    is_element_visible(gManagerWindow.document.getElementById("menuitem_disableTheme"),
+                       "'Stop Wearing Theme' should be visible");
+
+  if (aIsRemote)
+    is_element_visible(gManagerWindow.document.getElementById("menuitem_installItem"),
+                       "'Install' should be visible");
+  else
+    is_element_hidden(gManagerWindow.document.getElementById("menuitem_installItem"),
+                       "'Install' should be hidden");
+                       
+  if (aIsDetails)
+    is_element_hidden(gManagerWindow.document.getElementById("menuitem_showDetails"), 
+                       "'Show More Information' should be hidden in details view");
+  else
+    is_element_visible(gManagerWindow.document.getElementById("menuitem_showDetails"), 
+                       "'Show More Information' should be visible in list view");
+                       
+  if (aIsSingleItemCase)
+    is_element_hidden(gManagerWindow.document.getElementById("addonitem-menuseparator"), 
+                       "Menu separator should be hidden with only one menu item");
+  else
+    is_element_visible(gManagerWindow.document.getElementById("addonitem-menuseparator"), 
+                       "Menu separator should be visible with multiple menu items");
+
+}
+
+
+add_test(function() {
+  var el = get_addon_element(gManagerWindow, "addon1@tests.mozilla.org");
+  isnot(el, null, "Should have found addon element");
+
+  gContextMenu.addEventListener("popupshown", function() {
+    gContextMenu.removeEventListener("popupshown", arguments.callee, false);
+
+    check_contextmenu(false, true, false, false, false);
+
+    gContextMenu.hidePopup();
+    run_next_test();
+  }, false);
+
+  info("Opening context menu on enabled extension item");
+  EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
+  EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
+});
+
+
+add_test(function() {
+  var el = get_addon_element(gManagerWindow, "addon2@tests.mozilla.org");
+
+  gContextMenu.addEventListener("popupshown", function() {
+    gContextMenu.removeEventListener("popupshown", arguments.callee, false);
+
+    check_contextmenu(false, false, false, false, false);
+
+    gContextMenu.hidePopup();
+    run_next_test();
+  }, false);
+
+  info("Opening context menu on disabled extension item");
+  EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
+  EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
+});
+
+
+add_test(function() {
+  gManagerWindow.loadView("addons://list/theme");
+  wait_for_view_load(gManagerWindow, function() {
+    var el = get_addon_element(gManagerWindow, "theme1@tests.mozilla.org");
+  
+    gContextMenu.addEventListener("popupshown", function() {
+      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
+  
+    check_contextmenu(true, true, false, false, false);
+  
+      gContextMenu.hidePopup();
+      run_next_test();
+    }, false);
+  
+    info("Opening context menu on enabled theme item");
+    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
+    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
+  });
+});
+
+
+add_test(function() {
+  var el = get_addon_element(gManagerWindow, "theme2@tests.mozilla.org");
+
+  gContextMenu.addEventListener("popupshown", function() {
+    gContextMenu.removeEventListener("popupshown", arguments.callee, false);
+
+    check_contextmenu(true, false, false, false, false);
+
+    gContextMenu.hidePopup();
+    run_next_test();
+  }, false);
+
+  info("Opening context menu on disabled theme item");
+  EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
+  EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
+});
+
+
+add_test(function() {
+  gManagerWindow.loadView("addons://detail/addon1@tests.mozilla.org");
+  wait_for_view_load(gManagerWindow, function() {
+    
+    gContextMenu.addEventListener("popupshown", function() {
+      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
+  
+      check_contextmenu(false, true, false, true, false);
+  
+      gContextMenu.hidePopup();
+      run_next_test();
+    }, false);
+
+    info("Opening context menu on enabled extension, in detail view");
+    var el = gManagerWindow.document.querySelector("#detail-view .detail-view-container");
+    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
+    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
+  });
+});
+
+
+add_test(function() {
+  gManagerWindow.loadView("addons://detail/addon2@tests.mozilla.org");
+  wait_for_view_load(gManagerWindow, function() {
+    
+    gContextMenu.addEventListener("popupshown", function() {
+      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
+  
+      check_contextmenu(false, false, false, true, false);
+  
+      gContextMenu.hidePopup();
+      run_next_test();
+    }, false);
+
+    info("Opening context menu on disabled extension, in detail view");
+    var el = gManagerWindow.document.querySelector("#detail-view .detail-view-container");
+    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
+    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
+  });
+});
+
+
+add_test(function() {
+  gManagerWindow.loadView("addons://detail/theme1@tests.mozilla.org");
+  wait_for_view_load(gManagerWindow, function() {
+    
+    gContextMenu.addEventListener("popupshown", function() {
+      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
+  
+      check_contextmenu(true, true, false, true, false);
+  
+      gContextMenu.hidePopup();
+      run_next_test();
+    }, false);
+
+    info("Opening context menu on enabled theme, in detail view");
+    var el = gManagerWindow.document.querySelector("#detail-view .detail-view-container");
+    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
+    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
+  });
+});
+
+
+add_test(function() {
+  gManagerWindow.loadView("addons://detail/theme2@tests.mozilla.org");
+  wait_for_view_load(gManagerWindow, function() {
+    
+    gContextMenu.addEventListener("popupshown", function() {
+      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
+  
+      check_contextmenu(true, false, false, true, false);
+  
+      gContextMenu.hidePopup();
+      run_next_test();
+    }, false);
+
+    info("Opening context menu on disabled theme, in detail view");
+    var el = gManagerWindow.document.querySelector("#detail-view .detail-view-container");
+    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
+    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
+  });
+});
+
+add_test(function() {
+  gManagerWindow.loadView("addons://detail/theme3@tests.mozilla.org");
+  wait_for_view_load(gManagerWindow, function() {
+    
+    gContextMenu.addEventListener("popupshown", function() {
+      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
+  
+      check_contextmenu(true, true, false, true, true);
+  
+      gContextMenu.hidePopup();
+      run_next_test();
+    }, false);
+
+    info("Opening context menu with single menu item on enabled theme, in detail view");
+    var el = gManagerWindow.document.querySelector("#detail-view .detail-view-container");
+    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
+    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
+  });
+});
+
+add_test(function() {
+  info("Searching for remote addons");
+
+  Services.prefs.setCharPref(PREF_GETADDONS_GETSEARCHRESULTS, SEARCH_URL);
+  Services.prefs.setIntPref(PREF_SEARCH_MAXRESULTS, 15);
+
+  var searchBox = gManagerWindow.document.getElementById("header-search");
+  searchBox.value = SEARCH_QUERY;
+
+  EventUtils.synthesizeMouseAtCenter(searchBox, { }, gManagerWindow);
+  EventUtils.synthesizeKey("VK_RETURN", { }, gManagerWindow);
+
+  wait_for_view_load(gManagerWindow, function() {
+    var filter = gManagerWindow.document.getElementById("search-filter-remote");
+    EventUtils.synthesizeMouseAtCenter(filter, { }, gManagerWindow);
+    executeSoon(function() {
+      
+      var el = get_addon_element(gManagerWindow, "remote1@tests.mozilla.org");
+    
+      gContextMenu.addEventListener("popupshown", function() {
+        gContextMenu.removeEventListener("popupshown", arguments.callee, false);
+    
+        check_contextmenu(false, false, true, false, false);
+    
+        gContextMenu.hidePopup();
+        run_next_test();
+      }, false);
+    
+      info("Opening context menu on remote extension item");
+      EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
+      EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
+      
+    });
+  });
+});
+
+
+add_test(function() {
+  gManagerWindow.loadView("addons://detail/remote1@tests.mozilla.org");
+  wait_for_view_load(gManagerWindow, function() {
+    
+    gContextMenu.addEventListener("popupshown", function() {
+      gContextMenu.removeEventListener("popupshown", arguments.callee, false);
+  
+      check_contextmenu(false, false, true, true, false);
+  
+      gContextMenu.hidePopup();
+      run_next_test();
+    }, false);
+
+    info("Opening context menu on remote extension, in detail view");
+    var el = gManagerWindow.document.querySelector("#detail-view .detail-view-container");
+    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
+    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
+  });
+});
diff --git a/toolkit/mozapps/extensions/test/browser/browser_details.js b/toolkit/mozapps/extensions/test/browser/browser_details.js
index 57642fab871..36c59512d07 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_details.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_details.js
@@ -10,6 +10,7 @@ const SEARCH_URL = TESTROOT + "browser_details.xml";
 
 var gManagerWindow;
 var gCategoryUtilities;
+var gProvider;
 
 var gApp = document.getElementById("bundle_brand").getString("brandShortName");
 var gVersion = Services.appinfo.version;
diff --git a/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js b/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
index a90d173e4e1..4c9b852dad9 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
@@ -1,65 +1,65 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Bug 566194 - safe mode / security & compatibility check status are not exposed in new addon manager UI
-
-function test() {
-  waitForExplicitFinish();
-  run_next_test();
-}
-
-function end_test() {
-  finish();
-}
-
-add_test(function() {
-  info("Testing compatibility checking warning");
-
-  var version = Services.appinfo.version.replace(/^([^\.]+\.[0-9]+[a-z]*).*/gi, "$1");
-  var pref = "extensions.checkCompatibility." + version;
-  info("Setting " + pref + " pref to false")
-  Services.prefs.setBoolPref(pref, false);
-
-  open_manager("addons://list/extension", function(aWindow) {
-    var label = aWindow.document.querySelector("#list-view label.global-warning-checkcompatibility");
-    is_element_visible(label, "Check Compatibility warning label should be visible");
-    var button = aWindow.document.querySelector("#list-view button.global-warning-checkcompatibility");
-    is_element_visible(button, "Check Compatibility warning button should be visible");
-
-    info("Clicking 'Enable' button");
-    EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
-    is(Services.prefs.prefHasUserValue(pref), false, "Check Compatability pref should be cleared");
-    is_element_hidden(label, "Check Compatibility warning label should be hidden");
-    is_element_hidden(button, "Check Compatibility warning button should be hidden");
-
-    close_manager(aWindow, function() {
-      run_next_test();
-    });
-  });
-});
-
-add_test(function() {
-  info("Testing update security checking warning");
-
-  var pref = "extensions.checkUpdateSecurity";
-  info("Setting " + pref + " pref to false")
-  Services.prefs.setBoolPref(pref, false);
-
-  open_manager(null, function(aWindow) {
-    var label = aWindow.document.querySelector("#list-view label.global-warning-updatesecurity");
-    is_element_visible(label, "Check Update Security warning label should be visible");
-    var button = aWindow.document.querySelector("#list-view button.global-warning-updatesecurity");
-    is_element_visible(button, "Check Update Security warning button should be visible");
-
-    info("Clicking 'Enable' button");
-    EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
-    is(Services.prefs.prefHasUserValue(pref), false, "Check Update Security pref should be cleared");
-    is_element_hidden(label, "Check Update Security warning label should be hidden");
-    is_element_hidden(button, "Check Update Security warning button should be hidden");
-
-    close_manager(aWindow, function() {
-      run_next_test();
-    });
-  });
-});
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Bug 566194 - safe mode / security & compatibility check status are not exposed in new addon manager UI
+
+function test() {
+  waitForExplicitFinish();
+  run_next_test();
+}
+
+function end_test() {
+  finish();
+}
+
+add_test(function() {
+  info("Testing compatibility checking warning");
+
+  var version = Services.appinfo.version.replace(/^([^\.]+\.[0-9]+[a-z]*).*/gi, "$1");
+  var pref = "extensions.checkCompatibility." + version;
+  info("Setting " + pref + " pref to false")
+  Services.prefs.setBoolPref(pref, false);
+
+  open_manager("addons://list/extension", function(aWindow) {
+    var label = aWindow.document.querySelector("#list-view label.global-warning-checkcompatibility");
+    is_element_visible(label, "Check Compatibility warning label should be visible");
+    var button = aWindow.document.querySelector("#list-view button.global-warning-checkcompatibility");
+    is_element_visible(button, "Check Compatibility warning button should be visible");
+
+    info("Clicking 'Enable' button");
+    EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
+    is(Services.prefs.prefHasUserValue(pref), false, "Check Compatability pref should be cleared");
+    is_element_hidden(label, "Check Compatibility warning label should be hidden");
+    is_element_hidden(button, "Check Compatibility warning button should be hidden");
+
+    close_manager(aWindow, function() {
+      run_next_test();
+    });
+  });
+});
+
+add_test(function() {
+  info("Testing update security checking warning");
+
+  var pref = "extensions.checkUpdateSecurity";
+  info("Setting " + pref + " pref to false")
+  Services.prefs.setBoolPref(pref, false);
+
+  open_manager(null, function(aWindow) {
+    var label = aWindow.document.querySelector("#list-view label.global-warning-updatesecurity");
+    is_element_visible(label, "Check Update Security warning label should be visible");
+    var button = aWindow.document.querySelector("#list-view button.global-warning-updatesecurity");
+    is_element_visible(button, "Check Update Security warning button should be visible");
+
+    info("Clicking 'Enable' button");
+    EventUtils.synthesizeMouse(button, 2, 2, { }, aWindow);
+    is(Services.prefs.prefHasUserValue(pref), false, "Check Update Security pref should be cleared");
+    is_element_hidden(label, "Check Update Security warning label should be hidden");
+    is_element_hidden(button, "Check Update Security warning button should be hidden");
+
+    close_manager(aWindow, function() {
+      run_next_test();
+    });
+  });
+});
diff --git a/toolkit/mozapps/extensions/test/browser/browser_manualupdates.js b/toolkit/mozapps/extensions/test/browser/browser_manualupdates.js
index 8801255204c..ed73fe2299f 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_manualupdates.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_manualupdates.js
@@ -1,188 +1,188 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests manual updates, including the Available Updates pane
-
-var gProvider;
-var gManagerWindow;
-var gCategoryUtilities;
-var gAvailableCategory;
-
-function test() {
-  waitForExplicitFinish();
-
-  gProvider = new MockProvider();
-
-  gProvider.createAddons([{
-    id: "addon1@tests.mozilla.org",
-    name: "auto updating addon",
-    version: "1.0",
-    applyBackgroundUpdates: AddonManager.AUTOUPDATE_ENABLE
-  }]);
-
-  open_manager("addons://list/extension", function(aWindow) {
-    gManagerWindow = aWindow;
-    gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-    run_next_test();
-  });
-}
-
-function end_test() {
-  close_manager(gManagerWindow, function() {
-    finish();
-  });
-}
-
-
-add_test(function() {
-  gAvailableCategory = gManagerWindow.gCategories.get("addons://updates/available");
-  is(gCategoryUtilities.isVisible(gAvailableCategory), false, "Available Updates category should initially be hidden");
-  
-  gProvider.createAddons([{
-    id: "addon2@tests.mozilla.org",
-    name: "manually updating addon",
-    version: "1.0",
-    isCompatible: false,
-    blocklistState: Ci.nsIBlocklistService.STATE_BLOCKED,
-    applyBackgroundUpdates: AddonManager.AUTOUPDATE_DISABLE
-  }]);
-  
-  is(gCategoryUtilities.isVisible(gAvailableCategory), true, "Available Updates category should now be visible");
-  
-  gAvailableCategory.addEventListener("CategoryVisible", function() {
-    gAvailableCategory.removeEventListener("CategoryVisible", arguments.callee, false);
-    is(gCategoryUtilities.isVisible(gAvailableCategory), false, "Available Updates category should not be visible");
-    gAvailableCategory.addEventListener("CategoryVisible", function() {
-      gAvailableCategory.removeEventListener("CategoryVisible", arguments.callee, false);
-      is(gCategoryUtilities.isVisible(gAvailableCategory), true, "Available Updates category should be visible");
-      run_next_test();
-    }, false);
-    gProvider.addons[1].applyBackgroundUpdates = AddonManager.AUTOUPDATE_DISABLE;
-  }, false);
-  gProvider.addons[1].applyBackgroundUpdates = AddonManager.AUTOUPDATE_ENABLE;
-});
-
-
-add_test(function() {
-  gAvailableCategory.addEventListener("CategoryBadgeUpdated", function() {
-    gAvailableCategory.removeEventListener("CategoryBadgeUpdated", arguments.callee, false);
-    is(gAvailableCategory.badgeCount, 1, "Badge for Available Updates should now be 1");
-    run_next_test();
-  }, false);
-
-  gCategoryUtilities.openType("extension", function() {
-    gProvider.createInstalls([{
-      name: "manually updating addon (new and improved!)",
-      existingAddon: gProvider.addons[1],
-      version: "1.1",
-      releaseNotesURI: Services.io.newURI(TESTROOT + "thereIsNoFileHere.xhtml", null, null)
-    }]);
-
-    var item = get_addon_element(gManagerWindow, "addon2@tests.mozilla.org");
-    is(item._version.value, "1.0", "Should still show the old version in the normal list");
-  });
-});
-
-
-add_test(function() {
-  wait_for_view_load(gManagerWindow, function() {
-    is(gManagerWindow.document.getElementById("categories").selectedItem.value, "addons://updates/available", "Available Updates category should now be selected");
-    is(gManagerWindow.gViewController.currentViewId, "addons://updates/available", "Available Updates view should be the current view");
-    run_next_test();
-  }, true);
-  EventUtils.synthesizeMouseAtCenter(gAvailableCategory, { }, gManagerWindow);
-});
-
-
-add_test(function() {
-  var list = gManagerWindow.document.getElementById("updates-list");
-  is(list.itemCount, 1, "Should be 1 available update listed");
-  var item = list.firstChild;
-  is(item.mAddon.id, "addon2@tests.mozilla.org", "Update item should be for the manually updating addon");
-  
-  // for manual update items, update-related properties are updated asynchronously,
-  // so we poll for one of the expected changes to know when its done
-  function waitForAsyncInit() {
-    if (item._version.value == "1.1") {
-      run_next_test();
-      return;
-    }
-    info("Update item not initialized yet, checking again in 100ms");
-    setTimeout(waitForAsyncInit, 100);
-  }
-  waitForAsyncInit();
-});
-
-add_test(function() {
-  var list = gManagerWindow.document.getElementById("updates-list");
-  var item = list.firstChild;
-  is(item._version.value, "1.1", "Update item should have version number of the update");
-  var postfix = gManagerWindow.document.getAnonymousElementByAttribute(item, "class", "update-postfix");
-  is_element_visible(postfix, "'Update' postfix should be visible");
-  is_element_visible(item._updateAvailable, "");
-  is_element_visible(item._relNotesToggle, "Release notes toggle should be visible");
-  is_element_hidden(item._warning, "Incompatible warning should be hidden");
-  is_element_hidden(item._error, "Blocklist error should be hidden");
-
-  info("Opening release notes");
-  item.addEventListener("RelNotesToggle", function() {
-    item.removeEventListener("RelNotesToggle", arguments.callee, false);
-    info("Release notes now open");
-
-    is_element_hidden(item._relNotesLoading, "Release notes loading message should be hidden");
-    is_element_visible(item._relNotesError, "Release notes error message should be visible");
-    is(item._relNotes.childElementCount, 0, "Release notes should be empty");
-
-    info("Closing release notes");
-    item.addEventListener("RelNotesToggle", function() {
-      item.removeEventListener("RelNotesToggle", arguments.callee, false);
-      info("Release notes now closed");
-      info("Setting Release notes URI to something that should load");
-      gProvider.installs[0].releaseNotesURI = Services.io.newURI(TESTROOT + "releaseNotes.xhtml", null, null)
-
-      info("Re-opening release notes");
-      item.addEventListener("RelNotesToggle", function() {
-        item.removeEventListener("RelNotesToggle", arguments.callee, false);
-        info("Release notes now open");
-
-        is_element_hidden(item._relNotesLoading, "Release notes loading message should be hidden");
-        is_element_hidden(item._relNotesError, "Release notes error message should be hidden");
-        isnot(item._relNotes.childElementCount, 0, "Release notes should have been inserted into container");
-        run_next_test();
-
-      }, false);
-      EventUtils.synthesizeMouseAtCenter(item._relNotesToggle, { }, gManagerWindow);
-      is_element_visible(item._relNotesLoading, "Release notes loading message should be visible");
-
-    }, false);
-    EventUtils.synthesizeMouseAtCenter(item._relNotesToggle, { }, gManagerWindow);
-
-  }, false);
-  EventUtils.synthesizeMouseAtCenter(item._relNotesToggle, { }, gManagerWindow);
-  is_element_visible(item._relNotesLoading, "Release notes loading message should be visible");
-});
-
-
-add_test(function() {
-  var list = gManagerWindow.document.getElementById("updates-list");
-  var item = list.firstChild;
-  var updateBtn = item._updateBtn;
-  is_element_visible(updateBtn, "Update button should be visible");
-
-  var install = gProvider.installs[0];
-  var listener = {
-    onInstallStarted: function() {
-      info("Install started");
-      is_element_visible(item._installStatus, "Install progress widget should be visible");
-    },
-    onInstallEnded: function() {
-      install.removeTestListener(this);
-      info("install ended");
-      is_element_hidden(item._installStatus, "Install progress widget should be hidden");
-      run_next_test();
-    }
-  };
-  install.addTestListener(listener);
-  EventUtils.synthesizeMouseAtCenter(updateBtn, { }, gManagerWindow);
-});
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Tests manual updates, including the Available Updates pane
+
+var gProvider;
+var gManagerWindow;
+var gCategoryUtilities;
+var gAvailableCategory;
+
+function test() {
+  waitForExplicitFinish();
+
+  gProvider = new MockProvider();
+
+  gProvider.createAddons([{
+    id: "addon1@tests.mozilla.org",
+    name: "auto updating addon",
+    version: "1.0",
+    applyBackgroundUpdates: AddonManager.AUTOUPDATE_ENABLE
+  }]);
+
+  open_manager("addons://list/extension", function(aWindow) {
+    gManagerWindow = aWindow;
+    gCategoryUtilities = new CategoryUtilities(gManagerWindow);
+    run_next_test();
+  });
+}
+
+function end_test() {
+  close_manager(gManagerWindow, function() {
+    finish();
+  });
+}
+
+
+add_test(function() {
+  gAvailableCategory = gManagerWindow.gCategories.get("addons://updates/available");
+  is(gCategoryUtilities.isVisible(gAvailableCategory), false, "Available Updates category should initially be hidden");
+  
+  gProvider.createAddons([{
+    id: "addon2@tests.mozilla.org",
+    name: "manually updating addon",
+    version: "1.0",
+    isCompatible: false,
+    blocklistState: Ci.nsIBlocklistService.STATE_BLOCKED,
+    applyBackgroundUpdates: AddonManager.AUTOUPDATE_DISABLE
+  }]);
+  
+  is(gCategoryUtilities.isVisible(gAvailableCategory), true, "Available Updates category should now be visible");
+  
+  gAvailableCategory.addEventListener("CategoryVisible", function() {
+    gAvailableCategory.removeEventListener("CategoryVisible", arguments.callee, false);
+    is(gCategoryUtilities.isVisible(gAvailableCategory), false, "Available Updates category should not be visible");
+    gAvailableCategory.addEventListener("CategoryVisible", function() {
+      gAvailableCategory.removeEventListener("CategoryVisible", arguments.callee, false);
+      is(gCategoryUtilities.isVisible(gAvailableCategory), true, "Available Updates category should be visible");
+      run_next_test();
+    }, false);
+    gProvider.addons[1].applyBackgroundUpdates = AddonManager.AUTOUPDATE_DISABLE;
+  }, false);
+  gProvider.addons[1].applyBackgroundUpdates = AddonManager.AUTOUPDATE_ENABLE;
+});
+
+
+add_test(function() {
+  gAvailableCategory.addEventListener("CategoryBadgeUpdated", function() {
+    gAvailableCategory.removeEventListener("CategoryBadgeUpdated", arguments.callee, false);
+    is(gAvailableCategory.badgeCount, 1, "Badge for Available Updates should now be 1");
+    run_next_test();
+  }, false);
+
+  gCategoryUtilities.openType("extension", function() {
+    gProvider.createInstalls([{
+      name: "manually updating addon (new and improved!)",
+      existingAddon: gProvider.addons[1],
+      version: "1.1",
+      releaseNotesURI: Services.io.newURI(TESTROOT + "thereIsNoFileHere.xhtml", null, null)
+    }]);
+
+    var item = get_addon_element(gManagerWindow, "addon2@tests.mozilla.org");
+    is(item._version.value, "1.0", "Should still show the old version in the normal list");
+  });
+});
+
+
+add_test(function() {
+  wait_for_view_load(gManagerWindow, function() {
+    is(gManagerWindow.document.getElementById("categories").selectedItem.value, "addons://updates/available", "Available Updates category should now be selected");
+    is(gManagerWindow.gViewController.currentViewId, "addons://updates/available", "Available Updates view should be the current view");
+    run_next_test();
+  }, true);
+  EventUtils.synthesizeMouseAtCenter(gAvailableCategory, { }, gManagerWindow);
+});
+
+
+add_test(function() {
+  var list = gManagerWindow.document.getElementById("updates-list");
+  is(list.itemCount, 1, "Should be 1 available update listed");
+  var item = list.firstChild;
+  is(item.mAddon.id, "addon2@tests.mozilla.org", "Update item should be for the manually updating addon");
+  
+  // for manual update items, update-related properties are updated asynchronously,
+  // so we poll for one of the expected changes to know when its done
+  function waitForAsyncInit() {
+    if (item._version.value == "1.1") {
+      run_next_test();
+      return;
+    }
+    info("Update item not initialized yet, checking again in 100ms");
+    setTimeout(waitForAsyncInit, 100);
+  }
+  waitForAsyncInit();
+});
+
+add_test(function() {
+  var list = gManagerWindow.document.getElementById("updates-list");
+  var item = list.firstChild;
+  is(item._version.value, "1.1", "Update item should have version number of the update");
+  var postfix = gManagerWindow.document.getAnonymousElementByAttribute(item, "class", "update-postfix");
+  is_element_visible(postfix, "'Update' postfix should be visible");
+  is_element_visible(item._updateAvailable, "");
+  is_element_visible(item._relNotesToggle, "Release notes toggle should be visible");
+  is_element_hidden(item._warning, "Incompatible warning should be hidden");
+  is_element_hidden(item._error, "Blocklist error should be hidden");
+
+  info("Opening release notes");
+  item.addEventListener("RelNotesToggle", function() {
+    item.removeEventListener("RelNotesToggle", arguments.callee, false);
+    info("Release notes now open");
+
+    is_element_hidden(item._relNotesLoading, "Release notes loading message should be hidden");
+    is_element_visible(item._relNotesError, "Release notes error message should be visible");
+    is(item._relNotes.childElementCount, 0, "Release notes should be empty");
+
+    info("Closing release notes");
+    item.addEventListener("RelNotesToggle", function() {
+      item.removeEventListener("RelNotesToggle", arguments.callee, false);
+      info("Release notes now closed");
+      info("Setting Release notes URI to something that should load");
+      gProvider.installs[0].releaseNotesURI = Services.io.newURI(TESTROOT + "releaseNotes.xhtml", null, null)
+
+      info("Re-opening release notes");
+      item.addEventListener("RelNotesToggle", function() {
+        item.removeEventListener("RelNotesToggle", arguments.callee, false);
+        info("Release notes now open");
+
+        is_element_hidden(item._relNotesLoading, "Release notes loading message should be hidden");
+        is_element_hidden(item._relNotesError, "Release notes error message should be hidden");
+        isnot(item._relNotes.childElementCount, 0, "Release notes should have been inserted into container");
+        run_next_test();
+
+      }, false);
+      EventUtils.synthesizeMouseAtCenter(item._relNotesToggle, { }, gManagerWindow);
+      is_element_visible(item._relNotesLoading, "Release notes loading message should be visible");
+
+    }, false);
+    EventUtils.synthesizeMouseAtCenter(item._relNotesToggle, { }, gManagerWindow);
+
+  }, false);
+  EventUtils.synthesizeMouseAtCenter(item._relNotesToggle, { }, gManagerWindow);
+  is_element_visible(item._relNotesLoading, "Release notes loading message should be visible");
+});
+
+
+add_test(function() {
+  var list = gManagerWindow.document.getElementById("updates-list");
+  var item = list.firstChild;
+  var updateBtn = item._updateBtn;
+  is_element_visible(updateBtn, "Update button should be visible");
+
+  var install = gProvider.installs[0];
+  var listener = {
+    onInstallStarted: function() {
+      info("Install started");
+      is_element_visible(item._installStatus, "Install progress widget should be visible");
+    },
+    onInstallEnded: function() {
+      install.removeTestListener(this);
+      info("install ended");
+      is_element_hidden(item._installStatus, "Install progress widget should be hidden");
+      run_next_test();
+    }
+  };
+  install.addTestListener(listener);
+  EventUtils.synthesizeMouseAtCenter(updateBtn, { }, gManagerWindow);
+});
diff --git a/toolkit/mozapps/extensions/test/browser/browser_recentupdates.js b/toolkit/mozapps/extensions/test/browser/browser_recentupdates.js
index 34ac241b585..1a29732e280 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_recentupdates.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_recentupdates.js
@@ -1,86 +1,86 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests the recent updates pane
-
-var gProvider;
-var gManagerWindow;
-var gCategoryUtilities;
-
-function test() {
-  waitForExplicitFinish();
-
-  gProvider = new MockProvider();
-
-  gProvider.createAddons([{
-    id: "addon1@tests.mozilla.org",
-    name: "updated 6 hours ago",
-    version: "1.0",
-    updateDate: new Date(Date.now() - (1000 * 60 * 60 * 6)),
-    releaseNotesURI: Services.io.newURI(TESTROOT + "releaseNotes.xhtml", null, null)
-  }, {
-    id: "addon2@tests.mozilla.org",
-    name: "updated 5 seconds ago",
-    version: "1.0",
-    updateDate: new Date(Date.now() - (1000 * 5))
-  }, {
-    id: "addon3@tests.mozilla.org",
-    name: "updated 1 month ago",
-    version: "1.0",
-    updateDate: new Date(Date.now() - (1000 * 60 * 60 * 25 * 30))
-  }]);
-  
-  open_manager("addons://list/extension", function(aWindow) {
-    gManagerWindow = aWindow;
-    gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-    run_next_test();
-  });
-}
-
-function end_test() {
-  close_manager(gManagerWindow, function() {
-    finish();
-  });
-}
-
-
-add_test(function() {
-  info("Checking menuitem for Recent Updates opens that pane");
-  var recentCat = gManagerWindow.gCategories.get("addons://updates/recent");
-  is(gCategoryUtilities.isVisible(recentCat), false, "Recent Updates category should initially be hidden");
-
-  var utilsBtn = gManagerWindow.document.getElementById("header-utils-btn");
-  utilsBtn.addEventListener("popupshown", function() {
-    wait_for_view_load(gManagerWindow, function() {
-      is(gCategoryUtilities.isVisible(recentCat), true, "Recent Updates category should now be visible");
-      is(gManagerWindow.document.getElementById("categories").selectedItem.value, "addons://updates/recent", "Recent Updates category should now be selected");
-      is(gManagerWindow.gViewController.currentViewId, "addons://updates/recent", "Recent Updates view should be the current view");
-      run_next_test();
-    }, true);
-    var menuitem = gManagerWindow.document.getElementById("utils-viewUpdates");
-    EventUtils.synthesizeMouse(menuitem, 2, 2, { }, gManagerWindow);
-  }, false);
-  EventUtils.synthesizeMouse(utilsBtn, 2, 2, { }, gManagerWindow);
-});
-
-
-add_test(function() {
-  var updatesList = gManagerWindow.document.getElementById("updates-list");
-  var items = updatesList.getElementsByTagName("richlistitem");
-  var possible = ["addon1@tests.mozilla.org", "addon2@tests.mozilla.org", "addon2@tests.mozilla.org"];
-  var expected = ["addon2@tests.mozilla.org", "addon1@tests.mozilla.org"];
-  for (let i = 0; i < items.length; i++) {
-    let item = items[i];
-    let itemId = item.mAddon.id;
-    if (possible.indexOf(itemId) == -1)
-      continue; // skip over any other addons, such as shipped addons that would update on every build
-    isnot(expected.length, 0, "Should be expecting more items");
-    is(itemId, expected.shift(), "Should get expected item based on recenty of update");
-    if (itemId == "addon1@tests.mozilla.org")
-      is_element_visible(item._relNotesToggle, "Release notes toggle should be visible for addon with release notes");
-    else
-      is_element_hidden(item._relNotesToggle, "Release notes toggle should be hidden for addon with no release notes");
-  }
-  run_next_test();
-});
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Tests the recent updates pane
+
+var gProvider;
+var gManagerWindow;
+var gCategoryUtilities;
+
+function test() {
+  waitForExplicitFinish();
+
+  gProvider = new MockProvider();
+
+  gProvider.createAddons([{
+    id: "addon1@tests.mozilla.org",
+    name: "updated 6 hours ago",
+    version: "1.0",
+    updateDate: new Date(Date.now() - (1000 * 60 * 60 * 6)),
+    releaseNotesURI: Services.io.newURI(TESTROOT + "releaseNotes.xhtml", null, null)
+  }, {
+    id: "addon2@tests.mozilla.org",
+    name: "updated 5 seconds ago",
+    version: "1.0",
+    updateDate: new Date(Date.now() - (1000 * 5))
+  }, {
+    id: "addon3@tests.mozilla.org",
+    name: "updated 1 month ago",
+    version: "1.0",
+    updateDate: new Date(Date.now() - (1000 * 60 * 60 * 25 * 30))
+  }]);
+  
+  open_manager("addons://list/extension", function(aWindow) {
+    gManagerWindow = aWindow;
+    gCategoryUtilities = new CategoryUtilities(gManagerWindow);
+    run_next_test();
+  });
+}
+
+function end_test() {
+  close_manager(gManagerWindow, function() {
+    finish();
+  });
+}
+
+
+add_test(function() {
+  info("Checking menuitem for Recent Updates opens that pane");
+  var recentCat = gManagerWindow.gCategories.get("addons://updates/recent");
+  is(gCategoryUtilities.isVisible(recentCat), false, "Recent Updates category should initially be hidden");
+
+  var utilsBtn = gManagerWindow.document.getElementById("header-utils-btn");
+  utilsBtn.addEventListener("popupshown", function() {
+    wait_for_view_load(gManagerWindow, function() {
+      is(gCategoryUtilities.isVisible(recentCat), true, "Recent Updates category should now be visible");
+      is(gManagerWindow.document.getElementById("categories").selectedItem.value, "addons://updates/recent", "Recent Updates category should now be selected");
+      is(gManagerWindow.gViewController.currentViewId, "addons://updates/recent", "Recent Updates view should be the current view");
+      run_next_test();
+    }, true);
+    var menuitem = gManagerWindow.document.getElementById("utils-viewUpdates");
+    EventUtils.synthesizeMouse(menuitem, 2, 2, { }, gManagerWindow);
+  }, false);
+  EventUtils.synthesizeMouse(utilsBtn, 2, 2, { }, gManagerWindow);
+});
+
+
+add_test(function() {
+  var updatesList = gManagerWindow.document.getElementById("updates-list");
+  var items = updatesList.getElementsByTagName("richlistitem");
+  var possible = ["addon1@tests.mozilla.org", "addon2@tests.mozilla.org", "addon2@tests.mozilla.org"];
+  var expected = ["addon2@tests.mozilla.org", "addon1@tests.mozilla.org"];
+  for (let i = 0; i < items.length; i++) {
+    let item = items[i];
+    let itemId = item.mAddon.id;
+    if (possible.indexOf(itemId) == -1)
+      continue; // skip over any other addons, such as shipped addons that would update on every build
+    isnot(expected.length, 0, "Should be expecting more items");
+    is(itemId, expected.shift(), "Should get expected item based on recenty of update");
+    if (itemId == "addon1@tests.mozilla.org")
+      is_element_visible(item._relNotesToggle, "Release notes toggle should be visible for addon with release notes");
+    else
+      is_element_hidden(item._relNotesToggle, "Release notes toggle should be hidden for addon with no release notes");
+  }
+  run_next_test();
+});
diff --git a/toolkit/mozapps/extensions/test/browser/head.js b/toolkit/mozapps/extensions/test/browser/head.js
index 7208d31f7e8..e6354ce5053 100644
--- a/toolkit/mozapps/extensions/test/browser/head.js
+++ b/toolkit/mozapps/extensions/test/browser/head.js
@@ -393,8 +393,8 @@ CertOverrideListener.prototype = {
   },
 
   notifyCertProblem: function (socketInfo, sslStatus, targetHost) {
-    cert = sslStatus.QueryInterface(Components.interfaces.nsISSLStatus)
-                    .serverCert;
+    var cert = sslStatus.QueryInterface(Components.interfaces.nsISSLStatus)
+                        .serverCert;
     var cos = Cc["@mozilla.org/security/certoverride;1"].
               getService(Ci.nsICertOverrideService);
     cos.rememberValidityOverride(this.host, -1, cert, this.bits, false);
diff --git a/toolkit/mozapps/extensions/test/browser/releaseNotes.xhtml b/toolkit/mozapps/extensions/test/browser/releaseNotes.xhtml
index 60a66d58b29..63ae07901cf 100644
--- a/toolkit/mozapps/extensions/test/browser/releaseNotes.xhtml
+++ b/toolkit/mozapps/extensions/test/browser/releaseNotes.xhtml
@@ -1,15 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html lang="en-US" dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
-</head>
-
-<body>
-  <h1>OMG, an update!!!!</h1>
-  <ul>
-    <li>Made everything more awesome</li>
-    <li>Added hot sauce</li>
-  </ul>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang="en-US" dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+
+<body>
+  <h1>OMG, an update!!!!</h1>
+  <ul>
+    <li>Made everything more awesome</li>
+    <li>Added hot sauce</li>
+  </ul>
+</body>
+</html>
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_auth4.js b/toolkit/mozapps/extensions/test/xpinstall/browser_auth4.js
index 81c3779d115..135d679454e 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_auth4.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_auth4.js
@@ -1,5 +1,7 @@
 // ----------------------------------------------------------------------------
 // Test whether a request for auth for an XPI switches to the appropriate tab
+var gNewTab;
+
 function test() {
   Harness.authenticationCallback = get_auth_info;
   Harness.downloadFailedCallback = download_failed;
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_cancel.js b/toolkit/mozapps/extensions/test/xpinstall/browser_cancel.js
index 8e5b5a2651b..1e75b51b065 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_cancel.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_cancel.js
@@ -27,10 +27,11 @@ function get_item(items, url) {
       return items[i];
   }
   ok(false, "Item for " + url + " was not listed");
+  return null;
 }
 
 function confirm_install(window) {
-  items = window.document.getElementById("itemList").childNodes;
+  let items = window.document.getElementById("itemList").childNodes;
   is(items.length, 2, "Should be 2 items listed in the confirmation dialog");
   let item = get_item(items, TESTROOT + "signed.xpi");
   if (item) {
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_multipackage.js b/toolkit/mozapps/extensions/test/xpinstall/browser_multipackage.js
index 8c1703d4dba..2ab893bf88c 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_multipackage.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_multipackage.js
@@ -16,6 +16,7 @@ function get_item(items, name) {
       return items[i];
   }
   ok(false, "Item for " + name + " was not listed");
+  return null;
 }
 
 function confirm_install(window) {
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_multiple.js b/toolkit/mozapps/extensions/test/xpinstall/browser_signed_multiple.js
index 0db723fea60..63e7a7966e8 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_multiple.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_signed_multiple.js
@@ -27,6 +27,7 @@ function get_item(items, url) {
       return items[i];
   }
   ok(false, "Item for " + url + " was not listed");
+  return null;
 }
 
 function confirm_install(window) {
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_naming.js b/toolkit/mozapps/extensions/test/xpinstall/browser_signed_naming.js
index 0479d304203..6c0d60ebc95 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_naming.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_signed_naming.js
@@ -26,6 +26,7 @@ function get_item(items, url) {
       return items[i];
   }
   ok(false, "Item for " + url + " was not listed");
+  return null;
 }
 
 function confirm_install(window) {
diff --git a/toolkit/mozapps/extensions/test/xpinstall/head.js b/toolkit/mozapps/extensions/test/xpinstall/head.js
index a7923a8cf80..f313a7a4f96 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/head.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/head.js
@@ -17,13 +17,13 @@ function getChromeRoot(path) {
 }
 
 function extractChromeRoot(path) {
-  var path = getChromeRoot(path);
-  var jar = getJar(path);
+  var chromeRootPath = getChromeRoot(path);
+  var jar = getJar(chromeRootPath);
   if (jar) {
     var tmpdir = extractJarToTmp(jar);
     return "file://" + tmpdir.path + "/";
   }
-  return path;
+  return chromeRootPath;
 }
 
 Components.utils.import("resource://gre/modules/AddonManager.jsm");

From fd2b93ccf2118cb0de2ea3f02fb0680bfe7ff238 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Thu, 28 Oct 2010 23:48:48 +0200
Subject: [PATCH 42/57] Backed out changeset 81326ef16ae1. a=oranges

---
 .../html/content/src/nsGenericHTMLElement.cpp | 12 +--
 .../html/content/src/nsHTMLButtonElement.cpp  |  2 +-
 .../html/content/src/nsHTMLFormElement.cpp    | 22 ++++--
 .../html/content/src/nsHTMLInputElement.cpp   |  2 +-
 content/html/content/test/Makefile.in         |  1 -
 content/html/content/test/test_bug392567.html | 26 ++++---
 content/html/content/test/test_bug566160.html | 33 +++++++++
 content/html/content/test/test_bug607145.html | 74 -------------------
 dom/interfaces/html/nsIDOMHTMLFormElement.idl |  5 +-
 .../passwordmgr/src/nsLoginManager.js         |  7 +-
 10 files changed, 78 insertions(+), 106 deletions(-)
 delete mode 100644 content/html/content/test/test_bug607145.html

diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 3f4f67f2f90..8ffe0c2a15a 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -2131,15 +2131,17 @@ nsGenericHTMLElement::GetURIAttr(nsIAtom* aAttr, nsIAtom* aBaseAttr, nsAString&
 {
   nsCOMPtr<nsIURI> uri;
   PRBool hadAttr = GetURIAttr(aAttr, aBaseAttr, PR_FALSE, getter_AddRefs(uri));
-
-  // If the content attribute isn't set or the URL is invalid, the default value
-  // should be returned. The default default value is the empty string and it
-  // looks like no attribute have a specified default value.
-  if (!hadAttr || !uri) {
+  if (!hadAttr) {
     aResult.Truncate();
     return NS_OK;
   }
 
+  if (!uri) {
+    // Just return the attr value
+    GetAttr(kNameSpaceID_None, aAttr, aResult);
+    return NS_OK;
+  }
+
   nsCAutoString spec;
   uri->GetSpec(spec);
   CopyUTF8toUTF16(spec, aResult);
diff --git a/content/html/content/src/nsHTMLButtonElement.cpp b/content/html/content/src/nsHTMLButtonElement.cpp
index e9cb26fc35c..2420d21242a 100644
--- a/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/content/html/content/src/nsHTMLButtonElement.cpp
@@ -218,7 +218,7 @@ nsHTMLButtonElement::GetForm(nsIDOMHTMLFormElement** aForm)
 NS_IMPL_STRING_ATTR(nsHTMLButtonElement, AccessKey, accesskey)
 NS_IMPL_BOOL_ATTR(nsHTMLButtonElement, Autofocus, autofocus)
 NS_IMPL_BOOL_ATTR(nsHTMLButtonElement, Disabled, disabled)
-NS_IMPL_URI_ATTR(nsHTMLButtonElement, FormAction, formaction)
+NS_IMPL_STRING_ATTR(nsHTMLButtonElement, FormAction, formaction)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLButtonElement, FormEnctype, formenctype,
                                 kFormDefaultEnctype->tag)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLButtonElement, FormMethod, formmethod,
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index ffca7972054..bb62ab3ac2c 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -375,7 +375,7 @@ nsHTMLFormElement::SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
 }
 
 NS_IMPL_STRING_ATTR(nsHTMLFormElement, AcceptCharset, acceptcharset)
-NS_IMPL_URI_ATTR(nsHTMLFormElement, Action, action)
+NS_IMPL_STRING_ATTR(nsHTMLFormElement, Action, action)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLFormElement, Autocomplete, autocomplete,
                                 kFormDefaultAutocomplete->tag)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLFormElement, Enctype, enctype,
@@ -386,6 +386,17 @@ NS_IMPL_BOOL_ATTR(nsHTMLFormElement, NoValidate, novalidate)
 NS_IMPL_STRING_ATTR(nsHTMLFormElement, Name, name)
 NS_IMPL_STRING_ATTR(nsHTMLFormElement, Target, target)
 
+NS_IMETHODIMP
+nsHTMLFormElement::GetMozActionUri(nsAString& aValue)
+{
+  GetAttr(kNameSpaceID_None, nsGkAtoms::action, aValue);
+  if (aValue.IsEmpty()) {
+    // Avoid resolving action="" to the base uri, bug 297761.
+    return NS_OK;
+  }
+  return GetURIAttr(nsGkAtoms::action, nsnull, aValue);
+}
+
 NS_IMETHODIMP
 nsHTMLFormElement::Submit()
 {
@@ -1419,23 +1430,18 @@ nsHTMLFormElement::GetActionURL(nsIURI** aActionURL,
   // attribute specified, it should be used. Otherwise, the action attribute
   // from the form element should be used.
   //
-  // In addition, if action="" or formaction="", we need to make sure we don't
-  // try to resolve the URL but we should submit to the current document.
-  //
   nsAutoString action;
   nsCOMPtr<nsIFormControl> formControl = do_QueryInterface(aOriginatingElement);
   if (formControl && formControl->IsSubmitControl() &&
       aOriginatingElement->GetAttr(kNameSpaceID_None, nsGkAtoms::formaction,
                                    action)) {
+    // Avoid resolving action="" to the base uri, bug 297761.
     if (!action.IsEmpty()) {
       static_cast<nsGenericHTMLElement*>(aOriginatingElement)->
         GetURIAttr(nsGkAtoms::formaction, nsnull, action);
     }
   } else {
-    GetAttr(kNameSpaceID_None, nsGkAtoms::action, action);
-    if (!action.IsEmpty()) {
-      GetAction(action);
-    }
+    GetMozActionUri(action);
   }
 
   //
diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index cce840d6d78..f56251136a4 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -962,7 +962,7 @@ NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLInputElement, Autocomplete, autocomplete,
 NS_IMPL_BOOL_ATTR(nsHTMLInputElement, Autofocus, autofocus)
 //NS_IMPL_BOOL_ATTR(nsHTMLInputElement, Checked, checked)
 NS_IMPL_BOOL_ATTR(nsHTMLInputElement, Disabled, disabled)
-NS_IMPL_URI_ATTR(nsHTMLInputElement, FormAction, formaction)
+NS_IMPL_STRING_ATTR(nsHTMLInputElement, FormAction, formaction)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLInputElement, FormEnctype, formenctype,
                                 kFormDefaultEnctype->tag)
 NS_IMPL_ENUM_ATTR_DEFAULT_VALUE(nsHTMLInputElement, FormMethod, formmethod,
diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in
index e84f741f722..7170818b06c 100644
--- a/content/html/content/test/Makefile.in
+++ b/content/html/content/test/Makefile.in
@@ -238,7 +238,6 @@ _TEST_FILES = \
 		test_bug606817.html \
 		test_bug297761.html \
 		file_bug297761.html \
-		test_bug607145.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/html/content/test/test_bug392567.html b/content/html/content/test/test_bug392567.html
index 766c8e7b870..e7e76d8d081 100644
--- a/content/html/content/test/test_bug392567.html
+++ b/content/html/content/test/test_bug392567.html
@@ -42,17 +42,17 @@ function runTests()
 
   // List of tests to run, each test consists of form action URL and expected result URL
   var tests = [
-    [jarUrl, jarUrl + "?$PARAMS"],
-    [jarUrl + "?jarTest1=jarTest2", jarUrl + "?$PARAMS"],
-    [jarUrl + "?jarTest3=jarTest4#jarTest5", jarUrl + "?$PARAMS#jarTest5"],
-    ["data:text/html,<html></html>", "data:text/html,<html></html>?$PARAMS"],
-    ["data:text/html,<html>How%20about%20this?</html>", "data:text/html,<html>How%20about%20this?$PARAMS"],
-    [httpUrl, httpUrl + "?$PARAMS"],
-    [httpUrl + "?httpTest1=httpTest2", httpUrl + "?$PARAMS"],
-    [httpUrl + "?httpTest3=httpTest4#httpTest5", httpUrl + "?$PARAMS#httpTest5"],
-    ["", documentURL + "?$PARAMS"],
-    [" ", documentURL + "?$PARAMS"],
-    ["../", previousDir + "?$PARAMS"],
+    [jarUrl, jarUrl + "?$PARAMS", null],
+    [jarUrl + "?jarTest1=jarTest2", jarUrl + "?$PARAMS", null],
+    [jarUrl + "?jarTest3=jarTest4#jarTest5", jarUrl + "?$PARAMS#jarTest5", null],
+    ["data:text/html,<html></html>", "data:text/html,<html></html>?$PARAMS", null],
+    ["data:text/html,<html>How%20about%20this?</html>", "data:text/html,<html>How%20about%20this?$PARAMS", null],
+    [httpUrl, httpUrl + "?$PARAMS", null],
+    [httpUrl + "?httpTest1=httpTest2", httpUrl + "?$PARAMS", null ],
+    [httpUrl + "?httpTest3=httpTest4#httpTest5", httpUrl + "?$PARAMS#httpTest5", null],
+    ["", documentURL + "?$PARAMS", null],
+    [" ", documentURL + "?$PARAMS", document.location],
+    ["../", previousDir + "?$PARAMS", previousDir],
   ];
 
   var currentTest = -1;
@@ -67,6 +67,10 @@ function runTests()
     }
 
     form.setAttribute("action", tests[currentTest][0]);
+    is(form.action, tests[currentTest][0],
+       "action IDL attribute should reflect the action content attribute");
+    is(form.mozActionUri, tests[currentTest][2] ? tests[currentTest][2] : tests[currentTest][0],
+       "mozActionUri IDL attribute should resolve the action URI");
     form.key.value = "value" + currentTest;
     form.submit();
   }
diff --git a/content/html/content/test/test_bug566160.html b/content/html/content/test/test_bug566160.html
index c11faaef65d..cd258ce0b14 100644
--- a/content/html/content/test/test_bug566160.html
+++ b/content/html/content/test/test_bug566160.html
@@ -83,8 +83,41 @@ var gTestResults = {
 
 var gPendingLoad = 0; // Has to be set after depending on the frames number.
 
+function checkFormActionAttribute(aElement)
+{
+  ok("formAction" in aElement, "formAction IDL attribute should be available in "
+     + aElement);
+
+  is(aElement.formAction, "", "formAction IDL attribute should be " +
+     "undefined by default");
+  is(aElement.getAttribute('formaction'), null, "formaction content attribute " +
+     "should be the empty string by default");
+
+  aElement.formAction = "foo";
+  is(aElement.getAttribute('formaction'), "foo", "formaction content attribute " +
+     "should be 'foo'.");
+  is(aElement.formAction, "foo", "formAction IDL attribute should reflect " +
+     "the content attribute");
+
+  aElement.setAttribute('formaction', 'bar');
+  is(aElement.getAttribute('formaction'), "bar", "formaction content attribute " +
+     "should be 'foo'.");
+  is(aElement.formAction, "bar", "formAction IDL attribute should reflect " +
+     "the content attribute");
+
+  aElement.removeAttribute('formaction');
+  is(aElement.formAction, "", "formAction IDL attribute should be " +
+     "undefined by default");
+  is(aElement.getAttribute('formaction'), null, "formaction content attribute " +
+     "should be the empty string by default");
+}
+
 function runTests()
 {
+  // First of all, let's check if .formAction and @formaction work correctly.
+  checkFormActionAttribute(document.createElement('input'));
+  checkFormActionAttribute(document.createElement('button'));
+
   // We add a load event for the frames which will be called when the forms
   // will be submitted.
   var frames = [ document.getElementById('frame1'),
diff --git a/content/html/content/test/test_bug607145.html b/content/html/content/test/test_bug607145.html
deleted file mode 100644
index dd72371de88..00000000000
--- a/content/html/content/test/test_bug607145.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=607145
--->
-<head>
-  <title>Test for Bug 607145</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=607145">Mozilla Bug 607145</a>
-<p id="display"></p>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for Bug 607145 **/
-
-function reflectURL(aElement, aAttr)
-{
-  var idl = aAttr;
-  var attr = aAttr.toLowerCase();
-  var elmtName = aElement.tagName.toLowerCase();
-
-  ok(idl in aElement, idl + " should be available in " + elmtName);
-
-  // Default values.
-  is(aElement[idl], "", "." + idl + " default value should be the empty string");
-  is(aElement.getAttribute(attr), null,
-     "@" + attr + " default value should be null");
-
-  var previousDir = location.href.replace(/test\/[^\/]*$/, "");
-  var dir = location.href.replace(/test_bug607145.html[^\/]*$/, "");
-  var doc = location.href.replace(/\.html.*/, ".html")
-  var values = [
-    /* value to set, resolved value */
-    [ "foo.html", dir + "foo.html" ],
-    [ "data:text/html,<html></html>", "data:text/html,<html></html>" ],
-    [ "http://example.org/", "http://example.org/" ],
-    [ "//example.org/", "http://example.org/" ],
-    [ "?foo=bar", doc + "?foo=bar" ],
-    [ "#foo", location.href + "#foo" ],
-    [ "", location.href ],
-    [ " ", location.href ],
-    [ "../", previousDir ],
-    [ "...", dir + "..." ],
-    // invalid URL
-    [ "http://a b/", "" ],
-  ];
-
-  for each (var value in values) {
-    aElement[idl] = value[0];
-    is(aElement[idl], value[1], "." + idl + " value should be " + value[1]);
-    is(aElement.getAttribute(attr), value[0],
-       "@" + attr + " value should be " + value[0]);
-  }
-
-  for each (var value in values) {
-    aElement.setAttribute(attr, value[0]);
-    is(aElement[idl], value[1], "." + idl + " value should be " + value[1]);
-    is(aElement.getAttribute(attr), value[0],
-       "@" + attr + " value should be " + value[0]);
-  }
-}
-
-reflectURL(document.createElement("form"), "action");
-reflectURL(document.createElement("input"), "formAction");
-reflectURL(document.createElement("button"), "formAction");
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/dom/interfaces/html/nsIDOMHTMLFormElement.idl b/dom/interfaces/html/nsIDOMHTMLFormElement.idl
index 7d78a2d0035..96da5649277 100644
--- a/dom/interfaces/html/nsIDOMHTMLFormElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLFormElement.idl
@@ -47,7 +47,7 @@
  * http://www.w3.org/TR/DOM-Level-2-HTML/
  */
 
-[scriptable, uuid(0884ce23-e069-499e-a13c-a91c8ae0fc98)]
+[scriptable, uuid(653dc482-d6db-4e85-bdd9-151fd110e7b1)]
 interface nsIDOMHTMLFormElement : nsIDOMHTMLElement
 {
            attribute DOMString            name;
@@ -65,4 +65,7 @@ interface nsIDOMHTMLFormElement : nsIDOMHTMLElement
 
   void                      submit();
   void                      reset();
+
+  // This property returns the resolved action URI.
+  readonly attribute DOMString            mozActionUri;
 };
diff --git a/toolkit/components/passwordmgr/src/nsLoginManager.js b/toolkit/components/passwordmgr/src/nsLoginManager.js
index 4b7cfb7cfcc..25140729414 100644
--- a/toolkit/components/passwordmgr/src/nsLoginManager.js
+++ b/toolkit/components/passwordmgr/src/nsLoginManager.js
@@ -978,12 +978,11 @@ LoginManager.prototype = {
     },
 
     _getActionOrigin : function (form) {
-        var uriString = form.action;
+        var uriString = form.mozActionUri;
 
-        // If uriString equals the empty string that means actian attribute is
-        // missing or invalid and it will submit to the baseURI.
+        // A blank or mission action submits to where it came from.
         if (uriString == "")
-            uriString = form.baseURI;
+            uriString = form.baseURI; // ala bug 297761
 
         return this._getPasswordOrigin(uriString, true);
     },

From a94f604f408a663359d69f74e14f55c6c457c107 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Thu, 28 Oct 2010 15:00:31 -0700
Subject: [PATCH 43/57] Bug 575561 - External links from within app tabs should
 always open in new tabs instead of replacing the app tab's page. r=gavin+bz,
 a=blocking-beta7

---
 browser/base/content/browser.js               | 21 ++++++
 browser/base/content/tabbrowser.xml           |  4 ++
 docshell/base/nsDocShell.cpp                  | 33 +++++++++-
 docshell/base/nsDocShell.h                    |  1 +
 docshell/base/nsIDocShell.idl                 | 10 ++-
 embedding/browser/webBrowser/Makefile.in      |  1 +
 .../webBrowser/nsIWebBrowserChrome3.idl       | 65 +++++++++++++++++++
 toolkit/components/help/content/help.js       |  3 +-
 toolkit/content/Services.jsm                  |  4 ++
 .../content/tests/chrome/findbar_window.xul   |  4 +-
 xpfe/appshell/public/nsIXULBrowserWindow.idl  | 10 +++
 xpfe/appshell/src/nsContentTreeOwner.cpp      | 24 +++++++
 xpfe/appshell/src/nsContentTreeOwner.h        |  5 +-
 13 files changed, 177 insertions(+), 8 deletions(-)
 create mode 100644 embedding/browser/webBrowser/nsIWebBrowserChrome3.idl

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 006eec5f90c..65310db8558 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3985,6 +3985,27 @@ var XULBrowserWindow = {
                         encodeURIComponent);
     gURLBar.setOverLink(link);
   },
+  
+  // Called before links are navigated to to allow us to retarget them if needed.
+  onBeforeLinkTraversal: function(originalTarget, linkURI, linkNode, isAppTab) {
+    // Don't modify non-default targets or targets that aren't in top-level app
+    // tab docshells (isAppTab will be false for app tab subframes).
+    if (originalTarget != "" || !isAppTab)
+      return originalTarget;
+
+    let docURI = linkNode.ownerDocument.documentURIObject;
+    try {
+      let docURIDomain = Services.eTLD.getBaseDomain(docURI, 0);
+      let linkURIDomain = Services.eTLD.getBaseDomain(linkURI, 0);
+      // External links from within app tabs should always open in new tabs
+      // instead of replacing the app tab's page (Bug 575561)
+      if (docURIDomain != linkURIDomain)
+        return "_blank";
+    } catch(e) {
+      // If getBaseDomain fails, we return originalTarget below.
+    }
+    return originalTarget;
+  },
 
   onLinkIconAvailable: function (aIconURL) {
     if (gProxyFavIcon && gBrowser.userTypedValue === null)
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index a11bde11f22..fdb9bb62fc8 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -191,6 +191,8 @@
           this.tabContainer._positionPinnedTabs();
           this.tabContainer.adjustTabstrip();
 
+          this.getBrowserForTab(aTab).docShell.isAppTab = true;
+
           let event = document.createEvent("Events");
           event.initEvent("TabPinned", true, false);
           aTab.dispatchEvent(event);
@@ -210,6 +212,8 @@
           this.tabContainer._positionPinnedTabs();
           this.tabContainer.adjustTabstrip();
 
+          this.getBrowserForTab(aTab).docShell.isAppTab = false;
+
           let event = document.createEvent("Events");
           event.initEvent("TabUnpinned", true, false);
           aTab.dispatchEvent(event);
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 8257979f25d..42ffaec9270 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -159,7 +159,7 @@
 #include "nsIController.h"
 #include "nsPICommandUpdater.h"
 #include "nsIDOMHTMLAnchorElement.h"
-#include "nsIWebBrowserChrome2.h"
+#include "nsIWebBrowserChrome3.h"
 #include "nsITabChild.h"
 #include "nsIStrictTransportSecurityService.h"
 
@@ -711,6 +711,7 @@ nsDocShell::nsDocShell():
     mAllowKeywordFixup(PR_FALSE),
     mIsOffScreenBrowser(PR_FALSE),
     mIsActive(PR_TRUE),
+    mIsAppTab(PR_FALSE),
     mFiredUnloadEvent(PR_FALSE),
     mEODForCurrentDocument(PR_FALSE),
     mURIResultedInDocument(PR_FALSE),
@@ -4802,6 +4803,20 @@ nsDocShell::GetIsActive(PRBool *aIsActive)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsDocShell::SetIsAppTab(PRBool aIsAppTab)
+{
+  mIsAppTab = aIsAppTab;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShell::GetIsAppTab(PRBool *aIsAppTab)
+{
+  *aIsAppTab = mIsAppTab;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsDocShell::SetVisibility(PRBool aVisibility)
 {
@@ -11311,8 +11326,22 @@ nsDocShell::OnLinkClick(nsIContent* aContent,
     return NS_OK;
   }
 
+  nsresult rv = NS_ERROR_FAILURE;
+  nsAutoString target;
+
+  nsCOMPtr<nsIWebBrowserChrome3> browserChrome3 = do_GetInterface(mTreeOwner);
+  if (browserChrome3) {
+    nsCOMPtr<nsIDOMNode> linkNode = do_QueryInterface(aContent);
+    nsAutoString oldTarget(aTargetSpec);
+    rv = browserChrome3->OnBeforeLinkTraversal(oldTarget, aURI,
+                                               linkNode, mIsAppTab, target);
+  }
+  
+  if (NS_FAILED(rv))
+    target = aTargetSpec;  
+
   nsCOMPtr<nsIRunnable> ev =
-      new OnLinkClickEvent(this, aContent, aURI, aTargetSpec,
+      new OnLinkClickEvent(this, aContent, aURI, target.get(),
                            aPostDataStream, aHeadersDataStream);
   return NS_DispatchToCurrentThread(ev);
 }
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index a6c33f149c1..317f766a48a 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -790,6 +790,7 @@ protected:
     PRPackedBool               mAllowKeywordFixup;
     PRPackedBool               mIsOffScreenBrowser;
     PRPackedBool               mIsActive;
+    PRPackedBool               mIsAppTab;
 
     // This boolean is set to true right before we fire pagehide and generally
     // unset when we embed a new content viewer.  While it's true no navigation
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
index 788be5c5ef2..e5a72e5813e 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -71,7 +71,7 @@ interface nsIPrincipal;
 interface nsIWebBrowserPrint;
 interface nsIVariant;
 
-[scriptable, uuid(74470127-87eb-4f79-8293-1616fe9cb689)]
+[scriptable, uuid(98cdbcc4-2d81-4191-a63f-b6c52085edbc)]
 interface nsIDocShell : nsISupports
 {
   /**
@@ -529,11 +529,17 @@ interface nsIDocShell : nsISupports
    */
   attribute boolean isActive;
 
-
   /**
    * The ID of the docshell in the session history.
    */
   readonly attribute unsigned long long historyID;
+
+  /**
+   * Sets whether a docshell is an app tab. An app tab docshell may behave
+   * differently than a non-app tab docshell in some cases, such as when
+   * handling link clicks. Docshells are not app tabs unless told otherwise.
+   */
+  attribute boolean isAppTab;
 };
 
 [uuid(5f7a2184-31b6-4d67-9c75-0c17477766e2)]
diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in
index b068d4c210d..10a56f9671c 100644
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -78,6 +78,7 @@ XPIDLSRCS	= \
 		nsIEmbeddingSiteWindow2.idl \
 		nsIContextMenuListener2.idl \
 		nsIWebBrowserChrome2.idl	    \
+		nsIWebBrowserChrome3.idl	    \
 		$(NULL)
 
 CPPSRCS		= \
diff --git a/embedding/browser/webBrowser/nsIWebBrowserChrome3.idl b/embedding/browser/webBrowser/nsIWebBrowserChrome3.idl
new file mode 100644
index 00000000000..b15bf12335e
--- /dev/null
+++ b/embedding/browser/webBrowser/nsIWebBrowserChrome3.idl
@@ -0,0 +1,65 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Margaret Leibovic <margaret.leibovic@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include "nsIWebBrowserChrome2.idl"
+#include "nsIURI.idl"
+#include "nsIDOMNode.idl"
+
+/**
+ * nsIWebBrowserChrome3 is an extension to nsIWebBrowserChrome2.
+ */
+[scriptable, uuid(7f2aa813-b250-4e46-afeb-97b1e91bc9a5)]
+interface nsIWebBrowserChrome3 : nsIWebBrowserChrome2
+{
+  /**
+   * Determines the appropriate target for a link.
+   *
+   * @param originalTarget
+   *        The original link target.
+   * @param linkURI
+   *        Link destination URI.
+   * @param aDOMNode
+   *        Link DOM node.
+   * @param isAppTab
+   *        Whether or not the link is in an app tab.
+   * @returns A new link target, if appropriate.
+   *          Otherwise returns originalTarget.
+   */
+  AString onBeforeLinkTraversal(in AString originalTarget,
+                                in nsIURI linkURI,
+                                in nsIDOMNode linkNode,
+                                in PRBool isAppTab);
+};
diff --git a/toolkit/components/help/content/help.js b/toolkit/components/help/content/help.js
index f17403b17bd..4a49bfb9b7c 100644
--- a/toolkit/components/help/content/help.js
+++ b/toolkit/components/help/content/help.js
@@ -562,7 +562,8 @@ nsHelpStatusHandler.prototype = {
 
     setJSStatus : function(status) {},
     setJSDefaultStatus : function(status) {},
-    setOverLink : function(link, context) {}
+    setOverLink : function(link, context) {},
+    onBeforeLinkTraversal: function(originalTarget, linkURI, linkNode, isAppTab) {}
 }
 
 function UpdateBackForwardButtons() {
diff --git a/toolkit/content/Services.jsm b/toolkit/content/Services.jsm
index 4d6a82866bf..86ad255edd2 100644
--- a/toolkit/content/Services.jsm
+++ b/toolkit/content/Services.jsm
@@ -130,3 +130,7 @@ XPCOMUtils.defineLazyServiceGetter(Services, "strings",
 XPCOMUtils.defineLazyServiceGetter(Services, "urlFormatter",
                                    "@mozilla.org/toolkit/URLFormatterService;1",
                                    "nsIURLFormatter");
+
+XPCOMUtils.defineLazyServiceGetter(Services, "eTLD",
+                                   "@mozilla.org/network/effective-tld-service;1",
+                                   "nsIEffectiveTLDService");
diff --git a/toolkit/content/tests/chrome/findbar_window.xul b/toolkit/content/tests/chrome/findbar_window.xul
index 33729245b7e..911b3e9cf85 100644
--- a/toolkit/content/tests/chrome/findbar_window.xul
+++ b/toolkit/content/tests/chrome/findbar_window.xul
@@ -76,7 +76,9 @@
 
       setOverLink: function(aStatusText, aLink) {
         gStatusText = aStatusText;
-      }
+      },
+
+      onBeforeLinkTraversal: function() { }
     };
 
     function ok(condition, message) {
diff --git a/xpfe/appshell/public/nsIXULBrowserWindow.idl b/xpfe/appshell/public/nsIXULBrowserWindow.idl
index 37a8676aa99..d787d9405a0 100644
--- a/xpfe/appshell/public/nsIXULBrowserWindow.idl
+++ b/xpfe/appshell/public/nsIXULBrowserWindow.idl
@@ -38,6 +38,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
+#include "nsIURI.idl"
+#include "nsIDOMNode.idl"
 
 interface nsIRequest;
 interface nsIDOMElement;
@@ -65,5 +67,13 @@ interface nsIXULBrowserWindow : nsISupports
    * over.
    */
   void setOverLink(in AString link, in nsIDOMElement element);
+
+  /**
+   * Determines the appropriate target for a link.
+   */
+  AString onBeforeLinkTraversal(in AString originalTarget,
+                                in nsIURI linkURI,
+                                in nsIDOMNode linkNode,
+                                in PRBool isAppTab);
 };
 
diff --git a/xpfe/appshell/src/nsContentTreeOwner.cpp b/xpfe/appshell/src/nsContentTreeOwner.cpp
index 3794e06d4b9..f6c21a0a86d 100644
--- a/xpfe/appshell/src/nsContentTreeOwner.cpp
+++ b/xpfe/appshell/src/nsContentTreeOwner.cpp
@@ -124,6 +124,7 @@ NS_INTERFACE_MAP_BEGIN(nsContentTreeOwner)
    NS_INTERFACE_MAP_ENTRY(nsIBaseWindow)
    NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome)
    NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome2)
+   NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome3)
    NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
    NS_INTERFACE_MAP_ENTRY(nsIWindowProvider)
    // NOTE: This is using aggregation because there are some properties and
@@ -430,6 +431,29 @@ nsContentTreeOwner::GetPersistence(PRBool* aPersistPosition,
   return NS_OK;
 }
 
+//*****************************************************************************
+// nsContentTreeOwner::nsIWebBrowserChrome3
+//*****************************************************************************   
+
+NS_IMETHODIMP nsContentTreeOwner::OnBeforeLinkTraversal(const nsAString &originalTarget,
+                                                        nsIURI *linkURI,
+                                                        nsIDOMNode *linkNode,
+                                                        PRBool isAppTab,
+                                                        nsAString &_retval)
+{
+  NS_ENSURE_STATE(mXULWindow);
+
+  nsCOMPtr<nsIXULBrowserWindow> xulBrowserWindow;
+  mXULWindow->GetXULBrowserWindow(getter_AddRefs(xulBrowserWindow));
+
+  if (xulBrowserWindow)
+    return xulBrowserWindow->OnBeforeLinkTraversal(originalTarget, linkURI,
+                                                   linkNode, isAppTab, _retval);
+  
+  _retval = originalTarget;
+  return NS_OK;
+}
+
 //*****************************************************************************
 // nsContentTreeOwner::nsIWebBrowserChrome2
 //*****************************************************************************   
diff --git a/xpfe/appshell/src/nsContentTreeOwner.h b/xpfe/appshell/src/nsContentTreeOwner.h
index efc4e54b339..31d462a52e5 100644
--- a/xpfe/appshell/src/nsContentTreeOwner.h
+++ b/xpfe/appshell/src/nsContentTreeOwner.h
@@ -49,7 +49,7 @@
 #include "nsIDocShellTreeOwner.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsIWebBrowserChrome2.h"
+#include "nsIWebBrowserChrome3.h"
 #include "nsIWindowProvider.h"
 
 class nsXULWindow;
@@ -58,7 +58,7 @@ class nsSiteWindow2;
 class nsContentTreeOwner : public nsIDocShellTreeOwner,
                            public nsIBaseWindow,
                            public nsIInterfaceRequestor,
-                           public nsIWebBrowserChrome2,
+                           public nsIWebBrowserChrome3,
                            public nsIWindowProvider
 {
 friend class nsXULWindow;
@@ -72,6 +72,7 @@ public:
    NS_DECL_NSIINTERFACEREQUESTOR
    NS_DECL_NSIWEBBROWSERCHROME
    NS_DECL_NSIWEBBROWSERCHROME2
+   NS_DECL_NSIWEBBROWSERCHROME3
    NS_DECL_NSIWINDOWPROVIDER
 
 protected:

From ee5986c4c40d6cda71cbab2ed61f82203d6c24eb Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Thu, 28 Oct 2010 15:00:50 -0700
Subject: [PATCH 44/57] Bug 575561 - External links from within app tabs should
 always open in new tabs instead of replacing the app tab's page (Tests).
 r=gavin, a=blocking-beta7

---
 browser/base/content/test/Makefile.in         |  3 +
 browser/base/content/test/app_bug575561.html  | 16 ++++
 .../content/test/app_subframe_bug575561.html  | 12 +++
 .../base/content/test/browser_bug575561.js    | 73 +++++++++++++++++++
 .../content/tests/browser/browser_Services.js |  3 +
 5 files changed, 107 insertions(+)
 create mode 100644 browser/base/content/test/app_bug575561.html
 create mode 100644 browser/base/content/test/app_subframe_bug575561.html
 create mode 100644 browser/base/content/test/browser_bug575561.js

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 6022529c7ac..3492d16576f 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -145,6 +145,7 @@ _BROWSER_FILES = \
                  browser_bug561636.js \
                  browser_bug562649.js \
                  browser_bug563588.js \
+                 browser_bug575561.js \
                  browser_bug577121.js \
                  browser_bug579872.js \
                  browser_bug580956.js \
@@ -218,6 +219,8 @@ _BROWSER_FILES = \
                  file_bug550565_favicon.ico \
                  browser_overLinkInLocationBar.js \
                  browser_aboutHome.js \
+                 app_bug575561.html \
+                 app_subframe_bug575561.html \
                  $(NULL)
 
 # compartment-disabled
diff --git a/browser/base/content/test/app_bug575561.html b/browser/base/content/test/app_bug575561.html
new file mode 100644
index 00000000000..60511f5dedd
--- /dev/null
+++ b/browser/base/content/test/app_bug575561.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=575561
+-->
+  <head>
+    <title>Test for links in app tabs</title>
+  </head>
+  <body>
+    <a href="http://example.com/browser/browser/base/content/test/dummy_page.html">same domain</a>
+    <a href="http://test1.example.com/browser/browser/base/content/test/dummy_page.html">same domain (different subdomain)</a>
+    <a href="http://example.org/browser/browser/base/content/test/dummy_page.html">different domain</a>
+    <a href="http://example.org/browser/browser/base/content/test/dummy_page.html" target="foo">different domain (with target)</a>
+    <iframe src="app_subframe_bug575561.html"></iframe>
+  </body>
+</html>
diff --git a/browser/base/content/test/app_subframe_bug575561.html b/browser/base/content/test/app_subframe_bug575561.html
new file mode 100644
index 00000000000..754f3806e15
--- /dev/null
+++ b/browser/base/content/test/app_subframe_bug575561.html
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=575561
+-->
+  <head>
+    <title>Test for links in app tab subframes</title>
+  </head>
+  <body>
+    <a href="http://example.org/browser/browser/base/content/test/dummy_page.html">different domain</a>
+  </body>
+</html>
diff --git a/browser/base/content/test/browser_bug575561.js b/browser/base/content/test/browser_bug575561.js
new file mode 100644
index 00000000000..131c06a47dd
--- /dev/null
+++ b/browser/base/content/test/browser_bug575561.js
@@ -0,0 +1,73 @@
+function test() {
+  waitForExplicitFinish();
+
+  // Pinned: Link to the same domain should not open a new tab
+  // Tests link to http://example.com/browser/browser/base/content/test/dummy_page.html  
+  testLink(0, true, false, function() {
+    // Pinned: Link to the same domain should not open a new tab
+    // Tests link to http://test1.example.com/browser/browser/base/content/test/dummy_page.html
+    testLink(1, true, false, function() {
+      // Pinned: Link to a different domain should open a new tab
+      // Tests link to http://example.org/browser/browser/base/content/test/dummy_page.html
+      testLink(2, true, true, function() {
+        // Not Pinned: Link to a different domain should not open a new tab
+        // Tests link to http://example.org/browser/browser/base/content/test/dummy_page.html
+        testLink(2, false, false, function() {
+          // Pinned: Targetted link should open a new tab
+          // Tests link to http://example.org/browser/browser/base/content/test/dummy_page.html with target="foo"
+          testLink(3, true, true, function() {
+            // Pinned: Link in a subframe should not open a new tab
+            // Tests link to http://example.org/browser/browser/base/content/test/dummy_page.html in subframe
+            testLink(0, true, false, finish, true);
+          });
+        });
+      });
+    });
+  });
+}
+
+function testLink(aLinkIndex, pinTab, expectNewTab, nextTest, testSubFrame) {
+  let appTab = gBrowser.addTab("http://example.com/browser/browser/base/content/test/app_bug575561.html", {skipAnimation: true});
+  if (pinTab)
+    gBrowser.pinTab(appTab);
+  gBrowser.selectedTab = appTab;
+  appTab.linkedBrowser.addEventListener("load", onLoad, true);
+
+  let loadCount = 0;
+  function onLoad() {
+    loadCount++;
+    if (loadCount < 2)
+      return;
+
+    appTab.linkedBrowser.removeEventListener("load", onLoad, true);
+
+    let browser = gBrowser.getBrowserForTab(appTab);
+    if (testSubFrame)
+      browser = browser.contentDocument.getElementsByTagName("iframe")[0];
+
+    let links = browser.contentDocument.getElementsByTagName("a");
+
+    if (expectNewTab)
+      gBrowser.tabContainer.addEventListener("TabOpen", onTabOpen, true);
+    else
+      browser.addEventListener("load", onPageLoad, true);
+
+    info("Clicking " + links[aLinkIndex].textContent);
+    EventUtils.sendMouseEvent({type:"click"}, links[aLinkIndex], browser.contentWindow);
+
+    function onPageLoad() {
+      browser.removeEventListener("load", onPageLoad, true);
+      is(browser.contentDocument.location.href, links[aLinkIndex].href, "Link should not open in a new tab");
+      gBrowser.removeTab(appTab);
+      nextTest();
+    }
+
+    function onTabOpen(event) {
+      gBrowser.tabContainer.removeEventListener("TabOpen", onTabOpen, true);
+      ok(true, "Link should open a new tab");
+      gBrowser.removeTab(appTab);
+      gBrowser.removeCurrentTab();
+      nextTest();
+    }
+  }
+}
diff --git a/toolkit/content/tests/browser/browser_Services.js b/toolkit/content/tests/browser/browser_Services.js
index 311de6a2e5a..635e06d68aa 100644
--- a/toolkit/content/tests/browser/browser_Services.js
+++ b/toolkit/content/tests/browser/browser_Services.js
@@ -50,6 +50,7 @@ function checkServices() {
   checkService("prefs", Ci.nsIPrefService);
   checkService("contentPrefs", Ci.nsIContentPrefService);
   checkService("wm", Ci.nsIWindowMediator);
+  checkService("obs", Ci.nsIObserverService);
   checkService("perms", Ci.nsIPermissionManager);
   checkService("io", Ci.nsIIOService);
   checkService("io", Ci.nsIIOService2);
@@ -66,6 +67,8 @@ function checkServices() {
   checkService("scriptloader", Ci.mozIJSSubScriptLoader);
   checkService("ww", Ci.nsIWindowWatcher);
   checkService("tm", Ci.nsIThreadManager);
+  checkService("droppedLinkHandler", Ci.nsIDroppedLinkHandler);
   checkService("strings", Ci.nsIStringBundleService);
   checkService("urlFormatter", Ci.nsIURLFormatter);
+  checkService("eTLD", Ci.nsIEffectiveTLDService);
 }

From aa241854547756e52c87050da82cc0b1e856732c Mon Sep 17 00:00:00 2001
From: Sid Stamm <sstamm@mozilla.com>
Date: Thu, 28 Oct 2010 15:59:30 -0700
Subject: [PATCH 45/57] Bug 548949 - make CSP parse hostless schemes properly,
 r=dveditz, a=jst

---
 content/base/src/CSPUtils.jsm           | 47 +++++++++++++++----------
 content/base/test/unit/test_csputils.js | 12 +++++++
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/content/base/src/CSPUtils.jsm b/content/base/src/CSPUtils.jsm
index 3722c7d7476..0afb96d240a 100644
--- a/content/base/src/CSPUtils.jsm
+++ b/content/base/src/CSPUtils.jsm
@@ -380,8 +380,7 @@ CSPRep.prototype = {
   },
 
   /**
-   * Generates string representation of the policy.  Should be fairly similar
-   * to the original.
+   * Generates canonical string representation of the policy.
    */
   toString:
   function csp_toString() {
@@ -607,8 +606,7 @@ CSPSourceList.prototype = {
   },
 
   /**
-   * Generates string representation of the Source List.
-   * Should be fairly similar to the original.
+   * Generates canonical string representation of the Source List.
    */
   toString:
   function() {
@@ -639,7 +637,7 @@ CSPSourceList.prototype = {
   },
 
   /**
-   * Makes a new instance that resembles this object.
+   * Makes a new deep copy of this object.
    * @returns
    *      a new CSPSourceList
    */
@@ -951,7 +949,7 @@ CSPSource.fromString = function(aStr, self, enforceSelfChecks) {
         // Allow scheme-only sources!  These default to wildcard host/port,
         // especially since host and port don't always matter.
         // Example: "javascript:" and "data:" 
-        if (!sObj._host) sObj._host = "*";
+        if (!sObj._host) sObj._host = CSPHost.fromString("*");
         if (!sObj._port) sObj._port = "*";
       } else {
         // some host was defined.
@@ -1050,8 +1048,7 @@ CSPSource.prototype = {
   },
 
   /**
-   * Generates string representation of the Source.
-   * Should be fairly similar to the original.
+   * Generates canonical string representation of the Source.
    */
   toString:
   function() {
@@ -1069,7 +1066,7 @@ CSPSource.prototype = {
   },
 
   /**
-   * Makes a new instance that resembles this object.
+   * Makes a new deep copy of this object.
    * @returns
    *      a new CSPSource
    */
@@ -1172,13 +1169,28 @@ CSPSource.prototype = {
       return null;
     }
 
+    // NOTE: Both sources must have a host, if they don't, something funny is
+    // going on.  The fromString() factory method should have set the host to
+    // * if there's no host specified in the input. Regardless, if a host is
+    // not present either the scheme is hostless or any host should be allowed.
+    // This means we can use the other source's host as the more restrictive
+    // host expression, or if neither are present, we can use "*", but the
+    // error should still be reported.
+
     // host
-    if (!this._host)
-      newSource._host = that._host;
-    else if (!that._host)
-      newSource._host = this._host;
-    else // both this and that have hosts
+    if (this._host && that._host) {
       newSource._host = this._host.intersectWith(that._host);
+    } else if (this._host) {
+      CSPError("intersecting source with undefined host: " + that.toString());
+      newSource._host = this._host.clone();
+    } else if (that._host) {
+      CSPError("intersecting source with undefined host: " + this.toString());
+      newSource._host = that._host.clone();
+    } else {
+      CSPError("intersecting two sources with undefined hosts: " +
+               this.toString() + " and " + that.toString());
+      newSource._host = CSPHost.fromString("*");
+    }
 
     return newSource;
   },
@@ -1266,8 +1278,7 @@ CSPHost.fromString = function(aStr) {
 
 CSPHost.prototype = {
   /**
-   * Generates string representation of the Source.
-   * Should be fairly similar to the original.
+   * Generates canonical string representation of the Host.
    */
   toString:
   function() {
@@ -1275,7 +1286,7 @@ CSPHost.prototype = {
   },
 
   /**
-   * Makes a new instance that resembles this object.
+   * Makes a new deep copy of this object.
    * @returns
    *      a new CSPHost
    */
@@ -1297,7 +1308,7 @@ CSPHost.prototype = {
    */
   permits:
   function(aHost) {
-    if (!aHost) return false;
+    if (!aHost) aHost = CSPHost.fromString("*");
 
     if (!(aHost instanceof CSPHost)) {
       // -- compare CSPHost to String
diff --git a/content/base/test/unit/test_csputils.js b/content/base/test/unit/test_csputils.js
index 2a9a8755755..75683b8977c 100644
--- a/content/base/test/unit/test_csputils.js
+++ b/content/base/test/unit/test_csputils.js
@@ -35,6 +35,7 @@
 
 //load('CSPUtils.jsm');
 Components.utils.import('resource://gre/modules/CSPUtils.jsm');
+Components.utils.import('resource://gre/modules/NetUtil.jsm');
 
 // load the HTTP server
 do_load_httpd_js();
@@ -190,6 +191,7 @@ test(
 
       //"funny characters (#) should not work for host.");
       do_check_eq(null, CSPSource.fromString("a#2-c.com"));
+
       //print(" --- Stop ignoring errors that print ---\n");
 
       //"failed to parse host with port.");
@@ -229,6 +231,16 @@ test(
       do_check_true(src.permits("https://foobar.com"));
       //"src should reject other hosts"
       do_check_false(src.permits("https://a.com"));
+
+      src = CSPSource.create("javascript:", "https://foobar.com:443");
+      //"hostless schemes should be parseable."
+      var aUri = NetUtil.newURI("javascript:alert('foo');");
+      do_check_true(src.permits(aUri));
+      //"src should reject other hosts"
+      do_check_false(src.permits("https://a.com"));
+      //"nothing else should be allowed"
+      do_check_false(src.permits("https://foobar.com"));
+
     });
 
 ///////////////////// Test the source list //////////////////////

From 72f5932f4230d1d32dc3552f1151bd9d1a81dc29 Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Thu, 28 Oct 2010 17:05:53 -0700
Subject: [PATCH 46/57] Backed out changeset fb506072dca8 due to crashes

Bug 570619 - Move crypto off the main thread
---
 services/crypto/modules/WeaveCrypto.js        |  92 +++++------
 services/crypto/modules/threaded.js           | 150 ------------------
 services/crypto/tests/unit/head_helpers.js    |   2 -
 .../crypto/tests/unit/test_crypto_crypt.js    |   4 +-
 .../crypto/tests/unit/test_crypto_keypair.js  |   4 +-
 .../crypto/tests/unit/test_crypto_random.js   |   4 +-
 .../crypto/tests/unit/test_crypto_rewrap.js   |   4 +-
 .../crypto/tests/unit/test_crypto_verify.js   |   4 +-
 services/sync/modules/util.js                 |   4 +-
 9 files changed, 55 insertions(+), 213 deletions(-)
 delete mode 100644 services/crypto/modules/threaded.js

diff --git a/services/crypto/modules/WeaveCrypto.js b/services/crypto/modules/WeaveCrypto.js
index ae7dbf819f8..55d3b7d279d 100644
--- a/services/crypto/modules/WeaveCrypto.js
+++ b/services/crypto/modules/WeaveCrypto.js
@@ -71,12 +71,6 @@ WeaveCrypto.prototype = {
         }
     },
 
-    // This is its own method so that it can be overridden.
-    // (Components.Exception isn't thread-safe for instance)
-    makeException : function makeException(message, result) {
-        return Components.Exception(message, result);
-    },
-
     init : function() {
         try {
             // Preferences. Add observer so we get notified of changes.
@@ -130,7 +124,7 @@ WeaveCrypto.prototype = {
             nssfile.append("libnss3.so");
             break;
           default:
-            throw this.makeException("unsupported platform: " + os, Cr.NS_ERROR_UNEXPECTED);
+            throw Components.Exception("unsupported platform: " + os, Cr.NS_ERROR_UNEXPECTED);
         }
         this.log("Using NSS library " + nssfile.path);
 
@@ -530,31 +524,31 @@ WeaveCrypto.prototype = {
         let mechanism = this.nss.PK11_AlgtagToMechanism(this.algorithm);
         mechanism = this.nss.PK11_GetPadMechanism(mechanism);
         if (mechanism == this.nss.CKM_INVALID_MECHANISM)
-            throw this.makeException("invalid algorithm (can't pad)", Cr.NS_ERROR_FAILURE);
+            throw Components.Exception("invalid algorithm (can't pad)", Cr.NS_ERROR_FAILURE);
 
         let ctx, symKey, slot, ivParam;
         try {
             ivParam = this.nss.PK11_ParamFromIV(mechanism, ivItem.address());
             if (ivParam.isNull())
-                throw this.makeException("can't convert IV to param", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("can't convert IV to param", Cr.NS_ERROR_FAILURE);
 
             slot = this.nss.PK11_GetInternalKeySlot();
             if (slot.isNull())
-                throw this.makeException("can't get internal key slot", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("can't get internal key slot", Cr.NS_ERROR_FAILURE);
 
             symKey = this.nss.PK11_ImportSymKey(slot, mechanism, this.nss.PK11_OriginUnwrap, operation, keyItem.address(), null);
             if (symKey.isNull())
-                throw this.makeException("symkey import failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("symkey import failed", Cr.NS_ERROR_FAILURE);
 
             ctx = this.nss.PK11_CreateContextBySymKey(mechanism, operation, symKey, ivParam);
             if (ctx.isNull())
-                throw this.makeException("couldn't create context for symkey", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("couldn't create context for symkey", Cr.NS_ERROR_FAILURE);
 
             let maxOutputSize = output.length;
             let tmpOutputSize = new ctypes.int(); // Note 1: NSS uses a signed int here...
 
             if (this.nss.PK11_CipherOp(ctx, output, tmpOutputSize.address(), maxOutputSize, input, input.length))
-                throw this.makeException("cipher operation failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("cipher operation failed", Cr.NS_ERROR_FAILURE);
 
             let actualOutputSize = tmpOutputSize.value;
             let finalOutput = output.addressOfElement(actualOutputSize);
@@ -565,7 +559,7 @@ WeaveCrypto.prototype = {
             // cipher operation. You'd think it would be called PK11_CipherOpFinal...
             let tmpOutputSize2 = new ctypes.unsigned_int(); // Note 2: ...but an unsigned here!
             if (this.nss.PK11_DigestFinal(ctx, finalOutput, tmpOutputSize2.address(), maxOutputSize))
-                throw this.makeException("cipher finalize failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("cipher finalize failed", Cr.NS_ERROR_FAILURE);
 
             actualOutputSize += tmpOutputSize2.value;
             let newOutput = ctypes.cast(output, ctypes.unsigned_char.array(actualOutputSize));
@@ -604,7 +598,7 @@ WeaveCrypto.prototype = {
 
             slot = this.nss.PK11_GetInternalSlot();
             if (slot.isNull())
-                throw this.makeException("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
 
             // Generate the keypair.
             privKey = this.nss.PK11_GenerateKeyPairWithFlags(slot,
@@ -613,18 +607,18 @@ WeaveCrypto.prototype = {
                                                              pubKey.address(),
                                                              attrFlags, null);
             if (privKey.isNull())
-                throw this.makeException("keypair generation failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("keypair generation failed", Cr.NS_ERROR_FAILURE);
             
             let s = this.nss.PK11_SetPrivateKeyNickname(privKey, "Weave User PrivKey");
             if (s)
-                throw this.makeException("key nickname failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("key nickname failed", Cr.NS_ERROR_FAILURE);
 
             let wrappedPrivateKey = this._wrapPrivateKey(privKey, passphrase, salt, iv);
             out_wrappedPrivateKey.value = wrappedPrivateKey; // outparam
 
             let derKey = this.nss.SECKEY_EncodeDERSubjectPublicKeyInfo(pubKey);
             if (derKey.isNull())
-              throw this.makeException("SECKEY_EncodeDERSubjectPublicKeyInfo failed", Cr.NS_ERROR_FAILURE);
+              throw Components.Exception("SECKEY_EncodeDERSubjectPublicKeyInfo failed", Cr.NS_ERROR_FAILURE);
 
             let encodedPublicKey = this.encodeBase64(derKey.contents.data, derKey.contents.len);
             out_encodedPublicKey.value = encodedPublicKey; // outparam
@@ -664,27 +658,27 @@ WeaveCrypto.prototype = {
             break;
 
           default:
-            throw this.makeException("unknown algorithm", Cr.NS_ERROR_FAILURE);
+            throw Components.Exception("unknown algorithm", Cr.NS_ERROR_FAILURE);
         }
 
         let slot, randKey, keydata;
         try {
             slot = this.nss.PK11_GetInternalSlot();
             if (slot.isNull())
-                throw this.makeException("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
 
             randKey = this.nss.PK11_KeyGen(slot, keygenMech, null, keySize, null);
             if (randKey.isNull())
-                throw this.makeException("PK11_KeyGen failed.", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("PK11_KeyGen failed.", Cr.NS_ERROR_FAILURE);
 
             // Slightly odd API, this call just prepares the key value for
             // extraction, we get the actual bits from the call to PK11_GetKeyData().
             if (this.nss.PK11_ExtractKeyValue(randKey))
-                throw this.makeException("PK11_ExtractKeyValue failed.", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("PK11_ExtractKeyValue failed.", Cr.NS_ERROR_FAILURE);
 
             keydata = this.nss.PK11_GetKeyData(randKey);
             if (keydata.isNull())
-                throw this.makeException("PK11_GetKeyData failed.", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("PK11_GetKeyData failed.", Cr.NS_ERROR_FAILURE);
 
             return this.encodeBase64(keydata.contents.data, keydata.contents.len);
         } catch (e) {
@@ -715,7 +709,7 @@ WeaveCrypto.prototype = {
         // Temporary buffer to hold the generated data.
         let scratch = new ctypes.ArrayType(ctypes.unsigned_char, byteCount)();
         if (this.nss.PK11_GenerateRandom(scratch, byteCount))
-            throw this.makeException("PK11_GenrateRandom failed", Cr.NS_ERROR_FAILURE);
+            throw Components.Exception("PK11_GenrateRandom failed", Cr.NS_ERROR_FAILURE);
 
         return this.encodeBase64(scratch.address(), scratch.length);
     },
@@ -738,7 +732,7 @@ WeaveCrypto.prototype = {
         try {
             slot = this.nss.PK11_GetInternalSlot();
             if (slot.isNull())
-                throw this.makeException("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
 
             // ImportSymKey wants a mechanism, from which it derives the key type.
             let keyMech = this.nss.PK11_AlgtagToMechanism(this.algorithm);
@@ -747,7 +741,7 @@ WeaveCrypto.prototype = {
             // really matter because we're just going to wrap it up and not use it.
             symKey = this.nss.PK11_ImportSymKey(slot, keyMech, this.nss.PK11_OriginUnwrap, this.nss.CKA_ENCRYPT, symKeyData.address(), null);
             if (symKey.isNull())
-                throw this.makeException("symkey import failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("symkey import failed", Cr.NS_ERROR_FAILURE);
 
             // Step 3. Put the public key bits into a P11 key object.
 
@@ -755,11 +749,11 @@ WeaveCrypto.prototype = {
             // pubKey = SECKEY_ImportDERPublicKey(&pubKeyData, CKK_RSA);
             pubKeyInfo = this.nss.SECKEY_DecodeDERSubjectPublicKeyInfo(pubKeyData.address());
             if (pubKeyInfo.isNull())
-                throw this.makeException("SECKEY_DecodeDERSubjectPublicKeyInfo failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("SECKEY_DecodeDERSubjectPublicKeyInfo failed", Cr.NS_ERROR_FAILURE);
 
             pubKey = this.nss.SECKEY_ExtractPublicKey(pubKeyInfo);
             if (pubKey.isNull())
-                throw this.makeException("SECKEY_ExtractPublicKey failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("SECKEY_ExtractPublicKey failed", Cr.NS_ERROR_FAILURE);
 
             // Step 4. Wrap the symmetric key with the public key.
 
@@ -767,7 +761,7 @@ WeaveCrypto.prototype = {
 
             let s = this.nss.PK11_PubWrapSymKey(wrapMech, pubKey, symKey, wrappedKey.address());
             if (s)
-                throw this.makeException("PK11_PubWrapSymKey failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("PK11_PubWrapSymKey failed", Cr.NS_ERROR_FAILURE);
 
             // Step 5. Base64 encode the wrapped key, cleanup, and return to caller.
             return this.encodeBase64(wrappedKey.data, wrappedKey.len);
@@ -807,16 +801,16 @@ WeaveCrypto.prototype = {
             let wrapMech = this.nss.PK11_AlgtagToMechanism(this.algorithm);
             wrapMech = this.nss.PK11_GetPadMechanism(wrapMech);
             if (wrapMech == this.nss.CKM_INVALID_MECHANISM)
-                throw this.makeException("unwrapSymKey: unknown key mech", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("unwrapSymKey: unknown key mech", Cr.NS_ERROR_FAILURE);
 
             ivParam = this.nss.PK11_ParamFromIV(wrapMech, ivItem.address());
             if (ivParam.isNull())
-                throw this.makeException("unwrapSymKey: PK11_ParamFromIV failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("unwrapSymKey: PK11_ParamFromIV failed", Cr.NS_ERROR_FAILURE);
 
             // Step 3. Unwrap the private key with the key from the passphrase.
             slot = this.nss.PK11_GetInternalSlot();
             if (slot.isNull())
-                throw this.makeException("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
 
             // Normally, one wants to associate a private key with a public key.
             // P11_UnwrapPrivKey() passes its keyID arg to PK11_MakeIDFromPubKey(),
@@ -837,7 +831,7 @@ WeaveCrypto.prototype = {
                                                   privKeyUsage.addressOfElement(0), privKeyUsageLength,
                                                   null);  // wincx
             if (privKey.isNull())
-                throw this.makeException("PK11_UnwrapPrivKey failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("PK11_UnwrapPrivKey failed", Cr.NS_ERROR_FAILURE);
 
             // Step 4. Unwrap the symmetric key with the user's private key.
 
@@ -846,15 +840,15 @@ WeaveCrypto.prototype = {
             symKey = this.nss.PK11_PubUnwrapSymKey(privKey, wrappedSymKey.address(), wrapMech,
                                                    this.nss.CKA_DECRYPT, 0);
             if (symKey.isNull())
-                throw this.makeException("PK11_PubUnwrapSymKey failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("PK11_PubUnwrapSymKey failed", Cr.NS_ERROR_FAILURE);
 
             // Step 5. Base64 encode the unwrapped key, cleanup, and return to caller.
             if (this.nss.PK11_ExtractKeyValue(symKey))
-                throw this.makeException("PK11_ExtractKeyValue failed.", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("PK11_ExtractKeyValue failed.", Cr.NS_ERROR_FAILURE);
 
             symKeyData = this.nss.PK11_GetKeyData(symKey);
             if (symKeyData.isNull())
-                throw this.makeException("PK11_GetKeyData failed.", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("PK11_GetKeyData failed.", Cr.NS_ERROR_FAILURE);
 
             return this.encodeBase64(symKeyData.contents.data, symKeyData.contents.len);
         } catch (e) {
@@ -894,16 +888,16 @@ WeaveCrypto.prototype = {
             let wrapMech = this.nss.PK11_AlgtagToMechanism(this.algorithm);
             wrapMech = this.nss.PK11_GetPadMechanism(wrapMech);
             if (wrapMech == this.nss.CKM_INVALID_MECHANISM)
-                throw this.makeException("rewrapSymKey: unknown key mech", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("rewrapSymKey: unknown key mech", Cr.NS_ERROR_FAILURE);
 
             ivParam = this.nss.PK11_ParamFromIV(wrapMech, ivItem.address());
             if (ivParam.isNull())
-                throw this.makeException("rewrapSymKey: PK11_ParamFromIV failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("rewrapSymKey: PK11_ParamFromIV failed", Cr.NS_ERROR_FAILURE);
 
             // Step 3. Unwrap the private key with the key from the passphrase.
             slot = this.nss.PK11_GetInternalSlot();
             if (slot.isNull())
-                throw this.makeException("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
 
             let keyID = ivItem.address();
 
@@ -917,7 +911,7 @@ WeaveCrypto.prototype = {
                                                   privKeyUsage.addressOfElement(0), privKeyUsageLength,
                                                   null);  // wincx
             if (privKey.isNull())
-                throw this.makeException("PK11_UnwrapPrivKey failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("PK11_UnwrapPrivKey failed", Cr.NS_ERROR_FAILURE);
 
             // Step 4. Rewrap the private key with the new passphrase.
             return this._wrapPrivateKey(privKey, newPassphrase, salt, iv);
@@ -956,16 +950,16 @@ WeaveCrypto.prototype = {
             let wrapMech = this.nss.PK11_AlgtagToMechanism(this.algorithm);
             wrapMech = this.nss.PK11_GetPadMechanism(wrapMech);
             if (wrapMech == this.nss.CKM_INVALID_MECHANISM)
-                throw this.makeException("rewrapSymKey: unknown key mech", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("rewrapSymKey: unknown key mech", Cr.NS_ERROR_FAILURE);
 
             ivParam = this.nss.PK11_ParamFromIV(wrapMech, ivItem.address());
             if (ivParam.isNull())
-                throw this.makeException("rewrapSymKey: PK11_ParamFromIV failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("rewrapSymKey: PK11_ParamFromIV failed", Cr.NS_ERROR_FAILURE);
 
             // Step 3. Unwrap the private key with the key from the passphrase.
             slot = this.nss.PK11_GetInternalSlot();
             if (slot.isNull())
-                throw this.makeException("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
 
             let keyID = ivItem.address();
 
@@ -1059,15 +1053,15 @@ WeaveCrypto.prototype = {
             algid = this.nss.PK11_CreatePBEV2AlgorithmID(pbeAlg, cipherAlg, prfAlg,
                                                         keyLength, iterations, saltItem.address());
             if (algid.isNull())
-                throw this.makeException("PK11_CreatePBEV2AlgorithmID failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("PK11_CreatePBEV2AlgorithmID failed", Cr.NS_ERROR_FAILURE);
 
             slot = this.nss.PK11_GetInternalSlot();
             if (slot.isNull())
-                throw this.makeException("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("couldn't get internal slot", Cr.NS_ERROR_FAILURE);
 
             symKey = this.nss.PK11_PBEKeyGen(slot, algid, passItem.address(), false, null);
             if (symKey.isNull())
-                throw this.makeException("PK11_PBEKeyGen failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("PK11_PBEKeyGen failed", Cr.NS_ERROR_FAILURE);
         } catch (e) {
             this.log("_deriveKeyFromPassphrase: failed: " + e);
             throw e;
@@ -1095,11 +1089,11 @@ WeaveCrypto.prototype = {
             let wrapMech = this.nss.PK11_AlgtagToMechanism(this.algorithm);
             wrapMech = this.nss.PK11_GetPadMechanism(wrapMech);
             if (wrapMech == this.nss.CKM_INVALID_MECHANISM)
-                throw this.makeException("wrapPrivKey: unknown key mech", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("wrapPrivKey: unknown key mech", Cr.NS_ERROR_FAILURE);
 
             let ivParam = this.nss.PK11_ParamFromIV(wrapMech, ivItem.address());
             if (ivParam.isNull())
-                throw this.makeException("wrapPrivKey: PK11_ParamFromIV failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("wrapPrivKey: PK11_ParamFromIV failed", Cr.NS_ERROR_FAILURE);
 
             // Use a buffer to hold the wrapped key. NSS says about 1200 bytes for
             // a 2048-bit RSA key, so a 4096 byte buffer should be plenty.
@@ -1111,7 +1105,7 @@ WeaveCrypto.prototype = {
                                               wrapMech, ivParam,
                                               wrappedKey.address(), null);
             if (s)
-                throw this.makeException("wrapPrivKey: PK11_WrapPrivKey failed", Cr.NS_ERROR_FAILURE);
+                throw Components.Exception("wrapPrivKey: PK11_WrapPrivKey failed", Cr.NS_ERROR_FAILURE);
 
             return this.encodeBase64(wrappedKey.data, wrappedKey.len);
         } catch (e) {
diff --git a/services/crypto/modules/threaded.js b/services/crypto/modules/threaded.js
deleted file mode 100644
index 691f2d3408a..00000000000
--- a/services/crypto/modules/threaded.js
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Firefox Sync.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Philipp von Weitershausen <philipp@weitershausen>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-const EXPORTED_SYMBOLS = ["ThreadedCrypto"];
-
-const Cu = Components.utils;
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://services-sync/ext/Sync.js");
-Cu.import("resource://services-crypto/WeaveCrypto.js");
-
-/*
- * Execute a function in a thread.
- */
-function Runner(func, thisObj, returnval, error) {
-  this.func = func;
-  this.thisObj = thisObj;
-  this.returnval = returnval;
-  this.error = error;
-}
-Runner.prototype = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIRunnable]),
-
-  run: function run() {
-    let ex = this.error;
-    if (ex) {
-      this.func.throw(ex);
-    } else {
-      this.func.call(this.thisObj, this.returnval);
-    }
-  }
-};
-
-/*
- * Execute a function in a thread and notify a callback on another thread
- * afterward.
- */
-function CallbackRunner(func, thisObj, args, callback, cbThread) {
-  this.func = func;
-  this.thisObj = thisObj;
-  this.args = args;
-  this.callback = callback;
-  this.cbThread = cbThread;
-}
-CallbackRunner.prototype = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIRunnable]),
-
-  run: function run() {
-    let returnval, error;
-    try {
-      returnval = this.func.apply(this.thisObj, this.args);
-    } catch(ex) {
-      error = ex;
-    }
-    this.cbThread.dispatch(new Runner(this.callback, this.thisObj,
-                                      returnval, error),
-                           Ci.nsIThread.DISPATCH_NORMAL);
-  }
-};
-
-/*
- * Implementation of IWeaveCrypto that defers method calls to another thread
- * but keeps the synchronous API. (Don't ask...)
- */
-function ThreadedCrypto() {
-  this.backgroundThread = Services.tm.newThread(0);
-  this.crypto = new WeaveCrypto();
-
-  // Components.Exception isn't thread-safe.
-  this.crypto.makeException = function makeException(message, result) {
-    return result;
-  };
-
-  // Make sure to kill the thread before XPCOM shuts down.
-  Services.obs.addObserver(this, "profile-before-change", true);
-}
-ThreadedCrypto.deferToThread = function deferToThread(methodname) {
-  return function threadMethod() {
-    // Dispatch method call to background thread.
-    let args = Array.slice(arguments);
-    return Sync(function(callback) {
-      let runner = new CallbackRunner(this.crypto[methodname], this.crypto,
-                                      args, callback, Services.tm.mainThread);
-      this.backgroundThread.dispatch(runner, Ci.nsIThread.DISPATCH_NORMAL);
-    }, this)();
-  };
-};
-ThreadedCrypto.prototype = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.IWeaveCrypto,
-                                         Ci.nsISupportsWeakReference]),
-
-  observe: function observe() {
-    this.backgroundThread.shutdown();
-  },
-
-  get algorithm() this.crypto.algorithm,
-  set algorithm(value) this.crypto.algorithm = value,
-
-  get keypairBits() this.crypto.keypairBits,
-  set keypairBits(value) this.crypto.keypairBits = value,
-
-  encrypt: ThreadedCrypto.deferToThread("encrypt"),
-  decrypt: ThreadedCrypto.deferToThread("decrypt"),
-  generateKeypair: ThreadedCrypto.deferToThread("generateKeypair"),
-  generateRandomKey: ThreadedCrypto.deferToThread("generateRandomKey"),
-  generateRandomIV: ThreadedCrypto.deferToThread("generateRandomIV"),
-  generateRandomBytes: ThreadedCrypto.deferToThread("generateRandomBytes"),
-  wrapSymmetricKey: ThreadedCrypto.deferToThread("wrapSymmetricKey"),
-  unwrapSymmetricKey: ThreadedCrypto.deferToThread("unwrapSymmetricKey"),
-  rewrapPrivateKey: ThreadedCrypto.deferToThread("rewrapPrivateKey"),
-  verifyPassphrase: ThreadedCrypto.deferToThread("verifyPassphrase")
-};
diff --git a/services/crypto/tests/unit/head_helpers.js b/services/crypto/tests/unit/head_helpers.js
index 86e12ab7eac..61155489200 100644
--- a/services/crypto/tests/unit/head_helpers.js
+++ b/services/crypto/tests/unit/head_helpers.js
@@ -11,8 +11,6 @@ try {
 }
 catch(ex) {
 
-do_get_profile();
-
 // Make sure to provide the right OS so crypto loads the right binaries
 let OS = "XPCShell";
 if ("@mozilla.org/windows-registry-key;1" in Cc)
diff --git a/services/crypto/tests/unit/test_crypto_crypt.js b/services/crypto/tests/unit/test_crypto_crypt.js
index d8104cbee16..dc53002dab7 100644
--- a/services/crypto/tests/unit/test_crypto_crypt.js
+++ b/services/crypto/tests/unit/test_crypto_crypt.js
@@ -1,7 +1,7 @@
 let cryptoSvc;
 try {
-  Components.utils.import("resource://services-crypto/threaded.js");
-  cryptoSvc = new ThreadedCrypto();
+  Components.utils.import("resource://services-crypto/WeaveCrypto.js");
+  cryptoSvc = new WeaveCrypto();
 } catch (ex) {
   // Fallback to binary WeaveCrypto
   cryptoSvc = Cc["@labs.mozilla.com/Weave/Crypto;1"]
diff --git a/services/crypto/tests/unit/test_crypto_keypair.js b/services/crypto/tests/unit/test_crypto_keypair.js
index 258f473319a..8ea7907f637 100644
--- a/services/crypto/tests/unit/test_crypto_keypair.js
+++ b/services/crypto/tests/unit/test_crypto_keypair.js
@@ -1,7 +1,7 @@
 let cryptoSvc;
 try {
-  Components.utils.import("resource://services-crypto/threaded.js");
-  cryptoSvc = new ThreadedCrypto();
+  Components.utils.import("resource://services-crypto/WeaveCrypto.js");
+  cryptoSvc = new WeaveCrypto();
 } catch (ex) {
   // Fallback to binary WeaveCrypto
   cryptoSvc = Cc["@labs.mozilla.com/Weave/Crypto;1"]
diff --git a/services/crypto/tests/unit/test_crypto_random.js b/services/crypto/tests/unit/test_crypto_random.js
index 105c743f644..ab85169be6b 100644
--- a/services/crypto/tests/unit/test_crypto_random.js
+++ b/services/crypto/tests/unit/test_crypto_random.js
@@ -1,7 +1,7 @@
 let cryptoSvc;
 try {
-  Components.utils.import("resource://services-crypto/threaded.js");
-  cryptoSvc = new ThreadedCrypto();
+  Components.utils.import("resource://services-crypto/WeaveCrypto.js");
+  cryptoSvc = new WeaveCrypto();
 } catch (ex) {
   // Fallback to binary WeaveCrypto
   cryptoSvc = Cc["@labs.mozilla.com/Weave/Crypto;1"]
diff --git a/services/crypto/tests/unit/test_crypto_rewrap.js b/services/crypto/tests/unit/test_crypto_rewrap.js
index 67fb6ccf020..d9568d6e66a 100644
--- a/services/crypto/tests/unit/test_crypto_rewrap.js
+++ b/services/crypto/tests/unit/test_crypto_rewrap.js
@@ -1,7 +1,7 @@
 let cryptoSvc;
 try {
-  Components.utils.import("resource://services-crypto/threaded.js");
-  cryptoSvc = new ThreadedCrypto();
+  Components.utils.import("resource://services-crypto/WeaveCrypto.js");
+  cryptoSvc = new WeaveCrypto();
 } catch (ex) {
   // Fallback to binary WeaveCrypto
   cryptoSvc = Cc["@labs.mozilla.com/Weave/Crypto;1"]
diff --git a/services/crypto/tests/unit/test_crypto_verify.js b/services/crypto/tests/unit/test_crypto_verify.js
index 6acdaff8dea..5475503e69d 100644
--- a/services/crypto/tests/unit/test_crypto_verify.js
+++ b/services/crypto/tests/unit/test_crypto_verify.js
@@ -1,7 +1,7 @@
 let cryptoSvc;
 try {
-  Components.utils.import("resource://services-crypto/threaded.js");
-  cryptoSvc = new ThreadedCrypto();
+  Components.utils.import("resource://services-crypto/WeaveCrypto.js");
+  cryptoSvc = new WeaveCrypto();
 } catch (ex) {
   // Fallback to binary WeaveCrypto
   cryptoSvc = Cc["@labs.mozilla.com/Weave/Crypto;1"]
diff --git a/services/sync/modules/util.js b/services/sync/modules/util.js
index 5e24fb4f26e..78af94fd654 100644
--- a/services/sync/modules/util.js
+++ b/services/sync/modules/util.js
@@ -1039,8 +1039,8 @@ Svc.__defineGetter__("Crypto", function() {
   let cryptoSvc;
   try {
     let ns = {};
-    Cu.import("resource://services-crypto/threaded.js", ns);
-    cryptoSvc = new ns.ThreadedCrypto();
+    Cu.import("resource://services-crypto/WeaveCrypto.js", ns);
+    cryptoSvc = new ns.WeaveCrypto();
   } catch (ex) {
     // Fallback to binary WeaveCrypto
     cryptoSvc = Cc["@labs.mozilla.com/Weave/Crypto;1"].

From 3df95ee0501b76c7cb4f78e7e92f7f2ace6720a2 Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Thu, 28 Oct 2010 17:19:28 -0700
Subject: [PATCH 47/57] Bug 604565 - Disable another intermittently failing
 xpcshell tests on OSX debug build [r=mconnor]

---
 services/sync/tests/unit/test_service_sync_remoteSetup.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/sync/tests/unit/test_service_sync_remoteSetup.js b/services/sync/tests/unit/test_service_sync_remoteSetup.js
index 9e73b550b4f..a4035935702 100644
--- a/services/sync/tests/unit/test_service_sync_remoteSetup.js
+++ b/services/sync/tests/unit/test_service_sync_remoteSetup.js
@@ -3,6 +3,9 @@ Cu.import("resource://services-sync/util.js");
 Cu.import("resource://services-sync/log4moz.js");
 
 function run_test() {
+  if (DISABLE_TESTS_BUG_604565)
+    return;
+
   let logger = Log4Moz.repository.rootLogger;
   Log4Moz.repository.rootLogger.addAppender(new Log4Moz.DumpAppender());
 

From 3c53ecca56d08c9b44445b1fae18fd35250a9ad1 Mon Sep 17 00:00:00 2001
From: David Mandelin <dmandelin@mozilla.com>
Date: Thu, 28 Oct 2010 17:44:24 -0700
Subject: [PATCH 48/57] Backed out changeset c133d3c084c0: now we want to
 measure if not doing sync stuff on background thread reduces crashes.

---
 js/src/jsstr.cpp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index b3beae68ffd..925bf319fe6 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -104,18 +104,6 @@ js_GetStringChars(JSContext *cx, JSString *str)
 void
 JSString::flatten()
 {
-    // Diagnostic: serialize all calls to this function to see
-    // if concurrent calls are crashing us.
-    JS_LOCK_RUNTIME(asCell()->compartment()->rt);
-    // The main body of this function can be executed only if
-    // the string is a rope. With multiple threads, it's possible
-    // we waited while another one ran, and the string has
-    // already been flattened for us.
-    if (!isRope()) {
-        JS_UNLOCK_RUNTIME(asCell()->compartment()->rt);
-        return;
-    }
-
     JSString *topNode;
     jschar *chars;
     size_t capacity;
@@ -193,8 +181,6 @@ JSString::flatten()
     /* Set null terminator. */
     chars[pos] = 0;
     topNode->initFlatMutable(chars, pos, capacity);
-
-    JS_UNLOCK_RUNTIME(asCell()->compartment()->rt);
 }
 
 #ifdef JS_TRACER

From a4d79ccbdfb98515c4a453a6bf84604880a15087 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Thu, 28 Oct 2010 22:45:02 -0400
Subject: [PATCH 49/57] bug 606317 - Android crash only : Crash [@
 libc.so@0x11cd0 ] occurs after opening an .ics r=doug a=blocking-fennec

---
 uriloader/exthandler/android/nsMIMEInfoAndroid.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
index 44745d3bba0..3281c0c1a02 100644
--- a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
+++ b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
@@ -168,11 +168,7 @@ NS_IMETHODIMP
 nsMIMEInfoAndroid::GetPreferredApplicationHandler(nsIHandlerApp** aApp)
 {
   *aApp = mPrefApp;
-  if (*aApp) {
-    nsAutoString appName;
-    (*aApp)->GetName(appName);
-  }
-
+  NS_IF_ADDREF(*aApp);
   return NS_OK;
 }
 

From 3b52e6839da794818f1bca8c8108e860b44c1a9c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Fri, 29 Oct 2010 16:06:35 +1300
Subject: [PATCH 50/57] Backed out changeset 069ccd107c32

---
 browser/base/content/test/Makefile.in         |  3 -
 browser/base/content/test/app_bug575561.html  | 16 ----
 .../content/test/app_subframe_bug575561.html  | 12 ---
 .../base/content/test/browser_bug575561.js    | 73 -------------------
 .../content/tests/browser/browser_Services.js |  3 -
 5 files changed, 107 deletions(-)
 delete mode 100644 browser/base/content/test/app_bug575561.html
 delete mode 100644 browser/base/content/test/app_subframe_bug575561.html
 delete mode 100644 browser/base/content/test/browser_bug575561.js

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 3492d16576f..6022529c7ac 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -145,7 +145,6 @@ _BROWSER_FILES = \
                  browser_bug561636.js \
                  browser_bug562649.js \
                  browser_bug563588.js \
-                 browser_bug575561.js \
                  browser_bug577121.js \
                  browser_bug579872.js \
                  browser_bug580956.js \
@@ -219,8 +218,6 @@ _BROWSER_FILES = \
                  file_bug550565_favicon.ico \
                  browser_overLinkInLocationBar.js \
                  browser_aboutHome.js \
-                 app_bug575561.html \
-                 app_subframe_bug575561.html \
                  $(NULL)
 
 # compartment-disabled
diff --git a/browser/base/content/test/app_bug575561.html b/browser/base/content/test/app_bug575561.html
deleted file mode 100644
index 60511f5dedd..00000000000
--- a/browser/base/content/test/app_bug575561.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=575561
--->
-  <head>
-    <title>Test for links in app tabs</title>
-  </head>
-  <body>
-    <a href="http://example.com/browser/browser/base/content/test/dummy_page.html">same domain</a>
-    <a href="http://test1.example.com/browser/browser/base/content/test/dummy_page.html">same domain (different subdomain)</a>
-    <a href="http://example.org/browser/browser/base/content/test/dummy_page.html">different domain</a>
-    <a href="http://example.org/browser/browser/base/content/test/dummy_page.html" target="foo">different domain (with target)</a>
-    <iframe src="app_subframe_bug575561.html"></iframe>
-  </body>
-</html>
diff --git a/browser/base/content/test/app_subframe_bug575561.html b/browser/base/content/test/app_subframe_bug575561.html
deleted file mode 100644
index 754f3806e15..00000000000
--- a/browser/base/content/test/app_subframe_bug575561.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=575561
--->
-  <head>
-    <title>Test for links in app tab subframes</title>
-  </head>
-  <body>
-    <a href="http://example.org/browser/browser/base/content/test/dummy_page.html">different domain</a>
-  </body>
-</html>
diff --git a/browser/base/content/test/browser_bug575561.js b/browser/base/content/test/browser_bug575561.js
deleted file mode 100644
index 131c06a47dd..00000000000
--- a/browser/base/content/test/browser_bug575561.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function test() {
-  waitForExplicitFinish();
-
-  // Pinned: Link to the same domain should not open a new tab
-  // Tests link to http://example.com/browser/browser/base/content/test/dummy_page.html  
-  testLink(0, true, false, function() {
-    // Pinned: Link to the same domain should not open a new tab
-    // Tests link to http://test1.example.com/browser/browser/base/content/test/dummy_page.html
-    testLink(1, true, false, function() {
-      // Pinned: Link to a different domain should open a new tab
-      // Tests link to http://example.org/browser/browser/base/content/test/dummy_page.html
-      testLink(2, true, true, function() {
-        // Not Pinned: Link to a different domain should not open a new tab
-        // Tests link to http://example.org/browser/browser/base/content/test/dummy_page.html
-        testLink(2, false, false, function() {
-          // Pinned: Targetted link should open a new tab
-          // Tests link to http://example.org/browser/browser/base/content/test/dummy_page.html with target="foo"
-          testLink(3, true, true, function() {
-            // Pinned: Link in a subframe should not open a new tab
-            // Tests link to http://example.org/browser/browser/base/content/test/dummy_page.html in subframe
-            testLink(0, true, false, finish, true);
-          });
-        });
-      });
-    });
-  });
-}
-
-function testLink(aLinkIndex, pinTab, expectNewTab, nextTest, testSubFrame) {
-  let appTab = gBrowser.addTab("http://example.com/browser/browser/base/content/test/app_bug575561.html", {skipAnimation: true});
-  if (pinTab)
-    gBrowser.pinTab(appTab);
-  gBrowser.selectedTab = appTab;
-  appTab.linkedBrowser.addEventListener("load", onLoad, true);
-
-  let loadCount = 0;
-  function onLoad() {
-    loadCount++;
-    if (loadCount < 2)
-      return;
-
-    appTab.linkedBrowser.removeEventListener("load", onLoad, true);
-
-    let browser = gBrowser.getBrowserForTab(appTab);
-    if (testSubFrame)
-      browser = browser.contentDocument.getElementsByTagName("iframe")[0];
-
-    let links = browser.contentDocument.getElementsByTagName("a");
-
-    if (expectNewTab)
-      gBrowser.tabContainer.addEventListener("TabOpen", onTabOpen, true);
-    else
-      browser.addEventListener("load", onPageLoad, true);
-
-    info("Clicking " + links[aLinkIndex].textContent);
-    EventUtils.sendMouseEvent({type:"click"}, links[aLinkIndex], browser.contentWindow);
-
-    function onPageLoad() {
-      browser.removeEventListener("load", onPageLoad, true);
-      is(browser.contentDocument.location.href, links[aLinkIndex].href, "Link should not open in a new tab");
-      gBrowser.removeTab(appTab);
-      nextTest();
-    }
-
-    function onTabOpen(event) {
-      gBrowser.tabContainer.removeEventListener("TabOpen", onTabOpen, true);
-      ok(true, "Link should open a new tab");
-      gBrowser.removeTab(appTab);
-      gBrowser.removeCurrentTab();
-      nextTest();
-    }
-  }
-}
diff --git a/toolkit/content/tests/browser/browser_Services.js b/toolkit/content/tests/browser/browser_Services.js
index 635e06d68aa..311de6a2e5a 100644
--- a/toolkit/content/tests/browser/browser_Services.js
+++ b/toolkit/content/tests/browser/browser_Services.js
@@ -50,7 +50,6 @@ function checkServices() {
   checkService("prefs", Ci.nsIPrefService);
   checkService("contentPrefs", Ci.nsIContentPrefService);
   checkService("wm", Ci.nsIWindowMediator);
-  checkService("obs", Ci.nsIObserverService);
   checkService("perms", Ci.nsIPermissionManager);
   checkService("io", Ci.nsIIOService);
   checkService("io", Ci.nsIIOService2);
@@ -67,8 +66,6 @@ function checkServices() {
   checkService("scriptloader", Ci.mozIJSSubScriptLoader);
   checkService("ww", Ci.nsIWindowWatcher);
   checkService("tm", Ci.nsIThreadManager);
-  checkService("droppedLinkHandler", Ci.nsIDroppedLinkHandler);
   checkService("strings", Ci.nsIStringBundleService);
   checkService("urlFormatter", Ci.nsIURLFormatter);
-  checkService("eTLD", Ci.nsIEffectiveTLDService);
 }

From e64a295c584f04ed5b66ec92cd1e223a329bf39a Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Fri, 29 Oct 2010 16:07:46 +1300
Subject: [PATCH 51/57] Backed out changeset ecd1948992eb

---
 browser/base/content/browser.js               | 21 ------
 browser/base/content/tabbrowser.xml           |  4 --
 docshell/base/nsDocShell.cpp                  | 33 +---------
 docshell/base/nsDocShell.h                    |  1 -
 docshell/base/nsIDocShell.idl                 | 10 +--
 embedding/browser/webBrowser/Makefile.in      |  1 -
 .../webBrowser/nsIWebBrowserChrome3.idl       | 65 -------------------
 toolkit/components/help/content/help.js       |  3 +-
 toolkit/content/Services.jsm                  |  4 --
 .../content/tests/chrome/findbar_window.xul   |  4 +-
 xpfe/appshell/public/nsIXULBrowserWindow.idl  | 10 ---
 xpfe/appshell/src/nsContentTreeOwner.cpp      | 24 -------
 xpfe/appshell/src/nsContentTreeOwner.h        |  5 +-
 13 files changed, 8 insertions(+), 177 deletions(-)
 delete mode 100644 embedding/browser/webBrowser/nsIWebBrowserChrome3.idl

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 65310db8558..006eec5f90c 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3985,27 +3985,6 @@ var XULBrowserWindow = {
                         encodeURIComponent);
     gURLBar.setOverLink(link);
   },
-  
-  // Called before links are navigated to to allow us to retarget them if needed.
-  onBeforeLinkTraversal: function(originalTarget, linkURI, linkNode, isAppTab) {
-    // Don't modify non-default targets or targets that aren't in top-level app
-    // tab docshells (isAppTab will be false for app tab subframes).
-    if (originalTarget != "" || !isAppTab)
-      return originalTarget;
-
-    let docURI = linkNode.ownerDocument.documentURIObject;
-    try {
-      let docURIDomain = Services.eTLD.getBaseDomain(docURI, 0);
-      let linkURIDomain = Services.eTLD.getBaseDomain(linkURI, 0);
-      // External links from within app tabs should always open in new tabs
-      // instead of replacing the app tab's page (Bug 575561)
-      if (docURIDomain != linkURIDomain)
-        return "_blank";
-    } catch(e) {
-      // If getBaseDomain fails, we return originalTarget below.
-    }
-    return originalTarget;
-  },
 
   onLinkIconAvailable: function (aIconURL) {
     if (gProxyFavIcon && gBrowser.userTypedValue === null)
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index fdb9bb62fc8..a11bde11f22 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -191,8 +191,6 @@
           this.tabContainer._positionPinnedTabs();
           this.tabContainer.adjustTabstrip();
 
-          this.getBrowserForTab(aTab).docShell.isAppTab = true;
-
           let event = document.createEvent("Events");
           event.initEvent("TabPinned", true, false);
           aTab.dispatchEvent(event);
@@ -212,8 +210,6 @@
           this.tabContainer._positionPinnedTabs();
           this.tabContainer.adjustTabstrip();
 
-          this.getBrowserForTab(aTab).docShell.isAppTab = false;
-
           let event = document.createEvent("Events");
           event.initEvent("TabUnpinned", true, false);
           aTab.dispatchEvent(event);
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 42ffaec9270..8257979f25d 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -159,7 +159,7 @@
 #include "nsIController.h"
 #include "nsPICommandUpdater.h"
 #include "nsIDOMHTMLAnchorElement.h"
-#include "nsIWebBrowserChrome3.h"
+#include "nsIWebBrowserChrome2.h"
 #include "nsITabChild.h"
 #include "nsIStrictTransportSecurityService.h"
 
@@ -711,7 +711,6 @@ nsDocShell::nsDocShell():
     mAllowKeywordFixup(PR_FALSE),
     mIsOffScreenBrowser(PR_FALSE),
     mIsActive(PR_TRUE),
-    mIsAppTab(PR_FALSE),
     mFiredUnloadEvent(PR_FALSE),
     mEODForCurrentDocument(PR_FALSE),
     mURIResultedInDocument(PR_FALSE),
@@ -4803,20 +4802,6 @@ nsDocShell::GetIsActive(PRBool *aIsActive)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsDocShell::SetIsAppTab(PRBool aIsAppTab)
-{
-  mIsAppTab = aIsAppTab;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocShell::GetIsAppTab(PRBool *aIsAppTab)
-{
-  *aIsAppTab = mIsAppTab;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDocShell::SetVisibility(PRBool aVisibility)
 {
@@ -11326,22 +11311,8 @@ nsDocShell::OnLinkClick(nsIContent* aContent,
     return NS_OK;
   }
 
-  nsresult rv = NS_ERROR_FAILURE;
-  nsAutoString target;
-
-  nsCOMPtr<nsIWebBrowserChrome3> browserChrome3 = do_GetInterface(mTreeOwner);
-  if (browserChrome3) {
-    nsCOMPtr<nsIDOMNode> linkNode = do_QueryInterface(aContent);
-    nsAutoString oldTarget(aTargetSpec);
-    rv = browserChrome3->OnBeforeLinkTraversal(oldTarget, aURI,
-                                               linkNode, mIsAppTab, target);
-  }
-  
-  if (NS_FAILED(rv))
-    target = aTargetSpec;  
-
   nsCOMPtr<nsIRunnable> ev =
-      new OnLinkClickEvent(this, aContent, aURI, target.get(),
+      new OnLinkClickEvent(this, aContent, aURI, aTargetSpec,
                            aPostDataStream, aHeadersDataStream);
   return NS_DispatchToCurrentThread(ev);
 }
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 317f766a48a..a6c33f149c1 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -790,7 +790,6 @@ protected:
     PRPackedBool               mAllowKeywordFixup;
     PRPackedBool               mIsOffScreenBrowser;
     PRPackedBool               mIsActive;
-    PRPackedBool               mIsAppTab;
 
     // This boolean is set to true right before we fire pagehide and generally
     // unset when we embed a new content viewer.  While it's true no navigation
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
index e5a72e5813e..788be5c5ef2 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -71,7 +71,7 @@ interface nsIPrincipal;
 interface nsIWebBrowserPrint;
 interface nsIVariant;
 
-[scriptable, uuid(98cdbcc4-2d81-4191-a63f-b6c52085edbc)]
+[scriptable, uuid(74470127-87eb-4f79-8293-1616fe9cb689)]
 interface nsIDocShell : nsISupports
 {
   /**
@@ -529,17 +529,11 @@ interface nsIDocShell : nsISupports
    */
   attribute boolean isActive;
 
+
   /**
    * The ID of the docshell in the session history.
    */
   readonly attribute unsigned long long historyID;
-
-  /**
-   * Sets whether a docshell is an app tab. An app tab docshell may behave
-   * differently than a non-app tab docshell in some cases, such as when
-   * handling link clicks. Docshells are not app tabs unless told otherwise.
-   */
-  attribute boolean isAppTab;
 };
 
 [uuid(5f7a2184-31b6-4d67-9c75-0c17477766e2)]
diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in
index 10a56f9671c..b068d4c210d 100644
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -78,7 +78,6 @@ XPIDLSRCS	= \
 		nsIEmbeddingSiteWindow2.idl \
 		nsIContextMenuListener2.idl \
 		nsIWebBrowserChrome2.idl	    \
-		nsIWebBrowserChrome3.idl	    \
 		$(NULL)
 
 CPPSRCS		= \
diff --git a/embedding/browser/webBrowser/nsIWebBrowserChrome3.idl b/embedding/browser/webBrowser/nsIWebBrowserChrome3.idl
deleted file mode 100644
index b15bf12335e..00000000000
--- a/embedding/browser/webBrowser/nsIWebBrowserChrome3.idl
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Margaret Leibovic <margaret.leibovic@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#include "nsIWebBrowserChrome2.idl"
-#include "nsIURI.idl"
-#include "nsIDOMNode.idl"
-
-/**
- * nsIWebBrowserChrome3 is an extension to nsIWebBrowserChrome2.
- */
-[scriptable, uuid(7f2aa813-b250-4e46-afeb-97b1e91bc9a5)]
-interface nsIWebBrowserChrome3 : nsIWebBrowserChrome2
-{
-  /**
-   * Determines the appropriate target for a link.
-   *
-   * @param originalTarget
-   *        The original link target.
-   * @param linkURI
-   *        Link destination URI.
-   * @param aDOMNode
-   *        Link DOM node.
-   * @param isAppTab
-   *        Whether or not the link is in an app tab.
-   * @returns A new link target, if appropriate.
-   *          Otherwise returns originalTarget.
-   */
-  AString onBeforeLinkTraversal(in AString originalTarget,
-                                in nsIURI linkURI,
-                                in nsIDOMNode linkNode,
-                                in PRBool isAppTab);
-};
diff --git a/toolkit/components/help/content/help.js b/toolkit/components/help/content/help.js
index 4a49bfb9b7c..f17403b17bd 100644
--- a/toolkit/components/help/content/help.js
+++ b/toolkit/components/help/content/help.js
@@ -562,8 +562,7 @@ nsHelpStatusHandler.prototype = {
 
     setJSStatus : function(status) {},
     setJSDefaultStatus : function(status) {},
-    setOverLink : function(link, context) {},
-    onBeforeLinkTraversal: function(originalTarget, linkURI, linkNode, isAppTab) {}
+    setOverLink : function(link, context) {}
 }
 
 function UpdateBackForwardButtons() {
diff --git a/toolkit/content/Services.jsm b/toolkit/content/Services.jsm
index 86ad255edd2..4d6a82866bf 100644
--- a/toolkit/content/Services.jsm
+++ b/toolkit/content/Services.jsm
@@ -130,7 +130,3 @@ XPCOMUtils.defineLazyServiceGetter(Services, "strings",
 XPCOMUtils.defineLazyServiceGetter(Services, "urlFormatter",
                                    "@mozilla.org/toolkit/URLFormatterService;1",
                                    "nsIURLFormatter");
-
-XPCOMUtils.defineLazyServiceGetter(Services, "eTLD",
-                                   "@mozilla.org/network/effective-tld-service;1",
-                                   "nsIEffectiveTLDService");
diff --git a/toolkit/content/tests/chrome/findbar_window.xul b/toolkit/content/tests/chrome/findbar_window.xul
index 911b3e9cf85..33729245b7e 100644
--- a/toolkit/content/tests/chrome/findbar_window.xul
+++ b/toolkit/content/tests/chrome/findbar_window.xul
@@ -76,9 +76,7 @@
 
       setOverLink: function(aStatusText, aLink) {
         gStatusText = aStatusText;
-      },
-
-      onBeforeLinkTraversal: function() { }
+      }
     };
 
     function ok(condition, message) {
diff --git a/xpfe/appshell/public/nsIXULBrowserWindow.idl b/xpfe/appshell/public/nsIXULBrowserWindow.idl
index d787d9405a0..37a8676aa99 100644
--- a/xpfe/appshell/public/nsIXULBrowserWindow.idl
+++ b/xpfe/appshell/public/nsIXULBrowserWindow.idl
@@ -38,8 +38,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
-#include "nsIURI.idl"
-#include "nsIDOMNode.idl"
 
 interface nsIRequest;
 interface nsIDOMElement;
@@ -67,13 +65,5 @@ interface nsIXULBrowserWindow : nsISupports
    * over.
    */
   void setOverLink(in AString link, in nsIDOMElement element);
-
-  /**
-   * Determines the appropriate target for a link.
-   */
-  AString onBeforeLinkTraversal(in AString originalTarget,
-                                in nsIURI linkURI,
-                                in nsIDOMNode linkNode,
-                                in PRBool isAppTab);
 };
 
diff --git a/xpfe/appshell/src/nsContentTreeOwner.cpp b/xpfe/appshell/src/nsContentTreeOwner.cpp
index f6c21a0a86d..3794e06d4b9 100644
--- a/xpfe/appshell/src/nsContentTreeOwner.cpp
+++ b/xpfe/appshell/src/nsContentTreeOwner.cpp
@@ -124,7 +124,6 @@ NS_INTERFACE_MAP_BEGIN(nsContentTreeOwner)
    NS_INTERFACE_MAP_ENTRY(nsIBaseWindow)
    NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome)
    NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome2)
-   NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome3)
    NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
    NS_INTERFACE_MAP_ENTRY(nsIWindowProvider)
    // NOTE: This is using aggregation because there are some properties and
@@ -431,29 +430,6 @@ nsContentTreeOwner::GetPersistence(PRBool* aPersistPosition,
   return NS_OK;
 }
 
-//*****************************************************************************
-// nsContentTreeOwner::nsIWebBrowserChrome3
-//*****************************************************************************   
-
-NS_IMETHODIMP nsContentTreeOwner::OnBeforeLinkTraversal(const nsAString &originalTarget,
-                                                        nsIURI *linkURI,
-                                                        nsIDOMNode *linkNode,
-                                                        PRBool isAppTab,
-                                                        nsAString &_retval)
-{
-  NS_ENSURE_STATE(mXULWindow);
-
-  nsCOMPtr<nsIXULBrowserWindow> xulBrowserWindow;
-  mXULWindow->GetXULBrowserWindow(getter_AddRefs(xulBrowserWindow));
-
-  if (xulBrowserWindow)
-    return xulBrowserWindow->OnBeforeLinkTraversal(originalTarget, linkURI,
-                                                   linkNode, isAppTab, _retval);
-  
-  _retval = originalTarget;
-  return NS_OK;
-}
-
 //*****************************************************************************
 // nsContentTreeOwner::nsIWebBrowserChrome2
 //*****************************************************************************   
diff --git a/xpfe/appshell/src/nsContentTreeOwner.h b/xpfe/appshell/src/nsContentTreeOwner.h
index 31d462a52e5..efc4e54b339 100644
--- a/xpfe/appshell/src/nsContentTreeOwner.h
+++ b/xpfe/appshell/src/nsContentTreeOwner.h
@@ -49,7 +49,7 @@
 #include "nsIDocShellTreeOwner.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsIWebBrowserChrome3.h"
+#include "nsIWebBrowserChrome2.h"
 #include "nsIWindowProvider.h"
 
 class nsXULWindow;
@@ -58,7 +58,7 @@ class nsSiteWindow2;
 class nsContentTreeOwner : public nsIDocShellTreeOwner,
                            public nsIBaseWindow,
                            public nsIInterfaceRequestor,
-                           public nsIWebBrowserChrome3,
+                           public nsIWebBrowserChrome2,
                            public nsIWindowProvider
 {
 friend class nsXULWindow;
@@ -72,7 +72,6 @@ public:
    NS_DECL_NSIINTERFACEREQUESTOR
    NS_DECL_NSIWEBBROWSERCHROME
    NS_DECL_NSIWEBBROWSERCHROME2
-   NS_DECL_NSIWEBBROWSERCHROME3
    NS_DECL_NSIWINDOWPROVIDER
 
 protected:

From 623a70fe3ddc3d9b2ebb8656897cf93bb37e9e1d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Fri, 29 Oct 2010 16:08:07 +1300
Subject: [PATCH 52/57] Bug 595842. When GetHDCWithClip fails, fall through to
 the fallback rendering path. r=vlad,a=blocking-beta7

---
 gfx/thebes/gfxWindowsNativeDrawing.cpp        | 39 ++++++++++---------
 .../native-theme/border-radius-ref.html       |  9 +++++
 .../reftests/native-theme/border-radius.html  |  9 +++++
 layout/reftests/native-theme/reftest.list     |  2 +
 4 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 layout/reftests/native-theme/border-radius-ref.html
 create mode 100644 layout/reftests/native-theme/border-radius.html

diff --git a/gfx/thebes/gfxWindowsNativeDrawing.cpp b/gfx/thebes/gfxWindowsNativeDrawing.cpp
index 44dc6368664..cca132f0d40 100644
--- a/gfx/thebes/gfxWindowsNativeDrawing.cpp
+++ b/gfx/thebes/gfxWindowsNativeDrawing.cpp
@@ -90,25 +90,29 @@ gfxWindowsNativeDrawing::BeginNativeDrawing()
              (surf->GetContentType() == gfxASurface::CONTENT_COLOR_ALPHA &&
               (mNativeDrawFlags & CAN_DRAW_TO_COLOR_ALPHA))))
         {
-            if (mTransformType == TRANSLATION_ONLY) {
-                mRenderState = RENDER_STATE_NATIVE_DRAWING;
+            // grab the DC. This can fail if there is a complex clipping path,
+            // in which case we'll have to fall back.
+            mWinSurface = static_cast<gfxWindowsSurface*>(static_cast<gfxASurface*>(surf.get()));
+            mDC = mWinSurface->GetDCWithClip(mContext);
 
-                mTranslation = m.GetTranslation();
+            if (mDC) {
+                if (mTransformType == TRANSLATION_ONLY) {
+                    mRenderState = RENDER_STATE_NATIVE_DRAWING;
 
-                mWinSurface = static_cast<gfxWindowsSurface*>(static_cast<gfxASurface*>(surf.get()));
-            } else if (((mTransformType == AXIS_ALIGNED_SCALE)
-                        && (mNativeDrawFlags & CAN_AXIS_ALIGNED_SCALE)) ||
-                       (mNativeDrawFlags & CAN_COMPLEX_TRANSFORM))
-            {
-                mWorldTransform.eM11 = (FLOAT) m.xx;
-                mWorldTransform.eM12 = (FLOAT) m.yx;
-                mWorldTransform.eM21 = (FLOAT) m.xy;
-                mWorldTransform.eM22 = (FLOAT) m.yy;
-                mWorldTransform.eDx  = (FLOAT) m.x0;
-                mWorldTransform.eDy  = (FLOAT) m.y0;
+                    mTranslation = m.GetTranslation();
+                } else if (((mTransformType == AXIS_ALIGNED_SCALE)
+                            && (mNativeDrawFlags & CAN_AXIS_ALIGNED_SCALE)) ||
+                           (mNativeDrawFlags & CAN_COMPLEX_TRANSFORM))
+                {
+                    mWorldTransform.eM11 = (FLOAT) m.xx;
+                    mWorldTransform.eM12 = (FLOAT) m.yx;
+                    mWorldTransform.eM21 = (FLOAT) m.xy;
+                    mWorldTransform.eM22 = (FLOAT) m.yy;
+                    mWorldTransform.eDx  = (FLOAT) m.x0;
+                    mWorldTransform.eDy  = (FLOAT) m.y0;
 
-                mRenderState = RENDER_STATE_NATIVE_DRAWING;
-                mWinSurface = static_cast<gfxWindowsSurface*>(static_cast<gfxASurface*>(surf.get()));
+                    mRenderState = RENDER_STATE_NATIVE_DRAWING;
+                }
             }
         }
 
@@ -156,9 +160,6 @@ gfxWindowsNativeDrawing::BeginNativeDrawing()
     if (mRenderState == RENDER_STATE_NATIVE_DRAWING) {
         // we can just do native drawing directly to the context's surface
 
-        // grab the DC
-        mDC = mWinSurface->GetDCWithClip(mContext);
-
         // do we need to use SetWorldTransform?
         if (mTransformType != TRANSLATION_ONLY) {
             SetGraphicsMode(mDC, GM_ADVANCED);
diff --git a/layout/reftests/native-theme/border-radius-ref.html b/layout/reftests/native-theme/border-radius-ref.html
new file mode 100644
index 00000000000..d6d4b16ccec
--- /dev/null
+++ b/layout/reftests/native-theme/border-radius-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+<body>
+<div style="padding:50px; border-radius:50px; width:400px; height:400px; border:1px solid black;">
+  <input type="radio">
+  <input type="checkbox">
+</div>
+</body>
+</html>
diff --git a/layout/reftests/native-theme/border-radius.html b/layout/reftests/native-theme/border-radius.html
new file mode 100644
index 00000000000..f9ced1d436e
--- /dev/null
+++ b/layout/reftests/native-theme/border-radius.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+<body>
+<div style="padding:50px; border-radius:50px; width:400px; height:400px; border:1px solid black; overflow:hidden;">
+  <input type="radio">
+  <input type="checkbox">
+</div>
+</body>
+</html>
diff --git a/layout/reftests/native-theme/reftest.list b/layout/reftests/native-theme/reftest.list
index 151ecef2e9e..e500e06530c 100644
--- a/layout/reftests/native-theme/reftest.list
+++ b/layout/reftests/native-theme/reftest.list
@@ -61,4 +61,6 @@ skip-if(gtk2Widget) random-if(d2d) == resizer-bottomend-rtl.xul resizer-bottomen
 skip-if(!winWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minimum-size-notheme-ref.html
 # skip-if(!winWidget) == scroll-thumb-minimum-size-theme.html scroll-thumb-minimum-size-theme-ref.html # Bug 512206
 
+== border-radius.html border-radius-ref.html
+
 == checkbox-dynamic-1.html checkbox-dynamic-1-ref.html

From a90baff00ce6e925aa3377b7db786979c6f5f846 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Wed, 27 Oct 2010 16:56:11 -0400
Subject: [PATCH 53/57] Bug 482175 - Rely on password manager notifications
 instead of timeouts in tests. r=dolske a=test-only

---
 .../passwordmgr/test/test_prompt.html         | 81 ++++++++++++-------
 1 file changed, 54 insertions(+), 27 deletions(-)

diff --git a/toolkit/components/passwordmgr/test/test_prompt.html b/toolkit/components/passwordmgr/test/test_prompt.html
index cbbe750a261..5775866204a 100644
--- a/toolkit/components/passwordmgr/test/test_prompt.html
+++ b/toolkit/components/passwordmgr/test/test_prompt.html
@@ -124,6 +124,33 @@ ok(true, "whee, done!");
   SimpleTest.finish();
 }
 
+function addNotificationCallback(cb)
+{
+  storageObserver.notificationCallbacks.push(cb);
+}
+
+var storageObserver = {
+  notificationCallbacks: [],
+
+  QueryInterface : function (iid) {
+    const interfaces = [Ci.nsIObserver,
+                        Ci.nsISupports, Ci.nsISupportsWeakReference];
+
+    if (!interfaces.some( function(v) { return iid.equals(v) } ))
+      throw Components.results.NS_ERROR_NO_INTERFACE;
+    return this;
+  },
+
+  observe : function (subject, topic, data) {
+   if (this.notificationCallbacks.length)
+      this.notificationCallbacks.splice(0, 1)[0]();
+  }
+};
+
+var observerService = Cc["@mozilla.org/observer-service;1"]
+                      .getService(Ci.nsIObserverService);
+observerService.addObserver(storageObserver, "passwordmgr-storage-changed", false);
+
 /*
  * handleDialog
  *
@@ -417,12 +444,6 @@ function handleLoad() {
         is(username, "mochiuser1", "Checking for echoed username");
         is(password, "mochipass1-new", "Checking for echoed password");
 
-        // Check for the popup notification, and change the password.
-        popup = getPopup(popupNotifications, "password-change");
-        ok(popup, "got popup notification");
-        clickPopupButton(popup, kChangeButton);
-        popup.remove();
-
         // Housekeeping: change it back
         function resetIt() {
           netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
@@ -430,7 +451,13 @@ function handleLoad() {
                         "mochiuser1", "mochipass1-new", "", "");
           pwmgr.modifyLogin(tmpLogin, login3A);
         }
-        setTimeout(resetIt, 0);
+        addNotificationCallback(resetIt);
+
+        // Check for the popup notification, and change the password.
+        popup = getPopup(popupNotifications, "password-change");
+        ok(popup, "got popup notification");
+        clickPopupButton(popup, kChangeButton);
+        popup.remove();
 
         // Same as last test, but for a realm we haven't already authenticated
         // to (but have an existing saved login for, so that we'll trigger
@@ -445,30 +472,30 @@ function handleLoad() {
         is(username, "mochiuser3", "Checking for echoed username");
         is(password, "mochipass3-new", "Checking for echoed password");
 
+        // Housekeeping: change it back to the original login4. Actually,
+        // just delete it and we'll re-add it as the next test.
+        function clearIt() {
+          netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+          tmpLogin.init("http://mochi.test:8888", null, "mochitest3",
+                        "mochiuser3", "mochipass3-new", "", "");
+          pwmgr.removeLogin(tmpLogin);
+
+          // Trigger a new prompt, so we can test adding a new login.
+          startCallbackTimer();
+          iframe.src = "authenticate.sjs?user=mochiuser3&pass=mochipass3-old&realm=mochitest3";
+        }
+        addNotificationCallback(clearIt);
+
         // Check for the popup notification, and change the password.
         popup = getPopup(popupNotifications, "password-change");
         ok(popup, "got popup notification");
         clickPopupButton(popup, kChangeButton);
         popup.remove();
 
-        // Housekeeping: change it back to the original login4. Actually,
-        // just delete it and we'll re-add it as the next test.
-        function clearIt() {
-            netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-            tmpLogin.init("http://mochi.test:8888", null, "mochitest3",
-                          "mochiuser3", "mochipass3-new", "", "");
-            pwmgr.removeLogin(tmpLogin);
-        }
-        setTimeout(clearIt, 0);
-
         // Clear cached auth from this subtest, and avoid leaking due to bug 459620.
         var authMgr = Cc['@mozilla.org/network/http-auth-manager;1'].
                       getService(Ci.nsIHttpAuthManager);
         authMgr.clearAll();
-
-        // Trigger a new prompt, so we can test adding a new login.
-        startCallbackTimer();
-        iframe.src = "authenticate.sjs?user=mochiuser3&pass=mochipass3-old&realm=mochitest3";
         break;
 
     case 1005:
@@ -477,17 +504,17 @@ function handleLoad() {
         is(username, "mochiuser3", "Checking for echoed username");
         is(password, "mochipass3-old", "Checking for echoed password");
 
+        function finishIt() {
+          netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+          finishTest();
+        }
+        addNotificationCallback(finishIt);
+
         // Check for the popup notification, and change the password.
         popup = getPopup(popupNotifications, "password-save");
         ok(popup, "got popup notification");
         clickPopupButton(popup, kRememberButton);
         popup.remove();
-        
-        function finishIt() {
-            netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-            finishTest();
-        }
-        setTimeout(finishIt, 0);
         break;
 
     default:

From a94de56fa80f648231853ed59b732e7024ca1d6e Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Thu, 28 Oct 2010 23:45:46 -0700
Subject: [PATCH 54/57] Bug 607534 - Optimize custom dynamic loader to use less
 memory, r=cjones a=blocking-fennec

---
 ipc/glue/GeckoChildProcessHost.cpp     |  22 ++++
 ipc/glue/SharedMemoryBasic_android.cpp |  12 +--
 other-licenses/android/APKOpen.cpp     | 144 +++++++++++++++++++++++--
 other-licenses/android/APKOpen.h       |  12 ++-
 other-licenses/android/linker.c        |  55 ++++++++--
 toolkit/xre/nsAndroidStartup.cpp       |   2 +-
 6 files changed, 217 insertions(+), 30 deletions(-)

diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp
index 28f444a2141..7442c566bd4 100644
--- a/ipc/glue/GeckoChildProcessHost.cpp
+++ b/ipc/glue/GeckoChildProcessHost.cpp
@@ -69,6 +69,10 @@
 #define NS_TASKBAR_CONTRACTID "@mozilla.org/windows-taskbar;1"
 #endif
 
+#ifdef ANDROID
+#include "APKOpen.h"
+#endif
+
 using mozilla::MonitorAutoEnter;
 using mozilla::ipc::GeckoChildProcessHost;
 
@@ -388,6 +392,20 @@ GeckoChildProcessHost::PerformAsyncLaunch(std::vector<std::string> aExtraOpts, b
 #ifdef ANDROID
   // The java wrapper unpacks this for us but can't make it executable
   chmod(exePath.value().c_str(), 0700);
+  int cacheCount = 0;
+  const struct lib_cache_info * cache = getLibraryCache();
+  nsCString cacheStr;
+  while (cache &&
+         cacheCount++ < MAX_LIB_CACHE_ENTRIES &&
+         strlen(cache->name)) {
+    mFileMap.push_back(std::pair<int,int>(cache->fd, cache->fd));
+    cacheStr.Append(cache->name);
+    cacheStr.AppendPrintf(":%d;", cache->fd);
+    cache++;
+  }
+  // fill the last arg with something if there's no cache
+  if (cacheStr.IsEmpty())
+    cacheStr.AppendLiteral("-");
 #endif
 
   // remap the IPC socket fd to a well-known int, as the OS does for
@@ -451,6 +469,10 @@ GeckoChildProcessHost::PerformAsyncLaunch(std::vector<std::string> aExtraOpts, b
 
   childArgv.push_back(childProcessType);
 
+#ifdef ANDROID
+  childArgv.push_back(cacheStr.get());
+#endif
+
   base::LaunchApp(childArgv, mFileMap,
 #if defined(OS_LINUX) || defined(OS_MACOSX)
                   newEnvVars,
diff --git a/ipc/glue/SharedMemoryBasic_android.cpp b/ipc/glue/SharedMemoryBasic_android.cpp
index 6f457b107c4..34385c08995 100644
--- a/ipc/glue/SharedMemoryBasic_android.cpp
+++ b/ipc/glue/SharedMemoryBasic_android.cpp
@@ -56,15 +56,7 @@
 // Temporarily go directly to the kernel interface until we can
 // interact better with libcutils.
 //
-#define ASHMEM_DEVICE  		"/dev/ashmem"
-#define ASHMEM_NAME_LEN		256
-#define __ASHMEMIOC 0x77
-#define ASHMEM_SET_NAME		_IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN])
-#define ASHMEM_GET_NAME		_IOR(__ASHMEMIOC, 2, char[ASHMEM_NAME_LEN])
-#define ASHMEM_SET_SIZE		_IOW(__ASHMEMIOC, 3, size_t)
-#define ASHMEM_GET_SIZE		_IO(__ASHMEMIOC, 4)
-#define ASHMEM_SET_PROT_MASK	_IOW(__ASHMEMIOC, 5, unsigned long)
-#define ASHMEM_GET_PROT_MASK	_IO(__ASHMEMIOC, 6)
+#include <linux/ashmem.h>
 
 namespace mozilla {
 namespace ipc {
@@ -102,7 +94,7 @@ SharedMemoryBasic::Create(size_t aNbytes)
   NS_ABORT_IF_FALSE(-1 == mShmFd, "Already Create()d");
 
   // Carve a new instance off of /dev/ashmem
-  int shmfd = open(ASHMEM_DEVICE, O_RDWR, 0600);
+  int shmfd = open("/" ASHMEM_NAME_DEF, O_RDWR, 0600);
   if (-1 == shmfd) {
     LogError("ShmemAndroid::Create():open");
     return false;
diff --git a/other-licenses/android/APKOpen.cpp b/other-licenses/android/APKOpen.cpp
index f8f9a85f1fd..7de334c6d63 100644
--- a/other-licenses/android/APKOpen.cpp
+++ b/other-licenses/android/APKOpen.cpp
@@ -34,19 +34,29 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * This custom library loading code is only meant to be called
+ * during initialization. As a result, it takes no special 
+ * precautions to be threadsafe. Any of the library loading functions
+ * like mozload should not be available to other code.
+ */
+
 #include <jni.h>
 #include <android/log.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <sys/limits.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <fcntl.h>
 #include <endian.h>
 #include <unistd.h>
 #include <zlib.h>
+#include <linux/ashmem.h>
 #include "dlfcn.h"
 #include "APKOpen.h"
 
@@ -109,7 +119,27 @@ struct cdir_end {
 
 static size_t zip_size;
 static int zip_fd;
-NS_EXPORT struct mapping_info * lib_mapping;
+static struct mapping_info * lib_mapping;
+
+NS_EXPORT const struct mapping_info *
+getLibraryMapping()
+{
+  return lib_mapping;
+}
+
+static int
+createAshmem(size_t bytes)
+{
+  int fd = open("/" ASHMEM_NAME_DEF, O_RDWR, 0600);
+  if (fd < 0)
+    return -1;
+
+  if (!ioctl(fd, ASHMEM_SET_SIZE, bytes))
+    return fd;
+
+  close(fd);
+  return -1;
+}
 
 static void * map_file (const char *file)
 {
@@ -320,6 +350,80 @@ extractLib(const struct cdir_entry *entry, void * data, void * dest)
     __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "File not fully uncompressed! %d / %d", strm.total_out, letoh32(entry->uncompressed_size));
 }
 
+static int cache_count = 0;
+static struct lib_cache_info *cache_mapping = NULL;
+
+NS_EXPORT const struct lib_cache_info *
+getLibraryCache()
+{
+  return cache_mapping;
+}
+
+static void
+ensureLibCache()
+{
+  if (!cache_mapping)
+    cache_mapping = (struct lib_cache_info *)calloc(MAX_LIB_CACHE_ENTRIES,
+                                                    sizeof(*cache_mapping));
+}
+
+static void
+fillLibCache(const char *buf)
+{
+  ensureLibCache();
+
+  char * str = strdup(buf);
+  if (!str)
+    return;
+
+  char * saveptr;
+  char * nextstr = str;
+  do {
+    struct lib_cache_info *info = &cache_mapping[cache_count];
+
+    char * name = strtok_r(nextstr, ":", &saveptr);
+    if (!name)
+      break;
+    nextstr = NULL;
+
+    char * fd_str = strtok_r(NULL, ";", &saveptr);
+    if (!fd_str)
+      break;
+
+    long int fd = strtol(fd_str, NULL, 10);
+    if (fd == LONG_MIN || fd == LONG_MAX)
+      break;
+    strncpy(info->name, name, MAX_LIB_CACHE_NAME_LEN - 1);
+    info->fd = fd;
+  } while (cache_count++ < MAX_LIB_CACHE_ENTRIES);
+  free(str);
+}
+
+static int
+lookupLibCacheFd(const char *libName)
+{
+  if (!cache_mapping)
+    return -1;
+
+  int count = cache_count;
+  while (count--) {
+    struct lib_cache_info *info = &cache_mapping[count];
+    if (!strcmp(libName, info->name))
+      return info->fd;
+  }
+  return -1;
+}
+
+static void
+addLibCacheFd(const char *libName, int fd)
+{
+  ensureLibCache();
+
+  struct lib_cache_info *info = &cache_mapping[cache_count++];
+  strncpy(info->name, libName, MAX_LIB_CACHE_NAME_LEN - 1);
+  info->fd = fd;
+}
+
 static void * mozload(const char * path, void *zip,
                       struct cdir_entry *cdir_start, uint16_t cdir_entries)
 {
@@ -338,9 +442,7 @@ static void * mozload(const char * path, void *zip,
     snprintf(fullpath, 256, "/data/data/org.mozilla.fennec/%s", path + 4);
     __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "resolved %s to %s", path, fullpath);
     extractFile(fullpath, entry, data);
-    __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "%s: 1", fullpath);
     handle = __wrap_dlopen(fullpath, RTLD_LAZY);
-    __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "%s: 2", fullpath);
     if (!handle)
       __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Couldn't load %s because %s", fullpath, __wrap_dlerror());
 #ifdef DEBUG
@@ -358,32 +460,48 @@ static void * mozload(const char * path, void *zip,
 
   int fd = zip_fd;
   void * buf = NULL;
+  uint32_t lib_size = letoh32(entry->uncompressed_size);
   if (letoh16(file->compression) == DEFLATE) {
-    fd = -1;
-    buf = mmap(NULL, letoh32(entry->uncompressed_size),
-               PROT_READ | PROT_WRITE | PROT_EXEC,
-               MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    int cache_fd = lookupLibCacheFd(path + 4);
+    fd = cache_fd;
+    if (fd < 0)
+      fd = createAshmem(lib_size);
+#ifdef DEBUG
+    else
+      __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Loading %s from cache", path + 4);
+#endif
+    if (fd < 0) {
+      __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Couldn't get an ashmem buffer");
+      return NULL;
+    }
+    buf = mmap(NULL, lib_size,
+               PROT_READ | PROT_WRITE,
+               MAP_SHARED, fd, 0);
     if (buf == (void *)-1) {
       __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Couldn't mmap decompression buffer");
+      close(fd);
       return NULL;
     }
 
     offset = 0;
 
-    extractLib(entry, data, buf);
+    if (cache_fd < 0) {
+      extractLib(entry, data, buf);
+      addLibCacheFd(path + 4, fd);
+    }
     data = buf;
   }
 
 #ifdef DEBUG
-  __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Loading %s with len %d and offset %d", path, letoh32(entry->uncompressed_size), offset);
+  __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Loading %s with len %d (0x%08x) and offset %d (0x%08x)", path, lib_size, lib_size, offset, offset);
 #endif
 
   handle = moz_mapped_dlopen(path, RTLD_LAZY, fd, data,
-                             letoh32(entry->uncompressed_size), offset);
+                             lib_size, offset);
   if (!handle)
     __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Couldn't load %s because %s", path, __wrap_dlerror());
   if (buf)
-    munmap(buf, letoh32(entry->uncompressed_size));
+    munmap(buf, lib_size);
 
 #ifdef DEBUG
   gettimeofday(&t1, 0);
@@ -550,8 +668,12 @@ ChildProcessInit(int argc, char* argv[])
     break;
   }
 
+  fillLibCache(argv[argc - 1]);
   loadLibs(argv[i]);
 
+  // don't pass the last arg - it's only recognized by the lib cache
+  argc--;
+
   typedef GeckoProcessType (*XRE_StringToChildProcessType_t)(char*);
   typedef nsresult (*XRE_InitChildProcess_t)(int, char**, GeckoProcessType);
   XRE_StringToChildProcessType_t fXRE_StringToChildProcessType =
diff --git a/other-licenses/android/APKOpen.h b/other-licenses/android/APKOpen.h
index 7d4fa4b16d1..c5425441b8b 100644
--- a/other-licenses/android/APKOpen.h
+++ b/other-licenses/android/APKOpen.h
@@ -45,6 +45,16 @@ struct mapping_info {
   size_t offset;
 };
 
-extern struct mapping_info * lib_mapping;
+const struct mapping_info * getLibraryMapping();
+
+#define MAX_LIB_CACHE_ENTRIES 32
+#define MAX_LIB_CACHE_NAME_LEN 32
+
+struct lib_cache_info {
+  char name[MAX_LIB_CACHE_NAME_LEN];
+  int fd;
+};
+
+const struct lib_cache_info * getLibraryCache();
 
 #endif /* APKOpen_h */
diff --git a/other-licenses/android/linker.c b/other-licenses/android/linker.c
index b33e6dcafd8..28636db11c1 100644
--- a/other-licenses/android/linker.c
+++ b/other-licenses/android/linker.c
@@ -930,18 +930,19 @@ load_segments(int fd, size_t offset, void *header, soinfo *si)
             TRACE("[ %d - Trying to load segment from '%s' @ 0x%08x "
                   "(0x%08x). p_vaddr=0x%08x p_offset=0x%08x ]\n", pid, si->name,
                   (unsigned)tmp, len, phdr->p_vaddr, phdr->p_offset);
-            if (fd == -1) {
+            if (fd == -1 || PFLAGS_TO_PROT(phdr->p_flags) & PROT_WRITE) {
                 pbase = mmap(tmp, len, PROT_WRITE,
-                             MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1,
-                             0);
+                             MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
                 if (pbase != MAP_FAILED) {
                     memcpy(pbase, header + ((phdr->p_offset) & (~PAGE_MASK)), len);
                     mprotect(pbase, len, PFLAGS_TO_PROT(phdr->p_flags));
-                }
-            } else
+                } else
+                    DL_ERR("%s: Memcpy mapping of segment failed!", si->name);
+            } else {
                 pbase = mmap(tmp, len, PFLAGS_TO_PROT(phdr->p_flags),
-                             MAP_PRIVATE | MAP_FIXED, fd,
+                             MAP_SHARED | MAP_FIXED, fd,
                              offset + ((phdr->p_offset) & (~PAGE_MASK)));
+            }
             if (pbase == MAP_FAILED) {
                 DL_ERR("%d failed to map segment from '%s' @ 0x%08x (0x%08x). "
                       "p_vaddr=0x%08x p_offset=0x%08x", pid, si->name,
@@ -1238,7 +1239,7 @@ load_mapped_library(const char * name, int fd,
           pid, name, (void *)si->base, (unsigned) ext_sz);
 
     /* Now actually load the library's segments into right places in memory */
-    if (load_segments(offset ? fd : -1, offset, mem, si) < 0) {
+    if (load_segments(fd, offset, mem, si) < 0) {
         if (si->ba_index >= 0) {
             ba_free(&ba_nonprelink, si->ba_index);
             si->ba_index = -1;
@@ -1394,6 +1395,28 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count)
     Elf32_Rel *start = rel;
     unsigned idx;
 
+    /* crappy hack to ensure we don't write into the read-only region */
+
+    /* crappy hack part 1: find the read only region */
+    int cnt;
+    void * ro_region_end = si->base;
+    Elf32_Ehdr *ehdr = (Elf32_Ehdr *)si->base;
+    Elf32_Phdr *phdr = (Elf32_Phdr *)((unsigned char *)si->base + ehdr->e_phoff);
+    for (cnt = 0; cnt < ehdr->e_phnum; ++cnt, ++phdr) {
+        if (phdr->p_type != PT_LOAD ||
+            PFLAGS_TO_PROT(phdr->p_flags) & PROT_WRITE ||
+            phdr->p_vaddr != 0)
+            continue;
+
+        ro_region_end = si->base + phdr->p_filesz;
+        break;
+    }
+
+    void * remapped_page = NULL;
+    void * copy_page = mmap(NULL, PAGE_SIZE,
+                            PROT_READ | PROT_WRITE,
+                            MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
     for (idx = 0; idx < count; ++idx) {
         unsigned type = ELF32_R_TYPE(rel->r_info);
         unsigned sym = ELF32_R_SYM(rel->r_info);
@@ -1479,6 +1502,23 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count)
             s = NULL;
         }
 
+        /* crappy hack part 2: make this page writable */
+        void * reloc_page = reloc & ~PAGE_MASK;
+        if (reloc < ro_region_end && reloc_page != remapped_page) {
+            if (remapped_page != NULL)
+                mprotect(remapped_page, PAGE_SIZE, PROT_READ | PROT_EXEC);
+            memcpy(copy_page, reloc_page, PAGE_SIZE);
+            munmap(reloc_page, PAGE_SIZE);
+            if (mmap(reloc_page, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC,
+                     MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
+                     -1, 0) == MAP_FAILED)
+                DL_ERR("failed to map page for %s at 0x%08x! errno=%d",
+                       si->name, reloc_page, errno);
+
+            memcpy(reloc_page, copy_page, PAGE_SIZE);
+            remapped_page = reloc_page;
+        }
+
 /* TODO: This is ugly. Split up the relocations by arch into
  * different files.
  */
@@ -1584,6 +1624,7 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count)
         }
         rel++;
     }
+    munmap(copy_page, PAGE_SIZE);
     return 0;
 }
 
diff --git a/toolkit/xre/nsAndroidStartup.cpp b/toolkit/xre/nsAndroidStartup.cpp
index b8e36515b1f..5a8599bd241 100644
--- a/toolkit/xre/nsAndroidStartup.cpp
+++ b/toolkit/xre/nsAndroidStartup.cpp
@@ -75,7 +75,7 @@ static void*
 GeckoStart(void *data)
 {
 #ifdef MOZ_CRASHREPORTER
-    struct mapping_info *info = lib_mapping;
+    const struct mapping_info *info = getLibraryMapping();
     while (info->name) {
       CrashReporter::AddLibraryMapping(info->name, info->file_id, info->base,
                                        info->len, info->offset);

From 008007b5a37753a61d84873ef4b1054924aa09ca Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Fri, 29 Oct 2010 22:17:07 +1300
Subject: [PATCH 55/57] Try to fix failing test for bug 595842 by removing
 border whose antialiasing seems to be inconsistent, a=testonly

---
 layout/reftests/native-theme/border-radius-ref.html | 2 +-
 layout/reftests/native-theme/border-radius.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/layout/reftests/native-theme/border-radius-ref.html b/layout/reftests/native-theme/border-radius-ref.html
index d6d4b16ccec..908f9515d8a 100644
--- a/layout/reftests/native-theme/border-radius-ref.html
+++ b/layout/reftests/native-theme/border-radius-ref.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <body>
-<div style="padding:50px; border-radius:50px; width:400px; height:400px; border:1px solid black;">
+<div style="padding:50px; border-radius:50px; width:400px; height:400px;">
   <input type="radio">
   <input type="checkbox">
 </div>
diff --git a/layout/reftests/native-theme/border-radius.html b/layout/reftests/native-theme/border-radius.html
index f9ced1d436e..43ed3964591 100644
--- a/layout/reftests/native-theme/border-radius.html
+++ b/layout/reftests/native-theme/border-radius.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <body>
-<div style="padding:50px; border-radius:50px; width:400px; height:400px; border:1px solid black; overflow:hidden;">
+<div style="padding:50px; border-radius:50px; width:400px; height:400px; overflow:hidden;">
   <input type="radio">
   <input type="checkbox">
 </div>

From c7d21e0bea27f36cd280faf55f52c48a160f8e09 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Fri, 29 Oct 2010 10:07:54 -0400
Subject: [PATCH 56/57] Bug 608239: Backout changeset 99233ad2ff70
 a=fennec-should-load-pages

---
 ipc/glue/GeckoChildProcessHost.cpp     |  22 ----
 ipc/glue/SharedMemoryBasic_android.cpp |  12 ++-
 other-licenses/android/APKOpen.cpp     | 144 ++-----------------------
 other-licenses/android/APKOpen.h       |  12 +--
 other-licenses/android/linker.c        |  55 ++--------
 toolkit/xre/nsAndroidStartup.cpp       |   2 +-
 6 files changed, 30 insertions(+), 217 deletions(-)

diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp
index 7442c566bd4..28f444a2141 100644
--- a/ipc/glue/GeckoChildProcessHost.cpp
+++ b/ipc/glue/GeckoChildProcessHost.cpp
@@ -69,10 +69,6 @@
 #define NS_TASKBAR_CONTRACTID "@mozilla.org/windows-taskbar;1"
 #endif
 
-#ifdef ANDROID
-#include "APKOpen.h"
-#endif
-
 using mozilla::MonitorAutoEnter;
 using mozilla::ipc::GeckoChildProcessHost;
 
@@ -392,20 +388,6 @@ GeckoChildProcessHost::PerformAsyncLaunch(std::vector<std::string> aExtraOpts, b
 #ifdef ANDROID
   // The java wrapper unpacks this for us but can't make it executable
   chmod(exePath.value().c_str(), 0700);
-  int cacheCount = 0;
-  const struct lib_cache_info * cache = getLibraryCache();
-  nsCString cacheStr;
-  while (cache &&
-         cacheCount++ < MAX_LIB_CACHE_ENTRIES &&
-         strlen(cache->name)) {
-    mFileMap.push_back(std::pair<int,int>(cache->fd, cache->fd));
-    cacheStr.Append(cache->name);
-    cacheStr.AppendPrintf(":%d;", cache->fd);
-    cache++;
-  }
-  // fill the last arg with something if there's no cache
-  if (cacheStr.IsEmpty())
-    cacheStr.AppendLiteral("-");
 #endif
 
   // remap the IPC socket fd to a well-known int, as the OS does for
@@ -469,10 +451,6 @@ GeckoChildProcessHost::PerformAsyncLaunch(std::vector<std::string> aExtraOpts, b
 
   childArgv.push_back(childProcessType);
 
-#ifdef ANDROID
-  childArgv.push_back(cacheStr.get());
-#endif
-
   base::LaunchApp(childArgv, mFileMap,
 #if defined(OS_LINUX) || defined(OS_MACOSX)
                   newEnvVars,
diff --git a/ipc/glue/SharedMemoryBasic_android.cpp b/ipc/glue/SharedMemoryBasic_android.cpp
index 34385c08995..6f457b107c4 100644
--- a/ipc/glue/SharedMemoryBasic_android.cpp
+++ b/ipc/glue/SharedMemoryBasic_android.cpp
@@ -56,7 +56,15 @@
 // Temporarily go directly to the kernel interface until we can
 // interact better with libcutils.
 //
-#include <linux/ashmem.h>
+#define ASHMEM_DEVICE  		"/dev/ashmem"
+#define ASHMEM_NAME_LEN		256
+#define __ASHMEMIOC 0x77
+#define ASHMEM_SET_NAME		_IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN])
+#define ASHMEM_GET_NAME		_IOR(__ASHMEMIOC, 2, char[ASHMEM_NAME_LEN])
+#define ASHMEM_SET_SIZE		_IOW(__ASHMEMIOC, 3, size_t)
+#define ASHMEM_GET_SIZE		_IO(__ASHMEMIOC, 4)
+#define ASHMEM_SET_PROT_MASK	_IOW(__ASHMEMIOC, 5, unsigned long)
+#define ASHMEM_GET_PROT_MASK	_IO(__ASHMEMIOC, 6)
 
 namespace mozilla {
 namespace ipc {
@@ -94,7 +102,7 @@ SharedMemoryBasic::Create(size_t aNbytes)
   NS_ABORT_IF_FALSE(-1 == mShmFd, "Already Create()d");
 
   // Carve a new instance off of /dev/ashmem
-  int shmfd = open("/" ASHMEM_NAME_DEF, O_RDWR, 0600);
+  int shmfd = open(ASHMEM_DEVICE, O_RDWR, 0600);
   if (-1 == shmfd) {
     LogError("ShmemAndroid::Create():open");
     return false;
diff --git a/other-licenses/android/APKOpen.cpp b/other-licenses/android/APKOpen.cpp
index 7de334c6d63..f8f9a85f1fd 100644
--- a/other-licenses/android/APKOpen.cpp
+++ b/other-licenses/android/APKOpen.cpp
@@ -34,29 +34,19 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/*
- * This custom library loading code is only meant to be called
- * during initialization. As a result, it takes no special 
- * precautions to be threadsafe. Any of the library loading functions
- * like mozload should not be available to other code.
- */
-
 #include <jni.h>
 #include <android/log.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include <sys/limits.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <endian.h>
 #include <unistd.h>
 #include <zlib.h>
-#include <linux/ashmem.h>
 #include "dlfcn.h"
 #include "APKOpen.h"
 
@@ -119,27 +109,7 @@ struct cdir_end {
 
 static size_t zip_size;
 static int zip_fd;
-static struct mapping_info * lib_mapping;
-
-NS_EXPORT const struct mapping_info *
-getLibraryMapping()
-{
-  return lib_mapping;
-}
-
-static int
-createAshmem(size_t bytes)
-{
-  int fd = open("/" ASHMEM_NAME_DEF, O_RDWR, 0600);
-  if (fd < 0)
-    return -1;
-
-  if (!ioctl(fd, ASHMEM_SET_SIZE, bytes))
-    return fd;
-
-  close(fd);
-  return -1;
-}
+NS_EXPORT struct mapping_info * lib_mapping;
 
 static void * map_file (const char *file)
 {
@@ -350,80 +320,6 @@ extractLib(const struct cdir_entry *entry, void * data, void * dest)
     __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "File not fully uncompressed! %d / %d", strm.total_out, letoh32(entry->uncompressed_size));
 }
 
-static int cache_count = 0;
-static struct lib_cache_info *cache_mapping = NULL;
-
-NS_EXPORT const struct lib_cache_info *
-getLibraryCache()
-{
-  return cache_mapping;
-}
-
-static void
-ensureLibCache()
-{
-  if (!cache_mapping)
-    cache_mapping = (struct lib_cache_info *)calloc(MAX_LIB_CACHE_ENTRIES,
-                                                    sizeof(*cache_mapping));
-}
-
-static void
-fillLibCache(const char *buf)
-{
-  ensureLibCache();
-
-  char * str = strdup(buf);
-  if (!str)
-    return;
-
-  char * saveptr;
-  char * nextstr = str;
-  do {
-    struct lib_cache_info *info = &cache_mapping[cache_count];
-
-    char * name = strtok_r(nextstr, ":", &saveptr);
-    if (!name)
-      break;
-    nextstr = NULL;
-
-    char * fd_str = strtok_r(NULL, ";", &saveptr);
-    if (!fd_str)
-      break;
-
-    long int fd = strtol(fd_str, NULL, 10);
-    if (fd == LONG_MIN || fd == LONG_MAX)
-      break;
-    strncpy(info->name, name, MAX_LIB_CACHE_NAME_LEN - 1);
-    info->fd = fd;
-  } while (cache_count++ < MAX_LIB_CACHE_ENTRIES);
-  free(str);
-}
-
-static int
-lookupLibCacheFd(const char *libName)
-{
-  if (!cache_mapping)
-    return -1;
-
-  int count = cache_count;
-  while (count--) {
-    struct lib_cache_info *info = &cache_mapping[count];
-    if (!strcmp(libName, info->name))
-      return info->fd;
-  }
-  return -1;
-}
-
-static void
-addLibCacheFd(const char *libName, int fd)
-{
-  ensureLibCache();
-
-  struct lib_cache_info *info = &cache_mapping[cache_count++];
-  strncpy(info->name, libName, MAX_LIB_CACHE_NAME_LEN - 1);
-  info->fd = fd;
-}
-
 static void * mozload(const char * path, void *zip,
                       struct cdir_entry *cdir_start, uint16_t cdir_entries)
 {
@@ -442,7 +338,9 @@ static void * mozload(const char * path, void *zip,
     snprintf(fullpath, 256, "/data/data/org.mozilla.fennec/%s", path + 4);
     __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "resolved %s to %s", path, fullpath);
     extractFile(fullpath, entry, data);
+    __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "%s: 1", fullpath);
     handle = __wrap_dlopen(fullpath, RTLD_LAZY);
+    __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "%s: 2", fullpath);
     if (!handle)
       __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Couldn't load %s because %s", fullpath, __wrap_dlerror());
 #ifdef DEBUG
@@ -460,48 +358,32 @@ static void * mozload(const char * path, void *zip,
 
   int fd = zip_fd;
   void * buf = NULL;
-  uint32_t lib_size = letoh32(entry->uncompressed_size);
   if (letoh16(file->compression) == DEFLATE) {
-    int cache_fd = lookupLibCacheFd(path + 4);
-    fd = cache_fd;
-    if (fd < 0)
-      fd = createAshmem(lib_size);
-#ifdef DEBUG
-    else
-      __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Loading %s from cache", path + 4);
-#endif
-    if (fd < 0) {
-      __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Couldn't get an ashmem buffer");
-      return NULL;
-    }
-    buf = mmap(NULL, lib_size,
-               PROT_READ | PROT_WRITE,
-               MAP_SHARED, fd, 0);
+    fd = -1;
+    buf = mmap(NULL, letoh32(entry->uncompressed_size),
+               PROT_READ | PROT_WRITE | PROT_EXEC,
+               MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
     if (buf == (void *)-1) {
       __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Couldn't mmap decompression buffer");
-      close(fd);
       return NULL;
     }
 
     offset = 0;
 
-    if (cache_fd < 0) {
-      extractLib(entry, data, buf);
-      addLibCacheFd(path + 4, fd);
-    }
+    extractLib(entry, data, buf);
     data = buf;
   }
 
 #ifdef DEBUG
-  __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Loading %s with len %d (0x%08x) and offset %d (0x%08x)", path, lib_size, lib_size, offset, offset);
+  __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Loading %s with len %d and offset %d", path, letoh32(entry->uncompressed_size), offset);
 #endif
 
   handle = moz_mapped_dlopen(path, RTLD_LAZY, fd, data,
-                             lib_size, offset);
+                             letoh32(entry->uncompressed_size), offset);
   if (!handle)
     __android_log_print(ANDROID_LOG_ERROR, "GeckoLibLoad", "Couldn't load %s because %s", path, __wrap_dlerror());
   if (buf)
-    munmap(buf, lib_size);
+    munmap(buf, letoh32(entry->uncompressed_size));
 
 #ifdef DEBUG
   gettimeofday(&t1, 0);
@@ -668,12 +550,8 @@ ChildProcessInit(int argc, char* argv[])
     break;
   }
 
-  fillLibCache(argv[argc - 1]);
   loadLibs(argv[i]);
 
-  // don't pass the last arg - it's only recognized by the lib cache
-  argc--;
-
   typedef GeckoProcessType (*XRE_StringToChildProcessType_t)(char*);
   typedef nsresult (*XRE_InitChildProcess_t)(int, char**, GeckoProcessType);
   XRE_StringToChildProcessType_t fXRE_StringToChildProcessType =
diff --git a/other-licenses/android/APKOpen.h b/other-licenses/android/APKOpen.h
index c5425441b8b..7d4fa4b16d1 100644
--- a/other-licenses/android/APKOpen.h
+++ b/other-licenses/android/APKOpen.h
@@ -45,16 +45,6 @@ struct mapping_info {
   size_t offset;
 };
 
-const struct mapping_info * getLibraryMapping();
-
-#define MAX_LIB_CACHE_ENTRIES 32
-#define MAX_LIB_CACHE_NAME_LEN 32
-
-struct lib_cache_info {
-  char name[MAX_LIB_CACHE_NAME_LEN];
-  int fd;
-};
-
-const struct lib_cache_info * getLibraryCache();
+extern struct mapping_info * lib_mapping;
 
 #endif /* APKOpen_h */
diff --git a/other-licenses/android/linker.c b/other-licenses/android/linker.c
index 28636db11c1..b33e6dcafd8 100644
--- a/other-licenses/android/linker.c
+++ b/other-licenses/android/linker.c
@@ -930,19 +930,18 @@ load_segments(int fd, size_t offset, void *header, soinfo *si)
             TRACE("[ %d - Trying to load segment from '%s' @ 0x%08x "
                   "(0x%08x). p_vaddr=0x%08x p_offset=0x%08x ]\n", pid, si->name,
                   (unsigned)tmp, len, phdr->p_vaddr, phdr->p_offset);
-            if (fd == -1 || PFLAGS_TO_PROT(phdr->p_flags) & PROT_WRITE) {
+            if (fd == -1) {
                 pbase = mmap(tmp, len, PROT_WRITE,
-                             MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+                             MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1,
+                             0);
                 if (pbase != MAP_FAILED) {
                     memcpy(pbase, header + ((phdr->p_offset) & (~PAGE_MASK)), len);
                     mprotect(pbase, len, PFLAGS_TO_PROT(phdr->p_flags));
-                } else
-                    DL_ERR("%s: Memcpy mapping of segment failed!", si->name);
-            } else {
+                }
+            } else
                 pbase = mmap(tmp, len, PFLAGS_TO_PROT(phdr->p_flags),
-                             MAP_SHARED | MAP_FIXED, fd,
+                             MAP_PRIVATE | MAP_FIXED, fd,
                              offset + ((phdr->p_offset) & (~PAGE_MASK)));
-            }
             if (pbase == MAP_FAILED) {
                 DL_ERR("%d failed to map segment from '%s' @ 0x%08x (0x%08x). "
                       "p_vaddr=0x%08x p_offset=0x%08x", pid, si->name,
@@ -1239,7 +1238,7 @@ load_mapped_library(const char * name, int fd,
           pid, name, (void *)si->base, (unsigned) ext_sz);
 
     /* Now actually load the library's segments into right places in memory */
-    if (load_segments(fd, offset, mem, si) < 0) {
+    if (load_segments(offset ? fd : -1, offset, mem, si) < 0) {
         if (si->ba_index >= 0) {
             ba_free(&ba_nonprelink, si->ba_index);
             si->ba_index = -1;
@@ -1395,28 +1394,6 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count)
     Elf32_Rel *start = rel;
     unsigned idx;
 
-    /* crappy hack to ensure we don't write into the read-only region */
-
-    /* crappy hack part 1: find the read only region */
-    int cnt;
-    void * ro_region_end = si->base;
-    Elf32_Ehdr *ehdr = (Elf32_Ehdr *)si->base;
-    Elf32_Phdr *phdr = (Elf32_Phdr *)((unsigned char *)si->base + ehdr->e_phoff);
-    for (cnt = 0; cnt < ehdr->e_phnum; ++cnt, ++phdr) {
-        if (phdr->p_type != PT_LOAD ||
-            PFLAGS_TO_PROT(phdr->p_flags) & PROT_WRITE ||
-            phdr->p_vaddr != 0)
-            continue;
-
-        ro_region_end = si->base + phdr->p_filesz;
-        break;
-    }
-
-    void * remapped_page = NULL;
-    void * copy_page = mmap(NULL, PAGE_SIZE,
-                            PROT_READ | PROT_WRITE,
-                            MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-
     for (idx = 0; idx < count; ++idx) {
         unsigned type = ELF32_R_TYPE(rel->r_info);
         unsigned sym = ELF32_R_SYM(rel->r_info);
@@ -1502,23 +1479,6 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count)
             s = NULL;
         }
 
-        /* crappy hack part 2: make this page writable */
-        void * reloc_page = reloc & ~PAGE_MASK;
-        if (reloc < ro_region_end && reloc_page != remapped_page) {
-            if (remapped_page != NULL)
-                mprotect(remapped_page, PAGE_SIZE, PROT_READ | PROT_EXEC);
-            memcpy(copy_page, reloc_page, PAGE_SIZE);
-            munmap(reloc_page, PAGE_SIZE);
-            if (mmap(reloc_page, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC,
-                     MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
-                     -1, 0) == MAP_FAILED)
-                DL_ERR("failed to map page for %s at 0x%08x! errno=%d",
-                       si->name, reloc_page, errno);
-
-            memcpy(reloc_page, copy_page, PAGE_SIZE);
-            remapped_page = reloc_page;
-        }
-
 /* TODO: This is ugly. Split up the relocations by arch into
  * different files.
  */
@@ -1624,7 +1584,6 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count)
         }
         rel++;
     }
-    munmap(copy_page, PAGE_SIZE);
     return 0;
 }
 
diff --git a/toolkit/xre/nsAndroidStartup.cpp b/toolkit/xre/nsAndroidStartup.cpp
index 5a8599bd241..b8e36515b1f 100644
--- a/toolkit/xre/nsAndroidStartup.cpp
+++ b/toolkit/xre/nsAndroidStartup.cpp
@@ -75,7 +75,7 @@ static void*
 GeckoStart(void *data)
 {
 #ifdef MOZ_CRASHREPORTER
-    const struct mapping_info *info = getLibraryMapping();
+    struct mapping_info *info = lib_mapping;
     while (info->name) {
       CrashReporter::AddLibraryMapping(info->name, info->file_id, info->base,
                                        info->len, info->offset);

From 28678340e74d6d9916cbcce44e55470488b30f3d Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Fri, 29 Oct 2010 11:38:26 -0400
Subject: [PATCH 57/57] Bug 608258 - Crash at visiting AMO [r=jdm
 a=blocking-fennecb2]

---
 netwerk/protocol/http/HttpChannelParentListener.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netwerk/protocol/http/HttpChannelParentListener.cpp b/netwerk/protocol/http/HttpChannelParentListener.cpp
index 74fe14c70e4..6f5e1afb6f3 100644
--- a/netwerk/protocol/http/HttpChannelParentListener.cpp
+++ b/netwerk/protocol/http/HttpChannelParentListener.cpp
@@ -144,7 +144,7 @@ HttpChannelParentListener::GetInterface(const nsIID& aIID, void **result)
   }
 
   if (aIID.Equals(NS_GET_IID(nsISecureBrowserUI))) {
-    if (!mActiveChannel && !mActiveChannel->mTabParent)
+    if (!mActiveChannel || !mActiveChannel->mTabParent)
       return NS_NOINTERFACE;
     return mActiveChannel->mTabParent->QueryInterface(aIID, result);
   }